power up/down working for broadcast
This commit is contained in:
174
source/display.c
174
source/display.c
@@ -452,80 +452,29 @@ void Display_Wireless(uint8_t wireless)
|
||||
GL_DrawMonoBitmap(txControl, LCD_X_MID-90, LCD_Y_MAX-22, LCD_DRAW_SET);
|
||||
}
|
||||
|
||||
void Display_Mode(uint8_t Con_Mode1)
|
||||
{
|
||||
|
||||
SYSTEM_DATA_t * sys = system_getSys();
|
||||
ACCESSORY_t *active = sys->activeAccessory;
|
||||
|
||||
if (active != NULL)
|
||||
{
|
||||
switch (active->connected)
|
||||
{
|
||||
case ID_BROADCAST:
|
||||
{
|
||||
GL_DrawMonoBitmap(inductionIcon, LCD_X_MAX-60,LCD_Y_MIN + 2, LCD_DRAW_SET);
|
||||
break;
|
||||
}
|
||||
|
||||
case ID_TX_SINGLE_DIRECT:
|
||||
{
|
||||
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);
|
||||
break;
|
||||
}
|
||||
|
||||
case ID_TX_DUAL_DIRECT:
|
||||
{
|
||||
GL_DrawMonoBitmap(directConnectIcon3, LCD_X_MAX-60,LCD_Y_MIN + 2, LCD_DRAW_SET);
|
||||
break;
|
||||
}
|
||||
|
||||
case ID_CLAMP:
|
||||
{
|
||||
GL_DrawMonoBitmap(clampIcon2, LCD_X_MAX-60,LCD_Y_MIN + 2, LCD_DRAW_SET);
|
||||
break;
|
||||
}
|
||||
|
||||
case ID_CLAMP2:
|
||||
{
|
||||
GL_DrawMonoBitmap(clampIcon2, LCD_X_MAX-60,LCD_Y_MIN + 2, LCD_DRAW_SET);
|
||||
FL_DrawString("V2", LCD_X_MAX-40, LCD_Y_MIN+30, font10Bold, LCD_DRAW_SET, FL_ALIGN_CENTER);
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
return;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
void Display_Level(PWR_MODE_t Level)
|
||||
|
||||
//void Display_Level(PWR_MODE_t Level)
|
||||
void displayLevel(void)
|
||||
{
|
||||
PowerLevel_t level = driver_getPowerLevel();
|
||||
|
||||
GL_DrawRectangle( 70, LCD_Y_MIN+15, 90, LCD_Y_MIN + 1, 2, LCD_DRAW_SET);
|
||||
GL_DrawRectangle( 94, LCD_Y_MIN+15, 114, LCD_Y_MIN + 1, 2, LCD_DRAW_SET);
|
||||
GL_DrawRectangle(118, LCD_Y_MIN+15, 138, LCD_Y_MIN + 1, 2, LCD_DRAW_SET);
|
||||
GL_DrawRectangle(142, LCD_Y_MIN+15, 162, LCD_Y_MIN + 1, 2, LCD_DRAW_SET);
|
||||
|
||||
switch(Level)
|
||||
switch(level)
|
||||
{
|
||||
case LEVEL4:
|
||||
case POWER_LEVEL_4:
|
||||
GL_DrawFilledRectangle(142, LCD_Y_MIN+15, 162, LCD_Y_MIN + 1, LCD_DRAW_SET);
|
||||
|
||||
case LEVEL3:
|
||||
case POWER_LEVEL_3:
|
||||
GL_DrawFilledRectangle(118, LCD_Y_MIN+15, 138, LCD_Y_MIN + 1, LCD_DRAW_SET);
|
||||
|
||||
case LEVEL2:
|
||||
case POWER_LEVEL_2:
|
||||
GL_DrawFilledRectangle( 94, LCD_Y_MIN+15, 114, LCD_Y_MIN + 1, LCD_DRAW_SET);
|
||||
|
||||
case LEVEL1:
|
||||
case POWER_LEVEL_1:
|
||||
GL_DrawFilledRectangle( 70, LCD_Y_MIN+15, 90, LCD_Y_MIN + 1, LCD_DRAW_SET);
|
||||
|
||||
}
|
||||
@@ -816,3 +765,108 @@ void Display_OnScreen_Diagnostics(void)
|
||||
// FL_DrawString(tempString, 0, 80, font10Bold, LCD_DRAW_SET, FL_ALIGN_LEFT);
|
||||
|
||||
}
|
||||
|
||||
static void displayFrequency(void)
|
||||
{
|
||||
FREQUENCY_t *freq = driver_getFrequency();
|
||||
|
||||
if (freq->ldFrequency > 0)
|
||||
{
|
||||
Display_CD_Symbol(); // place a CD symbol in front in correct position
|
||||
}
|
||||
|
||||
uint32_t value = freq->frequency;
|
||||
|
||||
if (value < 1000)
|
||||
{
|
||||
sprintf(tempString,"%dHz", value);
|
||||
}
|
||||
else
|
||||
if (value < 10000 && value >= 1000 )
|
||||
{
|
||||
sprintf(tempString,"%.2fkHz", (float32_t)value/1000.0 );
|
||||
}
|
||||
else
|
||||
if (value < 100000 && value >= 10000)
|
||||
{
|
||||
sprintf(tempString,"%.1fkHz",(float32_t)value/1000 );
|
||||
}
|
||||
else
|
||||
if (value > 100000)
|
||||
{
|
||||
sprintf(tempString,"%.0fkHz",(float32_t)value/1000 );
|
||||
}
|
||||
|
||||
FL_DrawString(tempString, LCD_X_MAX+6, LCD_Y_MAX - 22, font18Bold, LCD_DRAW_SET, FL_ALIGN_RIGHT);
|
||||
}
|
||||
|
||||
static void displayMode(void)
|
||||
{
|
||||
|
||||
SYSTEM_DATA_t * sys = system_getSys();
|
||||
ACCESSORY_t *active = sys->activeAccessory;
|
||||
|
||||
if (active != NULL)
|
||||
{
|
||||
switch (active->connected)
|
||||
{
|
||||
case ID_BROADCAST:
|
||||
{
|
||||
GL_DrawMonoBitmap(inductionIcon, LCD_X_MAX-60,LCD_Y_MIN + 2, LCD_DRAW_SET);
|
||||
break;
|
||||
}
|
||||
|
||||
case ID_TX_SINGLE_DIRECT:
|
||||
{
|
||||
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);
|
||||
break;
|
||||
}
|
||||
|
||||
case ID_TX_DUAL_DIRECT:
|
||||
{
|
||||
GL_DrawMonoBitmap(directConnectIcon3, LCD_X_MAX-60,LCD_Y_MIN + 2, LCD_DRAW_SET);
|
||||
break;
|
||||
}
|
||||
|
||||
case ID_CLAMP:
|
||||
{
|
||||
GL_DrawMonoBitmap(clampIcon2, LCD_X_MAX-60,LCD_Y_MIN + 2, LCD_DRAW_SET);
|
||||
break;
|
||||
}
|
||||
|
||||
case ID_CLAMP2:
|
||||
{
|
||||
GL_DrawMonoBitmap(clampIcon2, LCD_X_MAX-60,LCD_Y_MIN + 2, LCD_DRAW_SET);
|
||||
FL_DrawString("V2", LCD_X_MAX-40, LCD_Y_MIN+30, font10Bold, LCD_DRAW_SET, FL_ALIGN_CENTER);
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
void Display_Update(void)
|
||||
{
|
||||
|
||||
LCD_Clear(); //clear the frameBuffer
|
||||
|
||||
Display_USB_Status();
|
||||
|
||||
// display current mode information
|
||||
displayMode();
|
||||
|
||||
displayLevel();
|
||||
|
||||
displayFrequency();
|
||||
|
||||
LCD_Update();
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user