From 21385ee4ea514d1aadc0d1a7fbcc8f5864234c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD?= <43981173+UU5JPP@users.noreply.github.com> Date: Tue, 16 Nov 2021 11:03:48 +0300 Subject: [PATCH] PTT --- STM32/Core/Src/audio_processor.c | 8 +- STM32/Core/Src/color_themes.h | 2 + STM32/Core/Src/front_unit.c | 24 +-- STM32/Core/Src/front_unit.h | 9 + STM32/Core/Src/functions.c | 1 - STM32/Core/Src/lcd.c | 9 +- STM32/Core/Src/rf_unit.c | 77 +++++-- STM32/Core/Src/trx_manager.c | 2 + STM32/Core/Src/trx_manager.h | 2 + STM32/MDK-ARM/RTE/_WOLF-Lite/RTE_Components.h | 42 ++-- STM32/MDK-ARM/WOLF-Lite.uvoptx | 194 +++++++++++++++++- STM32/MDK-ARM/WOLF-Lite.uvprojx | 2 +- STM32/MDK-ARM/WOLF-Lite/WOLF-Lite.lnp | 15 -- 13 files changed, 318 insertions(+), 69 deletions(-) diff --git a/STM32/Core/Src/audio_processor.c b/STM32/Core/Src/audio_processor.c index d284aaa..3f42e57 100644 --- a/STM32/Core/Src/audio_processor.c +++ b/STM32/Core/Src/audio_processor.c @@ -249,8 +249,8 @@ void processRxAudio(void) Processor_AudioBuffer_current[pos * 2] = convertToSPIBigEndian(out); //left channel Processor_AudioBuffer_current[pos * 2 + 1] = Processor_AudioBuffer_current[pos * 2]; //right channel } - } - + } + //Mute codec if(WM8731_Muting) { @@ -590,11 +590,11 @@ void processTxAudio(void) if (TRX.CW_SelfHear && (TRX.CW_KEYER || CW_key_serial || CW_key_dot_hard || CW_key_dash_hard) && (mode == TRX_MODE_CW_L || mode == TRX_MODE_CW_U) && !TRX_Tune) { static float32_t cwgen_index = 0; - const float32_t SELFHEAR_Volume = 30.0f; + const float32_t SELFHEAR_Volume = 100.0f; float32_t amplitude = volume2rate((float32_t)TRX.Volume / 100.0f) * volume2rate(SELFHEAR_Volume / 100.0f); for (uint_fast16_t i = 0; i < AUDIO_BUFFER_HALF_SIZE; i++) { - const float32_t CW_Pitch_freq = 800; + const float32_t CW_Pitch_freq = 700; float32_t point = generateSinF(amplitude * FPGA_Audio_Buffer_TX_I_tmp[i], &cwgen_index, TRX_SAMPLERATE, CW_Pitch_freq); int32_t sample = 0; arm_float_to_q31(&point, &sample, 1); diff --git a/STM32/Core/Src/color_themes.h b/STM32/Core/Src/color_themes.h index 97eb8c7..f201774 100644 --- a/STM32/Core/Src/color_themes.h +++ b/STM32/Core/Src/color_themes.h @@ -29,6 +29,7 @@ typedef const struct const uint16_t STATUS_LABEL_BW; const uint16_t STATUS_LABEL_RIT; const uint16_t STATUS_LABEL_VLT; + const uint16_t STATUS_LABEL_PTT_SW1; const uint16_t STATUS_LABEL_CPU; const uint16_t STATUS_LABEL_PWM; const uint16_t STATUS_LABEL_THERM; @@ -89,6 +90,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_PTT_SW1 = rgb888torgb565(249, 205, 46), .STATUS_LABEL_CPU = rgb888torgb565(255, 0, 0), .STATUS_LABEL_PWM = rgb888torgb565(255, 0, 0), .STATUS_LABEL_THERM = rgb888torgb565(249, 205, 46), diff --git a/STM32/Core/Src/front_unit.c b/STM32/Core/Src/front_unit.c index 415ff46..2e22e53 100644 --- a/STM32/Core/Src/front_unit.c +++ b/STM32/Core/Src/front_unit.c @@ -16,8 +16,8 @@ static uint16_t FRONTPANEL_ReadMCP3008_Value(uint8_t channel, GPIO_TypeDef *CS_P static void FRONTPANEL_ENCODER2_Rotated(int8_t direction); -static void FRONTPANEL_BUTTONHANDLER_BAND_P(void); -static void FRONTPANEL_BUTTONHANDLER_BAND_N(void); +void FRONTPANEL_BUTTONHANDLER_BAND_P(void); +void FRONTPANEL_BUTTONHANDLER_BAND_N(void); static void FRONTPANEL_BUTTONHANDLER_SQUELCH(void); static void FRONTPANEL_BUTTONHANDLER_WPM(void); static void FRONTPANEL_BUTTONHANDLER_KEYER(void); @@ -27,21 +27,21 @@ static void FRONTPANEL_BUTTONHANDLER_STEP(void); static void FRONTPANEL_BUTTONHANDLER_BANDMAP(void); static void FRONTPANEL_BUTTONHANDLER_HIDDEN_ENABLE(void); static void FRONTPANEL_BUTTONHANDLER_ATTHOLD(void); -static void FRONTPANEL_BUTTONHANDLER_AGC(void); +void FRONTPANEL_BUTTONHANDLER_AGC(void); static void FRONTPANEL_BUTTONHANDLER_AGC_SPEED(void); -static void FRONTPANEL_BUTTONHANDLER_NOTCH(void); -static void FRONTPANEL_BUTTONHANDLER_FAST(void); -static void FRONTPANEL_BUTTONHANDLER_MUTE(void); +void FRONTPANEL_BUTTONHANDLER_NOTCH(void); +void FRONTPANEL_BUTTONHANDLER_FAST(void); +void FRONTPANEL_BUTTONHANDLER_MUTE(void); static void FRONTPANEL_BUTTONHANDLER_AsB(void); static void FRONTPANEL_BUTTONHANDLER_ArB(void); -static void FRONTPANEL_BUTTONHANDLER_TUNE(void); +void FRONTPANEL_BUTTONHANDLER_TUNE(void); static void FRONTPANEL_BUTTONHANDLER_BW(void); static void FRONTPANEL_BUTTONHANDLER_HPF(void); static void FRONTPANEL_BUTTONHANDLER_MENU(void); -static void FRONTPANEL_BUTTONHANDLER_LOCK(void); +void FRONTPANEL_BUTTONHANDLER_LOCK(void); static void FRONTPANEL_BUTTONHANDLER_PWR_P(void); static void FRONTPANEL_BUTTONHANDLER_PWR_N(void); -static void FRONTPANEL_BUTTONHANDLER_ZOOM_P(void); +void FRONTPANEL_BUTTONHANDLER_ZOOM_P(void); static void FRONTPANEL_ENC2SW_click_handler(uint32_t parameter); static void FRONTPANEL_ENC2SW_hold_handler(uint32_t parameter); @@ -547,7 +547,7 @@ void FRONTPANEL_Process(void) SPI_process = false; } //---------------------------------------------------------------------------- -static void FRONTPANEL_BUTTONHANDLER_ZOOM_P(void) +void FRONTPANEL_BUTTONHANDLER_ZOOM_P(void) { if (TRX.FFT_Zoom == 1) TRX.FFT_Zoom = 2; @@ -716,7 +716,7 @@ void FRONTPANEL_BUTTONHANDLER_MODE_N(void) TRX_Temporary_Stop_BandMap = true; } -static void FRONTPANEL_BUTTONHANDLER_BAND_P(void) +void FRONTPANEL_BUTTONHANDLER_BAND_P(void) { int8_t band = getBandFromFreq(CurrentVFO()->Freq, true); band++; @@ -743,7 +743,7 @@ static void FRONTPANEL_BUTTONHANDLER_BAND_P(void) LCD_UpdateQuery.FreqInfo = true; } -static void FRONTPANEL_BUTTONHANDLER_BAND_N(void) +void FRONTPANEL_BUTTONHANDLER_BAND_N(void) { int8_t band = getBandFromFreq(CurrentVFO()->Freq, true); band--; diff --git a/STM32/Core/Src/front_unit.h b/STM32/Core/Src/front_unit.h index b985239..33c0798 100644 --- a/STM32/Core/Src/front_unit.h +++ b/STM32/Core/Src/front_unit.h @@ -30,6 +30,8 @@ extern void FRONTPANEL_ENCODER2_checkRotate(void); extern void FRONTPANEL_check_ENC2SW(void); extern void FRONTPANEL_Init(void); extern void FRONTPANEL_Process(void); +extern void FRONTPANEL_BUTTONHANDLER_BAND_N(void); +extern void FRONTPANEL_BUTTONHANDLER_BAND_P(void); extern void FRONTPANEL_BUTTONHANDLER_BW_N(void); extern void FRONTPANEL_BUTTONHANDLER_BW_P(void); extern void FRONTPANEL_BUTTONHANDLER_MODE_P(void); @@ -38,5 +40,12 @@ extern void FRONTPANEL_BUTTONHANDLER_PRE(void); extern void FRONTPANEL_BUTTONHANDLER_ATT(void); extern void FRONTPANEL_BUTTONHANDLER_RF_POWER(void); extern void FRONTPANEL_BUTTONHANDLER_VOLUME(void); +extern void FRONTPANEL_BUTTONHANDLER_AGC(void); +extern void FRONTPANEL_BUTTONHANDLER_FAST(void); +extern void FRONTPANEL_BUTTONHANDLER_MUTE(void); +extern void FRONTPANEL_BUTTONHANDLER_LOCK(void); +extern void FRONTPANEL_BUTTONHANDLER_NOTCH(void); +extern void FRONTPANEL_BUTTONHANDLER_TUNE(void); +extern void FRONTPANEL_BUTTONHANDLER_ZOOM_P(void); #endif diff --git a/STM32/Core/Src/functions.c b/STM32/Core/Src/functions.c index fb14690..bd2b60d 100644 --- a/STM32/Core/Src/functions.c +++ b/STM32/Core/Src/functions.c @@ -355,7 +355,6 @@ float32_t getMaxTXAmplitudeOnFreq(uint32_t freq) return (float32_t)CALIBRATE.rf_out_power_40m / 100.0f * (float32_t)MAX_TX_AMPLITUDE; } - float32_t generateSin(float32_t amplitude, uint32_t index, uint32_t samplerate, uint32_t freq) { float32_t ret = amplitude * arm_sin_f32(((float32_t)index / (float32_t)samplerate) * PI * 2.0f * (float32_t)freq); diff --git a/STM32/Core/Src/lcd.c b/STM32/Core/Src/lcd.c index b078400..64ae840 100644 --- a/STM32/Core/Src/lcd.c +++ b/STM32/Core/Src/lcd.c @@ -666,7 +666,14 @@ static void LCD_displayStatusInfoBar(bool redraw) 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); - + +// //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); + //PWM if (TRX_on_TX()) { diff --git a/STM32/Core/Src/rf_unit.c b/STM32/Core/Src/rf_unit.c index d2a3325..9ca6e48 100644 --- a/STM32/Core/Src/rf_unit.c +++ b/STM32/Core/Src/rf_unit.c @@ -63,7 +63,12 @@ void RF_UNIT_ProcessSensors(void) TRX_CPU_VRef = TRX_CPU_VRef * 0.9f + cpu_vref_result * 0.1f; TRX_CPU_VBat = TRX_CPU_VBat * 0.9f + cpu_vbat * 2.0f * 0.1f; - + + //SW1_Voltage + TRX_SW1_Voltage = ptt_sw1; + //SW2_Voltage + TRX_SW2_Voltage = ptt_sw2; + //POWER power_in = power_in * CALIBRATE.volt_cal_rate; //do voltage calibration in future!!! if(fabsf(TRX_InVoltage - power_in) > 0.2f) @@ -114,35 +119,46 @@ void RF_UNIT_ProcessSensors(void) //sendToDebug_float32(ptt_sw1, false); //sendToDebug_float32(ptt_sw2, false); //sendToDebug_newline(); + + if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 0.1 && ptt_sw2 < 0.3 && ptt_sw1 > 1.80 && ptt_sw1 <2.0) + { + FRONTPANEL_BUTTONHANDLER_BAND_N();//DN + HAL_Delay(200); + } + if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 0.1 && ptt_sw2 < 0.3 && ptt_sw1 > 1.1 && ptt_sw1 <1.3) + { + FRONTPANEL_BUTTONHANDLER_BAND_P();//UP + HAL_Delay(200); + } - if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 2.79 && ptt_sw2 < 2.99 && ptt_sw1 > 1.1 && ptt_sw1 <1.3) + if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 1.0 && ptt_sw2 < 1.3 && ptt_sw1 > 2.80 && ptt_sw1 <3.0) { - FRONTPANEL_BUTTONHANDLER_BW_N(); + FRONTPANEL_BUTTONHANDLER_BW_N();//P1 HAL_Delay(200); } - if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 2.79 && ptt_sw2 < 2.99 && ptt_sw1 > 1.82 && ptt_sw1 <2.02) + if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 1.8 && ptt_sw2 < 2.0 && ptt_sw1 > 2.8 && ptt_sw1 <3.0) { - FRONTPANEL_BUTTONHANDLER_BW_P(); + FRONTPANEL_BUTTONHANDLER_BW_P();//P2 HAL_Delay(200); } - if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 2.8 && ptt_sw2 < 3 && ptt_sw1 > 2.38 && ptt_sw1 <2.58) + if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 2.4 && ptt_sw2 < 2.6 && ptt_sw1 > 2.8 && ptt_sw1 <3.0) { - FRONTPANEL_BUTTONHANDLER_MODE_N(); + FRONTPANEL_BUTTONHANDLER_MODE_N();//P3 HAL_Delay(200); } - if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 2.8 && ptt_sw2 < 3 && ptt_sw1 > 2.84 && ptt_sw1 <3.04) + if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 2.8 && ptt_sw2 < 3.0 && ptt_sw1 > 2.8 && ptt_sw1 <3.0) { - FRONTPANEL_BUTTONHANDLER_MODE_P(); + FRONTPANEL_BUTTONHANDLER_MODE_P();//P4 HAL_Delay(200); } - if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 1.15 && ptt_sw2 < 1.25 && ptt_sw1 > 0 && ptt_sw1 <0.1) + if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 1.1 && ptt_sw2 < 1.3 && ptt_sw1 > 0 && ptt_sw1 <0.1) { - FRONTPANEL_BUTTONHANDLER_PRE(); + FRONTPANEL_BUTTONHANDLER_PRE();//1 HAL_Delay(200); } - if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 1.85 && ptt_sw2 < 1.98 && ptt_sw1 > 0 && ptt_sw1 <0.1) + if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 1.8 && ptt_sw2 < 2.0 && ptt_sw1 > 0 && ptt_sw1 <0.1) { - FRONTPANEL_BUTTONHANDLER_ATT(); + FRONTPANEL_BUTTONHANDLER_ATT();//2 HAL_Delay(200); } if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 1.82 && ptt_sw2 < 2.02 && ptt_sw1 > 0.09 && ptt_sw1 <0.29) @@ -155,6 +171,41 @@ void RF_UNIT_ProcessSensors(void) FRONTPANEL_ENCODER2_checkRotate(); HAL_Delay(200); } + if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 2.4 && ptt_sw2 < 2.6 && ptt_sw1 > 0.0 && ptt_sw1 <0.1) + { + FRONTPANEL_BUTTONHANDLER_AGC();//3 + HAL_Delay(200); + } + if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 1.1 && ptt_sw2 < 1.3 && ptt_sw1 > 1.0 && ptt_sw1 <1.1) + { + FRONTPANEL_BUTTONHANDLER_FAST();//4 + HAL_Delay(200); + } + if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 1.8 && ptt_sw2 < 2.0 && ptt_sw1 > 1.0 && ptt_sw1 <1.1) + { + FRONTPANEL_BUTTONHANDLER_MUTE();//5 + HAL_Delay(200); + } + if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 2.4 && ptt_sw2 < 2.6 && ptt_sw1 > 1.0 && ptt_sw1 <1.1) + { + FRONTPANEL_BUTTONHANDLER_LOCK();//6 + HAL_Delay(200); + } + if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 1.1 && ptt_sw2 < 1.3 && ptt_sw1 > 1.8 && ptt_sw1 <2.0) + { + FRONTPANEL_BUTTONHANDLER_NOTCH();//7 + HAL_Delay(200); + } + if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 1.1 && ptt_sw2 < 1.3 && ptt_sw1 > 2.3 && ptt_sw1 <2.6) + { + FRONTPANEL_BUTTONHANDLER_TUNE();//* + HAL_Delay(200); + } + if(pttsw1_old > 3.2 && pttsw2_old > 3.2 && ptt_sw2 > 2.3 && ptt_sw2 < 2.6 && ptt_sw1 > 2.3 && ptt_sw1 <2.6) + { + FRONTPANEL_BUTTONHANDLER_ZOOM_P();//# + HAL_Delay(200); + } pttsw1_old = ptt_sw1; pttsw2_old = ptt_sw2; } diff --git a/STM32/Core/Src/trx_manager.c b/STM32/Core/Src/trx_manager.c index 9bf904c..8b4ebcc 100644 --- a/STM32/Core/Src/trx_manager.c +++ b/STM32/Core/Src/trx_manager.c @@ -47,6 +47,8 @@ uint32_t TRX_freq_phrase = 0; uint32_t TRX_freq_phrase_tx = 0; float32_t TRX_InVoltage = 12.0f; +float32_t TRX_SW1_Voltage = 0.0f; +float32_t TRX_SW2_Voltage = 0.0f; float32_t TRX_CPU_temperature = 0.0f; float32_t TRX_CPU_VRef = 0.0f; float32_t TRX_CPU_VBat = 0.0f; diff --git a/STM32/Core/Src/trx_manager.h b/STM32/Core/Src/trx_manager.h index baaa6b8..b429532 100644 --- a/STM32/Core/Src/trx_manager.h +++ b/STM32/Core/Src/trx_manager.h @@ -45,6 +45,8 @@ extern uint32_t TRX_freq_phrase; extern uint32_t TRX_freq_phrase_tx; volatile extern uint32_t TRX_Temporary_Mute_StartTime; extern float32_t TRX_InVoltage; +extern float32_t TRX_SW1_Voltage; +extern float32_t TRX_SW2_Voltage; extern float32_t TRX_CPU_temperature; extern float32_t TRX_CPU_VRef; extern float32_t TRX_CPU_VBat; 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 b37f57e..3c02e7c 100644 --- a/STM32/MDK-ARM/WOLF-Lite.uvoptx +++ b/STM32/MDK-ARM/WOLF-Lite.uvoptx @@ -1141,6 +1141,198 @@ + + 62 + 0 + 817 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\lcd.c + + + + + 63 + 0 + 818 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\lcd.c + + + + + 64 + 0 + 819 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\lcd.c + + + + + 65 + 0 + 820 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\lcd.c + + + + + 66 + 0 + 831 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\lcd.c + + + + + 67 + 0 + 832 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\lcd.c + + + + + 68 + 0 + 833 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\lcd.c + + + + + 69 + 0 + 834 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\lcd.c + + + + + 70 + 0 + 212 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\trx_manager.c + + + + + 71 + 0 + 217 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\trx_manager.c + + + + + 72 + 0 + 264 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\trx_manager.c + + + + + 73 + 0 + 269 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ..\Core\Src\trx_manager.c + + + 0 @@ -1216,7 +1408,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 b78e79c..94d41ca 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/MDK-ARM/WOLF-Lite/WOLF-Lite.lnp b/STM32/MDK-ARM/WOLF-Lite/WOLF-Lite.lnp index 8ec9892..f5458b0 100644 --- a/STM32/MDK-ARM/WOLF-Lite/WOLF-Lite.lnp +++ b/STM32/MDK-ARM/WOLF-Lite/WOLF-Lite.lnp @@ -65,33 +65,18 @@ "wolf-lite\usbd_desc.o" "wolf-lite\usbd_ioreq.o" "wolf-lite\basicmathfunctions.o" -"wolf-lite\basicmathfunctionsf16.o" "wolf-lite\bayesfunctions.o" -"wolf-lite\bayesfunctionsf16.o" "wolf-lite\commontables.o" -"wolf-lite\commontablesf16.o" "wolf-lite\complexmathfunctions.o" -"wolf-lite\complexmathfunctionsf16.o" "wolf-lite\controllerfunctions.o" "wolf-lite\distancefunctions.o" -"wolf-lite\distancefunctionsf16.o" "wolf-lite\fastmathfunctions.o" -"wolf-lite\fastmathfunctionsf16.o" "wolf-lite\filteringfunctions.o" -"wolf-lite\filteringfunctionsf16.o" -"wolf-lite\interpolationfunctions.o" -"wolf-lite\interpolationfunctionsf16.o" "wolf-lite\matrixfunctions.o" -"wolf-lite\matrixfunctionsf16.o" -"wolf-lite\quaternionmathfunctions.o" "wolf-lite\svmfunctions.o" -"wolf-lite\svmfunctionsf16.o" "wolf-lite\statisticsfunctions.o" -"wolf-lite\statisticsfunctionsf16.o" "wolf-lite\supportfunctions.o" -"wolf-lite\supportfunctionsf16.o" "wolf-lite\transformfunctions.o" -"wolf-lite\transformfunctionsf16.o" --strict --scatter ".\WOLF-Lite\WOLF-Lite-custom.sct" --summary_stderr --info summarysizes --map --load_addr_map_info --xref --callgraph --symbols --info sizes --info totals --info unused --info veneers