Skip to content
This repository has been archived by the owner on Mar 10, 2024. It is now read-only.

Commit

Permalink
Renamed some colors.
Browse files Browse the repository at this point in the history
  • Loading branch information
Dual Tachyon authored and Dual Tachyon committed Oct 10, 2023
1 parent d75dcf7 commit ebb0484
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 28 deletions.
36 changes: 18 additions & 18 deletions app/menu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -683,49 +683,49 @@ void MENU_DrawSetting(void)
case MENU_FREQ_STEP:
gSettingCurrentValue = gSettings.FrequencyStep;
gSettingMaxValues = 14;
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawFrequencyStep(gSettingCurrentValue);
break;

case MENU_SQ_LEVEL:
gSettingCurrentValue = gSettings.Squelch;
gSettingMaxValues = 10;
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawLevel(gSettingCurrentValue);
break;

case MENU_LED_TIMER:
gSettingCurrentValue = gSettings.DisplayTimer;
gSettingMaxValues = 43;
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawTimer(gSettingCurrentValue);
break;

case MENU_LOCK_TIMER:
gSettingCurrentValue = gSettings.LockTimer;
gSettingMaxValues = 43;
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawTimer(gSettingCurrentValue);
break;

case MENU_TOT:
gSettingCurrentValue = gSettings.TimeoutTimer;
gSettingMaxValues = 43;
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawTimer(gSettingCurrentValue);
break;

case MENU_VOX_LEVEL:
gSettingCurrentValue = gSettings.VoxLevel;
gSettingMaxValues = 10;
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawLevel(gSettingCurrentValue);
break;

case MENU_VOX_DELAY:
gSettingCurrentValue = gSettings.VoxDelay;
gSettingMaxValues = 10;
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawLevel(gSettingCurrentValue);
break;

Expand Down Expand Up @@ -753,7 +753,7 @@ void MENU_DrawSetting(void)
gSettingMaxValues = 1;
T9State = 0;
EditSize = 16;
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawActivateBy();
T9WritePos = 16;
for (i = 0; i < EditSize; i++) {
Expand All @@ -774,7 +774,7 @@ void MENU_DrawSetting(void)
gSettingCode = gVfoState[gSettings.CurrentVfo].RX.Code;
gSettingCodeType = gVfoState[gSettings.CurrentVfo].RX.CodeType;
MENU_SetMaxCssValues();
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawSettingArrow(0);
UI_DrawStringSwitchType();
DrawCss(gSettingCodeType, gSettingCode);
Expand All @@ -784,7 +784,7 @@ void MENU_DrawSetting(void)
gSettingCode = gVfoState[gSettings.CurrentVfo].TX.Code;
gSettingCodeType = gVfoState[gSettings.CurrentVfo].TX.CodeType;
MENU_SetMaxCssValues();
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawSettingArrow(0);
UI_DrawStringSwitchType();
DrawCss(gSettingCodeType, gSettingCode);
Expand All @@ -809,7 +809,7 @@ void MENU_DrawSetting(void)
case MENU_SCRAMBLER:
gSettingCurrentValue = gVfoState[gSettings.CurrentVfo].Scramble;
gSettingMaxValues = 9;
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawScrambler(gSettingCurrentValue);
break;

Expand All @@ -827,14 +827,14 @@ void MENU_DrawSetting(void)
gSettingCurrentValue = 0;
}
gSettingGolay = gVfoState[gSettings.CurrentVfo].Golay;
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawSettingArrow(0);
UI_DrawMute(gSettingCurrentValue, gSettingGolay, true);
return;

case MENU_CH_NAME:
gSettingMaxValues = 1;
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawActivateBy();
T9State = 0;
EditSize = 10;
Expand All @@ -850,7 +850,7 @@ void MENU_DrawSetting(void)
case MENU_DELETE_CH:
gSettingMaxValues = 999;
gSettingCurrentValue = gSettings.VfoChNo[gSettings.CurrentVfo];
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawChannelName(gSettingCurrentValue);
break;

Expand All @@ -866,28 +866,28 @@ void MENU_DrawSetting(void)
case MENU_DTMF_DELAY:
gSettingCurrentValue = gDTMF_Settings.Delay;
gSettingMaxValues = 21;
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawDtmfDelay(gSettingCurrentValue);
break;

case MENU_DTMF_INTERVAL:
gSettingCurrentValue = gDTMF_Settings.Interval;
gSettingMaxValues = 18;
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawDtmfInterval(gSettingCurrentValue);
break;

case MENU_DTMF_MODE:
gSettingCurrentValue = gDTMF_Settings.Mode;
gSettingMaxValues = 4;
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawDtmfMode(gSettingCurrentValue);
break;

case MENU_DTMF_SELECT:
gSettingCurrentValue = gDTMF_Settings.Select;
gSettingMaxValues = 16;
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawDtmfSelect(gSettingCurrentValue);
break;

Expand Down
2 changes: 1 addition & 1 deletion radio/detector.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ static void Loop(void)
bScan = false;

while (1) {
DISPLAY_Fill(80, 159, 8, 40, 0);
DISPLAY_Fill(80, 159, 8, 40, COLOR_BLACK);
gRxLinkCounter = 0;
do {
if (gRxLinkCounter == 0 && !bCtdcScan) {
Expand Down
2 changes: 1 addition & 1 deletion radio/hardware.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ void HARDWARE_Init(void)
void HARDWARE_Reboot(void)
{
DELAY_WaitMS(1000);
DISPLAY_Fill(0, 159, 0, 96, 0);
DISPLAY_Fill(0, 159, 0, 96, COLOR_BLACK);
RADIO_Sleep();
NVIC_SystemReset();
}
Expand Down
10 changes: 5 additions & 5 deletions radio/settings.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,15 @@ void SETTINGS_LoadCalibration(void)
gpio_bits_set(GPIOA, BOARD_GPIOA_LCD_RESX);

while (1) {
DISPLAY_Fill(0, 159, 0, 96, 0x0000);
DISPLAY_Fill(0, 159, 0, 96, COLOR_BLACK);
DELAY_WaitMS(1000);
DISPLAY_Fill(0, 159, 0, 96, 0xFFFF);
DISPLAY_Fill(0, 159, 0, 96, COLOR_WHITE);
DELAY_WaitMS(1000);
DISPLAY_Fill(0, 159, 0, 96, 0x001F);
DISPLAY_Fill(0, 159, 0, 96, COLOR_RED);
DELAY_WaitMS(1000);
DISPLAY_Fill(0, 159, 0, 96, 0x0400);
DISPLAY_Fill(0, 159, 0, 96, COLOR_RGB(0, 32, 0));
DELAY_WaitMS(1000);
DISPLAY_Fill(0, 159, 0, 96, 0xF800);
DISPLAY_Fill(0, 159, 0, 96, COLOR_BLUE);
DELAY_WaitMS(1000);
}
}
Expand Down
4 changes: 2 additions & 2 deletions task/keys.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ static void HandlerLong(KEY_t Key)

case KEY_5:
gMenuIndex = MENU_SQ_LEVEL;
DISPLAY_Fill(0, 159, 1, 81, 0);
DISPLAY_Fill(0, 159, 1, 81, COLOR_BLACK);
DISPLAY_DrawRectangle0(0, 56, 160, 1, gSettings.BorderColor);
MENU_DrawSetting();
break;
Expand All @@ -407,7 +407,7 @@ static void HandlerLong(KEY_t Key)

case KEY_8:
gMenuIndex = MENU_FREQ_STEP;
DISPLAY_Fill(0, 159, 1, 81, 0);
DISPLAY_Fill(0, 159, 1, 81, COLOR_BLACK);
DISPLAY_DrawRectangle0(0, 56, 160, 1, gSettings.BorderColor);
MENU_DrawSetting();
break;
Expand Down
2 changes: 1 addition & 1 deletion ui/version.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ void UI_DrawVersion(void)
if (sizeof(GIT_HASH) > 0) {
memcpy(Version, GIT_HASH, sizeof(GIT_HASH) - 1);
}
DISPLAY_Fill(0, 159, 1, 55, 0);
DISPLAY_Fill(0, 159, 1, 55, COLOR_BLACK);
UI_DrawString(24, 48, "V1.33 OEFW", 10);
UI_DrawString(24, 24, Version, 10);
}
Expand Down

0 comments on commit ebb0484

Please sign in to comment.