Merge pull request #6 from UU5JPP/main

Калибровка вольтметра

STM32/Core/Src/color_themes.h

@@ -84,6 +84,7 @@ static const STRUCT_COLOR_THEME COLOR_THEMES[2] = {
 		.STATUS_LABEL_BW = rgb888torgb565(0, 200, 255),
 		.STATUS_LABEL_RIT = COLOR_WHITE,
 		.STATUS_LABEL_VLT = rgb888torgb565(249, 205, 46),
+		.STATUS_LABEL_CPU = rgb888torgb565(255, 0, 0),
 		.STATUS_LABEL_THERM = rgb888torgb565(249, 205, 46),
 		.STATUS_LABEL_NOTCH = rgb888torgb565(0, 200, 255),
 		.STATUS_SMETER = rgb888torgb565(249, 205, 46),
@@ -138,7 +139,6 @@ static const STRUCT_COLOR_THEME COLOR_THEMES[2] = {
 		.STATUS_LABEL_BW = rgb888torgb565(0, 100, 255),
 		.STATUS_LABEL_RIT = COLOR_BLACK,
 		.STATUS_LABEL_VLT = rgb888torgb565(249, 205, 46),
-		.STATUS_LABEL_CPU = rgb888torgb565(0, 255, 0),
 		.STATUS_LABEL_THERM = rgb888torgb565(249, 205, 46),
 		.STATUS_LABEL_NOTCH = rgb888torgb565(0, 100, 255),
 		.STATUS_SMETER = rgb888torgb565(255, 238, 175),

STM32/Core/Src/lcd.c

@@ -593,7 +593,8 @@ static void LCD_displayStatusInfoBar(bool redraw)
 	//VOLTAGE
 	sprintf(buff, "VLT:%.1f ", TRX_InVoltage);
 	LCDDriver_printText(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_LABELS_FONT_SIZE);
-	//CPU
+	
+	//CPU-DSP
 	sprintf(buff, "CPU:%.1f ", CPU_LOAD.Load);
 	LCDDriver_printText(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_LABELS_FONT_SIZE);
 	

STM32/Core/Src/main.c

@@ -1281,15 +1281,15 @@ static void MX_FSMC_Init(void)
 
 	//LCD timings
 	#if defined(LCD_HX8357B)	
-	Timing.AddressSetupTime = 4;
-	Timing.DataSetupTime = 4;
-	Timing.BusTurnAroundDuration = 0;
+	Timing.AddressSetupTime = 10;
+	Timing.DataSetupTime = 10;
+	Timing.BusTurnAroundDuration = 5;
 	Timing.AccessMode = FSMC_ACCESS_MODE_A;
 	#endif
 	#if defined(LCD_ILI9481)	
-	Timing.AddressSetupTime = 3;
-	Timing.DataSetupTime = 4;
-	Timing.BusTurnAroundDuration = 3;
+	Timing.AddressSetupTime = 20;
+	Timing.DataSetupTime = 20;
+	Timing.BusTurnAroundDuration = 10;
 	Timing.AccessMode = FSMC_ACCESS_MODE_A;
 	#endif
 	if (HAL_SRAM_Init(&hsram1, &Timing, NULL) != HAL_OK)

STM32/Core/Src/rf_unit.c

@@ -45,7 +45,7 @@ void RF_UNIT_ProcessSensors(void)
 	float32_t alc = (float32_t)(HAL_ADCEx_InjectedGetValue(&hadc2, ADC_INJECTED_RANK_2)) * 3.3f / 4096.0f;
 	float32_t power_in = (float32_t)(HAL_ADCEx_InjectedGetValue(&hadc2, ADC_INJECTED_RANK_1)) * 3.3f / 4096.0f;
 	
-	power_in = power_in * 10.f; //do voltage calibration in future!!!
+	power_in = power_in * CALIBRATE.volt_cal_rate; //do voltage calibration in future!!!
 	if(fabsf(TRX_InVoltage - power_in) > 0.2f)
 		TRX_InVoltage = power_in;
 	

STM32/Core/Src/screen_layout.h

@@ -86,11 +86,11 @@
 #define LAY_STATUS_LABEL_DBM_Y_OFFSET 36
 #define LAY_STATUS_LABEL_BW_X_OFFSET 60
 #define LAY_STATUS_LABEL_BW_Y_OFFSET 36
-#define LAY_STATUS_LABEL_RIT_X_OFFSET 160
+#define LAY_STATUS_LABEL_RIT_X_OFFSET 140
 #define LAY_STATUS_LABEL_RIT_Y_OFFSET 36
-#define LAY_STATUS_LABEL_VLT_X_OFFSET 230
+#define LAY_STATUS_LABEL_VLT_X_OFFSET 200
 #define LAY_STATUS_LABEL_VLT_Y_OFFSET 36
-#define LAY_STATUS_LABEL_CPU_X_OFFSET 270
+#define LAY_STATUS_LABEL_CPU_X_OFFSET 280
 #define LAY_STATUS_LABEL_CPU_Y_OFFSET 36
 #define LAY_STATUS_LABEL_NOTCH_X_OFFSET 335
 #define LAY_STATUS_LABEL_NOTCH_Y_OFFSET 36

STM32/Core/Src/settings.c

@@ -275,6 +275,7 @@ void LoadCalibration(bool clear)
 		CALIBRATE.rf_out_power_hf_high = 80;														// >30mhz
 		CALIBRATE.smeter_calibration = -13;														// S-Meter calibration, set when calibrating the transceiver to S9
 		CALIBRATE.swr_trans_rate = 11.0f;														//SWR Transormator rate
+		CALIBRATE.volt_cal_rate = 10.0f;														//VOLTAGE
 		
 		CALIBRATE.ENDBit = 100;
 		sendToDebug_strln("[OK] Loaded default calibrate settings");

STM32/Core/Src/settings.h

@@ -38,7 +38,8 @@
 //#define LCD_HX8357C true
 //#define LCD_R61581 true //untested
 //#define LCD_ILI9486 true
-#define SCREEN_ROTATE 2 // Poworot displey 2, 4
+
+#define SCREEN_ROTATE 2 // povorot displey 2,4
 
 //SPI Speed
 #define SPI_FRONT_UNIT_PRESCALER SPI_BAUDRATEPRESCALER_8
@@ -204,6 +205,7 @@ extern struct TRX_CALIBRATE
 	uint8_t rf_out_power_vhf;
 	int16_t smeter_calibration;
 	float32_t swr_trans_rate;
+	float32_t volt_cal_rate;
 
 	uint8_t csum; //check sum
 	uint8_t ENDBit; //end bit

STM32/Core/Src/system_menu.c

@@ -97,6 +97,7 @@ static void SYSMENU_HANDL_CALIB_RF_GAIN_HF_LOW(int8_t direction);
 static void SYSMENU_HANDL_CALIB_RF_GAIN_HF(int8_t direction);
 static void SYSMENU_HANDL_CALIB_RF_GAIN_HF_HIGH(int8_t direction);
 static void SYSMENU_HANDL_CALIB_S_METER(int8_t direction);
+static void SYSMENU_HANDL_CALIB_VOLT(int8_t direction);
 static void SYSMENU_HANDL_CALIB_ADC_OFFSET(int8_t direction);
 static void SYSMENU_HANDL_CALIB_SWR_TRANS_RATE(int8_t direction);
 
@@ -225,6 +226,7 @@ static const struct sysmenu_item_handler sysmenu_calibration_handlers[] =
 		{"RF GAIN HF HIGH", SYSMENU_UINT8, (uint32_t *)&CALIBRATE.rf_out_power_hf_high, SYSMENU_HANDL_CALIB_RF_GAIN_HF_HIGH},	//-V641
 		{"S METER", SYSMENU_INT16, (uint32_t *)&CALIBRATE.smeter_calibration, SYSMENU_HANDL_CALIB_S_METER},
 		{"SWR TRANS RATE", SYSMENU_FLOAT32, (uint32_t *)&CALIBRATE.swr_trans_rate, SYSMENU_HANDL_CALIB_SWR_TRANS_RATE},
+		{"VOLT CALIBR", SYSMENU_FLOAT32, (uint32_t *)&CALIBRATE.volt_cal_rate, SYSMENU_HANDL_CALIB_VOLT},
 };
 static const uint8_t sysmenu_calibration_item_count = sizeof(sysmenu_calibration_handlers) / sizeof(sysmenu_calibration_handlers[0]);
 
@@ -1576,6 +1578,16 @@ static void SYSMENU_HANDL_CALIB_SWR_TRANS_RATE(int8_t direction)
 		CALIBRATE.swr_trans_rate = 50.0f;
 }
 
+//VOLT-CALIBR
+static void SYSMENU_HANDL_CALIB_VOLT(int8_t direction)
+{
+	CALIBRATE.volt_cal_rate += (float32_t)direction * 0.1f;
+	if (CALIBRATE.volt_cal_rate < 1.0f)
+		CALIBRATE.volt_cal_rate = 1.0f;
+	if (CALIBRATE.volt_cal_rate > 50.0f)
+		CALIBRATE.volt_cal_rate = 50.0f;
+}
+
 //SERVICES
 void SYSMENU_HANDL_SERVICESMENU(int8_t direction)
 {

STM32/MDK-ARM/RTE/_WOLF-Lite/RTE_Components.h

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

STM32/MDK-ARM/WOLF-Lite.uvoptx

@@ -145,7 +145,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U-O142 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(2BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F4xx_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F407VETx$CMSIS\Flash\STM32F4xx_512.FLM)</Name>
+          <Name>-U066EFF504955857567104354 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("") -D00(00000000) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32F4xx_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F407VETx$CMSIS\Flash\STM32F4xx_512.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>

STM32/MDK-ARM/WOLF-Lite.uvprojx

@@ -10,7 +10,7 @@
       <TargetName>WOLF-Lite</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6140000::V6.14::ARMCLANG</pCCUsed>
+      <pCCUsed>6150000::V6.15::ARMCLANG</pCCUsed>
       <uAC6>1</uAC6>
       <TargetOption>
         <TargetCommonOption>
@@ -940,11 +940,6 @@
     <Layers>
       <Layer>
         <LayName>&lt;Project Info&gt;</LayName>
-        <LayDesc></LayDesc>
-        <LayUrl></LayUrl>
-        <LayKeys></LayKeys>
-        <LayCat></LayCat>
-        <LayLic></LayLic>
         <LayTarg>0</LayTarg>
         <LayPrjMark>1</LayPrjMark>
       </Layer>

STM32/MDK-ARM/WOLF-Lite/WOLF-Lite.build_log.htm

@@ -3,50 +3,33 @@
 <pre>
 <h1>µVision Build Log</h1>
 <h2>Tool Versions:</h2>
-IDE-Version: µVision V5.31.0.0
+IDE-Version: µVision V5.33.0.0
 Copyright (C) 2020 ARM Ltd and ARM Germany GmbH. All rights reserved.
-License Information: R7KBI R7KBI, R7KBI, LIC=6XJT4-F9AGQ-MS7YP-MAG1J-04QU9-PESGM
+License Information: R7KBI uu5jpp@mail.ru, R7KBI, LIC=2TTQ1-C4JY4-D3JM3-AXCSF-UCXL7-1VJRK
  
 Tool Versions:
-Toolchain:       MDK-ARM Professional  Version: 5.31.0.0
+Toolchain:       MDK-ARM Professional  Version: 5.33.0.0
 Toolchain Path:  C:\Keil_v5\ARM\ARMCLANG\Bin
-C Compiler:      ArmClang.exe V6.14
-Assembler:       Armasm.exe V6.14
-Linker/Locator:  ArmLink.exe V6.14
-Library Manager: ArmAr.exe V6.14
-Hex Converter:   FromElf.exe V6.14
-CPU DLL:         SARMCM3.DLL V5.31.0.0
+C Compiler:      ArmClang.exe V6.15
+Assembler:       Armasm.exe V6.15
+Linker/Locator:  ArmLink.exe V6.15
+Library Manager: ArmAr.exe V6.15
+Hex Converter:   FromElf.exe V6.15
+CPU DLL:         SARMCM3.DLL V5.33.0.0
 Dialog DLL:      DCM.DLL V1.17.3.0
-Target DLL:      STLink\ST-LINKIII-KEIL_SWO.dll V3.0.7.0
-Dialog DLL:      TCM.DLL V1.46.0.0
+Target DLL:      STLink\ST-LINKIII-KEIL_SWO.dll V3.0.8.0
+Dialog DLL:      TCM.DLL V1.48.0.0
  
 <h2>Project:</h2>
-H:\YandexDisk\Àðõèâ\Àíòîí\Git\Wolf-LITE\STM32\MDK-ARM\WOLF-Lite.uvprojx
-Project File Date:  01/21/2021
+C:\Lite\STM32\MDK-ARM\WOLF-Lite.uvprojx
+Project File Date:  01/08/2021
 
 <h2>Output:</h2>
-*** Using Compiler 'V6.14', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin'
+*** Using Compiler 'V6.15', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin'
 Build target 'WOLF-Lite'
-compiling agc.c...
-compiling bootloader.c...
-compiling fpga.c...
-compiling functions.c...
-compiling audio_processor.c...
-compiling fft.c...
-compiling audio_filters.c...
-compiling rf_unit.c...
-compiling front_unit.c...
-compiling swr_analyzer.c...
-compiling lcd.c...
-compiling settings.c...
-compiling trx_manager.c...
-compiling system_menu.c...
-compiling wm8731.c...
-compiling usbd_cat_if.c...
 compiling main.c...
-compiling stm32f4xx_it.c...
 linking...
-Program Size: Code=189600 RO-data=92676 RW-data=118168 ZI-data=61756  
+Program Size: Code=181016 RO-data=92768 RW-data=118176 ZI-data=61756  
 FromELF: creating hex file...
 "WOLF-Lite\WOLF-Lite.axf" - 0 Error(s), 0 Warning(s).
 
@@ -76,21 +59,21 @@ Package Vendor: Keil
    * Component: ARM::CMSIS:CORE:5.4.0
 
    * Component: ARM::CMSIS:DSP:Source:1.8.0
-      Source file:   CMSIS\DSP\Source\FastMathFunctions\FastMathFunctions.c
-      Source file:   CMSIS\DSP\Source\SVMFunctions\SVMFunctions.c
-      Source file:   CMSIS\DSP\Source\ControllerFunctions\ControllerFunctions.c
-      Source file:   CMSIS\DSP\Source\BasicMathFunctions\BasicMathFunctions.c
-      Source file:   CMSIS\DSP\Source\StatisticsFunctions\StatisticsFunctions.c
-      Source file:   CMSIS\DSP\Source\DistanceFunctions\DistanceFunctions.c
-      Source file:   CMSIS\DSP\Source\FilteringFunctions\FilteringFunctions.c
-      Source file:   CMSIS\DSP\Source\CommonTables\CommonTables.c
-      Source file:   CMSIS\DSP\Source\MatrixFunctions\MatrixFunctions.c
-      Source file:   CMSIS\DSP\Source\TransformFunctions\TransformFunctions.c
-      Source file:   CMSIS\DSP\Source\ComplexMathFunctions\ComplexMathFunctions.c
-      Source file:   CMSIS\DSP\Source\BayesFunctions\BayesFunctions.c
-      Source file:   CMSIS\DSP\Source\SupportFunctions\SupportFunctions.c
       Include file:  CMSIS\DSP\Include\arm_math.h
-Build Time Elapsed:  00:00:19
+      Source file:   CMSIS\DSP\Source\BasicMathFunctions\BasicMathFunctions.c
+      Source file:   CMSIS\DSP\Source\BayesFunctions\BayesFunctions.c
+      Source file:   CMSIS\DSP\Source\CommonTables\CommonTables.c
+      Source file:   CMSIS\DSP\Source\ComplexMathFunctions\ComplexMathFunctions.c
+      Source file:   CMSIS\DSP\Source\ControllerFunctions\ControllerFunctions.c
+      Source file:   CMSIS\DSP\Source\DistanceFunctions\DistanceFunctions.c
+      Source file:   CMSIS\DSP\Source\FastMathFunctions\FastMathFunctions.c
+      Source file:   CMSIS\DSP\Source\SupportFunctions\SupportFunctions.c
+      Source file:   CMSIS\DSP\Source\SVMFunctions\SVMFunctions.c
+      Source file:   CMSIS\DSP\Source\MatrixFunctions\MatrixFunctions.c
+      Source file:   CMSIS\DSP\Source\StatisticsFunctions\StatisticsFunctions.c
+      Source file:   CMSIS\DSP\Source\FilteringFunctions\FilteringFunctions.c
+      Source file:   CMSIS\DSP\Source\TransformFunctions\TransformFunctions.c
+Build Time Elapsed:  00:00:12
 </pre>
 </body>
 </html>

STM32/MDK-ARM/WOLF-Lite/audio_filters.__i

@@ -0,0 +1,10 @@
+-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -c
+-fno-rtti -flto -funsigned-char -fshort-enums -fshort-wchar
+-gdwarf-3 -fno-ldm-stm -Ofast -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../Core/USBDevice -I ../Core/Src -I ../Core/Src
+-I./RTE/_WOLF-Lite
+-IC:/Users/uu5jp/AppData/Local/Arm/Packs/ARM/CMSIS/5.7.0/CMSIS/Core/Include
+-IC:/Users/uu5jp/AppData/Local/Arm/Packs/ARM/CMSIS/5.7.0/CMSIS/DSP/Include
+-IC:/Users/uu5jp/AppData/Local/Arm/Packs/ARM/CMSIS/5.7.0/CMSIS/DSP/PrivateInclude
+-IC:/Users/uu5jp/AppData/Local/Arm/Packs/Keil/STM32F4xx_DFP/2.15.0/Drivers/CMSIS/Device/ST/STM32F4xx/Include
+-D__UVISION_VERSION="531" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -DARM_MATH_LOOPUNROLL
+-o wolf-lite/audio_filters.o -MD "../Core/Src/audio_filters.c"

STM32/MDK-ARM/WOLF-Lite/supportfunctions.__i

@@ -0,0 +1,10 @@
+-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -c
+-fno-rtti -flto -funsigned-char -fshort-enums -fshort-wchar
+-gdwarf-3 -fno-ldm-stm -Ofast -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../Core/USBDevice -I ../Core/Src -I ../Core/Src
+-I./RTE/_WOLF-Lite
+-IC:/Users/uu5jp/AppData/Local/Arm/Packs/ARM/CMSIS/5.7.0/CMSIS/Core/Include
+-IC:/Users/uu5jp/AppData/Local/Arm/Packs/ARM/CMSIS/5.7.0/CMSIS/DSP/Include
+-IC:/Users/uu5jp/AppData/Local/Arm/Packs/ARM/CMSIS/5.7.0/CMSIS/DSP/PrivateInclude
+-IC:/Users/uu5jp/AppData/Local/Arm/Packs/Keil/STM32F4xx_DFP/2.15.0/Drivers/CMSIS/Device/ST/STM32F4xx/Include
+-D__UVISION_VERSION="531" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -DARM_MATH_LOOPUNROLL
+-o wolf-lite/supportfunctions.o -MD "C:/Users/uu5jp/AppData/Local/Arm/Packs/ARM/CMSIS/5.7.0/CMSIS/DSP/Source/SupportFunctions/SupportFunctions.c"