mirror
/
Wolf-LITE
kopia lustrzana https://github.com/UU5JPP/Wolf-LITE
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

MIC

master
Антон 2022-04-28 21:36:55 +03:00
rodzic 6177a1e350
commit 877d25058e
7 zmienionych plików z 35597 dodań i 36033 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

96
STM32/Core/Src/lcd.c
Wyświetl plik

@ -633,34 +633,34 @@ 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)
{
LCDDriver_printTextFont("B", LAY_STATUS_VAL_X_OFFSET, LAY_STATUS_VAL_Y_OFFSET, COLOR->STATUS_RX, BG_COLOR, LAY_STATUS_TXRX_FONT);
//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)
{
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 == 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)
{
LCDDriver_printTextFont("S", 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){
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) {
if (TRX.ShiftEnabled) {
LCDDriver_Fill_RectWH(325, 34, 50, 11, COLOR_BLACK);//Ïîäëîæêà ïîä òåêñòîì RIT COLOR_BLACK
sprintf(buff, "RIT: %d", TRX_SHIFT);
LCDDriver_printTextFont(buff, 300, 45, COLOR_RED, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
@ -668,56 +668,50 @@ static void LCD_displayStatusInfoBar(bool redraw)
}
else {
LCDDriver_Fill_RectWH(300, 31, 75, 15, COLOR_BLACK);//Ïîäëîæêà ïîä òåêñòîì RIT COLOR_BLACK
}
//VOLTAGE
}
//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:%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) {
sprintf(buff, "USB");
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);
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
if (TRX.InputType_MIC == true) {
sprintf(buff, "MIC");
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) {
sprintf(buff, "USB");
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 PTT_SW1
// sprintf(buff, "PTT_SW1:%.2f ", TRX_SW1_Voltage);
// LCDDriver_printTextFont(buff, 90, 40, COLOR_WHITE, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
// //VOLTAGE PTT_SW2
// sprintf(buff, "PTT_SW2:%.2f ", TRX_SW2_Voltage);
// LCDDriver_printTextFont(buff, 90, 57, COLOR_WHITE, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
// 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
//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);
//NOTCH
LCDDriver_printTextFont("NOTCH", LAY_STATUS_LABEL_NOTCH_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_NOTCH_Y_OFFSET, (CurrentVFO()->AutoNotchFilter) ? COLOR->STATUS_LABEL_NOTCH : COLOR_WHITE, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
//FFT BW
//NOTCH
LCDDriver_printTextFont("NOTCH", LAY_STATUS_LABEL_NOTCH_X_OFFSET, LAY_STATUS_Y_OFFSET + LAY_STATUS_LABEL_NOTCH_Y_OFFSET, (CurrentVFO()->AutoNotchFilter) ? COLOR->STATUS_LABEL_NOTCH : COLOR_WHITE, BG_COLOR, LAY_STATUS_LABEL_STROKA_FONT);
//FFT BW
if (TRX.FFT_Zoom == 1)
sprintf(buff, "FFT:48kHz");
else if (TRX.FFT_Zoom == 2)
@ -730,12 +724,6 @@ static void LCD_displayStatusInfoBar(bool redraw)
sprintf(buff, "FFT:3kHz ");
// 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);

4
STM32/Core/Src/screen_layout.h
Wyświetl plik

@ -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

70858
STM32/MDK-ARM/JLinkLog.txt
Wyświetl plik

Plik diff jest za duży Load Diff

42
STM32/MDK-ARM/RTE/_WOLF-Lite_ALEX_61.440/RTE_Components.h
Wyświetl plik

@ -1,21 +1,21 @@
/*
* Auto generated Run-Time-Environment Configuration File
* *** Do not modify ! ***
*
* Project: 'WOLF-Lite'
* Target: 'WOLF-Lite_ALEX_61.440'
*/
#ifndef RTE_COMPONENTS_H
#define RTE_COMPONENTS_H
/*
* Define the Device Header File:
*/
#define CMSIS_device_header "stm32f4xx.h"
#endif /* RTE_COMPONENTS_H */
/*
* Auto generated Run-Time-Environment Configuration File
* *** Do not modify ! ***
*
* Project: 'WOLF-Lite'
* Target: 'WOLF-Lite_ALEX_61.440'
*/
#ifndef RTE_COMPONENTS_H
#define RTE_COMPONENTS_H
/*
* Define the Device Header File:
*/
#define CMSIS_device_header "stm32f4xx.h"
#endif /* RTE_COMPONENTS_H */

620
STM32/MDK-ARM/WOLF-Lite.uvoptx
Wyświetl plik

Plik diff jest za duży Load Diff

10
STM32/MDK-ARM/WOLF-Lite.uvprojx
Wyświetl plik

@ -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>

BIN
STM32/MDK-ARM/WOLF-Lite_ALEX_61_440.bin 100644
Wyświetl plik

Plik binarny nie jest wyświetlany.