Merge pull request #139 from Maxwelltoo/master

fix subclass reference error
This commit is contained in:
Jaxon
2023-01-10 10:30:59 +08:00
committed by GitHub
7 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -80,7 +80,7 @@ void sendPid(unsigned char __pid) {
unsigned char tmp[8] = {0x02, 0x01, __pid, 0, 0, 0, 0, 0};
SERIAL_PORT_MONITOR.print("SEND PID: 0x");
SERIAL_PORT_MONITOR.println(__pid, HEX);
CAN.sendMsgBuf(CAN_ID_PID, 0, 8, tmp);
CAN.MCP_CAN::sendMsgBuf(CAN_ID_PID, 0, 8, tmp);
}
void setup() {
+1 -1
View File
@@ -61,7 +61,7 @@ void loop() {
}
}
CAN.sendMsgBuf(0x00, 0, 8, stmp);
CAN.MCP_CAN::sendMsgBuf(0x00, 0, 8, stmp);
delay(100); // send data per 100ms
SERIAL_PORT_MONITOR.println("CAN BUS sendMsgBuf ok!");
}
+1 -1
View File
@@ -54,7 +54,7 @@ void loop() {
}
}
CAN.sendMsgBuf(0x00, 0, CANFD::len2dlc(MAX_DATA_SIZE), stmp);
CAN.MCP_CAN::sendMsgBuf(0x00, 0, CANFD::len2dlc(MAX_DATA_SIZE), stmp);
delay(100); // send data per 100ms
SERIAL_PORT_MONITOR.println("CAN BUS sendMsgBuf ok!");
}
+1 -1
View File
@@ -52,7 +52,7 @@ unsigned char stmp[8] = {ledHIGH, 1, 2, 3, ledLOW, 5, 6, 7};
void loop() {
SERIAL_PORT_MONITOR.println("In loop");
// send data: id = 0x70, standard frame, data len = 8, stmp: data buf
CAN.sendMsgBuf(0x70, 0, 8, stmp);
CAN.MCP_CAN::sendMsgBuf(0x70, 0, 8, stmp);
delay(1000); // send data once per second
}
+1 -1
View File
@@ -26,7 +26,7 @@ mcp2515_can CAN(SPI_CS_PIN); // Set CS pin
void messageCb(const std_msgs::Empty& toggle_msg) {
//digitalWrite(13, HIGH-digitalRead(13)); // blink the led
// send data: id = 0x00, standrad frame, data len = 8, stmp: data buf
CAN.sendMsgBuf(0x70, 0, 8, stmp);
CAN.MCP_CAN::sendMsgBuf(0x70, 0, 8, stmp);
delay(1000); // send data per 100ms
}
+2 -2
View File
@@ -83,7 +83,7 @@ unsigned char stmp[8] = {0, 0, 0, 0, 0, 0, 0, 0};
void loop() {
SERIAL_PORT_MONITOR.println("Sending message");
CAN.sendMsgBuf(0x00, 0, 0, NULL); // Send empty wakeup message
CAN.MCP_CAN::sendMsgBuf(0x00, 0, 0, NULL); // Send empty wakeup message
delay(100); // give the receiving node some time to wake up
@@ -100,7 +100,7 @@ void loop() {
}
}
CAN.sendMsgBuf(0x00, 0, 8, stmp);
CAN.MCP_CAN::sendMsgBuf(0x00, 0, 8, stmp);
// sleep
@@ -51,7 +51,7 @@ unsigned char stmp[8] = {0, 1, 2, 3, 4, 5, 6, 7};
void loop() {
for (int id = 0; id < 10; id++) {
memset(stmp, id, sizeof(stmp)); // set id to send data buff
CAN.sendMsgBuf(id, 0, sizeof(stmp), stmp);
CAN.MCP_CAN::sendMsgBuf(id, 0, sizeof(stmp), stmp);
delay(100);
}
}