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

RIT Update

master
linoobs 2022-04-23 16:40:36 +02:00
rodzic 5307a0673f
commit 0b7bce684e
8 zmienionych plików z 35608 dodań i 34874 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -79,7 +79,7 @@ static PERIPH_FrontPanel_Button PERIPH_FrontPanel_BottomScroll_Buttons[BOTTOM_SC
{.port = 1, .channel = 6, .name = "ZOOM", .tres_min = 500, .tres_max = 700, .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_ZOOM_P, .holdHandler = FRONTPANEL_BUTTONHANDLER_ZOOM_P}, //SB3
{.port = 1, .channel = 6, .name = "NOTCH", .tres_min = 300, .tres_max = 500, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_NOTCH, .holdHandler = FRONTPANEL_BUTTONHANDLER_NOTCH}, //SB4
{.port = 1, .channel = 6, .name = "FAST", .tres_min = 10, .tres_max = 300, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_FAST, .holdHandler = FRONTPANEL_BUTTONHANDLER_FAST}, //SB5
{.port = 1, .channel = 7, .name = "SHIFT", .tres_min = 10, .tres_max = 300, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_SHIFT, .holdHandler = FRONTPANEL_BUTTONHANDLER_CLAR}, //SB3
{.port = 1, .channel = 7, .name = "CLAR", .tres_min = 10, .tres_max = 300, .state = false, .prev_state = false, .work_in_menu = false, .clickHandler = FRONTPANEL_BUTTONHANDLER_CLAR, .holdHandler = FRONTPANEL_BUTTONHANDLER_CLAR}, //SB3
},
{
{.port = 1, .channel = 5, .name = "VOLUME", .tres_min = 500, .tres_max = 700, .state = false, .prev_state = false, .work_in_menu = true, .clickHandler = FRONTPANEL_BUTTONHANDLER_VOLUME, .holdHandler = FRONTPANEL_BUTTONHANDLER_VOLUME}, //SB2

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

@ -647,18 +647,28 @@ static void LCD_displayStatusInfoBar(bool redraw)
LCDDriver_printTextFont("S", LAY_STATUS_VAL_X_OFFSET, LAY_STATUS_VAL_Y_OFFSET, COLOR->STATUS_RX, BG_COLOR, LAY_STATUS_TXRX_FONT);
}
LCDDriver_Fill_RectWH(35, 158, 40, 11, COLOR_BLACK);//Ïîäëîæêà ïîä òåêñòîì RIT COLOR_BLACK
//RIT
if (TRX.CLAR)
sprintf(buff, "RIT:CLAR");
else if (TRX.ShiftEnabled)
sprintf(buff, "SHIFT:%d", TRX_SHIFT);
else
sprintf(buff, "RIT: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);
//CLAR
if (TRX.CLAR == true) {
LCDDriver_Fill_RectWH(45, 159, 40, 11, COLOR_BLACK);//Ïîäëîæêà ïîä òåêñòîì CLAR COLOR_BLACK
sprintf(buff, "CLAR:ON");
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);
}
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);
}
//RIT
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);
// LCDDriver_printText(buff, 300, 45, COLOR_RED, BG_COLOR, LAY_STATUS_LABELS_FONT_SIZE);
}
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)

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

@ -115,13 +115,13 @@
#define LAY_STATUS_LABEL_BW_Y_OFFSET -68
#define LAY_STATUS_LABEL_RIT_X_OFFSET 5
#define LAY_STATUS_LABEL_RIT_Y_OFFSET 44
#define LAY_STATUS_LABEL_VLT_X_OFFSET 145
#define LAY_STATUS_LABEL_VLT_X_OFFSET 155
#define LAY_STATUS_LABEL_VLT_Y_OFFSET 44
#define LAY_STATUS_LABEL_IN_X_OFFSET 90
#define LAY_STATUS_LABEL_IN_X_OFFSET 100
#define LAY_STATUS_LABEL_IN_Y_OFFSET 44
#define LAY_STATUS_LABEL_PWM_X_OFFSET 5
#define LAY_STATUS_LABEL_PWM_Y_OFFSET 44
#define LAY_STATUS_LABEL_CPU_X_OFFSET 220
#define LAY_STATUS_LABEL_CPU_X_OFFSET 230
#define LAY_STATUS_LABEL_CPU_Y_OFFSET 44
#define LAY_STATUS_LABEL_NOTCH_X_OFFSET 310
#define LAY_STATUS_LABEL_NOTCH_Y_OFFSET 44

2
STM32/Core/Src/settings.c
Wyświetl plik

@ -199,7 +199,7 @@ void LoadSettings(bool clear)
TRX.FFT_Averaging = 3; // averaging the FFT to make it smoother
TRX.FFT_Window = 1;
TRX.ShiftEnabled = false; // activate the SHIFT mode
TRX.SHIFT_INTERVAL = 5000; // Detune range with the SHIFT knob (5000 = -5000hz / + 5000hz)
TRX.SHIFT_INTERVAL = 1000; // Detune range with the SHIFT knob (5000 = -5000hz / + 5000hz)
TRX.DNR_SNR_THRESHOLD = 50; // Digital noise reduction level
TRX.DNR_AVERAGE = 2; // DNR averaging when looking for average magnitude
TRX.DNR_MINIMAL = 99; // DNR averaging when searching for minimum magnitude

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

Plik diff jest za duży Load Diff

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

@ -1850,6 +1850,166 @@
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>106</Number>
<Type>0</Type>
<LineNumber>838</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\lcd.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>107</Number>
<Type>0</Type>
<LineNumber>839</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\lcd.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>108</Number>
<Type>0</Type>
<LineNumber>840</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\lcd.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>109</Number>
<Type>0</Type>
<LineNumber>845</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\lcd.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>110</Number>
<Type>0</Type>
<LineNumber>846</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\lcd.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>111</Number>
<Type>0</Type>
<LineNumber>847</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\lcd.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>112</Number>
<Type>0</Type>
<LineNumber>851</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\lcd.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>113</Number>
<Type>0</Type>
<LineNumber>852</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\lcd.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>114</Number>
<Type>0</Type>
<LineNumber>853</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\lcd.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>115</Number>
<Type>0</Type>
<LineNumber>854</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>..\Core\Src\lcd.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
</Breakpoint>
<Tracepoint>
<THDelay>0</THDelay>

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

@ -10,13 +10,13 @@
<TargetName>WOLF-Lite_R7KBI_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>
@ -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>
@ -2035,7 +2035,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>
@ -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_R7KBI_61_440.bin
Wyświetl plik

Plik binarny nie jest wyświetlany.