updates
This commit is contained in:
@@ -95,6 +95,7 @@ float vout_adj = 0;
|
||||
uint32_t vout_adj_uint = 0x00000000;
|
||||
uint8_t buffer_count = 0x00;
|
||||
uint32_t v_scale = 0x00000000;
|
||||
uint8_t solid_state_flag = 0x00;
|
||||
|
||||
/* Stored in RAM */
|
||||
const uint16_t dataBuffer[25] =
|
||||
@@ -140,6 +141,7 @@ static void MX_ADC1_Init(void);
|
||||
static void MX_TIM16_Init(void);
|
||||
/* USER CODE BEGIN PFP */
|
||||
void power_switch (uint8_t state);
|
||||
void power_switch_solid_state (uint8_t state);
|
||||
void adc_task(void);
|
||||
float get_actual_vdda(ADC_HandleTypeDef *hadc);
|
||||
void voltage_conversion_task(void);
|
||||
@@ -282,7 +284,10 @@ int main(void)
|
||||
|
||||
else
|
||||
{
|
||||
__HAL_TIM_SET_COMPARE(&htim16, TIM_CHANNEL_1, 0);
|
||||
if (solid_state_flag == 0x00)
|
||||
{
|
||||
__HAL_TIM_SET_COMPARE(&htim16, TIM_CHANNEL_1, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -824,6 +829,22 @@ void power_switch (uint8_t state)
|
||||
}
|
||||
}
|
||||
|
||||
/* Power switch solid state function */
|
||||
void power_switch_solid_state (uint8_t state)
|
||||
{
|
||||
if (state == 1)
|
||||
{
|
||||
HAL_GPIO_WritePin(LD2_GPIO_Port, LD2_Pin, GPIO_PIN_SET);
|
||||
__HAL_TIM_SET_COMPARE(&htim16, TIM_CHANNEL_1, 63999);
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
HAL_GPIO_WritePin(LD2_GPIO_Port, LD2_Pin, GPIO_PIN_RESET);
|
||||
__HAL_TIM_SET_COMPARE(&htim16, TIM_CHANNEL_1, 0);
|
||||
}
|
||||
}
|
||||
|
||||
/* UART Tx callback */
|
||||
void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)
|
||||
{
|
||||
@@ -938,11 +959,19 @@ void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
|
||||
{
|
||||
/* 'S' - Set power output state */
|
||||
case 0x53:
|
||||
solid_state_flag = 0x00;
|
||||
power_state_value = rx_buffer[1];
|
||||
v_target = ((uint32_t)rx_buffer[2] << 24) | ((uint32_t)rx_buffer[3] << 16) | ((uint32_t)rx_buffer[4] << 8) | ((uint32_t)rx_buffer[5]);
|
||||
power_switch(power_state_value);
|
||||
break;
|
||||
|
||||
/* 's' - Set power output solid state */
|
||||
case 0x73:
|
||||
solid_state_flag = 0xff;
|
||||
power_state_value = rx_buffer[1];
|
||||
power_switch_solid_state(power_state_value);
|
||||
break;
|
||||
|
||||
/* 'V' - Get voltages (both input and output) */
|
||||
case 0x56:
|
||||
adc_task_flag = 0xff;
|
||||
|
||||
@@ -1,18 +1,19 @@
|
||||
../Core/Src/main.c:162:5:main 5
|
||||
../Core/Src/main.c:301:6:SystemClock_Config 3
|
||||
../Core/Src/main.c:348:13:MX_ADC1_Init 4
|
||||
../Core/Src/main.c:416:13:MX_ADC2_Init 3
|
||||
../Core/Src/main.c:475:13:MX_TIM2_Init 4
|
||||
../Core/Src/main.c:520:13:MX_TIM16_Init 5
|
||||
../Core/Src/main.c:583:13:MX_USART2_UART_Init 5
|
||||
../Core/Src/main.c:631:13:MX_GPIO_Init 1
|
||||
../Core/Src/main.c:658:6:ADC_Filter_Init 1
|
||||
../Core/Src/main.c:665:10:ADC_Filter_Update 2
|
||||
../Core/Src/main.c:688:9:update_pwm 5
|
||||
../Core/Src/main.c:730:7:get_actual_vdda 3
|
||||
../Core/Src/main.c:756:6:serial_number_task 3
|
||||
../Core/Src/main.c:794:6:adc_task 1
|
||||
../Core/Src/main.c:803:6:power_switch 2
|
||||
../Core/Src/main.c:828:6:HAL_UART_TxCpltCallback 1
|
||||
../Core/Src/main.c:834:6:HAL_UART_RxCpltCallback 18
|
||||
../Core/Src/main.c:986:6:Error_Handler 1
|
||||
../Core/Src/main.c:164:5:main 6
|
||||
../Core/Src/main.c:306:6:SystemClock_Config 3
|
||||
../Core/Src/main.c:353:13:MX_ADC1_Init 4
|
||||
../Core/Src/main.c:421:13:MX_ADC2_Init 3
|
||||
../Core/Src/main.c:480:13:MX_TIM2_Init 4
|
||||
../Core/Src/main.c:525:13:MX_TIM16_Init 5
|
||||
../Core/Src/main.c:588:13:MX_USART2_UART_Init 5
|
||||
../Core/Src/main.c:636:13:MX_GPIO_Init 1
|
||||
../Core/Src/main.c:663:6:ADC_Filter_Init 1
|
||||
../Core/Src/main.c:670:10:ADC_Filter_Update 2
|
||||
../Core/Src/main.c:693:9:update_pwm 5
|
||||
../Core/Src/main.c:735:7:get_actual_vdda 3
|
||||
../Core/Src/main.c:761:6:serial_number_task 3
|
||||
../Core/Src/main.c:799:6:adc_task 1
|
||||
../Core/Src/main.c:808:6:power_switch 2
|
||||
../Core/Src/main.c:833:6:power_switch_solid_state 2
|
||||
../Core/Src/main.c:849:6:HAL_UART_TxCpltCallback 1
|
||||
../Core/Src/main.c:855:6:HAL_UART_RxCpltCallback 20
|
||||
../Core/Src/main.c:1015:6:Error_Handler 1
|
||||
|
||||
Binary file not shown.
@@ -1,18 +1,19 @@
|
||||
../Core/Src/main.c:162:5:main 8 static
|
||||
../Core/Src/main.c:301:6:SystemClock_Config 88 static
|
||||
../Core/Src/main.c:348:13:MX_ADC1_Init 56 static
|
||||
../Core/Src/main.c:416:13:MX_ADC2_Init 40 static
|
||||
../Core/Src/main.c:475:13:MX_TIM2_Init 40 static
|
||||
../Core/Src/main.c:520:13:MX_TIM16_Init 88 static
|
||||
../Core/Src/main.c:583:13:MX_USART2_UART_Init 8 static
|
||||
../Core/Src/main.c:631:13:MX_GPIO_Init 40 static
|
||||
../Core/Src/main.c:658:6:ADC_Filter_Init 16 static
|
||||
../Core/Src/main.c:665:10:ADC_Filter_Update 16 static
|
||||
../Core/Src/main.c:688:9:update_pwm 24 static
|
||||
../Core/Src/main.c:730:7:get_actual_vdda 24 static
|
||||
../Core/Src/main.c:756:6:serial_number_task 8 static
|
||||
../Core/Src/main.c:794:6:adc_task 8 static
|
||||
../Core/Src/main.c:803:6:power_switch 16 static
|
||||
../Core/Src/main.c:828:6:HAL_UART_TxCpltCallback 16 static
|
||||
../Core/Src/main.c:834:6:HAL_UART_RxCpltCallback 16 static
|
||||
../Core/Src/main.c:986:6:Error_Handler 4 static,ignoring_inline_asm
|
||||
../Core/Src/main.c:164:5:main 8 static
|
||||
../Core/Src/main.c:306:6:SystemClock_Config 88 static
|
||||
../Core/Src/main.c:353:13:MX_ADC1_Init 56 static
|
||||
../Core/Src/main.c:421:13:MX_ADC2_Init 40 static
|
||||
../Core/Src/main.c:480:13:MX_TIM2_Init 40 static
|
||||
../Core/Src/main.c:525:13:MX_TIM16_Init 88 static
|
||||
../Core/Src/main.c:588:13:MX_USART2_UART_Init 8 static
|
||||
../Core/Src/main.c:636:13:MX_GPIO_Init 40 static
|
||||
../Core/Src/main.c:663:6:ADC_Filter_Init 16 static
|
||||
../Core/Src/main.c:670:10:ADC_Filter_Update 16 static
|
||||
../Core/Src/main.c:693:9:update_pwm 24 static
|
||||
../Core/Src/main.c:735:7:get_actual_vdda 24 static
|
||||
../Core/Src/main.c:761:6:serial_number_task 8 static
|
||||
../Core/Src/main.c:799:6:adc_task 8 static
|
||||
../Core/Src/main.c:808:6:power_switch 16 static
|
||||
../Core/Src/main.c:833:6:power_switch_solid_state 16 static
|
||||
../Core/Src/main.c:849:6:HAL_UART_TxCpltCallback 16 static
|
||||
../Core/Src/main.c:855:6:HAL_UART_RxCpltCallback 16 static
|
||||
../Core/Src/main.c:1015:6:Error_Handler 4 static,ignoring_inline_asm
|
||||
|
||||
Binary file not shown.
26604
Debug/POWER_SWITCH.list
26604
Debug/POWER_SWITCH.list
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user