oliver/cls_master
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added passthouth off headlight settings messages

Browse Source
This commit is contained in:
Oliver Walter
2024-05-29 03:28:16 +02:00
parent 8d02489b16
commit 13002071d7
9 changed files with 125 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Application/Tasks/CMakeLists.txt
View File

@@ -12,6 +12,8 @@ target_sources(${PROJECT_NAME}
${CMAKE_CURRENT_LIST_DIR}/FirmwareUpdate.c
${CMAKE_CURRENT_LIST_DIR}/LightTask.c
${CMAKE_CURRENT_LIST_DIR}/LightState.c
${CMAKE_CURRENT_LIST_DIR}/Headlight_can.c
INTERFACE
${CMAKE_CURRENT_LIST_DIR}/UsbDataHandler.h
${CMAKE_CURRENT_LIST_DIR}/CanDataTask.h

84
Application/Tasks/Headlight_can.c Normal file
View File

@@ -0,0 +1,84 @@
#include "UsbDataHandler.h"
#include "headlight.pb.h"
#include "CanDataHandler.h"
#include "stdint.h"
#include "cmsis_os2.h"
#include "CLS.h"
#include "CLS_BSP.h"
#include "CLSAddress.h"
cls_headlight_RequestSettings msg_cls_headlight_RequestSettings;
cls_headlight_Settings msg_cls_headlight_Settings;
cls_headlight_SaveSettings msg_cls_headlight_SaveSettings;
typedef struct Headlight_Control_Setting {
float alpha;
uint16_t on_threshold;
uint16_t off_threshold;
} Headlight_Control_Setting_t;
void DataClbk_cls_headlight_Settings(void* msg, uint32_t length) {
DATA_CLBK_SETUP(cls_headlight_Settings);
uint8_t device = msg_cls_headlight_Settings.deviceId;
uint16_t msg_light_setting = GENERATE_CLS_ADDRESS(CLS_CODE_CONFIG, device, 0);
CLS_BSP_TxHeaderType can_header = CREATE_BSP_CAN_HEADER(msg_light_setting, CLS_BSP_DLC_BYTES_8);
Headlight_Control_Setting_t data = {0};
data.alpha = msg_cls_headlight_Settings.alpha;
data.on_threshold = msg_cls_headlight_Settings.on_threshold;
data.off_threshold = msg_cls_headlight_Settings.off_threshold;
CLS_BSP_CAN_AddMessageToSend(&can_header, (uint8_t*)&data);
}
void DataClbk_cls_headlight_SaveSettings(void* msg, uint32_t length) {
DATA_CLBK_SETUP(cls_headlight_SaveSettings);
uint8_t device = msg_cls_headlight_SaveSettings.deviceId;
uint16_t msg_light_setting = GENERATE_CLS_ADDRESS(CLS_CODE_CONFIG, device, 4);
CLS_BSP_TxHeaderType can_header = CREATE_BSP_CAN_HEADER(msg_light_setting, CLS_BSP_DLC_BYTES_1);
CLS_BSP_CAN_AddMessageToSend(&can_header, (uint8_t*)"X");
}
static Headlight_Control_Setting_t response_theme = {0};
static cls_headlight_Settings headligh_settings = {0};
void CanData_responseHeadlightSetting(CanDataId canid, uint8_t* data, uint8_t len) {
if(len == 8) {
memcpy(&response_theme, data, 8);
headligh_settings.alpha = response_theme.alpha;
headligh_settings.on_threshold = response_theme.on_threshold;
headligh_settings.off_threshold = response_theme.off_threshold;
headligh_settings.deviceId = (canid >> 3) & 0x1F;
USBDataResonse(&headligh_settings,cls_headlight_Settings_fields, cls_usb_PackageType_HEADLIGHT_SETTINGS);
}
CanData_removeEvent(canid);
}
void DataClbk_cls_headlight_RequestSettings(void* msg, uint32_t length) {
DATA_CLBK_SETUP(cls_headlight_RequestSettings);
uint8_t device = msg_cls_headlight_RequestSettings.deviceId;
uint8_t data = 0;
uint16_t msg_light_setting = GENERATE_CLS_ADDRESS(CLS_CODE_CONFIG, device, 7);
CLS_BSP_TxHeaderType can_header = CREATE_BSP_CAN_HEADER(msg_light_setting, CLS_BSP_DLC_BYTES_1);
CanData_regEventMsg(msg_light_setting,CanData_responseHeadlightSetting);
CLS_BSP_CAN_AddMessageToSend(&can_header, (uint8_t*)&data);
}

8
Application/Tasks/UsbDataHandler.c
View File

@@ -3,6 +3,7 @@
#include "FreeRTOS.h"
#include "firmware.pb.h"
#include "light.pb.h"
#include "headlight.pb.h"
#include "usb_device.h"
#include <pb_decode.h>
#include "cls_device.pb.h"
@@ -62,7 +63,9 @@ union {
cls_light_SaveThemeSettings msg_cls_light_SaveThemeSettings;
cls_light_RequestThemeSetting msg_cls_light_RequestThemeSetting;
cls_usb_JumpToBootloader msg_cls_usb_JumpToBootloader;
cls_headlight_Settings msg_cls_headlight_Settings;
cls_headlight_SaveSettings msg_cls_headlight_SaveSettings;
cls_headlight_RequestSettings msg_cls_headlight_RequestSettings;
} mem_msg_decode;
@@ -121,6 +124,9 @@ message_handler_t message_handlers[] = {
MESSAGE_HANDLER(cls_usb_PackageType_LIGHT_SETTING_THEME_SAVE, cls_light_SaveThemeSettings),
MESSAGE_HANDLER(cls_usb_PackageType_LIGHT_REQUEST_THEME, cls_light_RequestThemeSetting),
MESSAGE_HANDLER(cls_usb_PackageType_JUMP_TO_BOOTLOADER, cls_usb_JumpToBootloader),
MESSAGE_HANDLER(cls_usb_PackageType_HEADLIGHT_SETTINGS, cls_headlight_Settings),
MESSAGE_HANDLER(cls_usb_PackageType_HEADLIGHT_SAVE_SETTINGS, cls_headlight_SaveSettings),
MESSAGE_HANDLER(cls_usb_PackageType_HEADLIGHT_REQUEST_SETTINGS, cls_headlight_RequestSettings),
};

3
Application/Tasks/UsbDataHandler.h
View File

@@ -136,6 +136,9 @@ void DataClbk_cls_light_GlobalTheme(void* msg, uint32_t length);
void DataClbk_cls_light_ThemeSettings(void* msg, uint32_t length);
void DataClbk_cls_light_SaveThemeSettings(void* msg, uint32_t length);
void DataClbk_cls_light_RequestThemeSetting(void* msg, uint32_t length);
void DataClbk_cls_headlight_Settings(void* msg, uint32_t length);
void DataClbk_cls_headlight_SaveSettings(void* msg, uint32_t length);
void DataClbk_cls_headlight_RequestSettings(void* msg, uint32_t length);
#include "usb.pb.h"
void USBDataResonse(void * msg, const pb_msgdesc_t *fields, cls_usb_PackageType typeid);