Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use RTC_NOINIT_ATTR instead of preferences for bootloop detection

Browse Source
This commit is contained in:
technyon
2024-07-05 17:27:35 +02:00
parent 25c40bb68b
commit 193ebb5f91
3 changed files with 63 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Network.cpp
View File

@@ -273,12 +273,6 @@ bool Network::update()
{ {
unsigned long ts = millis(); unsigned long ts = millis();
if(ts > 120000 && ts < 125000 && _preferences->getInt(preference_bootloop_counter, 0) > 0)
{
_preferences->putInt(preference_bootloop_counter, 0);
Log->println(F("Bootloop counter reset"));
}
_device->update(); _device->update();
if(!_mqttEnabled) if(!_mqttEnabled)

8
src/Network.h
View File

@@ -29,7 +29,12 @@ enum class NetworkDeviceType
class Network class Network
{ {
public: public:
explicit Network(Preferences* preferences, PresenceDetection* presenceDetection, Gpio* gpio, const String& maintenancePathPrefix, char* buffer, size_t bufferSize); explicit Network(Preferences* preferences,
PresenceDetection* presenceDetection,
Gpio* gpio,
const String& maintenancePathPrefix,
char* buffer,
size_t bufferSize);
void initialize(); void initialize();
bool update(); bool update();
@@ -174,4 +179,5 @@ private:
NetworkDeviceType _networkDeviceType = (NetworkDeviceType)-1; NetworkDeviceType _networkDeviceType = (NetworkDeviceType)-1;
int8_t _lastRssi = 127; int8_t _lastRssi = 127;
}; };

77
src/main.cpp
View File

@@ -15,6 +15,8 @@
#include "CharBuffer.h" #include "CharBuffer.h"
#include "NukiDeviceId.h" #include "NukiDeviceId.h"
#define IS_VALID_DETECT 0xa00ab00bc00bd00d;
Network* network = nullptr; Network* network = nullptr;
NetworkLock* networkLock = nullptr; NetworkLock* networkLock = nullptr;
NetworkOpener* networkOpener = nullptr; NetworkOpener* networkOpener = nullptr;
@@ -36,6 +38,10 @@ unsigned long restartTs = (2^32) - 5 * 60000;
RTC_NOINIT_ATTR int restartReason; RTC_NOINIT_ATTR int restartReason;
RTC_NOINIT_ATTR uint64_t restartReasonValidDetect; RTC_NOINIT_ATTR uint64_t restartReasonValidDetect;
RTC_NOINIT_ATTR bool rebuildGpioRequested; RTC_NOINIT_ATTR bool rebuildGpioRequested;
RTC_NOINIT_ATTR uint64_t bootloopValidDetect;
RTC_NOINIT_ATTR int8_t bootloopCounter;
bool restartReason_isValid; bool restartReason_isValid;
RestartReason currentRestartReason = RestartReason::NotApplicable; RestartReason currentRestartReason = RestartReason::NotApplicable;
@@ -47,6 +53,13 @@ void networkTask(void *pvParameters)
{ {
while(true) while(true)
{ {
unsigned long ts = millis();
if(ts > 120000 && ts < 125000 && bootloopCounter > 0)
{
bootloopCounter = (int8_t)0;
Log->println(F("Bootloop counter reset"));
}
bool connected = network->update(); bool connected = network->update();
if(connected && openerEnabled) if(connected && openerEnabled)
{ {
@@ -241,39 +254,61 @@ bool initPreferences()
return firstStart; return firstStart;
} }
void setup() void bootloopDetection()
{ {
Serial.begin(115200); uint64_t cmp = IS_VALID_DETECT;
Log = &Serial; bool bootloopIsValid = (bootloopValidDetect == cmp);
Log->println(bootloopIsValid);
Log->print(F("Nuki Hub version ")); Log->println(NUKI_HUB_VERSION); if(!bootloopIsValid)
Log->print(F("Nuki Hub build ")); Log->println(NUKI_HUB_BUILD);
bool firstStart = initPreferences();
initializeRestartReason();
if(preferences->getBool(preference_enable_bootloop_reset, false) &&
(esp_reset_reason() == esp_reset_reason_t::ESP_RST_PANIC ||
esp_reset_reason() == esp_reset_reason_t::ESP_RST_INT_WDT ||
esp_reset_reason() == esp_reset_reason_t::ESP_RST_TASK_WDT ||
esp_reset_reason() == esp_reset_reason_t::ESP_RST_WDT))
{ {
preferences->putInt(preference_bootloop_counter, preferences->getInt(preference_bootloop_counter, 0) + 1); bootloopCounter = (int8_t)0;
Log->println(F("Bootloop counter incremented")); bootloopValidDetect = IS_VALID_DETECT;
return;
if(preferences->getInt(preference_bootloop_counter) == 10) }
if(esp_reset_reason() == esp_reset_reason_t::ESP_RST_PANIC ||
esp_reset_reason() == esp_reset_reason_t::ESP_RST_INT_WDT ||
esp_reset_reason() == esp_reset_reason_t::ESP_RST_TASK_WDT ||
true ||
esp_reset_reason() == esp_reset_reason_t::ESP_RST_WDT)
{
bootloopCounter++;
Log->print(F("Bootloop counter incremented: "));
Log->println(bootloopCounter);
if(bootloopCounter == 10)
{ {
Log->print(F("Bootloop detected."));
preferences->putInt(preference_buffer_size, CHAR_BUFFER_SIZE); preferences->putInt(preference_buffer_size, CHAR_BUFFER_SIZE);
preferences->putInt(preference_task_size_network, NETWORK_TASK_SIZE); preferences->putInt(preference_task_size_network, NETWORK_TASK_SIZE);
preferences->putInt(preference_task_size_nuki, NUKI_TASK_SIZE); preferences->putInt(preference_task_size_nuki, NUKI_TASK_SIZE);
preferences->putInt(preference_authlog_max_entries, MAX_AUTHLOG); preferences->putInt(preference_authlog_max_entries, MAX_AUTHLOG);
preferences->putInt(preference_keypad_max_entries, MAX_KEYPAD); preferences->putInt(preference_keypad_max_entries, MAX_KEYPAD);
preferences->putInt(preference_timecontrol_max_entries, MAX_TIMECONTROL); preferences->putInt(preference_timecontrol_max_entries, MAX_TIMECONTROL);
preferences->putInt(preference_bootloop_counter, 0); bootloopCounter = 0;
} }
} }
}
void setup()
{
Serial.begin(115200);
Log = &Serial;
Log->print(F("Nuki Hub version ")); Log->println(NUKI_HUB_VERSION);
Log->print(F("Nuki Hub build ")); Log->println(NUKI_HUB_BUILD);
bool firstStart = initPreferences();
preferences->remove(preference_bootloop_counter);
initializeRestartReason();
if(preferences->getBool(preference_enable_bootloop_reset, false))
{
bootloopDetection();
}
uint32_t devIdOpener = preferences->getUInt(preference_device_id_opener); uint32_t devIdOpener = preferences->getUInt(preference_device_id_opener);