Update mcp2515.cpp

refactored One Shot Mode functionality

Author: arduinoenigma

mcp2515.cpp

@@ -26,7 +26,6 @@ MCP2515::MCP2515(const uint8_t _CS, const uint32_t _SPI_CLOCK, SPIClass * _SPI)
     SPI_CLOCK = _SPI_CLOCK;
     pinMode(SPICS, OUTPUT);
     digitalWrite(SPICS, HIGH);
-    OSMflag = false;
 }
 
 void MCP2515::startSPI() {
@@ -178,9 +177,14 @@ MCP2515::ERROR MCP2515::setNormalMode()
     return setMode(CANCTRL_REQOP_NORMAL);
 }
 
+MCP2515::ERROR MCP2515::setNormalOneShotMode()
+{
+    return setMode(CANCTRL_REQOP_NORMAL | CANCTRL_OSM);
+}
+
 MCP2515::ERROR MCP2515::setMode(const CANCTRL_REQOP_MODE mode)
 {
-    modifyRegister(MCP_CANCTRL, CANCTRL_REQOP | CANCTRL_OSM, OSMflag ? mode | CANCTRL_OSM : mode & ~(CANCTRL_OSM));
+    modifyRegister(MCP_CANCTRL, CANCTRL_REQOP | CANCTRL_OSM, mode);
 
     unsigned long endTime = millis() + 10;
     bool modeMatch = false;
@@ -778,13 +782,3 @@ uint8_t MCP2515::errorCountTX(void)
 {
     return readRegister(MCP_TEC);
 }
-
-// these merely set the OSM flag
-// setMode(...) or the other setXxxxMode() i.e: setNormalMode() must be called afterwards to set the correct mode with OSM
-void MCP2515::enableOSM(void) {
-    OSMflag = true;
-}
-
-void MCP2515::disableOSM(void) {
-    OSMflag = false;
-}