Skip to content

Commit f9b830b

Browse files
Quency-DQuency-D
authored
Merge pull request #4 from weebl2000/solar-watchdog
Address review comments
2 parents 53ff4ed + 1ab8a6f commit f9b830b

9 files changed

Lines changed: 47 additions & 47 deletions

File tree

‎examples/companion_radio/main.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ void setup() {
110110

111111
board.begin();
112112

113-
#ifdef HAS_EX_WATCHDOG
114-
ex_watchdog.begin();
113+
#ifdef HAS_EXTERNAL_WATCHDOG
114+
external_watchdog.begin();
115115
#endif
116116

117117
#ifdef DISPLAY_CLASS
@@ -229,7 +229,7 @@ void loop() {
229229
ui_task.loop();
230230
#endif
231231
rtc_clock.tick();
232-
#ifdef HAS_EX_WATCHDOG
233-
ex_watchdog.loop();
232+
#ifdef HAS_EXTERNAL_WATCHDOG
233+
external_watchdog.loop();
234234
#endif
235235
}

‎examples/simple_repeater/main.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ void setup() {
2929

3030
board.begin();
3131

32-
#ifdef HAS_EX_WATCHDOG
33-
ex_watchdog.begin();
32+
#ifdef HAS_EXTERNAL_WATCHDOG
33+
external_watchdog.begin();
3434
#endif
3535

3636
#if defined(MESH_DEBUG) && defined(NRF52_PLATFORM)
@@ -138,22 +138,22 @@ void loop() {
138138
#endif
139139
rtc_clock.tick();
140140

141-
#ifdef HAS_EX_WATCHDOG
142-
ex_watchdog.loop();
141+
#ifdef HAS_EXTERNAL_WATCHDOG
142+
external_watchdog.loop();
143143
#endif
144144
if (the_mesh.getNodePrefs()->powersaving_enabled && !the_mesh.hasPendingWork()) {
145145
#if defined(NRF52_PLATFORM)
146-
#ifdef HAS_EX_WATCHDOG
147-
uint32_t sleep_interval = ex_watchdog.getIntervalMs()/1000;
146+
#ifdef HAS_EXTERNAL_WATCHDOG
147+
uint32_t sleep_interval = external_watchdog.getIntervalMs()/1000;
148148
board.sleep((sleep_interval > 1800) ? 1800 : sleep_interval); // To sleep. Wake up after 30 minutes or when receiving a LoRa packet
149149
#else
150150
board.sleep(1800); // To sleep. Wake up after 30 minutes or when receiving a LoRa packet
151151
#endif
152152
board.sleep(1800); // nrf ignores seconds param, sleeps whenever possible
153153
#else
154154
if (the_mesh.millisHasNowPassed(lastActive + nextSleepinSecs * 1000)) { // To check if it is time to sleep
155-
#ifdef HAS_EX_WATCHDOG
156-
uint32_t sleep_interval = ex_watchdog.getIntervalMs()/1000;
155+
#ifdef HAS_EXTERNAL_WATCHDOG
156+
uint32_t sleep_interval = external_watchdog.getIntervalMs()/1000;
157157
board.sleep((sleep_interval > 1800) ? 1800 : sleep_interval); // To sleep. Wake up after 30 minutes or when receiving a LoRa packet
158158
#else
159159
board.sleep(1800); // To sleep. Wake up after 30 minutes or when receiving a LoRa packet

‎examples/simple_room_server/main.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ void setup() {
2424

2525
board.begin();
2626

27-
#ifdef HAS_EX_WATCHDOG
28-
ex_watchdog.begin();
27+
#ifdef HAS_EXTERNAL_WATCHDOG
28+
external_watchdog.begin();
2929
#endif
3030

3131
#ifdef DISPLAY_CLASS
@@ -117,7 +117,7 @@ void loop() {
117117
ui_task.loop();
118118
#endif
119119
rtc_clock.tick();
120-
#ifdef HAS_EX_WATCHDOG
121-
ex_watchdog.loop();
120+
#ifdef HAS_EXTERNAL_WATCHDOG
121+
external_watchdog.loop();
122122
#endif
123123
}

‎examples/simple_secure_chat/main.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -559,8 +559,8 @@ void setup() {
559559

560560
board.begin();
561561

562-
#ifdef HAS_EX_WATCHDOG
563-
ex_watchdog.begin();
562+
#ifdef HAS_EXTERNAL_WATCHDOG
563+
external_watchdog.begin();
564564
#endif
565565

566566
if (!radio_init()) { halt(); }
@@ -594,7 +594,7 @@ void setup() {
594594
void loop() {
595595
the_mesh.loop();
596596
rtc_clock.tick();
597-
#ifdef HAS_EX_WATCHDOG
598-
ex_watchdog.loop();
597+
#ifdef HAS_EXTERNAL_WATCHDOG
598+
external_watchdog.loop();
599599
#endif
600600
}

‎examples/simple_sensor/main.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ void setup() {
5858

5959
board.begin();
6060

61-
#ifdef HAS_EX_WATCHDOG
62-
ex_watchdog.begin();
61+
#ifdef HAS_EXTERNAL_WATCHDOG
62+
external_watchdog.begin();
6363
#endif
6464

6565
#ifdef DISPLAY_CLASS
@@ -151,7 +151,7 @@ void loop() {
151151
ui_task.loop();
152152
#endif
153153
rtc_clock.tick();
154-
#ifdef HAS_EX_WATCHDOG
155-
ex_watchdog.loop();
154+
#ifdef HAS_EXTERNAL_WATCHDOG
155+
external_watchdog.loop();
156156
#endif
157157
}

src/helpers/ExWatchdogManager.h renamed to src/helpers/ExternalWatchdogManager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#pragma once
22

3-
class ExWatchdogManager {
3+
class ExternalWatchdogManager {
44
protected:
55
unsigned long next_feed_watchdog;
66
public:
7-
ExWatchdogManager() { next_feed_watchdog = 0; }
7+
ExternalWatchdogManager() { next_feed_watchdog = 0; }
88
virtual bool begin() { return false; }
99
virtual void loop() { }
1010
virtual unsigned long getIntervalMs() const { return 0; }

‎variants/heltec_mesh_solar/platformio.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ build_flags = ${nrf52_base.build_flags}
1414
-D LORA_TX_POWER=22
1515
-D SX126X_CURRENT_LIMIT=140
1616
-D SX126X_RX_BOOSTED_GAIN=1
17-
-D HAS_EX_WATCHDOG
18-
-D EX_WATCHDOG_DONE_PIN=9
19-
-D EX_WATCHDOG_WAKE_PIN=10
20-
-D EX_WATCHDOG_TIMEOUT_MS=480000 ;(6*60*1000) ; 6 minute watchdog
17+
-D HAS_EXTERNAL_WATCHDOG
18+
-D EXTERNAL_WATCHDOG_DONE_PIN=9
19+
-D EXTERNAL_WATCHDOG_WAKE_PIN=10
20+
-D EXTERNAL_WATCHDOG_TIMEOUT_MS=480000 ;(6*60*1000) ; 6 minute watchdog
2121

2222
build_src_filter = ${nrf52_base.build_src_filter}
2323
+<helpers/*.cpp>

‎variants/heltec_mesh_solar/target.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ VolatileRTCClock fallback_clock;
1313
AutoDiscoverRTCClock rtc_clock(fallback_clock);
1414
MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
1515
SolarSensorManager sensors = SolarSensorManager(nmea);
16-
SolarExWatchdog ex_watchdog;
16+
SolarExternalWatchdog external_watchdog;
1717

1818
#ifdef DISPLAY_CLASS
1919
DISPLAY_CLASS display;
@@ -123,34 +123,34 @@ bool SolarSensorManager::setSettingValue(const char* name, const char* value) {
123123
return false; // not supported
124124
}
125125

126-
bool SolarExWatchdog::begin() {
126+
bool SolarExternalWatchdog::begin() {
127127
next_feed_watchdog = 0;
128-
pinMode(EX_WATCHDOG_WAKE_PIN, INPUT);
129-
pinMode(EX_WATCHDOG_DONE_PIN, OUTPUT);
128+
pinMode(EXTERNAL_WATCHDOG_WAKE_PIN, INPUT);
129+
pinMode(EXTERNAL_WATCHDOG_DONE_PIN, OUTPUT);
130130
delay(1);
131-
digitalWrite(EX_WATCHDOG_DONE_PIN, LOW);
131+
digitalWrite(EXTERNAL_WATCHDOG_DONE_PIN, LOW);
132132
delay(1);
133133
feed();
134134
return true;
135135
}
136-
void SolarExWatchdog::loop() {
136+
void SolarExternalWatchdog::loop() {
137137
if (millis() > next_feed_watchdog) {
138138
feed();
139-
next_feed_watchdog = millis() + EX_WATCHDOG_TIMEOUT_MS;
139+
next_feed_watchdog = millis() + EXTERNAL_WATCHDOG_TIMEOUT_MS;
140140
}
141141
}
142142

143-
unsigned long SolarExWatchdog::getIntervalMs() const {
143+
unsigned long SolarExternalWatchdog::getIntervalMs() const {
144144
unsigned long interval_ms = 0;
145145
interval_ms = next_feed_watchdog - millis();
146-
if(interval_ms > EX_WATCHDOG_TIMEOUT_MS) {
147-
interval_ms = EX_WATCHDOG_TIMEOUT_MS;
146+
if(interval_ms > EXTERNAL_WATCHDOG_TIMEOUT_MS) {
147+
interval_ms = EXTERNAL_WATCHDOG_TIMEOUT_MS;
148148
}
149149
return interval_ms;
150150
}
151151

152-
void SolarExWatchdog::feed() {
153-
digitalWrite(EX_WATCHDOG_DONE_PIN, HIGH);
152+
void SolarExternalWatchdog::feed() {
153+
digitalWrite(EXTERNAL_WATCHDOG_DONE_PIN, HIGH);
154154
delay(1);
155-
digitalWrite(EX_WATCHDOG_DONE_PIN, LOW);
155+
digitalWrite(EXTERNAL_WATCHDOG_DONE_PIN, LOW);
156156
}

‎variants/heltec_mesh_solar/target.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <helpers/AutoDiscoverRTCClock.h>
99
#include <helpers/SensorManager.h>
1010
#include <helpers/sensors/LocationProvider.h>
11-
#include <helpers/ExWatchdogManager.h>
11+
#include <helpers/ExternalWatchdogManager.h>
1212
#ifdef DISPLAY_CLASS
1313
#include <helpers/ui/ST7789Display.h>
1414
#endif
@@ -31,9 +31,9 @@ class SolarSensorManager : public SensorManager {
3131
bool setSettingValue(const char* name, const char* value) override;
3232
};
3333

34-
class SolarExWatchdog : public ExWatchdogManager {
34+
class SolarExternalWatchdog : public ExternalWatchdogManager {
3535
public:
36-
SolarExWatchdog() {}
36+
SolarExternalWatchdog() {}
3737
bool begin() override;
3838
void loop() override;
3939
unsigned long getIntervalMs() const override;
@@ -44,7 +44,7 @@ extern MeshSolarBoard board;
4444
extern WRAPPER_CLASS radio_driver;
4545
extern AutoDiscoverRTCClock rtc_clock;
4646
extern SolarSensorManager sensors;
47-
extern SolarExWatchdog ex_watchdog;
47+
extern SolarExternalWatchdog external_watchdog;
4848

4949
#ifdef DISPLAY_CLASS
5050
extern DISPLAY_CLASS display;

0 commit comments

Comments
 (0)