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

unMute

master
linoobs 2022-05-07 12:43:13 +02:00
rodzic b3c7938d79
commit 0a9607678f
4 zmienionych plików z 20 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
STM32/Core/Src/front_unit.c
Wyświetl plik

@ -658,11 +658,12 @@ void FRONTPANEL_BUTTONHANDLER_AsB(void) // A/B
// TX block
if (TRX_on_TX())
return;
TRX_TemporaryMute();
WM8731_Mute();
// TRX_TemporaryMute();
TRX.current_vfo = !TRX.current_vfo;
TRX_setFrequency(CurrentVFO()->Freq, CurrentVFO());
TRX_setMode(CurrentVFO()->Mode, CurrentVFO());
WM8731_UnMute();
LCD_UpdateQuery.TopButtons = true;
LCD_UpdateQuery.FreqInfo = true;
LCD_UpdateQuery.StatusInfoGUI = true;

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

@ -653,11 +653,11 @@ static void LCD_displayStatusInfoBar(bool redraw)
//CLAR
if (TRX.CLAR == true) {
sprintf(buff, "CLAR:ON");
printInfoSmall(LAY_STATUS_SMALL_CLAR_X, LAY_STATUS_SMALL_BAR_Y , LAY_STATUS_BLOCK_WIDTH, LAY_STATUS_BLOCK_HEIGHT, COLOR->BUTTON_EDGING, buff, COLOR->BUTTON_BACKGROUND, COLOR_WHITE, COLOR->BUTTON_INACTIVE_TEXT, TRX.CLAR);
printInfoSmall(LAY_STATUS_SMALL_CLAR_X, LAY_STATUS_SMALL_BAR_Y , LAY_STATUS_BLOCK_WIDTH, LAY_STATUS_BLOCK_HEIGHT, COLOR->BUTTON_EDGING, buff, COLOR->BACKGROUND, COLOR_WHITE, COLOR->BUTTON_INACTIVE_TEXT, TRX.CLAR);
}
if (TRX.CLAR == false) {
sprintf(buff, "CLAR:OFF");
printInfoSmall(LAY_STATUS_SMALL_CLAR_X, LAY_STATUS_SMALL_BAR_Y, LAY_STATUS_BLOCK_WIDTH, LAY_STATUS_BLOCK_HEIGHT, COLOR->BUTTON_EDGING, buff, COLOR->BUTTON_BACKGROUND, COLOR_WHITE, COLOR->BUTTON_INACTIVE_TEXT, false);
printInfoSmall(LAY_STATUS_SMALL_CLAR_X, LAY_STATUS_SMALL_BAR_Y, LAY_STATUS_BLOCK_WIDTH, LAY_STATUS_BLOCK_HEIGHT, COLOR->BUTTON_EDGING, buff, COLOR->BACKGROUND, COLOR_WHITE, COLOR->BUTTON_INACTIVE_TEXT, false);
}
//RIT-CPU
@ -681,16 +681,16 @@ static void LCD_displayStatusInfoBar(bool redraw)
//IN-OUT
if (TRX.InputType_MIC == true) {
sprintf(buff, "MIC:%d", TRX.MIC_GAIN);
printInfoSmall(LAY_STATUS_SMALL_IN_X, LAY_STATUS_SMALL_BAR_Y, LAY_STATUS_BLOCK_WIDTH, LAY_STATUS_BLOCK_HEIGHT, COLOR->BUTTON_EDGING, buff, COLOR->BUTTON_BACKGROUND, COLOR_WHITE, COLOR->BUTTON_INACTIVE_TEXT, false);
printInfoSmall(LAY_STATUS_SMALL_IN_X, LAY_STATUS_SMALL_BAR_Y, LAY_STATUS_BLOCK_WIDTH, LAY_STATUS_BLOCK_HEIGHT, COLOR->BUTTON_EDGING, buff, COLOR->BACKGROUND, COLOR_WHITE, COLOR->BUTTON_INACTIVE_TEXT, false);
}
if (TRX.InputType_MIC == false) {
sprintf(buff, "USB");
printInfoSmall(LAY_STATUS_SMALL_IN_X, LAY_STATUS_SMALL_BAR_Y, LAY_STATUS_BLOCK_WIDTH, LAY_STATUS_BLOCK_HEIGHT, COLOR->BUTTON_EDGING, buff, COLOR->BUTTON_BACKGROUND, COLOR_WHITE, COLOR->BUTTON_INACTIVE_TEXT, true);
printInfoSmall(LAY_STATUS_SMALL_IN_X, LAY_STATUS_SMALL_BAR_Y, LAY_STATUS_BLOCK_WIDTH, LAY_STATUS_BLOCK_HEIGHT, COLOR->BUTTON_EDGING, buff, COLOR->BACKGROUND, COLOR_WHITE, COLOR->BUTTON_INACTIVE_TEXT, true);
}
//VOLTAGE
sprintf(buff, "% 0.1fV ", TRX_InVoltage);
printInfoSmall(LAY_STATUS_SMALL_VLT_X, LAY_STATUS_SMALL_BAR_Y, LAY_STATUS_BLOCK_WIDTH, LAY_STATUS_BLOCK_HEIGHT, COLOR->BUTTON_EDGING, buff, COLOR->BUTTON_BACKGROUND, COLOR_RED, COLOR->BUTTON_INACTIVE_TEXT, false);
printInfoSmall(LAY_STATUS_SMALL_VLT_X, LAY_STATUS_SMALL_BAR_Y, LAY_STATUS_BLOCK_WIDTH, LAY_STATUS_BLOCK_HEIGHT, COLOR->BUTTON_EDGING, buff, COLOR->BACKGROUND, COLOR_RED, COLOR->BUTTON_INACTIVE_TEXT, false);
// //VOLTAGE PTT_SW1
@ -702,9 +702,9 @@ static void LCD_displayStatusInfoBar(bool redraw)
//GAIN
sprintf(buff, "GAIN:%d",TRX.IF_Gain); //buff, "%.0f%%", CPU_LOAD.Load
printInfoSmall(LAY_STATUS_SMALL_CPU_X, LAY_STATUS_SMALL_BAR_Y, LAY_STATUS_BLOCK_WIDTH, LAY_STATUS_BLOCK_HEIGHT, COLOR->BUTTON_EDGING, buff, COLOR->BUTTON_BACKGROUND, COLOR_RED, COLOR->BUTTON_INACTIVE_TEXT, TRX_IF_Gain);
printInfoSmall(LAY_STATUS_SMALL_CPU_X, LAY_STATUS_SMALL_BAR_Y, LAY_STATUS_BLOCK_WIDTH, LAY_STATUS_BLOCK_HEIGHT, COLOR->BUTTON_EDGING, buff, COLOR->BACKGROUND, COLOR_RED, COLOR->BUTTON_INACTIVE_TEXT, TRX_IF_Gain);
//NOTCH
printInfoSmall(LAY_STATUS_SMALL_NOTCH_X, LAY_STATUS_SMALL_BAR_Y, LAY_STATUS_BLOCK_WIDTH, LAY_STATUS_BLOCK_HEIGHT, COLOR->BUTTON_EDGING, "NOTCH", COLOR->BUTTON_BACKGROUND, COLOR_RED, COLOR->BUTTON_INACTIVE_TEXT, (CurrentVFO()->AutoNotchFilter));
printInfoSmall(LAY_STATUS_SMALL_NOTCH_X, LAY_STATUS_SMALL_BAR_Y, LAY_STATUS_BLOCK_WIDTH, LAY_STATUS_BLOCK_HEIGHT, COLOR->BUTTON_EDGING, "NOTCH", COLOR->BACKGROUND, COLOR_RED, COLOR->BUTTON_INACTIVE_TEXT, (CurrentVFO()->AutoNotchFilter));
//FFT BW
if (TRX.FFT_Zoom == 1)
@ -717,7 +717,7 @@ static void LCD_displayStatusInfoBar(bool redraw)
sprintf(buff, "6kHz ");
else if (TRX.FFT_Zoom == 16)
sprintf(buff, "3kHz ");
printInfoSmall(LAY_STATUS_SMALL_FFT_BW_X, LAY_STATUS_SMALL_BAR_Y, LAY_STATUS_BLOCK_WIDTH, LAY_STATUS_BLOCK_HEIGHT, COLOR->BUTTON_EDGING, buff, COLOR->BUTTON_BACKGROUND, COLOR_RED, COLOR->BUTTON_INACTIVE_TEXT, false);
printInfoSmall(LAY_STATUS_SMALL_FFT_BW_X, LAY_STATUS_SMALL_BAR_Y, LAY_STATUS_BLOCK_WIDTH, LAY_STATUS_BLOCK_HEIGHT, COLOR->BUTTON_EDGING, buff, COLOR->BACKGROUND, COLOR_RED, COLOR->BUTTON_INACTIVE_TEXT, false);
//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);

12
STM32/Core/Src/settings.h
Wyświetl plik

@ -14,21 +14,23 @@
#define ADC_CLOCK 61440000 // ADC generator frequency êàëèáðîâêà ÷àñòîòû ãåíåðàòîðà
#define DAC_CLOCK 153600000 // DAC generator frequency
#define BUTTONS_R7KBI true //Author board buttons
#define LCD_ILI9481_IPS true
#endif
#ifdef FRONT_R7KBI_64_320
#define ADC_CLOCK (int32_t)(64320000 + (CALIBRATE.vcxo_calibration)) // ADC generator frequency êàëèáðîâêà ÷àñòîòû ãåíåðàòîðà
#define DAC_CLOCK (int32_t)(160800000 + (CALIBRATE.vcxo_calibration)) // DAC generator frequency
#define DAC_CLOCK (int32_t)(160800000 + (CALIBRATE.vcxo_calibration/4)) // DAC generator frequency
#define BUTTONS_R7KBI true //Author board buttons
#define LCD_ILI9481_IPS true
#endif
#ifdef FRONT_ALEX_61_440
#define ADC_CLOCK 61440000 // ADC generator frequency êàëèáðîâêà ÷àñòîòû ãåíåðàòîðà
#define DAC_CLOCK 153600000 // DAC generator frequency
//#define BUTTONS_R7KBI false //Author board buttons
#define LCD_ILI9486 true
#endif
#ifdef FRONT_ALEX_64_320
#define ADC_CLOCK (int32_t)(64320000 + (CALIBRATE.vcxo_calibration)) // ADC generator frequency êàëèáðîâêà ÷àñòîòû ãåíåðàòîðà
#define DAC_CLOCK (int32_t)(160800000 + (CALIBRATE.vcxo_calibration)) // DAC generator frequency
//#define BUTTONS_R7KBI false //Author board buttons
#define DAC_CLOCK (int32_t)(160800000 + (CALIBRATE.vcxo_calibration/4)) // DAC generator frequency
#define LCD_ILI9486 true
#endif
//#define ADC_CLOCK 64320000 // ADC generator frequency eaeea?iaea ?anoiou aaia?aoi?a
@ -63,7 +65,7 @@
//#define LCD_HX8357B true // Alex
//#define LCD_HX8357C true // Alex
//#define LCD_ILI9486 true
#define LCD_ILI9481_IPS true
//#define LCD_ILI9481_IPS true
#define SCREEN_ROTATE 2 // povorot displey 2,4

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

@ -75,7 +75,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>0</IsCurrentTarget>
<IsCurrentTarget>1</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
@ -2943,7 +2943,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget>
<IsCurrentTarget>0</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>