Ewaryst/RingClock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working with CDC

Browse Source
This commit is contained in:
StefansE
2026-03-28 19:42:11 +01:00
parent 695b0340ad
commit 21874c4455
38 changed files with 13445 additions and 7520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Core/Inc/myComms.h
View File

@@ -23,6 +23,9 @@ typedef enum {
} commands_e;
void RxCpltCallback();
void setRxFlag(void);
void cmd_UART_Request(void);
void cmd_RunCommand(commands_e cmd, uint32_t * input);

4
Core/Inc/stm32f1xx_hal_conf.h
View File

@@ -53,7 +53,7 @@
/*#define HAL_NOR_MODULE_ENABLED */
/*#define HAL_NAND_MODULE_ENABLED */
/*#define HAL_PCCARD_MODULE_ENABLED */
/*#define HAL_PCD_MODULE_ENABLED */
#define HAL_PCD_MODULE_ENABLED
/*#define HAL_HCD_MODULE_ENABLED */
/*#define HAL_PWR_MODULE_ENABLED */
/*#define HAL_RCC_MODULE_ENABLED */
@@ -65,7 +65,7 @@
/*#define HAL_SPI_MODULE_ENABLED */
/*#define HAL_SRAM_MODULE_ENABLED */
#define HAL_TIM_MODULE_ENABLED
#define HAL_UART_MODULE_ENABLED
/*#define HAL_UART_MODULE_ENABLED */
/*#define HAL_USART_MODULE_ENABLED */
/*#define HAL_WWDG_MODULE_ENABLED */

2
Core/Inc/stm32f1xx_it.h
View File

@@ -56,8 +56,8 @@ void DebugMon_Handler(void);
void PendSV_Handler(void);
void SysTick_Handler(void);
void DMA1_Channel5_IRQHandler(void);
void USB_LP_CAN1_RX0_IRQHandler(void);
void TIM2_IRQHandler(void);
void USART2_IRQHandler(void);
/* USER CODE BEGIN EFP */
/* USER CODE END EFP */

52
Core/Inc/usart.h
View File

@@ -1,52 +0,0 @@
/* USER CODE BEGIN Header */
/**
******************************************************************************
* @file usart.h
* @brief This file contains all the function prototypes for
* the usart.c file
******************************************************************************
* @attention
*
* Copyright (c) 2026 STMicroelectronics.
* All rights reserved.
*
* This software is licensed under terms that can be found in the LICENSE file
* in the root directory of this software component.
* If no LICENSE file comes with this software, it is provided AS-IS.
*
******************************************************************************
*/
/* USER CODE END Header */
/* Define to prevent recursive inclusion -------------------------------------*/
#ifndef __USART_H__
#define __USART_H__
#ifdef __cplusplus
extern "C" {
#endif
/* Includes ------------------------------------------------------------------*/
#include "main.h"
/* USER CODE BEGIN Includes */
/* USER CODE END Includes */
extern UART_HandleTypeDef huart2;
/* USER CODE BEGIN Private defines */
/* USER CODE END Private defines */
void MX_USART2_UART_Init(void);
/* USER CODE BEGIN Prototypes */
/* USER CODE END Prototypes */
#ifdef __cplusplus
}
#endif
#endif /* __USART_H__ */

42
Core/Src/main.c
View File

@@ -21,7 +21,7 @@
#include "dma.h"
#include "i2c.h"
#include "tim.h"
#include "usart.h"
#include "usb_device.h"
#include "gpio.h"
/* Private includes ----------------------------------------------------------*/
@@ -30,6 +30,9 @@
#include "ws2812_effect.h"
#include "ds1307.h"
#include "clock.h"
#include "usbd_cdc_if.h"
/* USER CODE END Includes */
/* Private typedef -----------------------------------------------------------*/
@@ -60,11 +63,28 @@ extern uint8_t UART_RxBuf[6];
void SystemClock_Config(void);
/* USER CODE BEGIN PFP */
void USB_DEVICE_MasterHardReset(void);
/* USER CODE END PFP */
/* Private user code ---------------------------------------------------------*/
/* USER CODE BEGIN 0 */
void USB_DEVICE_MasterHardReset(void){
GPIO_InitTypeDef GPIO_InitStruct;
GPIO_InitStruct.Pin = GPIO_PIN_12;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_PULLDOWN;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
HAL_GPIO_WritePin(GPIOA,GPIO_PIN_12,0);
HAL_Delay(1000);
}
/* USER CODE END 0 */
/**
@@ -99,7 +119,9 @@ int main(void)
MX_DMA_Init();
MX_TIM2_Init();
MX_I2C1_Init();
MX_USART2_UART_Init();
USB_DEVICE_MasterHardReset();
MX_USB_DEVICE_Init();
/* USER CODE BEGIN 2 */
HAL_TIM_Base_Start(&htim2);
@@ -144,7 +166,14 @@ uint8_t UART_Buff[] = "Hello World\n";
// ws_Effect_RoudTheClock();
HAL_UART_Receive_IT(&huart2, UART_RxBuf, sizeof(UART_RxBuf));
//CDC_Transmit_FS(UART_Buff, sizeof(UART_Buff));
RxCpltCallback();
//HAL_UART_Receive_IT(&huart2, UART_RxBuf, sizeof(UART_RxBuf));
HAL_GPIO_TogglePin(LED_Green_GPIO_Port, LED_Green_Pin);
@@ -164,6 +193,7 @@ void SystemClock_Config(void)
{
RCC_OscInitTypeDef RCC_OscInitStruct = {0};
RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
RCC_PeriphCLKInitTypeDef PeriphClkInit = {0};
/** Initializes the RCC Oscillators according to the specified parameters
* in the RCC_OscInitTypeDef structure.
@@ -193,6 +223,12 @@ void SystemClock_Config(void)
{
Error_Handler();
}
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB;
PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_PLL_DIV1_5;
if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
{
Error_Handler();
}
}
/* USER CODE BEGIN 4 */

33
Core/Src/myComms.c
View File

@@ -7,7 +7,8 @@
#include "myComms.h"
#include "usart.h"
#include "usbd_cdc_if.h"
// #include "usart.h"
#include "clock.h"
#include "stdio.h"
@@ -32,6 +33,7 @@ static uint8_t ok[] = "OK\n";
uint8_t myId[] = "Clock\n";
uint8_t UART_RxBuf[6] = {0};
uint8_t RxComplete_fl = 0;
void (*commands[])(uint32_t) = {
cmd_WhoAmI,
@@ -42,9 +44,17 @@ void (*commands[])(uint32_t) = {
cmd_setColour_second
};
void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart){
cmd_UART_Request();
void setRxFlag(void){
RxComplete_fl = 1;
}
void RxCpltCallback(){
if(RxComplete_fl == 1){
RxComplete_fl = 0;
cmd_UART_Request();
}
}
@@ -54,9 +64,6 @@ void cmd_UART_Request(void){
cmd_RunCommand((uint8_t) msg->cmdId, (uint32_t*) &msg->bytes);
// HAL_UART_Transmit(&huart2, (uint8_t*) msg, sizeof(*msg), 1000);
// HAL_UART_Transmit(&huart2, ok, sizeof(ok), 1000);
}
@@ -73,7 +80,7 @@ void cmd_RunCommand(commands_e cmd, uint32_t* input){
void cmd_WhoAmI(uint32_t){
HAL_UART_Transmit(&huart2, myId, sizeof(myId), 1000);
CDC_Transmit_FS(myId, sizeof(myId));
}
@@ -89,7 +96,7 @@ void cmd_SetTime(uint32_t time){
ds1307_set_minutes(m);
ds1307_set_second(s);
HAL_UART_Transmit(&huart2, ok, sizeof(ok), 1000);
CDC_Transmit_FS(ok, sizeof(ok));
}
@@ -111,7 +118,7 @@ void cmd_GetTime(uint32_t time){
msg[5] = 44;
HAL_UART_Transmit(&huart2, msg, sizeof(msg), 1000);
CDC_Transmit_FS(msg, sizeof(msg));
}
void cmd_setColour_hour(uint32_t colour){
@@ -124,7 +131,7 @@ void cmd_setColour_hour(uint32_t colour){
clock_setColourHours(r, g, b);
HAL_UART_Transmit(&huart2, ok, sizeof(ok), 1000);
CDC_Transmit_FS(ok, sizeof(ok));
}
void cmd_setColour_minute(uint32_t colour){
@@ -137,7 +144,7 @@ void cmd_setColour_minute(uint32_t colour){
clock_setColourMinutes(r, g, b);
HAL_UART_Transmit(&huart2, ok, sizeof(ok), 1000);
CDC_Transmit_FS(ok, sizeof(ok));
}
void cmd_setColour_second(uint32_t colour){
@@ -150,7 +157,7 @@ void cmd_setColour_second(uint32_t colour){
clock_setColourSeconds(r, g, b);
HAL_UART_Transmit(&huart2, ok, sizeof(ok), 1000);
CDC_Transmit_FS(ok, sizeof(ok));
}
void cmd_setColour_background(uint32_t colour){
@@ -163,5 +170,5 @@ void cmd_setColour_background(uint32_t colour){
clock_setColourBackground(r, g, b);
HAL_UART_Transmit(&huart2, ok, sizeof(ok), 1000);
CDC_Transmit_FS(ok, sizeof(ok));
}

30
Core/Src/stm32f1xx_it.c
View File

@@ -55,9 +55,9 @@
/* USER CODE END 0 */
/* External variables --------------------------------------------------------*/
extern PCD_HandleTypeDef hpcd_USB_FS;
extern DMA_HandleTypeDef hdma_tim2_ch1;
extern TIM_HandleTypeDef htim2;
extern UART_HandleTypeDef huart2;
/* USER CODE BEGIN EV */
/* USER CODE END EV */
@@ -214,6 +214,20 @@ void DMA1_Channel5_IRQHandler(void)
/* USER CODE END DMA1_Channel5_IRQn 1 */
}
/**
* @brief This function handles USB low priority or CAN RX0 interrupts.
*/
void USB_LP_CAN1_RX0_IRQHandler(void)
{
/* USER CODE BEGIN USB_LP_CAN1_RX0_IRQn 0 */
/* USER CODE END USB_LP_CAN1_RX0_IRQn 0 */
HAL_PCD_IRQHandler(&hpcd_USB_FS);
/* USER CODE BEGIN USB_LP_CAN1_RX0_IRQn 1 */
/* USER CODE END USB_LP_CAN1_RX0_IRQn 1 */
}
/**
* @brief This function handles TIM2 global interrupt.
*/
@@ -228,20 +242,6 @@ void TIM2_IRQHandler(void)
/* USER CODE END TIM2_IRQn 1 */
}
/**
* @brief This function handles USART2 global interrupt.
*/
void USART2_IRQHandler(void)
{
/* USER CODE BEGIN USART2_IRQn 0 */
/* USER CODE END USART2_IRQn 0 */
HAL_UART_IRQHandler(&huart2);
/* USER CODE BEGIN USART2_IRQn 1 */
/* USER CODE END USART2_IRQn 1 */
}
/* USER CODE BEGIN 1 */
/* USER CODE END 1 */

122
Core/Src/usart.c
View File

@@ -1,122 +0,0 @@
/* USER CODE BEGIN Header */
/**
******************************************************************************
* @file usart.c
* @brief This file provides code for the configuration
* of the USART instances.
******************************************************************************
* @attention
*
* Copyright (c) 2026 STMicroelectronics.
* All rights reserved.
*
* This software is licensed under terms that can be found in the LICENSE file
* in the root directory of this software component.
* If no LICENSE file comes with this software, it is provided AS-IS.
*
******************************************************************************
*/
/* USER CODE END Header */
/* Includes ------------------------------------------------------------------*/
#include "usart.h"
/* USER CODE BEGIN 0 */
/* USER CODE END 0 */
UART_HandleTypeDef huart2;
/* USART2 init function */
void MX_USART2_UART_Init(void)
{
/* USER CODE BEGIN USART2_Init 0 */
/* USER CODE END USART2_Init 0 */
/* USER CODE BEGIN USART2_Init 1 */
/* USER CODE END USART2_Init 1 */
huart2.Instance = USART2;
huart2.Init.BaudRate = 115200;
huart2.Init.WordLength = UART_WORDLENGTH_8B;
huart2.Init.StopBits = UART_STOPBITS_1;
huart2.Init.Parity = UART_PARITY_NONE;
huart2.Init.Mode = UART_MODE_TX_RX;
huart2.Init.HwFlowCtl = UART_HWCONTROL_NONE;
huart2.Init.OverSampling = UART_OVERSAMPLING_16;
if (HAL_UART_Init(&huart2) != HAL_OK)
{
Error_Handler();
}
/* USER CODE BEGIN USART2_Init 2 */
/* USER CODE END USART2_Init 2 */
}
void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
{
GPIO_InitTypeDef GPIO_InitStruct = {0};
if(uartHandle->Instance==USART2)
{
/* USER CODE BEGIN USART2_MspInit 0 */
/* USER CODE END USART2_MspInit 0 */
/* USART2 clock enable */
__HAL_RCC_USART2_CLK_ENABLE();
__HAL_RCC_GPIOA_CLK_ENABLE();
/**USART2 GPIO Configuration
PA2 ------> USART2_TX
PA3 ------> USART2_RX
*/
GPIO_InitStruct.Pin = GPIO_PIN_2;
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
GPIO_InitStruct.Pin = GPIO_PIN_3;
GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
GPIO_InitStruct.Pull = GPIO_NOPULL;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
/* USART2 interrupt Init */
HAL_NVIC_SetPriority(USART2_IRQn, 0, 0);
HAL_NVIC_EnableIRQ(USART2_IRQn);
/* USER CODE BEGIN USART2_MspInit 1 */
/* USER CODE END USART2_MspInit 1 */
}
}
void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
{
if(uartHandle->Instance==USART2)
{
/* USER CODE BEGIN USART2_MspDeInit 0 */
/* USER CODE END USART2_MspDeInit 0 */
/* Peripheral clock disable */
__HAL_RCC_USART2_CLK_DISABLE();
/**USART2 GPIO Configuration
PA2 ------> USART2_TX
PA3 ------> USART2_RX
*/
HAL_GPIO_DeInit(GPIOA, GPIO_PIN_2|GPIO_PIN_3);
/* USART2 interrupt Deinit */
HAL_NVIC_DisableIRQ(USART2_IRQn);
/* USER CODE BEGIN USART2_MspDeInit 1 */
/* USER CODE END USART2_MspDeInit 1 */
}
}
/* USER CODE BEGIN 1 */
/* USER CODE END 1 */