From e4342d9715cb7cd959e900b7fd30f7b7c3694593 Mon Sep 17 00:00:00 2001 From: thebentern Date: Tue, 31 Jan 2023 13:59:09 +0000 Subject: [PATCH 1/6] [create-pull-request] automated change --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index 26a503776..f68474788 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 2 minor = 0 -build = 17 +build = 18 From 7750dd2d46dfc6e0c09d5cd62bcfd2ba20ff2bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Fri, 20 Jan 2023 16:49:50 +0100 Subject: [PATCH 2/6] debug asserts --- src/sleep.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/sleep.cpp b/src/sleep.cpp index 54502a5bd..ab0d18199 100644 --- a/src/sleep.cpp +++ b/src/sleep.cpp @@ -298,9 +298,18 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r if (pmu_found) gpio_wakeup_enable((gpio_num_t)PMU_IRQ, GPIO_INTR_LOW_LEVEL); // pmu irq #endif - assert(esp_sleep_enable_gpio_wakeup() == ESP_OK); - assert(esp_sleep_enable_timer_wakeup(sleepUsec) == ESP_OK); - assert(esp_light_sleep_start() == ESP_OK); + auto res = esp_sleep_enable_gpio_wakeup(); + if (res != 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(); #ifdef BUTTON_PIN From 39bb9f21ac6890af960c65a08a32597d333280d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Mon, 23 Jan 2023 09:51:30 +0100 Subject: [PATCH 3/6] trunk fmt --- src/sleep.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sleep.cpp b/src/sleep.cpp index ab0d18199..77c8d7119 100644 --- a/src/sleep.cpp +++ b/src/sleep.cpp @@ -300,15 +300,15 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r #endif auto res = esp_sleep_enable_gpio_wakeup(); if (res != ESP_OK) - LOG_DEBUG ("esp_sleep_enable_gpio_wakeup result %d\n", res); + 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); + 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); + 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(); From f0f819f403e73bc335228877988306e5ff885d5d Mon Sep 17 00:00:00 2001 From: Mark Trevor Birss Date: Wed, 1 Feb 2023 09:06:07 +0200 Subject: [PATCH 4/6] Update architecture.h --- src/platform/esp32/architecture.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h index 7936e7f75..f8973f338 100644 --- a/src/platform/esp32/architecture.h +++ b/src/platform/esp32/architecture.h @@ -90,6 +90,8 @@ #define HW_VENDOR meshtastic_HardwareModel_HELTEC_WSL_V3 #elif defined(TLORA_T3S3_V1) #define HW_VENDOR meshtastic_HardwareModel_TLORA_T3_S3 +#elif defined(BETAFPV_2400_TX) +#define HW_VENDOR HardwareModel_BETAFPV_2400_TX #endif // From 3dda6e14f74e49c586552d41ba200273b6edbe2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Wed, 1 Feb 2023 10:52:49 +0100 Subject: [PATCH 5/6] Trunk Fmt --- src/platform/esp32/architecture.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h index f8973f338..c0b7848ed 100644 --- a/src/platform/esp32/architecture.h +++ b/src/platform/esp32/architecture.h @@ -90,7 +90,7 @@ #define HW_VENDOR meshtastic_HardwareModel_HELTEC_WSL_V3 #elif defined(TLORA_T3S3_V1) #define HW_VENDOR meshtastic_HardwareModel_TLORA_T3_S3 -#elif defined(BETAFPV_2400_TX) +#elif defined(BETAFPV_2400_TX) #define HW_VENDOR HardwareModel_BETAFPV_2400_TX #endif From c908e616118b2974e52161f4ae16be2a7ed74b9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Wed, 1 Feb 2023 10:53:48 +0100 Subject: [PATCH 6/6] Update architecture.h Add Namespace --- src/platform/esp32/architecture.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h index c0b7848ed..09b754d0f 100644 --- a/src/platform/esp32/architecture.h +++ b/src/platform/esp32/architecture.h @@ -91,7 +91,7 @@ #elif defined(TLORA_T3S3_V1) #define HW_VENDOR meshtastic_HardwareModel_TLORA_T3_S3 #elif defined(BETAFPV_2400_TX) -#define HW_VENDOR HardwareModel_BETAFPV_2400_TX +#define HW_VENDOR meshtastic_HardwareModel_BETAFPV_2400_TX #endif //