diff --git a/STM32/Core/Src/bands.c b/STM32/Core/Src/bands.c index 4c85e13..18f67bc 100644 --- a/STM32/Core/Src/bands.c +++ b/STM32/Core/Src/bands.c @@ -132,6 +132,17 @@ const BAND_MAP BANDS[BANDS_COUNT] = {.startFreq = 24940000, .endFreq = 24990000, .mode = TRX_MODE_USB}, }, .regionsCount = 4, + }, + //CBMETERS + { + .name = "CB", + .selectable = true, + .startFreq = 26960000, + .endFreq = 27400000, + .regions = (const REGION_MAP[]){ + {.startFreq = 26960000, .endFreq = 27400000, .mode = TRX_MODE_NFM}, + }, + .regionsCount = 1, }, //10-10METERS { diff --git a/STM32/Core/Src/bands.h b/STM32/Core/Src/bands.h index 983f603..a00e213 100644 --- a/STM32/Core/Src/bands.h +++ b/STM32/Core/Src/bands.h @@ -5,7 +5,7 @@ #include #include -#define BANDS_COUNT 12 // number of bands in the collection +#define BANDS_COUNT 13 // number of bands in the collection typedef struct // description of the region in the band { diff --git a/STM32/Core/Src/fpga.c b/STM32/Core/Src/fpga.c index 85d33e1..414960c 100644 --- a/STM32/Core/Src/fpga.c +++ b/STM32/Core/Src/fpga.c @@ -242,14 +242,44 @@ static inline void FPGA_fpgadata_sendparam(void) //out BPF FPGA_fpgadata_out_tmp8 = 0; if(CurrentVFO()->Freq >= 1500000 && CurrentVFO()->Freq <= 2400000) //160m + { + bitWrite(FPGA_fpgadata_out_tmp8, 4, 0); //LPF1 + bitWrite(FPGA_fpgadata_out_tmp8, 5, 0); //LPF2 + bitWrite(FPGA_fpgadata_out_tmp8, 6, 0); //LPF3 + } + else if(CurrentVFO()->Freq >= 2400000 && CurrentVFO()->Freq <= 4500000) //80m + { + bitWrite(FPGA_fpgadata_out_tmp8, 4, 1); //LPF1 + bitWrite(FPGA_fpgadata_out_tmp8, 5, 0); //LPF2 + bitWrite(FPGA_fpgadata_out_tmp8, 6, 0); //LPF3 + } + else if(CurrentVFO()->Freq >= 4500000 && CurrentVFO()->Freq <= 7500000) //40m + { + bitWrite(FPGA_fpgadata_out_tmp8, 4, 0); //LPF1 + bitWrite(FPGA_fpgadata_out_tmp8, 5, 1); //LPF2 + bitWrite(FPGA_fpgadata_out_tmp8, 6, 0); //LPF3 + } + else if(CurrentVFO()->Freq >= 7500000 && CurrentVFO()->Freq <= 14800000) //30m,20m + { + bitWrite(FPGA_fpgadata_out_tmp8, 4, 1); //LPF1 + bitWrite(FPGA_fpgadata_out_tmp8, 5, 1); //LPF2 + bitWrite(FPGA_fpgadata_out_tmp8, 6, 0); //LPF3 + } + else if(CurrentVFO()->Freq >= 12000000 && CurrentVFO()->Freq <= 32000000) //17,15m,12,10m + { + bitWrite(FPGA_fpgadata_out_tmp8, 4, 0); //LPF1 + bitWrite(FPGA_fpgadata_out_tmp8, 5, 0); //LPF2 + bitWrite(FPGA_fpgadata_out_tmp8, 6, 1); //LPF3 + } + + + //out LPF + if(CurrentVFO()->Freq >= 1500000 && CurrentVFO()->Freq <= 2400000) //160m { bitWrite(FPGA_fpgadata_out_tmp8, 0, 0); //BPF_A bitWrite(FPGA_fpgadata_out_tmp8, 1, 0); //BPF_B bitWrite(FPGA_fpgadata_out_tmp8, 3, 1); //BPF_OE1 bitWrite(FPGA_fpgadata_out_tmp8, 2, 0); //BPF_OE2 - bitWrite(FPGA_fpgadata_out_tmp8, 4, 0); //LPF1 - bitWrite(FPGA_fpgadata_out_tmp8, 5, 0); //LPF2 - bitWrite(FPGA_fpgadata_out_tmp8, 6, 0); //LPF3 } else if(CurrentVFO()->Freq >= 2400000 && CurrentVFO()->Freq <= 4500000) //80m { @@ -257,9 +287,6 @@ static inline void FPGA_fpgadata_sendparam(void) bitWrite(FPGA_fpgadata_out_tmp8, 1, 0); //BPF_B bitWrite(FPGA_fpgadata_out_tmp8, 3, 1); //BPF_OE1 bitWrite(FPGA_fpgadata_out_tmp8, 2, 0); //BPF_OE2 - bitWrite(FPGA_fpgadata_out_tmp8, 4, 1); //LPF1 - bitWrite(FPGA_fpgadata_out_tmp8, 5, 0); //LPF2 - bitWrite(FPGA_fpgadata_out_tmp8, 6, 0); //LPF3 } else if(CurrentVFO()->Freq >= 4500000 && CurrentVFO()->Freq <= 7500000) //40m { @@ -267,9 +294,6 @@ static inline void FPGA_fpgadata_sendparam(void) bitWrite(FPGA_fpgadata_out_tmp8, 1, 1); //BPF_B bitWrite(FPGA_fpgadata_out_tmp8, 3, 1); //BPF_OE1 bitWrite(FPGA_fpgadata_out_tmp8, 2, 0); //BPF_OE2 - bitWrite(FPGA_fpgadata_out_tmp8, 4, 0); //LPF1 - bitWrite(FPGA_fpgadata_out_tmp8, 5, 1); //LPF2 - bitWrite(FPGA_fpgadata_out_tmp8, 6, 0); //LPF3 } else if(CurrentVFO()->Freq >= 7500000 && CurrentVFO()->Freq <= 12000000) //30m { @@ -277,9 +301,6 @@ static inline void FPGA_fpgadata_sendparam(void) bitWrite(FPGA_fpgadata_out_tmp8, 1, 1); //BPF_B bitWrite(FPGA_fpgadata_out_tmp8, 3, 1); //BPF_OE1 bitWrite(FPGA_fpgadata_out_tmp8, 2, 0); //BPF_OE2 - bitWrite(FPGA_fpgadata_out_tmp8, 4, 1); //LPF1 - bitWrite(FPGA_fpgadata_out_tmp8, 5, 1); //LPF2 - bitWrite(FPGA_fpgadata_out_tmp8, 6, 0); //LPF3 } else if(CurrentVFO()->Freq >= 12000000 && CurrentVFO()->Freq <= 14800000) //20m { @@ -287,9 +308,6 @@ static inline void FPGA_fpgadata_sendparam(void) bitWrite(FPGA_fpgadata_out_tmp8, 1, 0); //BPF_B bitWrite(FPGA_fpgadata_out_tmp8, 3, 0); //BPF_OE1 bitWrite(FPGA_fpgadata_out_tmp8, 2, 1); //BPF_OE2 - bitWrite(FPGA_fpgadata_out_tmp8, 4, 0); //LPF1 - bitWrite(FPGA_fpgadata_out_tmp8, 5, 0); //LPF2 - bitWrite(FPGA_fpgadata_out_tmp8, 6, 1); //LPF3 } else if(CurrentVFO()->Freq >= 14800000 && CurrentVFO()->Freq <= 22000000) //17,15m { @@ -297,9 +315,7 @@ static inline void FPGA_fpgadata_sendparam(void) bitWrite(FPGA_fpgadata_out_tmp8, 1, 0); //BPF_B bitWrite(FPGA_fpgadata_out_tmp8, 3, 0); //BPF_OE1 bitWrite(FPGA_fpgadata_out_tmp8, 2, 1); //BPF_OE2 - bitWrite(FPGA_fpgadata_out_tmp8, 4, 1); //LPF1 - bitWrite(FPGA_fpgadata_out_tmp8, 5, 0); //LPF2 - bitWrite(FPGA_fpgadata_out_tmp8, 6, 1); //LPF3 + } else if(CurrentVFO()->Freq >= 22000000 && CurrentVFO()->Freq <= 32000000) //12,10m { @@ -307,9 +323,6 @@ static inline void FPGA_fpgadata_sendparam(void) bitWrite(FPGA_fpgadata_out_tmp8, 1, 1); //BPF_B bitWrite(FPGA_fpgadata_out_tmp8, 3, 0); //BPF_OE1 bitWrite(FPGA_fpgadata_out_tmp8, 2, 1); //BPF_OE2 - bitWrite(FPGA_fpgadata_out_tmp8, 4, 0); //LPF1 - bitWrite(FPGA_fpgadata_out_tmp8, 5, 1); //LPF2 - bitWrite(FPGA_fpgadata_out_tmp8, 6, 1); //LPF3 } else //if(CurrentVFO()->Freq >= 0 && CurrentVFO()->Freq <= 53000000) //6m { @@ -317,9 +330,6 @@ static inline void FPGA_fpgadata_sendparam(void) bitWrite(FPGA_fpgadata_out_tmp8, 1, 1); //BPF_B bitWrite(FPGA_fpgadata_out_tmp8, 3, 0); //BPF_OE1 bitWrite(FPGA_fpgadata_out_tmp8, 2, 1); //BPF_OE2 - bitWrite(FPGA_fpgadata_out_tmp8, 4, 1); //LPF1 - bitWrite(FPGA_fpgadata_out_tmp8, 5, 1); //LPF2 - bitWrite(FPGA_fpgadata_out_tmp8, 6, 1); //LPF3 } //bitWrite(FPGA_fpgadata_out_tmp8, 7, 0); //unused FPGA_writePacket(FPGA_fpgadata_out_tmp8); diff --git a/STM32/Core/Src/front_unit.c b/STM32/Core/Src/front_unit.c index 2fe21e9..b54949d 100644 --- a/STM32/Core/Src/front_unit.c +++ b/STM32/Core/Src/front_unit.c @@ -290,8 +290,8 @@ static void FRONTPANEL_ENCODER_Rotated(float32_t direction) // rotated encoder, static void FRONTPANEL_ENCODER2_Rotated(int8_t direction) // rotated encoder, handler here, direction -1 - left, 1 - right { - if (TRX.Locked) - return; + //if (TRX.Locked) + //return; if (LCD_systemMenuOpened) { diff --git a/STM32/Core/Src/main.c b/STM32/Core/Src/main.c index 3ce28eb..802b68b 100644 --- a/STM32/Core/Src/main.c +++ b/STM32/Core/Src/main.c @@ -162,8 +162,8 @@ int main(void) MX_TIM7_Init(); MX_TIM8_Init(); /* USER CODE BEGIN 2 */ - HAL_TIM_PWM_Start(&htim4, TIM_CHANNEL_3); //LCD PWM - TIM4->CCR3 = 500; //LCD PWM + //HAL_TIM_PWM_Start(&htim4, TIM_CHANNEL_3); //LCD PWM + //TIM4->CCR3 = 500; //LCD PWM /* BUG FIX: Enabling Audio Clock Input in CubeMX does not set I2SSRC bit * in RCC_CFGR register! Hence we need to set it manually here! * WARNING: A bug fix is also needed in __HAL_RCC_GET_I2S_SOURCE() Line 6131 stm32f4xx_hal_rcc_ex.h -> #define __HAL_RCC_GET_I2S_SOURCE() ((uint32_t)(READ_BIT(RCC->CFGR, RCC_CFGR_I2SSRC)) >> RCC_CFGR_I2SSRC_Pos) @@ -215,15 +215,7 @@ int main(void) else LoadCalibration(false); - //DEBUG!!! - //CALIBRATE.ENCODER_SLOW_RATE = 1; - //CALIBRATE.ENCODER_DEBOUNCE = 10; - //CALIBRATE.ENCODER_ON_FALLING = true; - //TRX.Debug_Console = true; - //TRX.FRQ_FAST_STEP = 500; - //TRX.FFT_Zoom = 1; - //TRX.Locked = false; - // + TRX.Locked = false; sendToDebug_strln("[OK] FFT/Waterfall & TIM4 init"); FFT_PreInit(); @@ -252,7 +244,7 @@ int main(void) sendToDebug_str("UA3REO Transceiver started!\r\n\r\n"); /* USER CODE END 2 */ -TIM4->CCR3 = TRX.LCD_Brightness*5; //LCD PWM +//TIM4->CCR3 = TRX.LCD_Brightness*5; //LCD PWM /* Infinite loop */ /* USER CODE BEGIN WHILE */ while (1) diff --git a/STM32/Core/Src/settings.c b/STM32/Core/Src/settings.c index 984aaa8..441f977 100644 --- a/STM32/Core/Src/settings.c +++ b/STM32/Core/Src/settings.c @@ -221,7 +221,6 @@ void LoadSettings(bool clear) TRX.Volume = 50; //AF Volume TRX.CW_GaussFilter = true; //Gauss responce LPF filter TRX.LCD_position = 2; //LCD_position - TRX.LCD_Brightness = 60; //LCD Brightness TRX.ENDBit = 100; // Bit for the end of a successful write to eeprom sendToDebug_strln("[OK] Loaded default settings"); SaveSettings(); diff --git a/STM32/Core/Src/settings.h b/STM32/Core/Src/settings.h index db3f35a..79c5f5a 100644 --- a/STM32/Core/Src/settings.h +++ b/STM32/Core/Src/settings.h @@ -175,7 +175,6 @@ extern struct TRX_SETTINGS uint8_t ColorThemeId; bool FFT_Enabled; uint8_t FFT_Zoom; - uint8_t LCD_Brightness; uint8_t FFT_Averaging; uint8_t FFT_Window; uint8_t FFT_Color; diff --git a/STM32/Core/Src/system_menu.c b/STM32/Core/Src/system_menu.c index 38e61c5..ed0b0f6 100644 --- a/STM32/Core/Src/system_menu.c +++ b/STM32/Core/Src/system_menu.c @@ -77,7 +77,7 @@ static void SYSMENU_HANDL_SCREEN_FFT_Background(int8_t direction); static void SYSMENU_HANDL_SCREEN_FFT_Compressor(int8_t direction); static void SYSMENU_HANDL_SCREEN_LCD_position(int8_t direction);//LCD povorot static void SYSMENU_HANDL_SCREEN_FFT_HoldPeaks(int8_t direction); -static void SYSMENU_HANDL_SCREEN_LCD_Brightness(int8_t direction); + static void SYSMENU_HANDL_ADC_PGA(int8_t direction); static void SYSMENU_HANDL_ADC_RAND(int8_t direction); @@ -145,7 +145,6 @@ static const struct sysmenu_item_handler sysmenu_trx_handlers[] = { {"RF Power", SYSMENU_UINT8, (uint32_t *)&TRX.RF_Power, SYSMENU_HANDL_TRX_RFPower}, {"LCD position", SYSMENU_UINT8, (uint32_t *)&TRX.LCD_position, SYSMENU_HANDL_SCREEN_LCD_position},// LCD povorot - {"LCD Brightness", SYSMENU_UINT8, (uint32_t *)&TRX.LCD_Brightness, SYSMENU_HANDL_SCREEN_LCD_Brightness}, //LCD PWM {"Band Map", SYSMENU_BOOLEAN, (uint32_t *)&TRX.BandMapEnabled, SYSMENU_HANDL_TRX_BandMap}, {"AutoGainer", SYSMENU_BOOLEAN, (uint32_t *)&TRX.AutoGain, SYSMENU_HANDL_TRX_AutoGain}, {"Two Signal TUNE", SYSMENU_BOOLEAN, (uint32_t *)&TRX.TWO_SIGNAL_TUNE, SYSMENU_HANDL_TRX_TWO_SIGNAL_TUNE}, @@ -1400,16 +1399,6 @@ static void SYSMENU_HANDL_SCREEN_FFT_HoldPeaks(int8_t direction) TRX.FFT_HoldPeaks = false; } //----------------------------------------------------------------------- -static void SYSMENU_HANDL_SCREEN_LCD_Brightness(int8_t direction) -{ - TRX.LCD_Brightness += direction; - if (TRX.LCD_Brightness < 1) - TRX.LCD_Brightness = 1; - if (TRX.LCD_Brightness > 100) - TRX.LCD_Brightness = 100; - TIM4->CCR3 = TRX.LCD_Brightness*5; -} - //SCREEN MENU static void SYSMENU_HANDL_LCDMENU(int8_t direction) diff --git a/STM32/Core/Src/usbd_ua3reo.c b/STM32/Core/Src/usbd_ua3reo.c index ef4b84a..97504f6 100644 --- a/STM32/Core/Src/usbd_ua3reo.c +++ b/STM32/Core/Src/usbd_ua3reo.c @@ -95,7 +95,7 @@ __ALIGN_BEGIN static const uint8_t USBD_UA3REO_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ 0x09, /* bLength: Interface Descriptor size */ USB_DESC_TYPE_INTERFACE, /* bDescriptorType: Interface */ /* Interface descriptor type */ - 0x00, /* bInterfaceNumber: Number of Interface */ + DEBUG_INTERFACE_IDX, /* bInterfaceNumber: Number of Interface */ 0x00, /* bAlternateSetting: Alternate setting */ 0x01, /* bNumEndpoints: One endpoints used */ 0x02, /* bInterfaceClass: Communication Interface Class */ @@ -144,7 +144,7 @@ __ALIGN_BEGIN static const uint8_t USBD_UA3REO_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ /*Data class interface descriptor*/ 0x09, /* bLength: Endpoint Descriptor size */ USB_DESC_TYPE_INTERFACE, /* bDescriptorType: */ - 0x01, /* bInterfaceNumber: Number of Interface */ + (DEBUG_INTERFACE_IDX + 1), /* bInterfaceNumber: Number of Interface */ 0x00, /* bAlternateSetting: Alternate setting */ 0x02, /* bNumEndpoints: Two endpoints used */ 0x0A, /* bInterfaceClass: CDC */ @@ -188,7 +188,7 @@ __ALIGN_BEGIN static const uint8_t USBD_UA3REO_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ 0x09, /* bLength: Interface Descriptor size */ USB_DESC_TYPE_INTERFACE, /* bDescriptorType: Interface */ /* Interface descriptor type */ - 0x02, /* bInterfaceNumber: Number of Interface */ + CAT_INTERFACE_IDX, /* bInterfaceNumber: Number of Interface */ 0x00, /* bAlternateSetting: Alternate setting */ 0x01, /* bNumEndpoints: One endpoints used */ 0x02, /* bInterfaceClass: Communication Interface Class */ @@ -237,7 +237,7 @@ __ALIGN_BEGIN static const uint8_t USBD_UA3REO_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ /*Data class interface descriptor*/ 0x09, /* bLength: Endpoint Descriptor size */ USB_DESC_TYPE_INTERFACE, /* bDescriptorType: */ - 0x03, /* bInterfaceNumber: Number of Interface */ + (CAT_INTERFACE_IDX + 1), /* bInterfaceNumber: Number of Interface */ 0x00, /* bAlternateSetting: Alternate setting */ 0x02, /* bNumEndpoints: Two endpoints used */ 0x0A, /* bInterfaceClass: CDC */ @@ -281,7 +281,7 @@ __ALIGN_BEGIN static const uint8_t USBD_UA3REO_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ //------------------------------ 0x09, // bLength 0x04, // bDescriptorType - 0x04, // bInterfaceNumber + AUDIO_INTERFACE_IDX, // bInterfaceNumber 0x00, // bAlternateSetting 0x00, // bNumEndPoints 0x01, // bInterfaceClass (Audio Device Class) @@ -360,7 +360,7 @@ __ALIGN_BEGIN static const uint8_t USBD_UA3REO_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ //------------------------------ 0x09, // bLength 0x04, // bDescriptorType - 0x05, // bInterfaceNumber + (AUDIO_INTERFACE_IDX + 1), // bInterfaceNumber 0x00, // bAlternateSetting 0x00, // bNumEndPoints 0x01, // bInterfaceClass (Audio Device Class) @@ -372,7 +372,7 @@ __ALIGN_BEGIN static const uint8_t USBD_UA3REO_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ //------------------------------ 0x09, // bLength 0x04, // bDescriptorType - 0x05, // bInterfaceNumber + (AUDIO_INTERFACE_IDX + 1), // bInterfaceNumber 0x01, // bAlternateSetting 0x01, // bNumEndPoints 0x01, // bInterfaceClass (Audio Device Class) @@ -430,7 +430,7 @@ __ALIGN_BEGIN static const uint8_t USBD_UA3REO_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ //------------------------------ 0x09, // bLength 0x04, // bDescriptorType - 0x06, // bInterfaceNumber + (AUDIO_INTERFACE_IDX + 2), // bInterfaceNumber 0x00, // bAlternateSetting 0x00, // bNumEndPoints 0x01, // bInterfaceClass (Audio Device Class) @@ -442,7 +442,7 @@ __ALIGN_BEGIN static const uint8_t USBD_UA3REO_CfgFSDesc[USB_CDC_CONFIG_DESC_SIZ //------------------------------ 0x09, // bLength 0x04, // bDescriptorType - 0x06, // bInterfaceNumber + (AUDIO_INTERFACE_IDX + 2), // bInterfaceNumber 0x01, // bAlternateSetting 0x01, // bNumEndPoints 0x01, // bInterfaceClass (Audio Device Class) diff --git a/STM32/Core/Src/usbd_ua3reo.h b/STM32/Core/Src/usbd_ua3reo.h index cbac0e3..d5b700d 100644 --- a/STM32/Core/Src/usbd_ua3reo.h +++ b/STM32/Core/Src/usbd_ua3reo.h @@ -17,7 +17,7 @@ extern "C" #define CAT_EP_IDX 0x02 #define AUDIO_EP_IDX 0x03 #define DEBUG_CMD_IDX 0x04 -#define CAT_CMD_IDX 0x04 +#define CAT_CMD_IDX 0x05 #define IN_EP_DIR 0x80 // Adds a direction bit diff --git a/STM32/DEBUG.bat b/STM32/DEBUG.bat index c162e22..33be1f1 100644 --- a/STM32/DEBUG.bat +++ b/STM32/DEBUG.bat @@ -1,3 +1,3 @@ :start -"c:\Program Files\PuTTY\plink.exe" -serial COM5 -sercfg 115200,8,1,n,D +"c:\Program Files\PuTTY\plink.exe" -serial COM3 -sercfg 115200,8,1,n,D GOTO start diff --git a/STM32/MDK-ARM/RTE/_WOLF-Lite/RTE_Components.h b/STM32/MDK-ARM/RTE/_WOLF-Lite/RTE_Components.h index 1ca03f5..4769186 100644 --- a/STM32/MDK-ARM/RTE/_WOLF-Lite/RTE_Components.h +++ b/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 */ diff --git a/STM32/MDK-ARM/WOLF-Lite.uvoptx b/STM32/MDK-ARM/WOLF-Lite.uvoptx index 453069e..132dd9f 100644 --- a/STM32/MDK-ARM/WOLF-Lite.uvoptx +++ b/STM32/MDK-ARM/WOLF-Lite.uvoptx @@ -223,7 +223,7 @@ Application/User/Core - 0 + 1 0 0 0 diff --git a/STM32/MDK-ARM/WOLF-Lite.uvprojx b/STM32/MDK-ARM/WOLF-Lite.uvprojx index cc0265d..f37f1fd 100644 --- a/STM32/MDK-ARM/WOLF-Lite.uvprojx +++ b/STM32/MDK-ARM/WOLF-Lite.uvprojx @@ -10,7 +10,7 @@ WOLF-Lite 0x4 ARM-ADS - 6160000::V6.16::ARMCLANG + 6150000::V6.15::ARMCLANG 1 diff --git a/STM32/WOLF-Lite.ioc b/STM32/WOLF-Lite.ioc index 0864e4e..a658ed0 100644 --- a/STM32/WOLF-Lite.ioc +++ b/STM32/WOLF-Lite.ioc @@ -308,8 +308,8 @@ Mcu.PinsNb=78 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32F407VETx -MxCube.Version=6.1.1 -MxDb.Version=DB.6.0.10 +MxCube.Version=6.2.1 +MxDb.Version=DB.6.0.21 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false NVIC.DMA1_Stream0_IRQn=true\:0\:0\:false\:false\:true\:false\:true NVIC.DMA1_Stream5_IRQn=true\:1\:0\:true\:false\:true\:false\:true @@ -706,7 +706,7 @@ ProjectManager.CustomerFirmwarePackage= ProjectManager.DefaultFWLocation=true ProjectManager.DeletePrevious=true ProjectManager.DeviceId=STM32F407VETx -ProjectManager.FirmwarePackage=STM32Cube FW_F4 V1.25.2 +ProjectManager.FirmwarePackage=STM32Cube FW_F4 V1.26.1 ProjectManager.FreePins=true ProjectManager.HalAssertFull=false ProjectManager.HeapSize=0x1F00