From b09924b9c8c4a319606cdec937c065c2b103ceb7 Mon Sep 17 00:00:00 2001 From: Oliver Walter Date: Sun, 25 Feb 2024 01:21:36 +0100 Subject: [PATCH] renaming of proto messages with packages in mind --- Application/Tasks/CanDataTask.c | 8 +-- Application/Tasks/FirmwareHandler.c | 82 ++++++++++++++--------------- Application/Tasks/LightTask.c | 36 ++++++------- Application/Tasks/UsbDataHandler.c | 46 ++++++++-------- Application/Tasks/UsbDataHandler.h | 20 +++---- proto | 2 +- 6 files changed, 97 insertions(+), 97 deletions(-) diff --git a/Application/Tasks/CanDataTask.c b/Application/Tasks/CanDataTask.c index cd25fe1..aa91836 100644 --- a/Application/Tasks/CanDataTask.c +++ b/Application/Tasks/CanDataTask.c @@ -122,15 +122,15 @@ void HAL_FDCAN_RxFifo1Callback(FDCAN_HandleTypeDef *hfdcan, uint32_t RxFifo1ITs) } -void DataClbk_ResponseDeviceList(void* msg, uint32_t length) { +void DataClbk_cls_device_ResponseList(void* msg, uint32_t length) { // igored } #include "UsbDataHandler.h" -ResponseDeviceList list; +cls_device_ResponseList list; extern uint8_t gCLS_DEVICE_ADDRESS; -void DataClbk_RequestDeviceList(void* msg, uint32_t length) { +void DataClbk_cls_device_RequestList(void* msg, uint32_t length) { // add yourself list.devices[list.devices_count].available = true; @@ -154,6 +154,6 @@ void DataClbk_RequestDeviceList(void* msg, uint32_t length) { } } - USBDataResonse(&list, ResponseDeviceList_fields, UsbPackageType_RESPONSE_DEVICE_LIST); + USBDataResonse(&list, cls_device_ResponseList_fields, cls_usb_PackageType_RESPONSE_DEVICE_LIST); } \ No newline at end of file diff --git a/Application/Tasks/FirmwareHandler.c b/Application/Tasks/FirmwareHandler.c index 4f3faf0..b106fb9 100644 --- a/Application/Tasks/FirmwareHandler.c +++ b/Application/Tasks/FirmwareHandler.c @@ -12,12 +12,12 @@ #include "stdbool.h" // static memory only for decoding messages -static FirmwareStart msg_FirmwareStart; -static FirmwarePackage msg_FirmwarePackage; -static FirmwarePackageAck msg_FirmwarePackageAck; -static FirmwareDone msg_FirmwareDone; -static FirmwareFileCheck msg_FirmwareFileCheck; -static UsbDataPacket pack_FirmwarePackage; +static cls_firmware_Start msg_cls_firmware_Start; +static cls_firmware_Package msg_cls_firmware_Package; +static cls_firmware_PackageAck msg_cls_firmware_PackageAck; +static cls_firmware_Done msg_cls_firmware_Done; +static cls_firmware_FileCheck msg_cls_firmware_FileCheck; +static UsbDataPacket pack_cls_firmware_Package; static FIL FwFile = {0}; @@ -27,7 +27,7 @@ static uint32_t fwStartTime = 0; static uint32_t fwPackageCounter =0; /** - * @brief This function builds and sends a FirmwarePackageAck message over USB. + * @brief This function builds and sends a cls_firmware_PackageAck message over USB. * * @param ack A boolean flag indicating the acknowledgment status. * @param crc A 32-bit cyclic redundancy check (CRC) for the firmware package. @@ -35,31 +35,31 @@ static uint32_t fwPackageCounter =0; * @param device A 32-bit identifier for the device. */ void DataSend_FirmwarePackgeAck(bool ack, uint32_t crc, uint32_t counter, uint32_t device) { - msg_FirmwarePackageAck.ack = ack; - msg_FirmwarePackageAck.counter= counter; - msg_FirmwarePackageAck.crc_pac = crc; - msg_FirmwarePackageAck.device_id =device; + msg_cls_firmware_PackageAck.ack = ack; + msg_cls_firmware_PackageAck.counter= counter; + msg_cls_firmware_PackageAck.crc_pac = crc; + msg_cls_firmware_PackageAck.device_id =device; - UsbDataPacketSendMessage(UsbPackageType_FIRMWAREPACKAGEACK, &pack_FirmwarePackage, FirmwarePackageAck_fields, &msg_FirmwarePackageAck); + UsbDataPacketSendMessage(cls_usb_PackageType_FIRMWAREPACKAGEACK, &pack_cls_firmware_Package, cls_firmware_PackageAck_fields, &msg_cls_firmware_PackageAck); } void DataSend_FirmwareFileCheck(uint32_t crc, uint32_t device_id, bool ready_for_data, UINT size, char* name) { - msg_FirmwareFileCheck.crc_fw = crc; - msg_FirmwareFileCheck.device_id = device_id; - msg_FirmwareFileCheck.ready_for_data = ready_for_data; - msg_FirmwareFileCheck.size = size; - memcpy(msg_FirmwareFileCheck.name, name, sizeof(msg_FirmwareFileCheck.name)); + msg_cls_firmware_FileCheck.crc_fw = crc; + msg_cls_firmware_FileCheck.device_id = device_id; + msg_cls_firmware_FileCheck.ready_for_data = ready_for_data; + msg_cls_firmware_FileCheck.size = size; + memcpy(msg_cls_firmware_FileCheck.name, name, sizeof(msg_cls_firmware_FileCheck.name)); - UsbDataPacketSendMessage(UsbPackageType_FIRMWAREFILECHECK, &pack_FirmwarePackage, FirmwareFileCheck_fields, &msg_FirmwareFileCheck); + UsbDataPacketSendMessage(cls_usb_PackageType_FIRMWAREFILECHECK, &pack_cls_firmware_Package, cls_firmware_FileCheck_fields, &msg_cls_firmware_FileCheck); } #define CHUNK_SIZE 256 // Change this to the size of chunks you want to read static uint8_t crc_buffer[CHUNK_SIZE]; -void DataClbk_FirmwareStart(void *msg, uint32_t length) { - DATA_CLBK_SETUP(FirmwareStart); +void DataClbk_cls_firmware_Start(void *msg, uint32_t length) { + DATA_CLBK_SETUP(cls_firmware_Start); fwStartTime = osKernelGetSysTimerCount(); fwPackageCounter = 0; uint32_t crc = 0; @@ -70,7 +70,7 @@ void DataClbk_FirmwareStart(void *msg, uint32_t length) { f_close(&FwFile); } // Check if file already exists - if(f_open(&FwFile, msg_FirmwareStart.name, FA_READ) == FR_OK) { + if(f_open(&FwFile, msg_cls_firmware_Start.name, FA_READ) == FR_OK) { __HAL_CRC_DR_RESET(&hcrc); do { @@ -80,52 +80,52 @@ void DataClbk_FirmwareStart(void *msg, uint32_t length) { } while(bytesRead == CHUNK_SIZE); f_close(&FwFile); - if(crc == msg_FirmwareStart.crc_fw) { + if(crc == msg_cls_firmware_Start.crc_fw) { // CRC matches, no need for transfer - DataSend_FirmwareFileCheck(crc, msg_FirmwareStart.device_id, false, totalRead, msg_FirmwareStart.name); + DataSend_FirmwareFileCheck(crc, msg_cls_firmware_Start.device_id, false, totalRead, msg_cls_firmware_Start.name); return; } } - fresult_open = f_open(&FwFile, msg_FirmwareStart.name, FA_CREATE_ALWAYS | FA_WRITE); + fresult_open = f_open(&FwFile, msg_cls_firmware_Start.name, FA_CREATE_ALWAYS | FA_WRITE); FileOpen=true; - DataSend_FirmwareFileCheck(crc, msg_FirmwareStart.device_id, fresult_open==FR_OK, totalRead, msg_FirmwareStart.name); + DataSend_FirmwareFileCheck(crc, msg_cls_firmware_Start.device_id, fresult_open==FR_OK, totalRead, msg_cls_firmware_Start.name); } -void DataClbk_FirmwarePackage(void *msg, uint32_t length) { - DATA_CLBK_SETUP(FirmwarePackage); +void DataClbk_cls_firmware_Package(void *msg, uint32_t length) { + DATA_CLBK_SETUP(cls_firmware_Package); // check CRC and Package counter - uint32_t crc_check = HAL_CRC_Calculate(&hcrc,(uint32_t *)msg_FirmwarePackage.data.bytes, msg_FirmwarePackage.data.size); - if(msg_FirmwarePackage.crc_pac != crc_check ) { - DataSend_FirmwarePackgeAck(false, msg_FirmwarePackage.crc_pac, msg_FirmwarePackage.counter, msg_FirmwarePackage.device_id); + uint32_t crc_check = HAL_CRC_Calculate(&hcrc,(uint32_t *)msg_cls_firmware_Package.data.bytes, msg_cls_firmware_Package.data.size); + if(msg_cls_firmware_Package.crc_pac != crc_check ) { + DataSend_FirmwarePackgeAck(false, msg_cls_firmware_Package.crc_pac, msg_cls_firmware_Package.counter, msg_cls_firmware_Package.device_id); return; } - if(msg_FirmwarePackage.counter != fwPackageCounter) { - DataSend_FirmwarePackgeAck(false, msg_FirmwarePackage.crc_pac, msg_FirmwarePackage.counter, msg_FirmwarePackage.device_id); + if(msg_cls_firmware_Package.counter != fwPackageCounter) { + DataSend_FirmwarePackgeAck(false, msg_cls_firmware_Package.crc_pac, msg_cls_firmware_Package.counter, msg_cls_firmware_Package.device_id); return; } if(fresult_open != 0) { - DataSend_FirmwarePackgeAck(false, 0, 0, msg_FirmwarePackage.device_id); + DataSend_FirmwarePackgeAck(false, 0, 0, msg_cls_firmware_Package.device_id); return; } unsigned int bytes_written =0; - f_write(&FwFile,msg_FirmwarePackage.data.bytes, msg_FirmwarePackage.data.size, &bytes_written); + f_write(&FwFile,msg_cls_firmware_Package.data.bytes, msg_cls_firmware_Package.data.size, &bytes_written); fwPackageCounter++; - DataSend_FirmwarePackgeAck(true, msg_FirmwarePackage.crc_pac, msg_FirmwarePackage.counter, msg_FirmwarePackage.device_id); + DataSend_FirmwarePackgeAck(true, msg_cls_firmware_Package.crc_pac, msg_cls_firmware_Package.counter, msg_cls_firmware_Package.device_id); } -void DataClbk_FirmwarePackageAck(void *msg, uint32_t length) { - DATA_CLBK_SETUP(FirmwarePackageAck); +void DataClbk_cls_firmware_PackageAck(void *msg, uint32_t length) { + DATA_CLBK_SETUP(cls_firmware_PackageAck); // Does notthing for the Master } -void DataClbk_FirmwareDone(void *msg, uint32_t length) { - DATA_CLBK_SETUP(FirmwareDone); +void DataClbk_cls_firmware_Done(void *msg, uint32_t length) { + DATA_CLBK_SETUP(cls_firmware_Done); // check CRC and Package counter @@ -134,8 +134,8 @@ void DataClbk_FirmwareDone(void *msg, uint32_t length) { FileOpen=false; FirmwareUpdateArgs args; - args.device = msg_FirmwareDone.device_id; - memcpy(args.name, msg_FirmwareStart.name, sizeof(args.name)); + args.device = msg_cls_firmware_Done.device_id; + memcpy(args.name, msg_cls_firmware_Start.name, sizeof(args.name)); FirmwareUpdateTask_start(args); diff --git a/Application/Tasks/LightTask.c b/Application/Tasks/LightTask.c index 529175e..a88f435 100644 --- a/Application/Tasks/LightTask.c +++ b/Application/Tasks/LightTask.c @@ -23,9 +23,9 @@ const osThreadAttr_t LightTask_attr = { .priority = osPriorityNormal, }; -static LightGlobalBrightness msg_LightGlobalBrightness; -static LightGlobalTheme msg_LightGlobalTheme; -static LightThemeSettings msg_LightThemeSettings; +static cls_light_GlobalBrightness msg_cls_light_GlobalBrightness; +static cls_light_GlobalTheme msg_cls_light_GlobalTheme; +static cls_light_ThemeSettings msg_cls_light_ThemeSettings; static volatile struct LightSettings_s { volatile uint8_t brightness; @@ -66,32 +66,32 @@ void LightTask_func(void *argument) { } } -void DataClbk_LightGlobalBrightness(void* msg, uint32_t length) { - DATA_CLBK_SETUP(LightGlobalBrightness); - lightSettings.brightness = msg_LightGlobalBrightness.brightness; +void DataClbk_cls_light_GlobalBrightness(void* msg, uint32_t length) { + DATA_CLBK_SETUP(cls_light_GlobalBrightness); + lightSettings.brightness = msg_cls_light_GlobalBrightness.brightness; settingChangeTime = osKernelGetTickCount(); } -void DataClbk_LightGlobalTheme(void* msg, uint32_t length) { - DATA_CLBK_SETUP(LightGlobalTheme); - lightSettings.theme = msg_LightGlobalTheme.theme; +void DataClbk_cls_light_GlobalTheme(void* msg, uint32_t length) { + DATA_CLBK_SETUP(cls_light_ThemeSettings); + lightSettings.theme = msg_cls_light_GlobalTheme.theme; settingChangeTime = osKernelGetTickCount(); } -void DataClbk_LightThemeSettings(void* msg, uint32_t length) { - DATA_CLBK_SETUP(LightThemeSettings); - uint8_t device = msg_LightThemeSettings.deviceId & 0x1F; - uint8_t theme = msg_LightGlobalTheme.theme & 0x3; +void DataClbk_cls_light_ThemeSettings(void* msg, uint32_t length) { + DATA_CLBK_SETUP(cls_light_ThemeSettings); + uint8_t device = msg_cls_light_ThemeSettings.deviceId & 0x1F; + uint8_t theme = msg_cls_light_ThemeSettings.theme & 0x3; uint16_t msg_light_setting = GENERATE_CLS_ADDRESS(CLS_CODE_CONFIG, device, theme); CLS_BSP_TxHeaderType can_header = CREATE_BSP_CAN_HEADER(msg_light_setting, CLS_BSP_DLC_BYTES_8); RGB_Theme_t data = {0}; - data.animation = msg_LightThemeSettings.animation; - data.max_brighness = msg_LightThemeSettings.brightness; - data.color.r = (msg_LightThemeSettings.rgb) & 0xFF; - data.color.g = (msg_LightThemeSettings.rgb>>8) & 0xFF; - data.color.b = (msg_LightThemeSettings.rgb>>16) & 0xFF; + data.animation = msg_cls_light_ThemeSettings.animation; + data.max_brighness = msg_cls_light_ThemeSettings.brightness; + data.color.r = (msg_cls_light_ThemeSettings.rgb) & 0xFF; + data.color.g = (msg_cls_light_ThemeSettings.rgb>>8) & 0xFF; + data.color.b = (msg_cls_light_ThemeSettings.rgb>>16) & 0xFF; CLS_BSP_CAN_AddMessageToSend(&can_header, (uint8_t*)&data); } \ No newline at end of file diff --git a/Application/Tasks/UsbDataHandler.c b/Application/Tasks/UsbDataHandler.c index 7ff5c25..83c628a 100644 --- a/Application/Tasks/UsbDataHandler.c +++ b/Application/Tasks/UsbDataHandler.c @@ -49,15 +49,15 @@ typedef union { // static memory only for decoding messages union { - FirmwareStart msg_FirmwareStart; - FirmwarePackage msg_FirmwarePackage; - FirmwarePackageAck msg_FirmwarePackageAck; - FirmwareDone msg_FirmwareDone; - RequestDeviceList msg_RequestDeviceList; - ResponseDeviceList msg_ResponseDeviceList; - LightGlobalBrightness msg_LightGlobalBrightness; - LightGlobalTheme msg_LightGlobalTheme; - LightThemeSettings msg_LightThemeSettings; + cls_firmware_Start msg_cls_firmware_Start; + cls_firmware_Package msg_cls_firmware_Package; + cls_firmware_PackageAck msg_cls_firmware_PackageAck; + cls_firmware_Done msg_cls_firmware_Done; + cls_device_RequestList msg_cls_device_RequestList; + cls_device_ResponseList msg_cls_device_ResponseList; + cls_light_GlobalBrightness msg_cls_light_GlobalBrightness; + cls_light_GlobalTheme msg_cls_light_GlobalTheme; + cls_light_ThemeSettings msg_cls_light_ThemeSettings; } mem_msg_decode; @@ -103,15 +103,15 @@ typedef struct { message_handler_t message_handlers[] = { - MESSAGE_HANDLER(UsbPackageType_FIRMWARESTART, FirmwareStart), - MESSAGE_HANDLER(UsbPackageType_FIRMWAREPACKAGE, FirmwarePackage), - MESSAGE_HANDLER(UsbPackageType_FIRMWAREDONE, FirmwareDone), - MESSAGE_HANDLER(UsbPackageType_FIRMWAREPACKAGEACK, FirmwarePackageAck), - MESSAGE_HANDLER(UsbPackageType_REQUEST_DEVICE_LIST, RequestDeviceList), - MESSAGE_HANDLER(UsbPackageType_RESPONSE_DEVICE_LIST, ResponseDeviceList), - MESSAGE_HANDLER(UsbPackageType_LIGHT_GLOBAL_BRIGHT, LightGlobalBrightness), - MESSAGE_HANDLER(UsbPackageType_LIGHT_GLOBAL_THEME, LightGlobalTheme), - MESSAGE_HANDLER(UsbPackageType_LIGHT_SETTING_THEME, LightThemeSettings), + MESSAGE_HANDLER(cls_usb_PackageType_FIRMWARESTART, cls_firmware_Start), + MESSAGE_HANDLER(cls_usb_PackageType_FIRMWAREPACKAGE, cls_firmware_Package), + MESSAGE_HANDLER(cls_usb_PackageType_FIRMWAREDONE, cls_firmware_Done), + MESSAGE_HANDLER(cls_usb_PackageType_FIRMWAREPACKAGEACK, cls_firmware_PackageAck), + MESSAGE_HANDLER(cls_usb_PackageType_REQUEST_DEVICE_LIST, cls_device_RequestList), + MESSAGE_HANDLER(cls_usb_PackageType_RESPONSE_DEVICE_LIST, cls_device_ResponseList), + MESSAGE_HANDLER(cls_usb_PackageType_LIGHT_GLOBAL_BRIGHT, cls_light_GlobalBrightness), + MESSAGE_HANDLER(cls_usb_PackageType_LIGHT_GLOBAL_THEME, cls_light_GlobalTheme), + MESSAGE_HANDLER(cls_usb_PackageType_LIGHT_SETTING_THEME, cls_light_ThemeSettings), }; @@ -227,11 +227,11 @@ bool UsbDataPacketSendMessage(uint32_t type , UsbDataPacket * buffer ,const pb_m static UsbDataPacket packet; -void USBDataResonse(void * msg, const pb_msgdesc_t* fields, UsbPackageType typeid) { +void USBDataResonse(void * msg, const pb_msgdesc_t* fields, cls_usb_PackageType typeid) { UsbDataPacketSendMessage(typeid, &packet, fields, msg); } -//__attribute__((weak)) void DataClbk_FirmwareStart(void *msg, uint32_t length) {} -//__attribute__((weak)) void DataClbk_FirmwarePackage(void *msg, uint32_t length) {} -//__attribute__((weak)) void DataClbk_FirmwarePackageAck(void *msg, uint32_t length) {} -//__attribute__((weak)) void DataClbk_FirmwareDone(void *msg, uint32_t length) {} \ No newline at end of file +//__attribute__((weak)) void DataClbk_cls_firmware_Start(void *msg, uint32_t length) {} +//__attribute__((weak)) void DataClbk_cls_firmware_Package(void *msg, uint32_t length) {} +//__attribute__((weak)) void DataClbk_cls_firmware_PackageAck(void *msg, uint32_t length) {} +//__attribute__((weak)) void DataClbk_cls_firmware_Done(void *msg, uint32_t length) {} \ No newline at end of file diff --git a/Application/Tasks/UsbDataHandler.h b/Application/Tasks/UsbDataHandler.h index e7a817f..2239bf1 100644 --- a/Application/Tasks/UsbDataHandler.h +++ b/Application/Tasks/UsbDataHandler.h @@ -123,19 +123,19 @@ void UsbDataHandler_Runner(); int UsbDataHandler_RxCallback(uint8_t* Buf, uint32_t Len); -void DataClbk_FirmwareStart(void* msg, uint32_t length); -void DataClbk_FirmwarePackage(void* msg, uint32_t length); -void DataClbk_FirmwarePackageAck(void* msg, uint32_t length); -void DataClbk_FirmwareDone(void* msg, uint32_t length); -void DataClbk_ResponseDeviceList(void* msg, uint32_t length); -void DataClbk_RequestDeviceList(void* msg, uint32_t length); -void DataClbk_LightGlobalBrightness(void* msg, uint32_t length); -void DataClbk_LightGlobalTheme(void* msg, uint32_t length); -void DataClbk_LightThemeSettings(void* msg, uint32_t length); +void DataClbk_cls_firmware_Start(void* msg, uint32_t length); +void DataClbk_cls_firmware_Package(void* msg, uint32_t length); +void DataClbk_cls_firmware_PackageAck(void* msg, uint32_t length); +void DataClbk_cls_firmware_Done(void* msg, uint32_t length); +void DataClbk_cls_device_ResponseList(void* msg, uint32_t length); +void DataClbk_cls_device_RequestList(void* msg, uint32_t length); +void DataClbk_cls_light_GlobalBrightness(void* msg, uint32_t length); +void DataClbk_cls_light_GlobalTheme(void* msg, uint32_t length); +void DataClbk_cls_light_ThemeSettings(void* msg, uint32_t length); #include "usb.pb.h" -void USBDataResonse(void * msg, const pb_msgdesc_t *fields, UsbPackageType typeid); +void USBDataResonse(void * msg, const pb_msgdesc_t *fields, cls_usb_PackageType typeid); #ifdef __cplusplus } diff --git a/proto b/proto index c771175..68005c6 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit c771175e39936f078b803dce8f2ce2370199ed1d +Subproject commit 68005c6b87e65d69a240dcda26ca77159c1b1737