Trigger line to BLUE and status panel trigger text to green in NORAL mode

6 years ago · 39e1a02220
parent 4d8f76974a
commit 39e1a02220
2 changed files with 2 additions and 2 deletions
--- a/nanovna.h
+++ b/nanovna.h
@ -520,7 +520,7 @@ extern volatile uint8_t redraw_request;
 #define DEFAULT_TRACE_1_COLOR       RGB565(255,  0,  0)  /* RGB565(255,255,  0) */
 #define DEFAULT_TRACE_2_COLOR       RGB565(  0,255,  0)/* RGB565(  0,255,255) */
 #define DEFAULT_TRACE_3_COLOR       RGB565(255,255,  0)/* RGB565(  0,255,  0) */
-#define DEFAULT_TRIGGER_COLOR       RGB565(  0,190,  0)/* RGB565(  0,190,  0) */
+#define DEFAULT_TRIGGER_COLOR       RGB565(  0,0  ,255)/* RGB565(  0,190,  0) */
 //#define DEFAULT_TRACE_4_COLOR       RGB565(255,  0,255)
 #define DEFAULT_NORMAL_BAT_COLOR    RGB565( 31,227,  0)
 #define DEFAULT_LOW_BAT_COLOR       RGB565(255,  0,  0)
--- a/sa_core.c
+++ b/sa_core.c
@ -2421,7 +2421,7 @@ void draw_cal_status(void)

  // Trigger
  if (setting.trigger != T_AUTO) {
-    if (is_paused()) {
+    if (is_paused() || setting.trigger == T_NORMAL) {
      ili9341_set_foreground(BRIGHT_COLOR_GREEN);
    } else {
      ili9341_set_foreground(BRIGHT_COLOR_RED);