rg_system: Moved led animation to update_indicators

Right now it's just the blinking.

Author: ducalex

components/retro-go/rg_display.c

@@ -10,7 +10,7 @@
 static rg_task_t *display_task_queue;
 static rg_display_counters_t counters;
 static rg_display_config_t config;
-static rg_surface_t *osd;
+// static rg_surface_t *osd;
 static rg_surface_t *border;
 static rg_display_t display;
 static int16_t map_viewport_to_source_x[RG_SCREEN_WIDTH + 1];
@@ -214,12 +214,6 @@ static inline void write_update(const rg_surface_t *update)
         lines_remaining -= lines_to_copy;
     }
 
-    if (osd != NULL)
-    {
-        // TODO: Draw on screen display. By default it should be bottom left which is fine
-        // for both virtual keyboard and info labels. Maybe make it configurable later...
-    }
-
     if (lines_updated > draw_height * 0.80f)
         counters.fullFrames++;
     else

components/retro-go/rg_system.c

@@ -220,34 +220,26 @@ static void update_statistics(void)
     update_memory_statistics();
 }
 
-static void update_indicators(void)
+static void update_indicators(bool reset_animation)
 {
     uint32_t visibleIndicators = indicators & app.indicatorsMask;
+    static int animation_step = 0;
     rg_color_t newColor = 0; // C_GREEN
 
+    if (reset_animation)
+        animation_step = 0;
+    else
+        animation_step++;
+
     if (indicators & (3 << RG_INDICATOR_CRITICAL))
         newColor = C_RED; // Make it flash rapidly!
     else if (visibleIndicators & (1 << RG_INDICATOR_POWER_LOW))
-        newColor = C_RED;
+        newColor = (animation_step & 1) ? C_NONE : C_RED;
     else if (visibleIndicators)
         newColor = C_BLUE;
 
-    // In some cases it can be costly to update the LED status, skip if unchanged
-    if (newColor == ledColor)
-        return;
-
-    ledColor = newColor;
-
-#if defined(ESP_PLATFORM) && defined(RG_GPIO_LED)
-    if (RG_GPIO_LED == GPIO_NUM_NC)
-        return;
-    // GPIO LED doesn't support colors, so any color = on
-    int value = newColor != 0;
-    #ifdef RG_GPIO_LED_INVERT
-        value = !value;
-    #endif
-    gpio_set_level(RG_GPIO_LED, value);
-#endif
+    if (newColor != ledColor)
+        rg_system_set_led_color(newColor);
 }
 
 static void system_monitor_task(void *arg)
@@ -263,12 +255,10 @@ static void system_monitor_task(void *arg)
         rtcValue = time(NULL);
 
         update_statistics();
-        // update_indicators(); // Implicitly called by rg_system_set_indicator below
 
         rg_battery_t battery = rg_input_read_battery();
-        // TODO: The flashing should eventually be handled by update_indicators instead of here...
-        rg_system_set_indicator(RG_INDICATOR_POWER_LOW, (battery.present && battery.level <= 2.f &&
-                                                           !rg_system_get_indicator(RG_INDICATOR_POWER_LOW)));
+        rg_system_set_indicator(RG_INDICATOR_POWER_LOW, (battery.present && battery.level <= 2.f));
+        update_indicators(false);
 
         // Try to avoid complex conversions that could allocate, prefer rounding/ceiling if necessary.
         rg_system_log(RG_LOG_DEBUG, NULL, "STACK:%d, HEAP:%d+%d (%d+%d), BUSY:%d%%, FPS:%d (%d+%d+%d), BATT:%d\n",
@@ -1044,9 +1034,11 @@ bool rg_system_save_trace(const char *filename, bool panic_trace)
 
 void rg_system_set_indicator(rg_indicator_t indicator, bool on)
 {
+    uint32_t old_indicators = indicators;
     indicators &= ~(1 << indicator);
     indicators |= (on << indicator);
-    update_indicators();
+    if (old_indicators != indicators)
+        update_indicators(true);
 }
 
 bool rg_system_get_indicator(rg_indicator_t indicator)
@@ -1066,6 +1058,24 @@ bool rg_system_get_indicator_mask(rg_indicator_t indicator)
     return app.indicatorsMask & (1 << indicator);
 }
 
+bool rg_system_set_led_color(rg_color_t color)
+{
+    ledColor = color;
+#if defined(RG_GPIO_LED) && defined(RG_GPIO_LED_INVERT)
+    return RG_GPIO_LED != GPIO_NUM_NC && gpio_set_level(RG_GPIO_LED, !(color > 0)) == ESP_OK;
+#elif defined(RG_GPIO_LED)
+    // GPIO LED doesn't support colors, so any color = on
+    return RG_GPIO_LED != GPIO_NUM_NC && gpio_set_level(RG_GPIO_LED, (color > 0)) == ESP_OK;
+#else
+    return true;
+#endif
+}
+
+rg_color_t rg_system_get_led_color(void)
+{
+    return ledColor;
+}
+
 void rg_system_set_log_level(rg_log_level_t level)
 {
     if (level >= 0 && level < RG_LOG_MAX)

components/retro-go/rg_system.h

@@ -216,6 +216,8 @@ void rg_system_set_indicator(rg_indicator_t indicator, bool on);
 bool rg_system_get_indicator(rg_indicator_t indicator);
 void rg_system_set_indicator_mask(rg_indicator_t indicator, bool on);
 bool rg_system_get_indicator_mask(rg_indicator_t indicator);
+bool rg_system_set_led_color(rg_color_t color);
+rg_color_t rg_system_get_led_color(void);
 void rg_system_set_tick_rate(int tickRate);
 int rg_system_get_tick_rate(void);
 void rg_system_set_overclock(int level);