Merge remote-tracking branch 'origin/master' into develop

2026-01-24 04:47:24 -06:00
parent 0157a769c3 6d6a0734b0
commit d407ec1975
6 changed files with 27 additions and 5 deletions
@@ -6,6 +6,8 @@ build_flags =
  ${esp32_base.build_flags}
  -D CHATTER_2
  -I variants/esp32/chatter2
+  -DMESHTASTIC_EXCLUDE_WEBSERVER=1
+  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
  
 lib_deps =
  ${esp32_base.lib_deps}
@@ -16,6 +16,8 @@ build_flags =
  ${esp32_base.build_flags}
  -I variants/esp32/m5stack_core
  -DM5STACK
+  -DMESHTASTIC_EXCLUDE_WEBSERVER=1
+  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
  -DUSER_SETUP_LOADED
  -DTFT_SDA_READ
  -DTFT_DRIVER=0x9341
@@ -67,4 +67,8 @@ void variant_shutdown()
    nrf_gpio_cfg_input(PIN_BUTTON1, NRF_GPIO_PIN_PULLUP); // Configure the pin to be woken up as an input
    nrf_gpio_pin_sense_t sense1 = NRF_GPIO_PIN_SENSE_LOW;
    nrf_gpio_cfg_sense_set(PIN_BUTTON1, sense1);
+
+    nrf_gpio_cfg_input(EXT_CHRG_DETECT, NRF_GPIO_PIN_PULLUP); // Configure the pin to be woken up as an input
+    nrf_gpio_pin_sense_t sense2 = NRF_GPIO_PIN_SENSE_LOW;
+    nrf_gpio_cfg_sense_set(EXT_CHRG_DETECT, sense2);
 }