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

renaming of proto messages with packages in mind

Browse Source
This commit is contained in:
Oliver Walter
2024-02-25 01:21:36 +01:00
parent 894abf9058
commit b09924b9c8
6 changed files with 97 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Application/Tasks/LightTask.c
View File

@@ -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);
}