pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-02 10:50:40 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' into rsyslog-client

Browse Source
This commit is contained in:
Thomas Göttgens 2023-02-01 15:09:44 +01:00 committed by GitHub
commit e4d455640f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platform/esp32/architecture.h
View File

@ -90,6 +90,8 @@
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_WSL_V3 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_WSL_V3
#elif defined(TLORA_T3S3_V1) #elif defined(TLORA_T3S3_V1)
#define HW_VENDOR meshtastic_HardwareModel_TLORA_T3_S3 #define HW_VENDOR meshtastic_HardwareModel_TLORA_T3_S3
#elif defined(BETAFPV_2400_TX)
#define HW_VENDOR meshtastic_HardwareModel_BETAFPV_2400_TX
#endif #endif
// //

15
src/sleep.cpp
View File

@ -298,9 +298,18 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r
if (pmu_found) if (pmu_found)
gpio_wakeup_enable((gpio_num_t)PMU_IRQ, GPIO_INTR_LOW_LEVEL); // pmu irq gpio_wakeup_enable((gpio_num_t)PMU_IRQ, GPIO_INTR_LOW_LEVEL); // pmu irq
#endif #endif
assert(esp_sleep_enable_gpio_wakeup() == ESP_OK); auto res = esp_sleep_enable_gpio_wakeup();
assert(esp_sleep_enable_timer_wakeup(sleepUsec) == ESP_OK); if (res != ESP_OK)
assert(esp_light_sleep_start() == ESP_OK); LOG_DEBUG("esp_sleep_enable_gpio_wakeup result %d\n", res);
assert(res == ESP_OK);
res = esp_sleep_enable_timer_wakeup(sleepUsec);
if (res != ESP_OK)
LOG_DEBUG("esp_sleep_enable_timer_wakeup result %d\n", res);
assert(res == ESP_OK);
res = esp_light_sleep_start();
if (res != ESP_OK)
LOG_DEBUG("esp_light_sleep_start result %d\n", res);
assert(res == ESP_OK);
esp_sleep_wakeup_cause_t cause = esp_sleep_get_wakeup_cause(); esp_sleep_wakeup_cause_t cause = esp_sleep_get_wakeup_cause();
#ifdef BUTTON_PIN #ifdef BUTTON_PIN

2
version.properties
View File

@ -1,4 +1,4 @@
[VERSION] [VERSION]
major = 2 major = 2
minor = 0 minor = 0
build = 17 build = 18