patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pr665' into dev

Browse Source
This commit is contained in:
Thomas Basler 2023-03-07 18:59:02 +01:00
commit 5771256493
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
.vscode/settings.json .vscode/settings.json
platformio-device-monitor*.log platformio-device-monitor*.log
platformio_override.ini platformio_override.ini
.DS_Store

12
lib/ResetReason/src/ResetReason.cpp
View File

@ -34,7 +34,7 @@ String ResetReasonClass::get_reset_reason_verbose(uint8_t cpu_id)
case 3: case 3:
reason_str = F("Software reset digital core"); reason_str = F("Software reset digital core");
break; break;
#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) #if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(CONFIG_IDF_TARGET_ESP32S2)
case 4: case 4:
reason_str = F("Legacy watch dog reset digital core"); reason_str = F("Legacy watch dog reset digital core");
break; break;
@ -42,7 +42,7 @@ String ResetReasonClass::get_reset_reason_verbose(uint8_t cpu_id)
case 5: case 5:
reason_str = F("Deep Sleep reset digital core"); reason_str = F("Deep Sleep reset digital core");
break; break;
#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) #if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(CONFIG_IDF_TARGET_ESP32S2)
case 6: case 6:
reason_str = F("Reset by SLC module, reset digital core"); reason_str = F("Reset by SLC module, reset digital core");
break; break;
@ -68,7 +68,7 @@ String ResetReasonClass::get_reset_reason_verbose(uint8_t cpu_id)
case 13: case 13:
reason_str = F("RTC Watch dog Reset CPU"); reason_str = F("RTC Watch dog Reset CPU");
break; break;
#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) #if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(CONFIG_IDF_TARGET_ESP32S2)
case 14: case 14:
reason_str = F("for APP CPU, reset by PRO CPU"); reason_str = F("for APP CPU, reset by PRO CPU");
break; break;
@ -100,7 +100,7 @@ String ResetReasonClass::get_reset_reason_short(uint8_t cpu_id)
case 3: case 3:
reason_str = F("SW_RESET"); reason_str = F("SW_RESET");
break; break;
#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) #if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(CONFIG_IDF_TARGET_ESP32S2)
case 4: case 4:
reason_str = F("OWDT_RESET"); reason_str = F("OWDT_RESET");
break; break;
@ -108,7 +108,7 @@ String ResetReasonClass::get_reset_reason_short(uint8_t cpu_id)
case 5: case 5:
reason_str = F("DEEPSLEEP_RESET"); reason_str = F("DEEPSLEEP_RESET");
break; break;
#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) #if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(CONFIG_IDF_TARGET_ESP32S2)
case 6: case 6:
reason_str = F("SDIO_RESET"); reason_str = F("SDIO_RESET");
break; break;
@ -134,7 +134,7 @@ String ResetReasonClass::get_reset_reason_short(uint8_t cpu_id)
case 13: case 13:
reason_str = F("RTCWDT_CPU_RESET"); reason_str = F("RTCWDT_CPU_RESET");
break; break;
#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) #if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(CONFIG_IDF_TARGET_ESP32S2)
case 14: case 14:
reason_str = F("EXT_CPU_RESET"); reason_str = F("EXT_CPU_RESET");
break; break;

10
platformio.ini
View File

@ -147,3 +147,13 @@ build_flags = ${env.build_flags}
-DHOYMILES_PIN_IRQ=16 -DHOYMILES_PIN_IRQ=16
-DHOYMILES_PIN_CE=17 -DHOYMILES_PIN_CE=17
-DHOYMILES_PIN_CS=5 -DHOYMILES_PIN_CS=5
[env:lolin_s2_mini]
board = lolin_s2_mini
build_flags = ${env.build_flags}
-DHOYMILES_PIN_MISO=13
-DHOYMILES_PIN_MOSI=11
-DHOYMILES_PIN_SCLK=12
-DHOYMILES_PIN_CS=10
-DHOYMILES_PIN_IRQ=4
-DHOYMILES_PIN_CE=5