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

Lots of refactoring

Browse Source
This commit is contained in:
Brent Perteet
2025-06-11 10:55:00 -05:00
parent a437bcf8b5
commit aaa7f0dc29
35 changed files with 1165 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
source/display.c
View File

@@ -48,7 +48,6 @@ float32_t Watts_Filt;
extern SYSTEM_DATA_t sys;
extern ADC_t adc;
extern uint8_t Bat_Type, Cur_Mode, Task, Over_Voltage_Flag, Error;
extern MODE_REC_t mode_Array[];
extern uint8_t Bcast_Pwr_Level;
@@ -139,18 +138,12 @@ void Display_Volts(void)
if((( Cur_Mode != BROADCAST) && (!Is_Clamp_Detected())))
Display_Line_Voltage();
else
{
if((Is_Clamp_Detected()) && (Test_Mode) && (Cur_Mode != BROADCAST))
{
Display_Clamp_Power();
}
}
#if 0// testing the new averager
sprintf(tempString,"%.2fmA",adc.I_OUT_SlowFilt* 1000.0);
sprintf(tempString,"%.2fmA",sys.adc.I_OUT_SlowFilt* 1000.0);
FL_DrawString( tempString, X_POS_MA+50, 18, font16Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
#endif
@@ -160,7 +153,7 @@ void Display_Volts(void)
void Display_Line_Voltage(void)
{
Volts = adc.V_OUT_FastFilt;
Volts = sys.adc.V_OUT_FastFilt;
if(Volts < 0)
Volts = 0;
@@ -177,11 +170,11 @@ void Display_Clamp_Power(void)
float power = 0.0f;
Volts = adc.V_OUT_FastFilt;
Volts = sys.adc.V_OUT_FastFilt;
if(Volts < 0)
Volts = 0;
power = Volts * adc.I_OUT_FastFilt;
power = Volts * sys.adc.I_OUT_FastFilt;
sprintf(tempString,"%.1fW", power);
FL_DrawString( tempString, LCD_X_MID -10, 60, font18Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
@@ -191,7 +184,7 @@ void Display_Clamp_Power(void)
void Display_Clamp_Volts(void)
{
Volts = adc.V_OUT_FastFilt;
Volts = sys.adc.V_OUT_FastFilt;
if(Volts < 0)
Volts = 0;
@@ -206,11 +199,7 @@ void Display_Current(void)
if(( Cur_Mode != BROADCAST) && (!Is_Clamp_Detected()))
Display_Line_Current();
else
{
if((Is_Clamp_Detected()) && (Test_Mode))
Display_Line_Current();
}
}
@@ -218,18 +207,14 @@ void Display_Ohms(void)
{
if(( Cur_Mode != BROADCAST) && (!Is_Clamp_Detected()))
Display_Line_Ohms();
else
{
if((Is_Clamp_Detected()) && (Test_Mode))
Display_Line_Ohms();
}
}
void Display_Line_Current(void)
{
Milli_amps = adc.I_OUT_SlowFilt;
Milli_amps = sys.adc.I_OUT_SlowFilt;
if(Milli_amps < 0)
@@ -242,20 +227,20 @@ void Display_Line_Current(void)
void Display_Line_Ohms(void)
{
if(adc.Ohms_slowfilt < 0)
adc.Ohms_slowfilt = 0;
if(sys.adc.Ohms_slowfilt < 0)
sys.adc.Ohms_slowfilt = 0;
if(adc.Ohms_slowfilt < 10000)
if(sys.adc.Ohms_slowfilt < 10000)
{
sprintf(tempString,"%.0fΩ",adc.Ohms_slowfilt);
sprintf(tempString,"%.0fΩ",sys.adc.Ohms_slowfilt);
FL_DrawString( tempString, X_POS_MA+90, 72, font16Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
}
else
{
if(adc.Ohms_slowfilt < 100000)
if(sys.adc.Ohms_slowfilt < 100000)
{
sprintf(tempString,"%.0f kΩ",adc.Ohms_slowfilt/1000);
sprintf(tempString,"%.0f kΩ",sys.adc.Ohms_slowfilt/1000);
FL_DrawString( tempString, X_POS_MA+90, 72, font16Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
}
else
@@ -323,15 +308,15 @@ void Display_Battery_NC() // No Cap
if (Bat_Type == LITHIUM)
{
if(adc.V_BAT >= NCL_BATTERY_NINETY)
if(sys.adc.V_BAT >= NCL_BATTERY_NINETY)
Draw_Battery(STACKS_4);
else if(adc.V_BAT > NCL_BATTERY_3QUARTERS)
else if(sys.adc.V_BAT > NCL_BATTERY_3QUARTERS)
Draw_Battery(STACKS_3);
else if(adc.V_BAT > NCL_BATTERY_FIFTY)
else if(sys.adc.V_BAT > NCL_BATTERY_FIFTY)
Draw_Battery(STACKS_2);
else if(adc.V_BAT > NCL_BATTERY_1QUARTER)
else if(sys.adc.V_BAT > NCL_BATTERY_1QUARTER)
Draw_Battery(STACKS_1);
else if (adc.V_BAT > NCL_BATTERY_1EIGTH)
else if (sys.adc.V_BAT > NCL_BATTERY_1EIGTH)
Draw_Battery(STACKS_EMPTY);
else
Display_Bat_Frame_Flash();
@@ -340,15 +325,15 @@ void Display_Battery_NC() // No Cap
else
{
if(adc.V_BAT >= NCA_BATTERY_NINETY)
if(sys.adc.V_BAT >= NCA_BATTERY_NINETY)
Draw_Battery(STACKS_4);
else if(adc.V_BAT > NCA_BATTERY_3QUARTERS)
else if(sys.adc.V_BAT > NCA_BATTERY_3QUARTERS)
Draw_Battery(STACKS_3);
else if(adc.V_BAT > NCA_BATTERY_FIFTY)
else if(sys.adc.V_BAT > NCA_BATTERY_FIFTY)
Draw_Battery(STACKS_2);
else if(adc.V_BAT > NCA_BATTERY_1QUARTER)
else if(sys.adc.V_BAT > NCA_BATTERY_1QUARTER)
Draw_Battery(STACKS_1);
else if (adc.V_BAT > NCA_BATTERY_1EIGTH)
else if (sys.adc.V_BAT > NCA_BATTERY_1EIGTH)
Draw_Battery(STACKS_EMPTY);
else
Display_Bat_Frame_Flash();
@@ -365,15 +350,15 @@ void Display_Battery_CF() // cap fitted
if (Bat_Type == LITHIUM)
{
if(adc.V_BAT >= L_BATTERY_NINETY)
if(sys.adc.V_BAT >= L_BATTERY_NINETY)
Draw_Battery(STACKS_4);
else if(adc.V_BAT > L_BATTERY_3QUARTERS)
else if(sys.adc.V_BAT > L_BATTERY_3QUARTERS)
Draw_Battery(STACKS_3);
else if(adc.V_BAT > L_BATTERY_FIFTY)
else if(sys.adc.V_BAT > L_BATTERY_FIFTY)
Draw_Battery(STACKS_2);
else if(adc.V_BAT > L_BATTERY_1QUARTER)
else if(sys.adc.V_BAT > L_BATTERY_1QUARTER)
Draw_Battery(STACKS_1);
else if (adc.V_BAT > L_BATTERY_1EIGTH)
else if (sys.adc.V_BAT > L_BATTERY_1EIGTH)
Draw_Battery(STACKS_EMPTY);
else
Display_Bat_Frame_Flash();
@@ -382,15 +367,15 @@ void Display_Battery_CF() // cap fitted
else
{
if(adc.V_BAT >= A_BATTERY_NINETY)
if(sys.adc.V_BAT >= A_BATTERY_NINETY)
Draw_Battery(STACKS_4);
else if(adc.V_BAT > A_BATTERY_3QUARTERS)
else if(sys.adc.V_BAT > A_BATTERY_3QUARTERS)
Draw_Battery(STACKS_3);
else if(adc.V_BAT > A_BATTERY_FIFTY)
else if(sys.adc.V_BAT > A_BATTERY_FIFTY)
Draw_Battery(STACKS_2);
else if(adc.V_BAT > A_BATTERY_1QUARTER)
else if(sys.adc.V_BAT > A_BATTERY_1QUARTER)
Draw_Battery(STACKS_1);
else if (adc.V_BAT > A_BATTERY_1EIGTH)
else if (sys.adc.V_BAT > A_BATTERY_1EIGTH)
Draw_Battery(STACKS_EMPTY);
else
Display_Bat_Frame_Flash();
@@ -471,25 +456,15 @@ void Display_Mode(uint8_t Con_Mode1)
{
uint8_t What; // What to display
// Con_Mode1 = Cur_Mode; // Currently indexed is the selected.
// mod_Array[Cur_Mode].Select = false;
//What = mode_Array[Cur_Mode].Plugged;
switch(Con_Mode1) // Where to draw
{
case BROADCAST:
//GL_DrawMonoBitmap(border60x60, LCD_X_MAX-60,LCD_Y_MIN + 2, LCD_DRAW_SET); // Always draw
// GL_DrawMonoBitmap(clampIcon2, LCD_X_MAX-60,LCD_Y_MIN + 2, LCD_DRAW_SET); // Always draw
// GL_DrawMonoBitmap(directConnectIcon3, LCD_X_MAX-60,LCD_Y_MIN + 2, LCD_DRAW_SET); // Always draw
// GL_DrawMonoBitmap(directConnectIcon5, LCD_X_MAX-60,LCD_Y_MIN + 2, LCD_DRAW_SET); // Always draw
{
GL_DrawMonoBitmap(inductionIcon, LCD_X_MAX-60,LCD_Y_MIN + 2, LCD_DRAW_SET); // Always draw
// GL_DrawMonoBitmap(lamp, LCD_X_MAX-28,LCD_Y_MIN + 2, LCD_DRAW_SET); // Always draw
break;
}
case PORT1_A: // ACtually PORT 2
What = ACCY_GetConnectedAccessory(1);
@@ -968,7 +943,7 @@ void Display_Over_Voltage_Status(void)
{
static uint32_t county = 0;
if(Over_Voltage_Flag)
if(sys.status[OVERVOLTAGE])
{
if(county<3)
{
@@ -1008,13 +983,13 @@ void Display_OnScreen_Diagnostics(void)
sprintf(tempString,"Taps %d", Display_Taps());
FL_DrawString(tempString, 0, 20, font10Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
sprintf(tempString,"B %.2fV",adc.V_BAT);
sprintf(tempString,"B %.2fV",sys.adc.V_BAT);
FL_DrawString(tempString, 0, 60, font10Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
// sprintf(tempString,"VPSU %.2fV", adc.V_PSU);
// sprintf(tempString,"VPSU %.2fV", sys.adc.V_PSU);
// FL_DrawString(tempString, 0, 80, font10Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
sprintf(tempString,"C %.2fV",adc.V_CHK);
sprintf(tempString,"C %.2fV",sys.adc.V_CHK);
FL_DrawString(tempString, 0, 70, font10Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
@@ -1030,7 +1005,7 @@ void Display_OnScreen_Diagnostics(void)
FL_DrawString(tempString, 0, 80, font10Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
}
// sprintf(tempString,"R %.2f",adc.IRawFilt);
// sprintf(tempString,"R %.2f",sys.adc.IRawFilt);
// FL_DrawString(tempString, 0, 80, font10Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
}
@@ -1089,9 +1064,9 @@ void Display_OnScreen_Diagnostics(void)
// sprintf(tempString, "1: %.2f", adc.V_ID1);
// sprintf(tempString, "1: %.2f", sys.adc.V_ID1);
// FL_DrawString( tempString, 0, 0, font12Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
// sprintf(tempString, "2: %.2f", adc.V_ID2);
// sprintf(tempString, "2: %.2f", sys.adc.V_ID2);
// FL_DrawString( tempString, 0, 15, font12Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
// sprintf(tempString, "%d", Power_Level); // Display number
// FL_DrawString(tempString, 120, 00, font18Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);