diff --git a/src/watchdog/watchdogThread.cpp b/src/watchdog/watchdogThread.cpp index ff329f62b..3e8a5466f 100644 --- a/src/watchdog/watchdogThread.cpp +++ b/src/watchdog/watchdogThread.cpp @@ -10,7 +10,7 @@ WatchdogThread::WatchdogThread() : OSThread("Watchdog") } void WatchdogThread::feedDog(void) -{ +{ digitalWrite(HARDWARE_WATCHDOG_DONE, HIGH); delay(1); digitalWrite(HARDWARE_WATCHDOG_DONE, LOW); diff --git a/src/watchdog/watchdogThread.h b/src/watchdog/watchdogThread.h index 5756afa46..3a3830aa4 100644 --- a/src/watchdog/watchdogThread.h +++ b/src/watchdog/watchdogThread.h @@ -1,18 +1,16 @@ #pragma once -#include #include "concurrency/OSThread.h" +#include #ifdef HAS_HARDWARE_WATCHDOG class WatchdogThread : private concurrency::OSThread { public: - WatchdogThread(); void feedDog(void); virtual bool setup(); virtual int32_t runOnce() override; - }; extern WatchdogThread *watchdogThread; diff --git a/variants/nrf52840/heltec_mesh_solar/variant.h b/variants/nrf52840/heltec_mesh_solar/variant.h index 02cf724c3..298475401 100644 --- a/variants/nrf52840/heltec_mesh_solar/variant.h +++ b/variants/nrf52840/heltec_mesh_solar/variant.h @@ -39,8 +39,8 @@ extern "C" { #define NUM_ANALOG_INPUTS (1) #define NUM_ANALOG_OUTPUTS (0) -#define PIN_LED1 (32 + 15) // green (confirmed on 1.0 board) -#define LED_BLUE PIN_LED1 // fake for bluefruit library +#define PIN_LED1 (32 + 15) // green (confirmed on 1.0 board) +#define LED_BLUE PIN_LED1 // fake for bluefruit library #define LED_GREEN PIN_LED1 #define LED_STATE_ON 0 // State when LED is lit @@ -141,7 +141,7 @@ No longer populated on PCB #define HAS_HARDWARE_WATCHDOG #define HARDWARE_WATCHDOG_DONE (0 + 9) #define HARDWARE_WATCHDOG_WAKE (0 + 10) -#define HARDWARE_WATCHDOG_TIMEOUT_MS (6*60*1000) // 6 minute watchdog +#define HARDWARE_WATCHDOG_TIMEOUT_MS (6 * 60 * 1000) // 6 minute watchdog #define BQ4050_SDA_PIN (32 + 1) // I2C data line pin #define BQ4050_SCL_PIN (32 + 0) // I2C clock line pin