Compare commits

...

5 Commits

Author SHA1 Message Date
58b50b2fb3 added ambient light message 2024-05-29 03:48:06 +02:00
4744762b4c CLS_VehicleStatus added unlocked signal 2024-05-28 04:15:52 +02:00
4620d0a7ed added vehicle status message 2024-05-28 03:45:00 +02:00
7080707f9d fix missing 2024-05-23 21:37:44 +02:00
c322165491 fixed overlapping use of config channel 8 2024-05-23 21:33:51 +02:00
3 changed files with 52 additions and 5 deletions

37
CLS.c
View File

@@ -6,7 +6,9 @@
#include "CanDataHandler.h"
osTimerId_t CLS_HeatbeatTimerId = NULL; // Timer ID
osTimerId_t CLS_VehicleTimerId = NULL; // Timer ID
static CLS_HeatbeatData_t cls_heatbeat_data = {0};
static CLS_VehicleStatus_t cls_vehicle = {0};
static uint8_t EventChangeTypeData[2] ={0};
static CLS_Type_t newType = 0;
static CLS_Position_t newPostion = {0};
@@ -28,14 +30,28 @@ void CLS_Heatbeat(void *argument) {
}
}
__weak void CLS_VehicleHeatbeat(void *argument) {
}
void CLS_SendEventChangeTypePostion(CanDataId canid, CLS_Type_t newType, CLS_Position_t newPostion) {
const uint16_t cls_address = GENERATE_CLS_ADDRESS(CLS_CODE_CONFIG,canid,CLS_CHANNEL8);
const uint16_t cls_address = GENERATE_CLS_ADDRESS(CLS_CODE_CONFIG,canid,CLS_CHANNEL7);
EventChangeTypeData[0] = (uint8_t)newType;
EventChangeTypeData[1] = (newPostion.p0 & 0x0F) | ((newPostion.p1 << 4) & 0xF0);
CLS_BSP_TxHeaderType cls_hartbeat_header = CREATE_BSP_CAN_HEADER(cls_address, CLS_BSP_DLC_BYTES_2);
CLS_BSP_CAN_AddMessageToSend(&cls_hartbeat_header, (uint8_t*)&EventChangeTypeData);
}
const CLS_VehicleStatus_t * CLS_GetVehicleStatus(void) {
return &cls_vehicle;
}
void CLS_OnVehicleStatus(CanDataId canid, uint8_t* data, uint8_t len) {
if(len == 8) {
memcpy((uint8_t*)&cls_vehicle, data, 8);
}
}
void CLS_OnEventChangeTypePostion(CanDataId canid, uint8_t* data, uint8_t len) {
if(len >= 2) {
@@ -70,8 +86,25 @@ void CLS_Init(void) {
}
}
uint16_t cls_address = GENERATE_CLS_ADDRESS(CLS_CODE_CONFIG,gCLS_DEVICE_ADDRESS,CLS_CHANNEL8);
if (cls_heatbeat_data.type == cls_device_Type_MASTER) {
timerAttr.name = "CLS_Vehicle_Heatbeat";
CLS_VehicleTimerId = osTimerNew((osTimerFunc_t)CLS_VehicleHeatbeat, osTimerPeriodic, NULL, &timerAttr);
if (CLS_VehicleTimerId != NULL) { // Timer object created
if (osTimerStart(CLS_VehicleTimerId, 100) == osOK) { // Timer started
// Timer started successfully
}
}
}
uint16_t cls_address = GENERATE_CLS_ADDRESS(CLS_CODE_CONFIG,gCLS_DEVICE_ADDRESS,CLS_CHANNEL7);
//setup endpoint for changing the Device Type/Position
CanData_regEventMsg(cls_address, CLS_OnEventChangeTypePostion);
uint16_t cls_vehicle_address = GENERATE_CLS_ADDRESS(CLS_CODE_STATUS,0,CLS_CH_STA_VEHICLE);
CanData_regEventMsg(cls_vehicle_address, CLS_OnVehicleStatus);
}

16
CLS.h
View File

@@ -30,8 +30,22 @@ typedef struct CLS_HeatbeatData
CLS_Position_t position;
} CLS_HeatbeatData_t;
typedef struct CLS_VehicleStatus {
uint8_t k15;
uint8_t headlight;
uint8_t engine;
uint8_t speed;
uint8_t unlocked;
uint8_t reserved[3];
} CLS_VehicleStatus_t;
extern uint8_t gCLS_DEVICE_ADDRESS;
void CLS_Init(void);
void CLS_SendEventChangeTypePostion(uint16_t canid, CLS_Type_t newType, CLS_Position_t newPostion);
void CLS_SendEventChangeTypePostion(uint16_t canid, CLS_Type_t newType, CLS_Position_t newPostion);
const CLS_VehicleStatus_t * CLS_GetVehicleStatus(void);
void CLS_VehicleHeatbeat(void *argument);

View File

@@ -39,8 +39,8 @@ typedef enum {
typedef enum {
CLS_CH_STA_HEATBEAT = 0, // 0b000
CLS_CH_STA_1 = 1, // 0b001
CLS_CH_STA_2 = 2, // 0b010
CLS_CH_STA_VEHICLE = 1, // 0b001
CLS_CH_STA_AMBIENTLIGHT = 2, // 0b010
CLS_CH_STA_3 = 3, // 0b011
CLS_CH_STA_4 = 4, // 0b100
CLS_CH_STA_5 = 5, // 0b101