running and sending data over usart
This commit is contained in:
@@ -83,9 +83,7 @@ volatile bool usb_ready = false;
|
||||
volatile bool wb1mmc_ready = false;
|
||||
volatile bool print_desc = false;
|
||||
|
||||
volatile bool uart_rx_busy = false;
|
||||
uint8_t uart_rx_data[1];
|
||||
volatile bool queue_send = false;
|
||||
|
||||
void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc) {
|
||||
if (hadc->Instance == ADC1) {
|
||||
@@ -100,7 +98,6 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
|
||||
tim6_reloads += 1;
|
||||
to_recordVbatt = true;
|
||||
to_recordTime = true;
|
||||
queue_send = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -116,6 +113,7 @@ void USB_CDC_RxHandler(uint8_t* Buf, uint32_t Len) {
|
||||
void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart) {
|
||||
if (uart_rx_data[0] == 'R') {
|
||||
HAL_GPIO_TogglePin(GPIOB, LED1_Pin | LED2_Pin | LED3_Pin);
|
||||
wb1mmc_ready = true;
|
||||
}
|
||||
HAL_UART_Receive_DMA(&huart1, uart_rx_data, sizeof(uart_rx_data));
|
||||
}
|
||||
@@ -174,8 +172,8 @@ int main(void)
|
||||
HAL_TIM_Base_Start_IT(&htim6);
|
||||
HAL_UART_Receive_DMA(&huart1, uart_rx_data, sizeof(uart_rx_data));
|
||||
// For some reason initializing the ads131 first breaks the lsm6dsv gyro readings
|
||||
//initialize_lsm6dsv(&hspi1);
|
||||
//initialize_ads131(&hspi1);
|
||||
initialize_lsm6dsv(&hspi1);
|
||||
initialize_ads131(&hspi1);
|
||||
|
||||
while (1)
|
||||
{
|
||||
@@ -217,13 +215,6 @@ int main(void)
|
||||
// CDC_Transmit_FS((uint8_t*) "Not Detected\n\r", 14);
|
||||
// HAL_Delay(10);
|
||||
// }
|
||||
uint8_t uart_tx_data[1] = {'T'};
|
||||
if (queue_send) {
|
||||
HAL_UART_Transmit_DMA(&huart1, (uint8_t*)uart_tx_data, sizeof(uart_tx_data));
|
||||
queue_send = false;
|
||||
}
|
||||
|
||||
continue;
|
||||
|
||||
if (print_desc) {
|
||||
data_description();
|
||||
|
||||
@@ -41,7 +41,7 @@ void MX_USART1_UART_Init(void)
|
||||
|
||||
/* USER CODE END USART1_Init 1 */
|
||||
huart1.Instance = USART1;
|
||||
huart1.Init.BaudRate = 115200;
|
||||
huart1.Init.BaudRate = 460800;
|
||||
huart1.Init.WordLength = UART_WORDLENGTH_8B;
|
||||
huart1.Init.StopBits = UART_STOPBITS_1;
|
||||
huart1.Init.Parity = UART_PARITY_NONE;
|
||||
|
||||
Reference in New Issue
Block a user