diff --git a/CanHacker.cpp b/CanHacker.cpp index 734764a..5710e2b 100644 --- a/CanHacker.cpp +++ b/CanHacker.cpp @@ -59,7 +59,7 @@ void CanHacker::setClock(CAN_CLOCK clock){ } CanHacker::ERROR CanHacker::connectCan() { - MCP2515::ERROR error = mcp2515->setBitrate(bitrate, canClock); + MCP2515::ERROR error = mcp2515->setBitrate(CAN_33KBPS, MCP_8MHZ); if (error != MCP2515::ERROR_OK) { writeDebugStream(F("setBitrate error:\n")); writeDebugStream((int)error); @@ -163,32 +163,32 @@ CanHacker::ERROR CanHacker::receiveSetBitrateCommand(const char *buffer, const i } switch(buffer[1]) { case '0': - writeDebugStream(F("Set bitrate 10KBPS\n")); - bitrate = CAN_10KBPS; + writeDebugStream(F("Set bitrate 33KBPS\n")); + bitrate = CAN_33KBPS; break; case '1': - writeDebugStream(F("Set bitrate 20KBPS\n")); - bitrate = CAN_20KBPS; + writeDebugStream(F("Set bitrate 33KBPS\n")); + bitrate = CAN_33KBPS; break; case '2': - writeDebugStream(F("Set bitrate 50KBPS\n")); - bitrate = CAN_50KBPS; + writeDebugStream(F("Set bitrate 33KBPS\n")); + bitrate = CAN_33KBPS; break; case '3': - writeDebugStream(F("Set bitrate 100KBPS\n")); - bitrate = CAN_100KBPS; + writeDebugStream(F("Set bitrate 33KBPS\n")); + bitrate = CAN_33KBPS; break; case '4': - writeDebugStream(F("Set bitrate 125KBPS\n")); - bitrate = CAN_125KBPS; + writeDebugStream(F("Set bitrate 33KBPS\n")); + bitrate = CAN_33KBPS; break; case '5': - writeDebugStream(F("Set bitrate 250KBPS\n")); - bitrate = CAN_250KBPS; + writeDebugStream(F("Set bitrate 33KBPS\n")); + bitrate = CAN_33KBPS; break; case '6': - writeDebugStream(F("Set bitrate 500KBPS\n")); - bitrate = CAN_500KBPS; + writeDebugStream(F("Set bitrate 33KBPS\n")); + bitrate = CAN_33KBPS; break; case '7': writeDebugStream(F("Bitrate 7 is not supported\n")); @@ -198,8 +198,8 @@ CanHacker::ERROR CanHacker::receiveSetBitrateCommand(const char *buffer, const i return ERROR_INVALID_COMMAND; break; case '8': - writeDebugStream(F("Set bitrate 1000KBPS\n")); - bitrate = CAN_1000KBPS; + writeDebugStream(F("Set bitrate 33KBPS\n")); + bitrate = CAN_33KBPS; break; default: writeDebugStream(F("Unexpected bitrate\n")); diff --git a/CanHacker.h b/CanHacker.h index 1e79947..3047c5b 100644 --- a/CanHacker.h +++ b/CanHacker.h @@ -65,7 +65,7 @@ class CanHacker { static const char BEL = 7; static const uint16_t TIMESTAMP_LIMIT = 0xEA60; - CAN_CLOCK canClock = MCP_16MHZ; + CAN_CLOCK canClock = MCP_8MHZ; bool _timestampEnabled = false; bool _listenOnly = false; bool _loopback = false; diff --git a/examples/softwareserial_debug/softwareserial_debug/softwareserial_debug.ino b/examples/softwareserial_debug/softwareserial_debug/softwareserial_debug.ino index cb03333..2c7a956 100644 --- a/examples/softwareserial_debug/softwareserial_debug/softwareserial_debug.ino +++ b/examples/softwareserial_debug/softwareserial_debug/softwareserial_debug.ino @@ -31,7 +31,7 @@ void setup() { canHacker = new CanHacker(interfaceStream, debugStream, SPI_CS_PIN); - canHacker->enableLoopback(); // remove to disable loopback test mode + //canHacker->enableLoopback(); // remove to disable loopback test mode lineReader = new CanHackerLineReader(canHacker); pinMode(INT_PIN, INPUT);