kopia lustrzana https://github.com/UU5JPP/Wolf-LITE
master
rodzic
6177a1e350
commit
877d25058e
|
@ -633,32 +633,32 @@ static void LCD_displayStatusInfoBar(bool redraw)
|
|||
addSymbols(buff, buff, 12, " ", true);
|
||||
LCDDriver_printText(buff, LAY_STATUS_LABEL_BW_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_BW_Y_OFFSET, COLOR->STATUS_LABEL_BW, BG_COLOR, LAY_STATUS_LABELS_FONT_SIZE);
|
||||
|
||||
//
|
||||
if (TRX.TX_func_mode == 0)
|
||||
{
|
||||
//ENKODER STATUS
|
||||
if (TRX.TX_func_mode == 0){
|
||||
LCDDriver_printTextFont("B", LAY_STATUS_VAL_X_OFFSET, LAY_STATUS_VAL_Y_OFFSET, COLOR->STATUS_RX, BG_COLOR, LAY_STATUS_TXRX_FONT);
|
||||
}
|
||||
if (TRX.TX_func_mode == 1)
|
||||
{
|
||||
if (TRX.TX_func_mode == 1){
|
||||
LCDDriver_printTextFont("V", LAY_STATUS_VAL_X_OFFSET, LAY_STATUS_VAL_Y_OFFSET, COLOR->STATUS_RX, BG_COLOR, LAY_STATUS_TXRX_FONT);
|
||||
}
|
||||
if (TRX.TX_func_mode == 2)
|
||||
{
|
||||
if (TRX.TX_func_mode == 2){
|
||||
LCDDriver_printTextFont("S", LAY_STATUS_VAL_X_OFFSET, LAY_STATUS_VAL_Y_OFFSET, COLOR->STATUS_RX, BG_COLOR, LAY_STATUS_TXRX_FONT);
|
||||
}
|
||||
|
||||
|
||||
//CLAR
|
||||
if (TRX.CLAR == true) {
|
||||
LCDDriver_Fill_RectWH(45, 159, 40, 11, COLOR_BLACK);//Ïîäëîæêà ïîä òåêñòîì CLAR COLOR_BLACK
|
||||
sprintf(buff, "CLAR:ON");
|
||||
addSymbols(buff, buff, 12, " ", true);
|
||||
LCDDriver_printTextFont(buff, LAY_STATUS_LABEL_RIT_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_RIT_Y_OFFSET, COLOR->STATUS_LABEL_RIT, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
|
||||
// LCDDriver_printText(buff, LAY_STATUS_LABEL_RIT_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_RIT_Y_OFFSET, COLOR->STATUS_LABEL_RIT, BG_COLOR, LAY_STATUS_LABEL_S_VAL_FONT);
|
||||
}
|
||||
if (TRX.CLAR == false) {
|
||||
sprintf(buff, "CLAR:OFF");
|
||||
addSymbols(buff, buff, 12, " ", true);
|
||||
LCDDriver_printTextFont(buff, LAY_STATUS_LABEL_RIT_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_RIT_Y_OFFSET, COLOR->STATUS_LABEL_RIT, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
|
||||
// LCDDriver_printText(buff, LAY_STATUS_LABEL_RIT_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_RIT_Y_OFFSET, COLOR->STATUS_LABEL_RIT, BG_COLOR, LAY_STATUS_LABEL_S_VAL_FONT);
|
||||
}
|
||||
|
||||
//RIT
|
||||
if (TRX.ShiftEnabled) {
|
||||
LCDDriver_Fill_RectWH(325, 34, 50, 11, COLOR_BLACK);//Ïîäëîæêà ïîä òåêñòîì RIT COLOR_BLACK
|
||||
|
@ -669,19 +669,17 @@ static void LCD_displayStatusInfoBar(bool redraw)
|
|||
else {
|
||||
LCDDriver_Fill_RectWH(300, 31, 75, 15, COLOR_BLACK);//Ïîäëîæêà ïîä òåêñòîì RIT COLOR_BLACK
|
||||
}
|
||||
//VOLTAGE
|
||||
sprintf(buff, "% 0.1f V ", TRX_InVoltage);
|
||||
if(TRX_InVoltage < 10.0f)
|
||||
{
|
||||
LCDDriver_Fill_RectWH(LAY_STATUS_LABEL_VLT_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_VLT_Y_OFFSET, 75, 15, COLOR_BLACK);
|
||||
LCDDriver_printTextFont(buff, LAY_STATUS_LABEL_VLT_X_OFFSET + 9, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_VLT_Y_OFFSET, COLOR_RED, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
|
||||
}
|
||||
else
|
||||
LCDDriver_printTextFont(buff, LAY_STATUS_LABEL_VLT_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_VLT_Y_OFFSET, COLOR->STATUS_LABEL_VLT, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
|
||||
//IN/OUT
|
||||
|
||||
//PWM
|
||||
if (TRX_on_TX()){
|
||||
LCDDriver_Fill_RectWH(35, 158, 40, 11, COLOR_BLACK);//Ïîäëîæêà ïîä òåêñòîì PWR COLOR_BLACK
|
||||
sprintf(buff, "PWR:%d%% ", TRX.RF_Power);
|
||||
LCDDriver_printTextFont(buff, LAY_STATUS_LABEL_PWM_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_PWM_Y_OFFSET, COLOR->STATUS_LABEL_VLT, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
|
||||
}
|
||||
|
||||
//IN-OUT
|
||||
if (TRX.InputType_MIC == true) {
|
||||
sprintf(buff, "MIC");
|
||||
sprintf(buff, "MIC:%d", TRX.MIC_GAIN);
|
||||
LCDDriver_printTextFont(buff, LAY_STATUS_LABEL_IN_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_IN_Y_OFFSET, COLOR_RED, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
|
||||
}
|
||||
if (TRX.InputType_MIC == false) {
|
||||
|
@ -689,6 +687,16 @@ static void LCD_displayStatusInfoBar(bool redraw)
|
|||
LCDDriver_printTextFont(buff, LAY_STATUS_LABEL_IN_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_IN_Y_OFFSET, COLOR_RED, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
|
||||
}
|
||||
|
||||
//VOLTAGE
|
||||
sprintf(buff, "% 0.1f V ", TRX_InVoltage);
|
||||
if(TRX_InVoltage < 10.0f) {
|
||||
LCDDriver_Fill_RectWH(LAY_STATUS_LABEL_VLT_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_VLT_Y_OFFSET, 75, 15, COLOR_BLACK);
|
||||
LCDDriver_printTextFont(buff, LAY_STATUS_LABEL_VLT_X_OFFSET + 9, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_VLT_Y_OFFSET, COLOR_RED, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
|
||||
}
|
||||
else
|
||||
LCDDriver_printTextFont(buff, LAY_STATUS_LABEL_VLT_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_VLT_Y_OFFSET, COLOR->STATUS_LABEL_VLT, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
|
||||
|
||||
|
||||
// //VOLTAGE PTT_SW1
|
||||
// sprintf(buff, "PTT_SW1:%.2f ", TRX_SW1_Voltage);
|
||||
// LCDDriver_printTextFont(buff, 90, 40, COLOR_WHITE, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
|
||||
|
@ -696,20 +704,6 @@ static void LCD_displayStatusInfoBar(bool redraw)
|
|||
// sprintf(buff, "PTT_SW2:%.2f ", TRX_SW2_Voltage);
|
||||
// LCDDriver_printTextFont(buff, 90, 57, COLOR_WHITE, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
|
||||
|
||||
//PWM
|
||||
if (TRX_on_TX())
|
||||
{
|
||||
LCDDriver_Fill_RectWH(35, 158, 40, 11, COLOR_BLACK);//Ïîäëîæêà ïîä òåêñòîì PWR COLOR_BLACK
|
||||
sprintf(buff, "PWR:%d%% ", TRX.RF_Power);
|
||||
LCDDriver_printTextFont(buff, LAY_STATUS_LABEL_PWM_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_PWM_Y_OFFSET, COLOR->STATUS_LABEL_VLT, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
|
||||
}
|
||||
//VOLUME
|
||||
// if (TRX_on_TX() == false)
|
||||
// {
|
||||
// sprintf(buff, "VOL:%d%%", TRX.Volume);
|
||||
//// LCDDriver_printText(buff, LAY_STATUS_LABEL_PWM_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_PWM_Y_OFFSET, COLOR->STATUS_LABEL_VLT, BG_COLOR, LAY_STATUS_LABELS_FONT_SIZE);
|
||||
// LCDDriver_printTextFont(buff, LAY_STATUS_LABEL_PWM_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_PWM_Y_OFFSET, COLOR->STATUS_LABEL_VLT, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
|
||||
// }
|
||||
//CPU-DSP
|
||||
sprintf(buff, "CPU:%.0f ", CPU_LOAD.Load);
|
||||
LCDDriver_printTextFont(buff, LAY_STATUS_LABEL_CPU_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_CPU_Y_OFFSET, COLOR->STATUS_LABEL_CPU, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
|
||||
|
@ -731,12 +725,6 @@ static void LCD_displayStatusInfoBar(bool redraw)
|
|||
// LCDDriver_printText(buff, LAY_STATUS_LABEL_FFT_BW_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_FFT_BW_Y_OFFSET, COLOR->STATUS_LABELS_BW, BG_COLOR, LAY_STATUS_LABELS_FONT_SIZE);
|
||||
LCDDriver_printTextFont(buff, LAY_STATUS_LABEL_FFT_BW_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_FFT_BW_Y_OFFSET, COLOR->STATUS_LABELS_BW, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
|
||||
|
||||
|
||||
#if (defined(LAY_800x480))
|
||||
//LOCK
|
||||
LCDDriver_printText("LOCK", LAY_STATUS_LABEL_LOCK_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_LOCK_Y_OFFSET, TRX.Locked ? COLOR->STATUS_LABEL_ACTIVE : COLOR->STATUS_LABEL_INACTIVE, BG_COLOR, LAY_STATUS_LABELS_FONT_SIZE);
|
||||
#endif
|
||||
|
||||
//ERRORS LABELS
|
||||
LCDDriver_Fill_RectWH(LAY_STATUS_ERR_OFFSET_X, LAY_STATUS_ERR_OFFSET_Y, LAY_STATUS_ERR_WIDTH, LAY_STATUS_ERR_HEIGHT, BG_COLOR);
|
||||
if (TRX_ADC_OTR && !TRX_on_TX())
|
||||
|
|
|
@ -81,8 +81,8 @@
|
|||
#define LAY_STATUS_BAR_HEIGHT 10
|
||||
#define LAY_STATUS_TXRX_X_OFFSET 3
|
||||
#define LAY_STATUS_TXRX_Y_OFFSET -50
|
||||
#define LAY_STATUS_VAL_X_OFFSET 12 //#############################
|
||||
#define LAY_STATUS_VAL_Y_OFFSET 125 //#############################
|
||||
#define LAY_STATUS_VAL_X_OFFSET 12
|
||||
#define LAY_STATUS_VAL_Y_OFFSET 125
|
||||
#define LAY_STATUS_TXRX_FONT &FreeSans9pt7b
|
||||
#define LAY_STATUS_VFO_X_OFFSET 0
|
||||
#define LAY_STATUS_VFO_Y_OFFSET -43
|
||||
|
|
Plik diff jest za duży
Load Diff
Plik diff jest za duży
Load Diff
|
@ -16,7 +16,7 @@
|
|||
<TargetCommonOption>
|
||||
<Device>STM32F407VETx</Device>
|
||||
<Vendor>STMicroelectronics</Vendor>
|
||||
<PackID>Keil.STM32F4xx_DFP.2.15.0</PackID>
|
||||
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
|
||||
<PackURL>http://www.keil.com/pack/</PackURL>
|
||||
<Cpu>IRAM(0x20000000-0x2001FFFF) IRAM2(0x10000000-0x1000FFFF) IROM(0x8000000-0x807FFFF) CLOCK(25000000) FPU2 CPUTYPE("Cortex-M4")</Cpu>
|
||||
<FlashUtilSpec></FlashUtilSpec>
|
||||
|
@ -991,7 +991,7 @@
|
|||
<TargetCommonOption>
|
||||
<Device>STM32F407VETx</Device>
|
||||
<Vendor>STMicroelectronics</Vendor>
|
||||
<PackID>Keil.STM32F4xx_DFP.2.15.0</PackID>
|
||||
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
|
||||
<PackURL>http://www.keil.com/pack/</PackURL>
|
||||
<Cpu>IRAM(0x20000000-0x2001FFFF) IRAM2(0x10000000-0x1000FFFF) IROM(0x8000000-0x807FFFF) CLOCK(25000000) FPU2 CPUTYPE("Cortex-M4")</Cpu>
|
||||
<FlashUtilSpec></FlashUtilSpec>
|
||||
|
@ -2029,13 +2029,13 @@
|
|||
<TargetName>WOLF-Lite_ALEX_61.440</TargetName>
|
||||
<ToolsetNumber>0x4</ToolsetNumber>
|
||||
<ToolsetName>ARM-ADS</ToolsetName>
|
||||
<pCCUsed>6150000::V6.15::ARMCLANG</pCCUsed>
|
||||
<pCCUsed>6160000::V6.16::ARMCLANG</pCCUsed>
|
||||
<uAC6>1</uAC6>
|
||||
<TargetOption>
|
||||
<TargetCommonOption>
|
||||
<Device>STM32F407VETx</Device>
|
||||
<Vendor>STMicroelectronics</Vendor>
|
||||
<PackID>Keil.STM32F4xx_DFP.2.15.0</PackID>
|
||||
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
|
||||
<PackURL>http://www.keil.com/pack/</PackURL>
|
||||
<Cpu>IRAM(0x20000000-0x2001FFFF) IRAM2(0x10000000-0x1000FFFF) IROM(0x8000000-0x807FFFF) CLOCK(25000000) FPU2 CPUTYPE("Cortex-M4")</Cpu>
|
||||
<FlashUtilSpec></FlashUtilSpec>
|
||||
|
@ -3079,7 +3079,7 @@
|
|||
<TargetCommonOption>
|
||||
<Device>STM32F407VETx</Device>
|
||||
<Vendor>STMicroelectronics</Vendor>
|
||||
<PackID>Keil.STM32F4xx_DFP.2.15.0</PackID>
|
||||
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
|
||||
<PackURL>http://www.keil.com/pack/</PackURL>
|
||||
<Cpu>IRAM(0x20000000-0x2001FFFF) IRAM2(0x10000000-0x1000FFFF) IROM(0x8000000-0x807FFFF) CLOCK(25000000) FPU2 CPUTYPE("Cortex-M4")</Cpu>
|
||||
<FlashUtilSpec></FlashUtilSpec>
|
||||
|
|
Plik binarny nie jest wyświetlany.
Ładowanie…
Reference in New Issue