UL/TX
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

More refactoring

Browse Source 
Lots of things removed but compiles again
This commit is contained in:
Brent Perteet
2025-06-25 11:18:44 -05:00
parent 0556b06cab
commit 2ff7291c63
31 changed files with 1247 additions and 2569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
source/display.c
View File

@@ -17,7 +17,7 @@
#include "spi.h"
#include "lcd.h"
#include "display.h"
#include "frq.h"
//#include "frq.h"
#include "battery.h"
#include "utils.h"
#include "Graphics/splash.h"
@@ -544,6 +544,7 @@ void Display_High_Voltage(void)
void Display_Frequency(uint8_t frequency)
{
#if 0
// if (freqArray[frequency].frequency2 > 0)
// Display_CD_Symbol(); // place a CD symbol in front in correct position
@@ -568,27 +569,23 @@ void Display_Frequency(uint8_t frequency)
// }
FL_DrawString( tempString, LCD_X_MAX+6, LCD_Y_MAX - 22, font18Bold, LCD_DRAW_SET, FL_ALIGN_RIGHT);
#endif
}
void Display_CD_Symbol(void)
{
// uint16_t ldy = LCD_Y_MAX - GL_GetMonoBitmapHeight(ld2)+3;
#if 0
if (freqArray[frequency].frequency1 < 1000)
GL_DrawMonoBitmap(ld, LCD_X_MAX - 90, LCD_Y_MAX - 16, LCD_DRAW_SET);
else
GL_DrawMonoBitmap(ld, LCD_X_MAX - 106, LCD_Y_MAX - 16, LCD_DRAW_SET);
#endif
}
void Test_Frequency(void)
{
if(freqArray[frequency].enabled)
Display_Frequency(frequency);
frequency = Next_Frequency(frequency);
}
void Display_Bye_Bye()
{
@@ -656,7 +653,7 @@ void Display_Normal(void)
else
Display_Level(Power_Level); // Display bars
Display_Frequency(frequency);
//Display_Frequency(frequency);
if(Test_Mode)
FL_DrawString("BETA", LCD_X_MIN, LCD_Y_MIN-3, font16Bold, LCD_DRAW_XOR, FL_ALIGN_LEFT);
@@ -730,56 +727,6 @@ uint8_t Display_Taps(void)
}
void Display_Currently_Selected(void)
{
switch (Cur_Mode)
{
case BROADCAST:
break;
case PORT1_A:
if(ACCY_GetConnectedAccessory(1) == ID_CLAMP || ACCY_GetConnectedAccessory(1) == ID_CLAMP2)
//Display_Clamp_Volts();
Display_Clamp_Power();
else
Display_Line_Measurements();
break;
case PORT1_B:
if(ACCY_GetConnectedAccessory(1) == ID_CLAMP || ACCY_GetConnectedAccessory(1) == ID_CLAMP2)
//Display_Clamp_Volts();
Display_Clamp_Power();
else
Display_Line_Measurements();
break;
case PORT2_A:
if(ACCY_GetConnectedAccessory(2) == ID_CLAMP || ACCY_GetConnectedAccessory(2) == ID_CLAMP2)
//Display_Clamp_Volts();
Display_Clamp_Power();
else
Display_Line_Measurements();
break;
case PORT2_B:
if(ACCY_GetConnectedAccessory(2) == ID_CLAMP || ACCY_GetConnectedAccessory(2) == ID_CLAMP2)
//Display_Clamp_Volts();
Display_Clamp_Power();
else
Display_Line_Measurements();
break;
}
}
void Display_Line_Measurements(void)
{
Display_Line_Voltage();
@@ -790,39 +737,6 @@ void Display_Line_Measurements(void)
}
void Display_Tx_Status(void)
{
switch(Task)
{
case SAFETY_TASK:
Display_Danger_Menu();
break;
case FATAL_ERROR_TASK:
Display_Fatal_Error();
break;
case ESTOP_TASK:
Display_Estop();
break;
case LOW_BATTERY_TASK:
Display_Flash_Bat();
break;
case BAT_INSERTION_ERROR:
LCD_Clear(); //clear the frameBuffer
Display_Bat_Error();
break;
default:
Display_Normal();
}
}
void Display_USB_Status(void)
{