HydroBot/hydrobot-sharedlibs Changeset - eaddb578c329

Changeset - eaddb578c329

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

matthewreed - 7 years ago 2017-05-23 21:58:52

Fixed bugs in protocol receive and changed can receive led

2 files changed with 2 insertions and 2 deletions:

src/can.c

src/protocol.c

0 comments (0 inline, 0 general)

src/can.c

➞

Show inline comments

@@ @@ -125,9 +125,9 @@ void HAL_CAN_RxCpltCallback(CAN_HandleTy @@
     if ((hcan->pRxMsg->StdId == can_rx_id) | (hcan->pRxMsg->StdId == can_broadcast_id))
+    {
         protocol_receive_message(hcan->pRxMsg);
         led_start_time(LED_CAN, 500);
         HAL_CAN_Receive_IT(&can_handle, CAN_FIFO0);
+    }
     led_start_time(LED_CAN, 500);
+}
 void HAL_CAN_TxCpltCallback(CAN_HandleTypeDef* hcan) {}

src/protocol.c

➞

Show inline comments

@@ @@ -25,7 +25,7 @@ bool protocol_receive_message(CanRxMsgTy @@
     protocol_message_t message;
     message.command = can_message->Data[0] & 0x80;
     message.id = can_message->Data[0] & 0x7F;
-    message.key = (can_message->Data[1] << 8) & can_message->Data[2];
+    message.key = (can_message->Data[1] << 8) | can_message->Data[2];
     message.sensor = can_message->Data[3];
     message.data.byte_data[0] = can_message->Data[4];
     message.data.byte_data[1] = can_message->Data[5];

0 comments (0 inline, 0 general)