Skip to content

Commit c7514d2

Browse files
GOB52GOB52
committed
Cosmetic change
1 parent 2aec0c4 commit c7514d2

6 files changed

Lines changed: 91 additions & 78 deletions

File tree

‎examples/UnitUnified/UnitRTC/PlotToSerial/main/PlotToSerial.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace {
2121
// ==============================================================
2222
// NOTICE: Set your WiFi credentials and timezone before building
2323
// ==============================================================
24-
const char* WIFI_SSID = ""; // Your WiFi SSID
24+
const char* WIFI_SSID = ""; // Your WiFi SSID
2525
const char* WIFI_PASS = ""; // Your WiFi password
2626
// POSIX timezone string (default: JST-9 = UTC+9, no DST)
2727
const char* YOUR_TIMEZONE = "JST-9";
@@ -145,8 +145,7 @@ bool sync_ntp_to_rtc()
145145
WiFi.disconnect(true);
146146
WiFi.mode(WIFI_OFF);
147147

148-
struct tm t {
149-
};
148+
struct tm t{};
150149
if (!getLocalTime(&t, 10000)) {
151150
M5_LOGE("Failed to get NTP time");
152151
display_printf("\nNTP FAILED\n");

‎src/Unit_RTC.cpp‎

Lines changed: 57 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
#include "Unit_RTC.h"
22

3-
Unit_RTC::Unit_RTC() {
3+
Unit_RTC::Unit_RTC()
4+
{
45
_addr = DEVICE_ADDR;
56
}
67

7-
Unit_RTC::Unit_RTC(uint8_t addr) {
8+
Unit_RTC::Unit_RTC(uint8_t addr)
9+
{
810
_addr = addr;
911
}
1012

1113
/*! @brief Initialize the RTC. */
12-
void Unit_RTC::begin() {
14+
void Unit_RTC::begin()
15+
{
1316
_wire = &Wire;
1417
_wire->begin();
1518
writeReg(0x00, 0x00);
@@ -18,7 +21,8 @@ void Unit_RTC::begin() {
1821
}
1922

2023
/*! @brief Initialize the RTC. */
21-
void Unit_RTC::begin(TwoWire *wire) {
24+
void Unit_RTC::begin(TwoWire *wire)
25+
{
2226
_wire = wire;
2327
_wire->begin();
2428
writeReg(0x00, 0x00);
@@ -27,8 +31,8 @@ void Unit_RTC::begin(TwoWire *wire) {
2731
}
2832

2933
/*! @brief Initialize the RTC. */
30-
void Unit_RTC::begin(TwoWire *wire, uint8_t scl, uint8_t sda,
31-
uint32_t i2c_freq) {
34+
void Unit_RTC::begin(TwoWire *wire, uint8_t scl, uint8_t sda, uint32_t i2c_freq)
35+
{
3236
_wire = wire;
3337
_wire->begin(DEVICE_ADDR, sda, scl, i2c_freq);
3438
writeReg(0x00, 0x00);
@@ -37,23 +41,26 @@ void Unit_RTC::begin(TwoWire *wire, uint8_t scl, uint8_t sda,
3741
}
3842

3943
/*! @brief Write data to register. */
40-
void Unit_RTC::writeReg(uint8_t reg, uint8_t data) {
44+
void Unit_RTC::writeReg(uint8_t reg, uint8_t data)
45+
{
4146
_wire->beginTransmission(DEVICE_ADDR);
4247
_wire->write(reg);
4348
_wire->write(data);
4449
_wire->endTransmission();
4550
}
4651

4752
/*! @brief Read data from register. */
48-
uint8_t Unit_RTC::ReadReg(uint8_t reg) {
53+
uint8_t Unit_RTC::ReadReg(uint8_t reg)
54+
{
4955
_wire->beginTransmission(DEVICE_ADDR);
5056
_wire->write(reg);
5157
_wire->endTransmission(false);
5258
_wire->requestFrom(DEVICE_ADDR, 1);
5359
return _wire->read();
5460
}
5561

56-
void Unit_RTC::Str2Time(void) {
62+
void Unit_RTC::Str2Time(void)
63+
{
5764
Second = (asc[0] - 0x30) * 10 + asc[1] - 0x30;
5865
Minute = (asc[2] - 0x30) * 10 + asc[3] - 0x30;
5966
Hour = (asc[4] - 0x30) * 10 + asc[5] - 0x30;
@@ -66,16 +73,17 @@ void Unit_RTC::Str2Time(void) {
6673
*/
6774
}
6875

69-
void Unit_RTC::DataMask() {
70-
_trdata[0] = _trdata[0] & 0x7f; //秒
71-
_trdata[1] = _trdata[1] & 0x7f; //分
72-
_trdata[2] = _trdata[2] & 0x3f; //时
76+
void Unit_RTC::DataMask()
77+
{
78+
_trdata[0] = _trdata[0] & 0x7f; // 秒
79+
_trdata[1] = _trdata[1] & 0x7f; // 分
80+
_trdata[2] = _trdata[2] & 0x3f; // 时
7381

74-
_trdata[3] = _trdata[3] & 0x3f; //日
75-
_trdata[4] = _trdata[4] & 0x07; //星期
76-
_trdata[5] = _trdata[5] & 0x1f; //月
82+
_trdata[3] = _trdata[3] & 0x3f; // 日
83+
_trdata[4] = _trdata[4] & 0x07; // 星期
84+
_trdata[5] = _trdata[5] & 0x1f; // 月
7785

78-
_trdata[6] = _trdata[6] & 0xff; //年
86+
_trdata[6] = _trdata[6] & 0xff; // 年
7987
}
8088
/********************************************************************
8189
函 数 名： void Bcd2asc(void)
@@ -85,22 +93,24 @@ void Unit_RTC::DataMask() {
8593
入口参数：
8694
返 回 值：无
8795
***********************************************************************/
88-
void Unit_RTC::Bcd2asc(void) {
96+
void Unit_RTC::Bcd2asc(void)
97+
{
8998
uint8_t i, j;
9099
for (j = 0, i = 0; i < 7; i++) {
91-
asc[j++] =
92-
(_trdata[i] & 0xf0) >> 4 | 0x30; /*格式为: 秒 分 时 日 月 星期 年 */
100+
asc[j++] = (_trdata[i] & 0xf0) >> 4 | 0x30; /*格式为: 秒 分 时 日 月 星期 年 */
93101
asc[j++] = (_trdata[i] & 0x0f) | 0x30;
94102
}
95103
}
96104

97-
uint8_t Unit_RTC::Bcd2ToByte(uint8_t Value) {
105+
uint8_t Unit_RTC::Bcd2ToByte(uint8_t Value)
106+
{
98107
uint8_t tmp = 0;
99108
tmp = ((uint8_t)(Value & (uint8_t)0xF0) >> (uint8_t)0x4) * 10;
100109
return (tmp + (Value & (uint8_t)0x0F));
101110
}
102111

103-
uint8_t Unit_RTC::ByteToBcd2(uint8_t Value) {
112+
uint8_t Unit_RTC::ByteToBcd2(uint8_t Value)
113+
{
104114
uint8_t bcdhigh = 0;
105115

106116
while (Value >= 10) {
@@ -111,7 +121,8 @@ uint8_t Unit_RTC::ByteToBcd2(uint8_t Value) {
111121
return ((uint8_t)(bcdhigh << 4) | Value);
112122
}
113123

114-
void Unit_RTC::getTime(rtc_time_type *RTC_TimeStruct) {
124+
void Unit_RTC::getTime(rtc_time_type *RTC_TimeStruct)
125+
{
115126
// if()
116127
uint8_t buf[3] = {0};
117128

@@ -126,14 +137,15 @@ void Unit_RTC::getTime(rtc_time_type *RTC_TimeStruct) {
126137
buf[2] = _wire->read();
127138
}
128139

129-
RTC_TimeStruct->Seconds = Bcd2ToByte(buf[0] & 0x7f); //秒
130-
RTC_TimeStruct->Minutes = Bcd2ToByte(buf[1] & 0x7f); //分
131-
RTC_TimeStruct->Hours = Bcd2ToByte(buf[2] & 0x3f); //时
140+
RTC_TimeStruct->Seconds = Bcd2ToByte(buf[0] & 0x7f); // 秒
141+
RTC_TimeStruct->Minutes = Bcd2ToByte(buf[1] & 0x7f); // 分
142+
RTC_TimeStruct->Hours = Bcd2ToByte(buf[2] & 0x3f); // 时
132143
}
133144

134-
int Unit_RTC::setTime(rtc_time_type *RTC_TimeStruct) {
135-
if (RTC_TimeStruct == NULL || RTC_TimeStruct->Hours > 24 ||
136-
RTC_TimeStruct->Minutes > 60 || RTC_TimeStruct->Seconds > 60)
145+
int Unit_RTC::setTime(rtc_time_type *RTC_TimeStruct)
146+
{
147+
if (RTC_TimeStruct == NULL || RTC_TimeStruct->Hours > 24 || RTC_TimeStruct->Minutes > 60 ||
148+
RTC_TimeStruct->Seconds > 60)
137149
return 0;
138150

139151
_wire->beginTransmission(DEVICE_ADDR);
@@ -145,7 +157,8 @@ int Unit_RTC::setTime(rtc_time_type *RTC_TimeStruct) {
145157
return 1;
146158
}
147159

148-
void Unit_RTC::getDate(rtc_date_type *RTC_DateStruct) {
160+
void Unit_RTC::getDate(rtc_date_type *RTC_DateStruct)
161+
{
149162
uint8_t buf[4] = {0};
150163

151164
_wire->beginTransmission(DEVICE_ADDR);
@@ -171,9 +184,10 @@ void Unit_RTC::getDate(rtc_date_type *RTC_DateStruct) {
171184
}
172185
}
173186

174-
int Unit_RTC::setDate(rtc_date_type *RTC_DateStruct) {
175-
if (RTC_DateStruct == NULL || RTC_DateStruct->WeekDay > 7 ||
176-
RTC_DateStruct->Date > 31 || RTC_DateStruct->Month > 12)
187+
int Unit_RTC::setDate(rtc_date_type *RTC_DateStruct)
188+
{
189+
if (RTC_DateStruct == NULL || RTC_DateStruct->WeekDay > 7 || RTC_DateStruct->Date > 31 ||
190+
RTC_DateStruct->Month > 12)
177191
return 0;
178192
_wire->beginTransmission(DEVICE_ADDR);
179193
_wire->write(0x05);
@@ -193,7 +207,8 @@ int Unit_RTC::setDate(rtc_date_type *RTC_DateStruct) {
193207
return 1;
194208
}
195209

196-
int Unit_RTC::setAlarmIRQ(int afterSeconds) {
210+
int Unit_RTC::setAlarmIRQ(int afterSeconds)
211+
{
197212
uint8_t reg_value = 0;
198213
reg_value = ReadReg(0x01);
199214

@@ -224,7 +239,8 @@ int Unit_RTC::setAlarmIRQ(int afterSeconds) {
224239
return afterSeconds * div;
225240
}
226241

227-
int Unit_RTC::setAlarmIRQ(const rtc_time_type &RTC_TimeStruct) {
242+
int Unit_RTC::setAlarmIRQ(const rtc_time_type &RTC_TimeStruct)
243+
{
228244
uint8_t irq_enable = false;
229245
uint8_t out_buf[4] = {0x80, 0x80, 0x80, 0x80};
230246

@@ -257,8 +273,8 @@ int Unit_RTC::setAlarmIRQ(const rtc_time_type &RTC_TimeStruct) {
257273
return irq_enable ? 1 : 0;
258274
}
259275

260-
int Unit_RTC::setAlarmIRQ(const rtc_date_type &RTC_DateStruct,
261-
const rtc_time_type &RTC_TimeStruct) {
276+
int Unit_RTC::setAlarmIRQ(const rtc_date_type &RTC_DateStruct, const rtc_time_type &RTC_TimeStruct)
277+
{
262278
uint8_t irq_enable = false;
263279
uint8_t out_buf[4] = {0x80, 0x80, 0x80, 0x80};
264280

@@ -298,11 +314,13 @@ int Unit_RTC::setAlarmIRQ(const rtc_date_type &RTC_DateStruct,
298314
return irq_enable ? 1 : 0;
299315
}
300316

301-
void Unit_RTC::clearIRQ() {
317+
void Unit_RTC::clearIRQ()
318+
{
302319
uint8_t data = ReadReg(0x01);
303320
writeReg(0x01, data & 0xf3);
304321
}
305-
void Unit_RTC::disableIRQ() {
322+
void Unit_RTC::disableIRQ()
323+
{
306324
clearIRQ();
307325
uint8_t data = ReadReg(0x01);
308326
writeReg(0x01, data & 0xfC);

‎src/Unit_RTC.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ struct rtc_time_type {
2323
uint8_t Minutes;
2424
uint8_t Seconds;
2525
rtc_time_type(uint8_t hours = 0, uint8_t minutes = 0, uint8_t seconds = 0)
26-
: Hours{hours}, Minutes{minutes}, Seconds{seconds} {
26+
: Hours{hours}, Minutes{minutes}, Seconds{seconds}
27+
{
2728
}
2829
};
2930

@@ -32,14 +33,14 @@ struct rtc_date_type {
3233
uint8_t Month;
3334
uint8_t Date;
3435
uint8_t WeekDay;
35-
rtc_date_type(uint16_t year = 2000, uint8_t month = 0, uint8_t date = 0,
36-
uint8_t weekDay = 0)
37-
: Year{year}, Month{month}, Date{date}, WeekDay{weekDay} {
36+
rtc_date_type(uint16_t year = 2000, uint8_t month = 0, uint8_t date = 0, uint8_t weekDay = 0)
37+
: Year{year}, Month{month}, Date{date}, WeekDay{weekDay}
38+
{
3839
}
3940
};
4041

4142
class Unit_RTC {
42-
private:
43+
private:
4344
void Bcd2asc(void);
4445
void DataMask();
4546
void Str2Time(void);
@@ -48,15 +49,15 @@ class Unit_RTC {
4849
uint8_t Bcd2ToByte(uint8_t Value);
4950
uint8_t ByteToBcd2(uint8_t Value);
5051

51-
private:
52+
private:
5253
/*定义数组用来存储读取的时间数据 */
5354
uint8_t _trdata[7];
5455
/*定义数组用来存储转换的 asc 码时间数据*/
5556
// uint8_t asc[14];
5657
uint8_t _addr;
5758
TwoWire *_wire;
5859

59-
public:
60+
public:
6061
Unit_RTC();
6162
Unit_RTC(uint8_t addr);
6263
void begin();
@@ -72,13 +73,12 @@ class Unit_RTC {
7273

7374
int setAlarmIRQ(int afterSeconds);
7475
int setAlarmIRQ(const rtc_time_type &RTC_TimeStruct);
75-
int setAlarmIRQ(const rtc_date_type &RTC_DateStruct,
76-
const rtc_time_type &RTC_TimeStruct);
76+
int setAlarmIRQ(const rtc_date_type &RTC_DateStruct, const rtc_time_type &RTC_TimeStruct);
7777

7878
void clearIRQ();
7979
void disableIRQ();
8080

81-
public:
81+
public:
8282
uint8_t Second;
8383
uint8_t Minute;
8484
uint8_t Hour;

‎src/unit/unit_PCF8563.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ bool UnitPCF8563::readTimerControl(bool& enabled, pcf8563::TimerClock& clock)
433433
if (!readRegister8(TIMER_CONTROL_REG, val, 0)) {
434434
return false;
435435
}
436-
enabled = (val & 0x80) != 0; // TE bit
436+
enabled = (val & 0x80) != 0; // TE bit
437437
clock = static_cast<pcf8563::TimerClock>(val & 0x03); // TD bits
438438
return true;
439439
}
@@ -604,7 +604,7 @@ void UnitPCF8563::setSystemTimeFromRtc(struct timezone* tz)
604604
}
605605
struct tm t = dt.to_tm();
606606

607-
struct timeval tv {};
607+
struct timeval tv{};
608608
tv.tv_sec = mktime(&t);
609609
settimeofday(&tv, tz);
610610
}

‎test/embedded/test_pcf8563/pcf8563_test.cpp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ class TestPCF8563 : public ComponentTestBase<UnitPCF8563, bool> {
2626
{
2727
// ESP32-C6 boards (NessoN1, NanoC6) have 1 hardware I2C used by M5Unified; use HAL
2828
auto board = M5.getBoard();
29-
if (board == m5::board_t::board_ArduinoNessoN1 || board == m5::board_t::board_M5NanoC6
30-
|| is_using_hal()) {
29+
if (board == m5::board_t::board_ArduinoNessoN1 || board == m5::board_t::board_M5NanoC6 || is_using_hal()) {
3130
auto pin_num_sda = M5.getPin(m5::pin_name_t::port_a_sda);
3231
auto pin_num_scl = M5.getPin(m5::pin_name_t::port_a_scl);
3332
if (board == m5::board_t::board_ArduinoNessoN1) {
@@ -144,7 +143,7 @@ TEST_P(TestPCF8563, DateTime)
144143
// --- DateTime round-trip (struct tm) ---
145144
{
146145
SCOPED_TRACE("DateTime struct tm");
147-
struct tm wt {};
146+
struct tm wt{};
148147
wt.tm_year = 126; // 2026
149148
wt.tm_mon = 1; // February
150149
wt.tm_mday = 26;
@@ -154,7 +153,7 @@ TEST_P(TestPCF8563, DateTime)
154153
wt.tm_sec = 33;
155154
EXPECT_TRUE(unit->writeDateTime(wt));
156155

157-
struct tm rt {};
156+
struct tm rt{};
158157
EXPECT_TRUE(unit->readDateTime(rt));
159158
EXPECT_EQ(rt.tm_year, 126);
160159
EXPECT_EQ(rt.tm_mon, 1);
@@ -436,7 +435,7 @@ TEST_P(TestPCF8563, CompatAPI)
436435
SCOPED_TRACE("setAlarmIRQ date+time");
437436
m5::rtc_date_t ad = {2000, 1, 15, 3};
438437
m5::rtc_time_t at = {12, 30, -1};
439-
int result = unit->setAlarmIRQ(ad, at);
438+
int result = unit->setAlarmIRQ(ad, at);
440439
EXPECT_EQ(result, 1);
441440

442441
// Verify via readAlarm
@@ -695,7 +694,7 @@ TEST_P(TestPCF8563, CompatAlarmTimer)
695694
// setAlarmIRQ (same values)
696695
m5::rtc_date_t cd = {2000, 1, 25, -1};
697696
m5::rtc_time_t ct = {14, 30, -1};
698-
int result = unit->setAlarmIRQ(cd, ct);
697+
int result = unit->setAlarmIRQ(cd, ct);
699698
EXPECT_EQ(result, 1);
700699

701700
rtc_time_t rt2{};

0 commit comments

Comments
 (0)