Tweak colors to look more like stock

This commit is contained in:
Reed Nightingale 2020-01-01 20:42:27 -08:00
parent 817edf2546
commit c8a538511e

View File

@ -5,16 +5,16 @@
#include "nano_gui.h" #include "nano_gui.h"
static const unsigned int COLOR_TEXT = DISPLAY_WHITE; static const unsigned int COLOR_TEXT = DISPLAY_WHITE;
static const unsigned int COLOR_BACKGROUND = DISPLAY_BLACK; static const unsigned int COLOR_BACKGROUND = DISPLAY_NAVY;
static const unsigned int COLOR_ACTIVE_VFO_TEXT = DISPLAY_WHITE; static const unsigned int COLOR_ACTIVE_VFO_TEXT = DISPLAY_WHITE;
static const unsigned int COLOR_ACTIVE_VFO_BACKGROUND = DISPLAY_DARKGREY; static const unsigned int COLOR_ACTIVE_VFO_BACKGROUND = DISPLAY_BLACK;
static const unsigned int COLOR_INACTIVE_VFO_TEXT = DISPLAY_GREEN; static const unsigned int COLOR_INACTIVE_VFO_TEXT = DISPLAY_GREEN;
static const unsigned int COLOR_INACTIVE_VFO_BACKGROUND = DISPLAY_DARKGREY; static const unsigned int COLOR_INACTIVE_VFO_BACKGROUND = DISPLAY_BLACK;
static const unsigned int COLOR_INACTIVE_TEXT = DISPLAY_GREEN; static const unsigned int COLOR_INACTIVE_TEXT = DISPLAY_GREEN;
static const unsigned int COLOR_INACTIVE_BACKGROUND = DISPLAY_DARKGREY; static const unsigned int COLOR_INACTIVE_BACKGROUND = DISPLAY_BLACK;
static const unsigned int COLOR_INACTIVE_BORDER = DISPLAY_DARKGREY; static const unsigned int COLOR_INACTIVE_BORDER = DISPLAY_DARKGREY;
static const unsigned int COLOR_ACTIVE_TEXT = DISPLAY_BLACK; static const unsigned int COLOR_ACTIVE_TEXT = DISPLAY_BLACK;
@ -463,8 +463,8 @@ void enterFreq(){
if(button.x < ts_point.x && ts_point.x < x2 && if(button.x < ts_point.x && ts_point.x < x2 &&
button.y < ts_point.y && ts_point.y < y2){ button.y < ts_point.y && ts_point.y < y2){
Serial.print(F("Entered key: ")); //Serial.print(F("Entered key: "));
Serial.println(button.text); //Serial.println(button.text);
switch(button.id){ switch(button.id){
case KEYS_OK: case KEYS_OK:
{ {
@ -832,13 +832,13 @@ void setCwTone(){
} }
void doCommand(Button* button){ void doCommand(Button* button){
Serial.print(F("Doing command: ")); //Serial.print(F("Doing command: "));
Serial.print(button->text); //Serial.print(button->text);
Serial.print(F(", Hitbox: ")); //Serial.print(F(", Hitbox: "));
Serial.print(button->x);Serial.print(F(",")); //Serial.print(button->x);Serial.print(F(","));
Serial.print(button->y);Serial.print(F(";")); //Serial.print(button->y);Serial.print(F(";"));
Serial.print(button->x + button->w);Serial.print(F(",")); //Serial.print(button->x + button->w);Serial.print(F(","));
Serial.println(button->y + button->h); //Serial.println(button->y + button->h);
switch(button->id){ switch(button->id){
case BUTTON_RIT: case BUTTON_RIT:
{ {