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

lots of stuff

Browse Source
This commit is contained in:
Brent Perteet
2025-08-26 16:10:47 -05:00
parent 372e4941a2
commit bbc9d6ae91
27 changed files with 1193 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
source/display.c
View File

@@ -71,7 +71,7 @@ void Display_Bcast(void)
}
}
void Display_USB(void)
static void displayUSB(void)
{
GL_DrawMonoBitmap(usbIconSmall, LCD_X_MIN + 30, LCD_Y_MAX - usbIconSmall[1], LCD_DRAW_SET);
}
@@ -158,7 +158,7 @@ void Display_Line_Voltage(void)
if(Volts < 0)
Volts = 0;
sprintf(tempString,"%.0fVa",Volts);
sprintf(tempString,"%.0fV",Volts);
FL_DrawString( tempString, X_POS_MA+90, 48, font16Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
GL_DrawLine( X_POS_MA+90, 74, X_POS_MA+130, 74, 3, LCD_DRAW_SET);
@@ -188,7 +188,7 @@ void Display_Clamp_Volts(void)
if(Volts < 0)
Volts = 0;
sprintf(tempString,"%.0fVb",Volts);
sprintf(tempString,"%.0fV",Volts);
FL_DrawString( tempString, LCD_X_MID -10, 60, font18Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
}
@@ -686,15 +686,6 @@ void Display_Line_Measurements(void)
}
void Display_USB_Status(void)
{
if(GPIO_PinRead(GPIO,1,6))
Display_USB();
// GL_DrawMonoBitmap(usbIconSmall, LCD_X_MID, 30, LCD_DRAW_SET);
}
void Display_Over_Voltage_Status(void)
{
static uint32_t county = 0;
@@ -717,11 +708,30 @@ void Display_Fatal_Error(void)
FL_DrawString(tempString, 80, 90, font10Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
}
void Display_OnScreen_Diagnostics(void)
static void displayDiagnostics(void)
{
sprintf(tempString, "POT %d", Dds_Pot_Val[1]);
//TxDriver_t *d = driver_getDriver();
sprintf(tempString, "Pot: %d", driver_getAmplitude());
FL_DrawString(tempString, 0, 20, font10Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
sprintf(tempString, "Tap: %d", driver_getTap());
FL_DrawString(tempString, 0, 30, font10Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
sprintf(tempString, "Amp: %d", driver_getAmplifier());
FL_DrawString(tempString, 0, 40, font10Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
sprintf(tempString, "PSU: %.1fV", sys.adc.V_PSU);
FL_DrawString(tempString, 0, 50, font10Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
sprintf(tempString, " F: %c%c%c",
(sys.status[ESTOP] ? 'E' : ' '),
(sys.status[BYPASS] ? 'B' : ' '),
(sys.status[USB_CONNECTED] ? 'U' : ' ')
);
FL_DrawString(tempString, 0, 60, font10Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
#if 0
if((Port_State[MID_SR] & 0x40) > 0)
sprintf(tempString, "HI", Dds_Pot_Val[1]);
else
@@ -736,8 +746,7 @@ void Display_OnScreen_Diagnostics(void)
FL_DrawString(tempString, 0, 0, font10Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
sprintf(tempString,"Taps %d", Display_Taps());
FL_DrawString(tempString, 0, 20, font10Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
sprintf(tempString,"B %.2fV",sys.adc.V_BAT);
FL_DrawString(tempString, 0, 60, font10Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
@@ -763,6 +772,7 @@ void Display_OnScreen_Diagnostics(void)
// sprintf(tempString,"R %.2f",sys.adc.IRawFilt);
// FL_DrawString(tempString, 0, 80, font10Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
#endif
}
@@ -805,6 +815,7 @@ static void displayMode(void)
SYSTEM_DATA_t * sys = system_getSys();
ACCESSORY_t *active = sys->activeAccessory;
char *tmpString = sys->tmpString;
if (active != NULL)
{
@@ -812,15 +823,26 @@ static void displayMode(void)
{
case ID_BROADCAST:
{
// display icon
GL_DrawMonoBitmap(inductionIcon, LCD_X_MAX-60,LCD_Y_MIN + 2, LCD_DRAW_SET);
// display power percentage
sprintf(tmpString, "%d%%", (int)driver_getPowerLevel() * 25);
FL_DrawString( tmpString, LCD_X_MID, 60, font18Bold, LCD_DRAW_SET, FL_ALIGN_CENTER);
break;
}
case ID_TX_SINGLE_DIRECT:
{
// display icon / port
GL_DrawMonoBitmap(directConnectIcon5, LCD_X_MAX-60,LCD_Y_MIN + 2, LCD_DRAW_SET);
sprintf(sys->tmpString, "%d", active->portId);
FL_DrawString(sys->tmpString, LCD_X_MAX-40, LCD_Y_MIN, font12Bold, LCD_DRAW_SET, FL_ALIGN_RIGHT);
sprintf(tmpString, "%d", active->portId);
FL_DrawString(tmpString, LCD_X_MAX-40, LCD_Y_MIN, font12Bold, LCD_DRAW_SET, FL_ALIGN_RIGHT);
// display measurements
Display_Line_Measurements();
break;
}
@@ -855,17 +877,27 @@ static void displayMode(void)
void Display_Update(void)
{
LCD_Clear(); //clear the frameBuffer
// clear the frameBuffer
LCD_Clear();
Display_USB_Status();
// display if USB is connected
if (isUsbConnected())
{
displayUSB();
}
// display current mode information
displayMode();
// display power level bars
displayLevel();
// display current frequency
displayFrequency();
displayDiagnostics();
// write to the LCD
LCD_Update();
}