kopia lustrzana https://github.com/UU5JPP/Wolf-LITE
Fix and update CW
rodzic
9bb3596294
commit
8eab87fd9e
|
@ -286,11 +286,11 @@ void processTxAudio(void)
|
|||
return;
|
||||
|
||||
//sync fpga to audio-codec
|
||||
uint32_t dma_index = CODEC_AUDIO_BUFFER_SIZE * 2 - (uint16_t)__HAL_DMA_GET_COUNTER(hi2s3.hdmatx);
|
||||
/*uint32_t dma_index = CODEC_AUDIO_BUFFER_SIZE * 2 - (uint16_t)__HAL_DMA_GET_COUNTER(hi2s3.hdmatx);
|
||||
if(!WM8731_DMA_state && dma_index > (CODEC_AUDIO_BUFFER_SIZE * 2 - 100))
|
||||
return;
|
||||
if(WM8731_DMA_state && dma_index > (CODEC_AUDIO_BUFFER_SIZE - 100))
|
||||
return;
|
||||
return;*/
|
||||
static bool old_WM8731_DMA_state = false;
|
||||
if(WM8731_DMA_state == old_WM8731_DMA_state)
|
||||
return;
|
||||
|
|
|
@ -1095,11 +1095,11 @@ static void MX_GPIO_Init(void)
|
|||
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
||||
HAL_GPIO_Init(GPIOE, &GPIO_InitStruct);
|
||||
|
||||
/*Configure GPIO pin : ENC_CLK_Pin */
|
||||
GPIO_InitStruct.Pin = ENC_CLK_Pin;
|
||||
/*Configure GPIO pins : ENC_CLK_Pin KEY_IN_DASH_Pin KEY_IN_DOT_Pin */
|
||||
GPIO_InitStruct.Pin = ENC_CLK_Pin|KEY_IN_DASH_Pin|KEY_IN_DOT_Pin;
|
||||
GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING_FALLING;
|
||||
GPIO_InitStruct.Pull = GPIO_PULLUP;
|
||||
HAL_GPIO_Init(ENC_CLK_GPIO_Port, &GPIO_InitStruct);
|
||||
HAL_GPIO_Init(GPIOE, &GPIO_InitStruct);
|
||||
|
||||
/*Configure GPIO pins : ENC2_SW_Pin ENC_DT_Pin ENC2_DT_Pin */
|
||||
GPIO_InitStruct.Pin = ENC2_SW_Pin|ENC_DT_Pin|ENC2_DT_Pin;
|
||||
|
@ -1135,11 +1135,11 @@ static void MX_GPIO_Init(void)
|
|||
GPIO_InitStruct.Pull = GPIO_PULLUP;
|
||||
HAL_GPIO_Init(PTT_IN_GPIO_Port, &GPIO_InitStruct);
|
||||
|
||||
/*Configure GPIO pins : AUDIO_48K_CLOCK_Pin CPU_PW_Pin */
|
||||
GPIO_InitStruct.Pin = AUDIO_48K_CLOCK_Pin|CPU_PW_Pin;
|
||||
/*Configure GPIO pin : AUDIO_48K_CLOCK_Pin */
|
||||
GPIO_InitStruct.Pin = AUDIO_48K_CLOCK_Pin;
|
||||
GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
|
||||
GPIO_InitStruct.Pull = GPIO_PULLUP;
|
||||
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
|
||||
HAL_GPIO_Init(AUDIO_48K_CLOCK_GPIO_Port, &GPIO_InitStruct);
|
||||
|
||||
/*Configure GPIO pins : PB11 PB4 PB5 PB9 */
|
||||
GPIO_InitStruct.Pin = GPIO_PIN_11|GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_9;
|
||||
|
@ -1194,6 +1194,12 @@ static void MX_GPIO_Init(void)
|
|||
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
|
||||
HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
|
||||
|
||||
/*Configure GPIO pin : CPU_PW_Pin */
|
||||
GPIO_InitStruct.Pin = CPU_PW_Pin;
|
||||
GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
|
||||
GPIO_InitStruct.Pull = GPIO_PULLUP;
|
||||
HAL_GPIO_Init(CPU_PW_GPIO_Port, &GPIO_InitStruct);
|
||||
|
||||
/*Configure GPIO pin : LCD_BL_PWM_Pin */
|
||||
GPIO_InitStruct.Pin = LCD_BL_PWM_Pin;
|
||||
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
|
||||
|
@ -1201,12 +1207,6 @@ static void MX_GPIO_Init(void)
|
|||
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
|
||||
HAL_GPIO_Init(LCD_BL_PWM_GPIO_Port, &GPIO_InitStruct);
|
||||
|
||||
/*Configure GPIO pins : KEY_IN_DASH_Pin KEY_IN_DOT_Pin */
|
||||
GPIO_InitStruct.Pin = KEY_IN_DASH_Pin|KEY_IN_DOT_Pin;
|
||||
GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING;
|
||||
GPIO_InitStruct.Pull = GPIO_PULLUP;
|
||||
HAL_GPIO_Init(GPIOE, &GPIO_InitStruct);
|
||||
|
||||
/* EXTI interrupt init*/
|
||||
HAL_NVIC_SetPriority(EXTI0_IRQn, 6, 0);
|
||||
HAL_NVIC_EnableIRQ(EXTI0_IRQn);
|
||||
|
|
|
@ -523,7 +523,7 @@ void TIM6_DAC_IRQHandler(void)
|
|||
CW_Key_Timeout_est -= 10;
|
||||
if (CW_Key_Timeout_est == 0)
|
||||
{
|
||||
LCD_UpdateQuery.StatusInfoGUI = true;
|
||||
LCD_UpdateQuery.StatusInfoGUIRedraw = true;
|
||||
FPGA_NeedSendParams = true;
|
||||
TRX_Restart_Mode();
|
||||
}
|
||||
|
|
|
@ -6112,7 +6112,7 @@ typedef struct
|
|||
* @arg @ref RCC_I2SCLKSOURCE_EXT External clock mapped on the I2S_CKIN pin
|
||||
* used as I2S clock source
|
||||
*/
|
||||
// #define __HAL_RCC_GET_I2S_SOURCE() ((uint32_t)(READ_BIT(RCC->CFGR, RCC_CFGR_I2SSRC)))
|
||||
//#define __HAL_RCC_GET_I2S_SOURCE() ((uint32_t)(READ_BIT(RCC->CFGR, RCC_CFGR_I2SSRC)))
|
||||
#define __HAL_RCC_GET_I2S_SOURCE() ((uint32_t)(READ_BIT(RCC->CFGR, RCC_CFGR_I2SSRC)) >> RCC_CFGR_I2SSRC_Pos)
|
||||
#endif /* STM32F40xxx || STM32F41xxx || STM32F42xxx || STM32F43xxx || STM32F469xx || STM32F479xx */
|
||||
|
||||
|
|
|
@ -339,7 +339,7 @@
|
|||
<MiscControls></MiscControls>
|
||||
<Define>USE_HAL_DRIVER,STM32F407xx,ARM_MATH_MATRIX_CHECK,ARM_MATH_ROUNDING,ARM_MATH_LOOPUNROLL</Define>
|
||||
<Undefine></Undefine>
|
||||
<IncludePath>../Core/Inc; ../Drivers/STM32F4xx_HAL_Driver/Inc; ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy; ../Drivers/CMSIS/Device/ST/STM32F4xx/Include; ../Drivers/CMSIS/Include; ..\Core\USBDevice; ..\Core\Src; ..\Core\Src</IncludePath>
|
||||
<IncludePath>../Core/Inc; ../Drivers/STM32F4xx_HAL_Driver/Inc; ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy; ../Drivers/CMSIS/Device/ST/STM32F4xx/Include; ../Drivers/CMSIS/Include; ..\Core\USBDevice; ..\Core\Src; ..\Core\Src</IncludePath>
|
||||
</VariousControls>
|
||||
</Cads>
|
||||
<Aads>
|
||||
|
|
|
@ -478,8 +478,9 @@ PB6.GPIO_PuPd=GPIO_PULLUP
|
|||
PB6.Locked=true
|
||||
PB6.PinState=GPIO_PIN_SET
|
||||
PB6.Signal=GPIO_Output
|
||||
PB7.GPIOParameters=GPIO_PuPd,GPIO_Label
|
||||
PB7.GPIOParameters=GPIO_PuPd,GPIO_Label,GPIO_ModeDefaultEXTI
|
||||
PB7.GPIO_Label=CPU_PW
|
||||
PB7.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING
|
||||
PB7.GPIO_PuPd=GPIO_PULLUP
|
||||
PB7.Locked=true
|
||||
PB7.Signal=GPXTI7
|
||||
|
@ -619,13 +620,15 @@ PD9.GPIO_PuPd=GPIO_NOPULL
|
|||
PD9.GPIO_Speed_High_Default=GPIO_SPEED_FREQ_LOW
|
||||
PD9.Mode=16b-d1
|
||||
PD9.Signal=FSMC_D14
|
||||
PE0.GPIOParameters=GPIO_PuPd,GPIO_Label
|
||||
PE0.GPIOParameters=GPIO_PuPd,GPIO_Label,GPIO_ModeDefaultEXTI
|
||||
PE0.GPIO_Label=KEY_IN_DASH
|
||||
PE0.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_RISING_FALLING
|
||||
PE0.GPIO_PuPd=GPIO_PULLUP
|
||||
PE0.Locked=true
|
||||
PE0.Signal=GPXTI0
|
||||
PE1.GPIOParameters=GPIO_PuPd,GPIO_Label
|
||||
PE1.GPIOParameters=GPIO_PuPd,GPIO_Label,GPIO_ModeDefaultEXTI
|
||||
PE1.GPIO_Label=KEY_IN_DOT
|
||||
PE1.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_RISING_FALLING
|
||||
PE1.GPIO_PuPd=GPIO_PULLUP
|
||||
PE1.Locked=true
|
||||
PE1.Signal=GPXTI1
|
||||
|
|
Ładowanie…
Reference in New Issue