Disable RGBLED functionality with Makefile switch RGB_LED=disable

Author: Xykon

esp32/Makefile

@@ -37,6 +37,7 @@ RELEASE_DIR ?= build/
 COPY_IDF_LIB ?= 0
 
 LTE_LOG_BUFF ?= 0
+RGB_LED ?= enable
 
 # by default openthread over LoRa is enabled
 OPENTHREAD ?= on
@@ -127,6 +128,10 @@ ifeq ($(LTE_DEBUG_BUFF),1)
 	CFLAGS += -DLTE_DEBUG_BUFF
 endif #ifeq ($(LTE_LOG_BUFF),1)
 endif #ifeq ($(BOARD), $(filter $(BOARD), GPY FIPY))
+# Enable or Disable RGB led
+ifeq ($(RGB_LED),disable)
+	CFLAGS += -DRGB_LED_DISABLE
+endif #ifeq ($(LTE_LOG_BUFF),1)
 
 B_LIBS = -Lbootloader/lib -Lbootloader -L$(BUILD)/bootloader -L$(ESP_IDF_COMP_PATH)/esp32/ld \
          -L$(ESP_IDF_COMP_PATH)/esp32/lib -llog -lcore -lbootloader_support \

esp32/bootloader/bootloader.c

@@ -338,7 +338,9 @@ static bool find_active_image(bootloader_state_t *bs, esp_partition_pos_t *parti
     memcpy(&_boot_info, boot_info, sizeof(boot_info_t));
     bootloader_munmap(boot_info);
     boot_info = &_boot_info;
+#ifndef RGB_LED_DISABLE
     mperror_init0();
+#endif
 
     // // check the signature fot he bootloader first
     // uint8_t signature[16];
@@ -372,7 +374,9 @@ static bool find_active_image(bootloader_state_t *bs, esp_partition_pos_t *parti
         boot_info->safeboot = false;
         if (!ota_write_boot_info (boot_info, bs->ota_info.offset)) {
             ESP_LOGE(TAG, "Error writing boot info");
+#ifndef RGB_LED_DISABLE
             mperror_fatal_error();
+#endif
             return false;
         }
         return true;
@@ -504,7 +508,9 @@ static void bootloader_main()
     if (bootloader_state.ota_info.offset == 0 || !find_active_image(&bootloader_state, &partition)) {
         // nothing to load, bail out
         ESP_LOGE(TAG, "nothing to load");
+#ifndef RGB_LED_DISABLE
         mperror_fatal_error();
+#endif
         return;
     }
 

esp32/bootloader/bootmgr.c

@@ -70,16 +70,20 @@ static void delay_ms (uint32_t delay) {
 //*****************************************************************************
 static bool wait_while_blinking (uint32_t wait_time, uint32_t period, bool force_wait) {
     uint32_t count;
+#ifndef RGB_LED_DISABLE
     static bool toggle = true;
+#endif
     for (count = 0; (force_wait || gpio_get_level(MICROPY_HW_SAFE_PIN_NUM)) &&
          ((period * count) < wait_time); count++) {
+#ifndef RGB_LED_DISABLE
         // toggle the led
         if (toggle) {
             mperror_set_rgb_color(BOOTMGR_SAFEBOOT_COLOR);
         } else {
             mperror_set_rgb_color(0);
         }
         toggle = !toggle;
+#endif
         delay_ms(period);
     }
     return gpio_get_level(MICROPY_HW_SAFE_PIN_NUM) ? true : false;
@@ -116,8 +120,10 @@ uint32_t wait_for_safe_boot (const boot_info_t *boot_info, uint32_t *ActiveImg)
                 wait_while_blinking(BOOTMGR_WAIT_SAFE_MODE_3_MS, BOOTMGR_WAIT_SAFE_MODE_3_BLINK_MS, true);
             }
         }
+#ifndef RGB_LED_DISABLE
         // turn off the heartbeat led
         mperror_set_rgb_color(0);
+#endif
         // request a HW safe boot
         ret = SAFE_BOOT_HW;
     }

esp32/bootloader/mperror.c

@@ -6,7 +6,7 @@
  * see the Pycom Licence v1.0 document supplied with this file, or
  * available at https://www.pycom.io/opensource/licensing
  */
-
+#ifndef RGB_LED_DISABLE
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdint.h>
@@ -146,3 +146,11 @@ void IRAM_ATTR mperror_set_rgb_color (uint32_t rgbcolor) {
     XTOS_RESTORE_INTLEVEL(ilevel);
     ets_delay_us(RESET_TIME_US);
 }
+
+#else
+
+__attribute__((noreturn)) void mperror_fatal_error (void) {
+    for ( ; ; );
+}
+
+#endif //RGB_LED_DISABLE

esp32/main.c

@@ -120,9 +120,10 @@ void app_main(void) {
         nvs_flash_erase();
         nvs_flash_init();
     }
-
+#ifndef RGB_LED_DISABLE
     // initialise heartbeat on Core 0
     mperror_pre_init();
+#endif
 
     // differentiate the Flash Size (either 8MB or 4MB) based on ESP32 rev id
     micropy_hw_flash_size = (esp_get_revision() > 0 ? 0x800000 : 0x400000);

esp32/mods/machpin.c

@@ -138,11 +138,13 @@ void pin_init0(void) {
             {
                 continue;
             }
+#ifndef RGB_LED_DISABLE
             /* exclude RGB led from initialization as it is already initialized by mperror */
             if (self == &PIN_MODULE_P2)
             {
                 continue;
             }
+#endif
             pin_config(self, -1, -1, GPIO_MODE_INPUT, MACHPIN_PULL_DOWN, 0);
         }
     }

esp32/mods/modmachine.c

@@ -239,7 +239,9 @@ STATIC mp_obj_t machine_sleep (uint n_args, const mp_obj_t *arg) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_sleep_obj,0, 2, machine_sleep);
 
 STATIC mp_obj_t machine_deepsleep (uint n_args, const mp_obj_t *arg) {
+#ifndef RGB_LED_DISABLE
     mperror_enable_heartbeat(false);
+#endif
     bt_deinit(NULL);
     wlan_deinit(NULL);
 #if defined(FIPY) || defined(GPY)

esp32/mods/modpycom.c

@@ -124,6 +124,7 @@ static void modpycom_bootmgr(uint8_t boot_partition, uint8_t fs_type, uint8_t sa
 
 
 STATIC mp_obj_t mod_pycom_heartbeat (mp_uint_t n_args, const mp_obj_t *args) {
+#ifndef RGB_LED_DISABLE
     if (n_args) {
         mperror_enable_heartbeat (mp_obj_is_true(args[0]));
         if (!mp_obj_is_true(args[0])) {
@@ -134,19 +135,25 @@ STATIC mp_obj_t mod_pycom_heartbeat (mp_uint_t n_args, const mp_obj_t *args) {
     } else {
         return mp_obj_new_bool(mperror_is_heartbeat_enabled());
     }
+#else
+    nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "RGB Led Interface Disabled"));
+#endif
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_pycom_heartbeat_obj, 0, 1, mod_pycom_heartbeat);
 
 STATIC mp_obj_t mod_pycom_rgb_led (mp_obj_t o_color) {
-
+#ifndef RGB_LED_DISABLE
     if (mperror_is_heartbeat_enabled()) {
        nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, mpexception_os_request_not_possible));
     }
 
     uint32_t color = mp_obj_get_int(o_color);
     led_info.color.value = color;
     led_set_color(&led_info, true, false);
+#else
+    nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "RGB Led Interface Disabled"));
+#endif
 
     return mp_const_none;
 }

esp32/mptask.c

@@ -212,7 +212,9 @@ void TASK_Micropython (void *pvParameters) {
     mp_irq_init0();
 #endif
     uart_init0();
+#ifndef RGB_LED_DISABLE
     mperror_init0();
+#endif
     rng_init0();
     mp_hal_init(soft_reset);
     readline_init0();
@@ -295,8 +297,10 @@ void TASK_Micropython (void *pvParameters) {
             goto soft_reset_exit;
         }
         if (!ret) {
+#ifndef RGB_LED_DISABLE
             // flash the system led
             mperror_signal_error();
+#endif
         }
     }
 
@@ -317,8 +321,10 @@ void TASK_Micropython (void *pvParameters) {
                 goto soft_reset_exit;
             }
             if (!ret) {
+#ifndef RGB_LED_DISABLE
                 // flash the system led
                 mperror_signal_error();
+#endif
             }
         }
     }

esp32/util/mperror.c

@@ -6,7 +6,7 @@
  * see the Pycom Licence v1.0 document supplied with this file, or
  * available at https://www.pycom.io/opensource/licensing
  */
-
+#ifndef RGB_LED_DISABLE
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
@@ -37,6 +37,7 @@
 
 #include "esp_freertos_hooks.h"
 
+
 /******************************************************************************
  DEFINE CONSTANTS
  ******************************************************************************/
@@ -219,3 +220,33 @@ static void disable_and_wait (void) {
         mp_hal_delay_ms(2);
     }
 }
+
+#else
+#include "py/mpconfig.h"
+#ifndef BOOTLOADER_BUILD
+void NORETURN __fatal_error(const char *msg) {
+#ifdef DEBUG
+    if (msg != NULL) {
+        // wait for 20ms
+        mp_hal_delay_ms(20);
+        mp_hal_stdout_tx_str("\r\nFATAL ERROR:");
+        mp_hal_stdout_tx_str(msg);
+        mp_hal_stdout_tx_str("\r\n");
+    }
+#endif
+
+    for ( ;; ); //{__WFI();}
+}
+
+void nlr_jump_fail(void *val) {
+#ifdef DEBUG
+    char msg[64];
+    snprintf(msg, sizeof(msg), "uncaught exception %p\n", val);
+    __fatal_error(msg);
+#else
+    __fatal_error(NULL);
+#endif
+}
+#endif
+
+#endif // RGB_LED_DISABLE