增加了遥控器按键功能并修改所有函数和类型定义为标准格式

This commit is contained in:
NeoZng
2022-12-05 21:01:26 +08:00
parent 3947c48230
commit 9c9ea14bde
40 changed files with 352 additions and 251 deletions

View File

@@ -10,7 +10,7 @@
#include "stdlib.h"
static SuperCapInstance *super_cap_instance = NULL;
static void SuperCapRxCallback(can_instance *_instance)
static void SuperCapRxCallback(CANInstance *_instance)
{
static uint8_t *rxbuff;
static SuperCap_Msg_s *Msg;
@@ -25,9 +25,6 @@ SuperCapInstance *SuperCapInit(SuperCap_Init_Config_s *supercap_config)
{
super_cap_instance = (SuperCapInstance *)malloc(sizeof(SuperCapInstance));
memset(super_cap_instance, 0, sizeof(SuperCapInstance));
super_cap_instance->recv_data_len = supercap_config->recv_data_len;
super_cap_instance->send_data_len = supercap_config->send_data_len;
supercap_config->can_config.can_module_callback = SuperCapRxCallback;
super_cap_instance->can_ins = CANRegister(&supercap_config->can_config);
return super_cap_instance;
@@ -35,9 +32,7 @@ SuperCapInstance *SuperCapInit(SuperCap_Init_Config_s *supercap_config)
void SuperCapSend(SuperCapInstance *instance, uint8_t *data)
{
CANSetDLC(instance->can_ins, 8);
memcpy(instance->can_ins->tx_buff, data, instance->send_data_len);
memcpy(instance->can_ins->tx_buff, data, 8);
CANTransmit(instance->can_ins);
}

View File

@@ -1,50 +1,39 @@
/*
* @Descripttion:
* @version:
* @Descripttion:
* @version:
* @Author: Chenfu
* @Date: 2022-12-02 21:32:47
* @LastEditTime: 2022-12-05 15:25:46
*/
#ifndef SUPER_CAP_H
#define SUPER_CAP_H
#define SUPER_CAP_H
#include "bsp_can.h"
typedef struct
typedef struct
{
uint16_t vol;
uint16_t current;
uint16_t power;
}SuperCap_Msg_s;
} SuperCap_Msg_s;
#pragma pack(1)
typedef struct
{
can_instance* can_ins;
/* 发送部分 */
uint8_t send_data_len;
uint8_t raw_sendbuf;
/* 接收部分 */
uint8_t recv_data_len;
uint8_t raw_recvbuff;
CANInstance *can_ins;
SuperCap_Msg_s cap_msg;
} SuperCapInstance;
#pragma pack()
typedef struct
{
can_instance_config_s can_config;
CAN_Init_Config_s can_config;
uint8_t send_data_len;
uint8_t recv_data_len;
} SuperCap_Init_Config_s;
SuperCapInstance *SuperCapInit(SuperCap_Init_Config_s* supercap_config);
SuperCapInstance *SuperCapInit(SuperCap_Init_Config_s *supercap_config);
void SuperCapSend(SuperCapInstance *instance, uint8_t *data);
#endif // !SUPER_CAP_Hd