Fix send bug

This commit is contained in:
Stefano Calabretti
2022-05-10 17:43:27 +02:00
parent 94589c07d7
commit 97b113fc91
2 changed files with 9 additions and 8 deletions
+1
View File
@@ -1,2 +1,3 @@
!.vscode/settings.json !.vscode/settings.json
.vscode .vscode
.DS_Store
+7 -7
View File
@@ -14,7 +14,7 @@ typedef struct {
} TransmissionParams; } TransmissionParams;
static TransmissionParams buildParams(CanHandle *hcan, MmrCanPacket packet); static TransmissionParams buildParams(CanHandle *hcan, MmrCanPacket *packet);
static HalStatus send(TransmissionParams *tp); static HalStatus send(TransmissionParams *tp);
static HalStatus sendNormal(TransmissionParams *tp); static HalStatus sendNormal(TransmissionParams *tp);
static HalStatus sendMulti(TransmissionParams *tp); static HalStatus sendMulti(TransmissionParams *tp);
@@ -34,7 +34,7 @@ static uint8_t __currentMailbox = 0;
HalStatus MMR_CAN_Send(CanHandle *hcan, MmrCanPacket packet) { HalStatus MMR_CAN_Send(CanHandle *hcan, MmrCanPacket packet) {
TransmissionParams tp = TransmissionParams tp =
buildParams(hcan, packet); buildParams(hcan, &packet);
syncHeaders(&tp); syncHeaders(&tp);
return packet.length <= MMR_CAN_MAX_DATA_LENGTH return packet.length <= MMR_CAN_MAX_DATA_LENGTH
@@ -45,21 +45,21 @@ HalStatus MMR_CAN_Send(CanHandle *hcan, MmrCanPacket packet) {
HalStatus MMR_CAN_SendNoTamper(CanHandle *hcan, MmrCanPacket packet) { HalStatus MMR_CAN_SendNoTamper(CanHandle *hcan, MmrCanPacket packet) {
TransmissionParams tp = TransmissionParams tp =
buildParams(hcan, packet); buildParams(hcan, &packet);
return send(&tp); return send(&tp);
} }
static TransmissionParams buildParams(CanHandle *hcan, MmrCanPacket packet) { static TransmissionParams buildParams(CanHandle *hcan, MmrCanPacket *packet) {
return (TransmissionParams) { return (TransmissionParams) {
.handle = hcan, .handle = hcan,
.packet = &packet, .packet = packet,
.headers.mmr = packet.header, .headers.mmr = packet->header,
.headers.tx = { .headers.tx = {
.IDE = CAN_ID_EXT, .IDE = CAN_ID_EXT,
.RTR = CAN_RTR_DATA, .RTR = CAN_RTR_DATA,
.DLC = packet.length, .DLC = packet->length,
.TransmitGlobalTime = DISABLE, .TransmitGlobalTime = DISABLE,
}, },
}; };