ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2025-12-06 03:31:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: revert color of traces to the original

Browse source
This commit is contained in:
TT 2020-01-29 02:23:20 +09:00
parent 51c3980e1b
commit 14dfe97557
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nanovna.h
View file

@ -289,6 +289,7 @@ extern int16_t vbat;
#define DEFAULT_MENU_COLOR RGB565(255,255,255) #define DEFAULT_MENU_COLOR RGB565(255,255,255)
#define DEFAULT_MENU_TEXT_COLOR RGB565( 0, 0, 0) #define DEFAULT_MENU_TEXT_COLOR RGB565( 0, 0, 0)
#define DEFAULT_MENU_ACTIVE_COLOR RGB565(180,255,180) #define DEFAULT_MENU_ACTIVE_COLOR RGB565(180,255,180)
<<<<<<< HEAD
#define DEFAULT_TRACE_1_COLOR RGB565(255,200, 14) #define DEFAULT_TRACE_1_COLOR RGB565(255,200, 14)
#define DEFAULT_TRACE_2_COLOR RGB565( 0,191,231) #define DEFAULT_TRACE_2_COLOR RGB565( 0,191,231)
#define DEFAULT_TRACE_3_COLOR RGB565( 64,255, 0) #define DEFAULT_TRACE_3_COLOR RGB565( 64,255, 0)
@ -296,6 +297,12 @@ extern int16_t vbat;
#define DEFAULT_NORMAL_BAT_COLOR RGB565( 31,227, 0) #define DEFAULT_NORMAL_BAT_COLOR RGB565( 31,227, 0)
#define DEFAULT_LOW_BAT_COLOR RGB565(255, 0, 0) #define DEFAULT_LOW_BAT_COLOR RGB565(255, 0, 0)
#define DEFAULT_SPEC_INPUT_COLOR RGB565(128,255,128); #define DEFAULT_SPEC_INPUT_COLOR RGB565(128,255,128);
=======
#define DEFAULT_TRACE_1_COLOR RGB565(255,255, 0)
#define DEFAULT_TRACE_2_COLOR RGB565( 0,255,255)
#define DEFAULT_TRACE_3_COLOR RGB565( 0,255, 0)
#define DEFAULT_TRACE_4_COLOR RGB565(255, 0,255)
>>>>>>> fix: revert color of traces to the original
extern uint16_t foreground_color; extern uint16_t foreground_color;
extern uint16_t background_color; extern uint16_t background_color;