OSS/CANNode
0
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

last before adding current sensors

Browse Source
This commit is contained in:
wiebel 2019-09-02 15:53:17 +02:00
parent 6a76239f40
commit b26c97e136
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/CANNode.cpp
View File

@ -1,4 +1,4 @@
#include <Arduino.h> // #include <Arduino.h>
// ------------------------------------------------------------- // -------------------------------------------------------------
// CANNode for Teensy 3.1/3.2 // CANNode for Teensy 3.1/3.2
@ -14,8 +14,8 @@
// For Node definition: // For Node definition:
//#include "Node_1_def.h" // Dachstuhl #include "Node_1_def.h" // Dachstuhl
#include "Node_2_def.h" // Werkstatt //#include "Node_2_def.h" // Werkstatt
//#include "Node_3_def.h" // Keller //#include "Node_3_def.h" // Keller
// Metro ticks in ms // Metro ticks in ms
@ -142,7 +142,7 @@ int CAN_send(uint8_t prio, uint8_t dst, uint8_t cmd, uint8_t* data, uint8_t data
txmsg.id = forgeid(prio, dst, cmd, type); txmsg.id = forgeid(prio, dst, cmd, type);
txmsg.len = data_size; txmsg.len = data_size;
for (uint8_t i = 0; i < txmsg.len; i++) { txmsg.buf[i] = data[i]; } for (uint8_t i = 0; i < txmsg.len; i++) { txmsg.buf[i] = data[i]; }
CANbus.write(txmsg); return CANbus.write(txmsg);
// txmsg.buf[0]++; // txmsg.buf[0]++;
// txmsg.len = 0; // txmsg.len = 0;
} }
@ -153,7 +153,7 @@ int CAN_send(uint8_t prio, uint8_t dst, uint8_t cmd, uint8_t data, uint8_t type=
txmsg.id = forgeid(prio, dst, cmd, type); txmsg.id = forgeid(prio, dst, cmd, type);
txmsg.len = 1; txmsg.len = 1;
txmsg.buf[0] = data; txmsg.buf[0] = data;
CANbus.write(txmsg); return CANbus.write(txmsg);
// txmsg.buf[0]++; // txmsg.buf[0]++;
// txmsg.len = 0; // txmsg.len = 0;
} }