V3.11.3 release - rollup of changes from dev branch

lincomatic · Jan 25, 2016 · 7d96ee3 · 7d96ee3
1 parent 964178c
commit 7d96ee3
Show file tree

Hide file tree

Showing 14 changed files with 421 additions and 229 deletions.
diff --git a/Adafruit_MCP9808.cpp b/Adafruit_MCP9808.cpp
diff --git a/Adafruit_MCP9808.h b/Adafruit_MCP9808.h
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,38 @@
 Change Log
 
-SC: 20151011
+SCL 20160125
+-> promoted vD3.11.3 to v3.11.3 stable
+
+vD3.11.3 SCL 20160125
+- replace Adafruit_MCP9808 with new MCP9808 code
+- fix bug handling negative temperatures from MCP9808
+
+vD3.11.2 SCL 20160120
+- fix error displaying negative temperatures... extra - sign leading decimals when negative temperature
+
+vD3.11.1 SCL 20160120
+- fix bug in handling negative temperatures from DS3231
+
+vD3.11.0 SCL 20160112
+- added RAPI_I2C. Serial RAPI now enabled by RAPI_SERIAL.
+  *WARNING* RAPI_I2C not tested yet and probably doesn't work
+  both RAPI_I2C and RAPI_SERIAL may be enabled simultaneously
+- call RapiSendEvseState() if POST error
+- fix bug, wasn't calling RapiSendEvseState() if HardFault()
+- in J1772EvseController::Init() - call RapiSendCommand() with EVSE_STATE_UNKNOWN
+
+SCL 20160111
+- change VOLT_PIN to PILOT_PIN
+
+SCL 20151211
+- change static inline to inline for wiresend/wirerecv() to fix compiler error
+	in Arduino 1.6.6
+
+SCL 20151125
+- added i2caddr.h
+- take Wire.begin() out of RTClib.cpp
+
+SCL: 20151011
 v3.10.4
 - vD3.10.4 promoted to stable
 

diff --git a/I2CIO.cpp b/I2CIO.cpp
@@ -58,7 +58,7 @@ int I2CIO::begin (  uint8_t i2cAddr )
 {
    _i2cAddr = i2cAddr;
 
-   Wire.begin ( );
+//don't need - open_evse.ino does it   Wire.begin ( );
 
    _initialised = Wire.requestFrom ( _i2cAddr, (uint8_t)1 );
 

diff --git a/J1772EvseController.cpp b/J1772EvseController.cpp
@@ -140,7 +140,7 @@ uint32_t MovingAverage(uint32_t samp)
 #endif // AMMETER
 
 J1772EVSEController::J1772EVSEController() :
-  adcPilot(VOLT_PIN)
+  adcPilot(PILOT_PIN)
 #ifdef CURRENT_PIN
   , adcCurrent(CURRENT_PIN)
 #endif
@@ -191,7 +191,9 @@ void J1772EVSEController::Reboot()
 void J1772EVSEController::DisabledTest_P(PGM_P message)
 {
   g_OBD.LcdMsg_P(g_psDisabledTests, message);
+#ifndef NOCHECKS
   delay(SHOW_DISABLED_DELAY);
+#endif
 }
 
 void J1772EVSEController::ShowDisabledTests()
@@ -272,6 +274,7 @@ void J1772EVSEController::HardFault()
 {
   SetHardFault();
   g_OBD.Update(OBD_UPD_HARDFAULT);
+  RapiSendEvseState();
   while (1) {
     ProcessInputs(); // spin forever or until user resets via menu
     // if we're in P12 state, we can recover from the hard fault when EV
@@ -449,7 +452,7 @@ void J1772EVSEController::Disable()
     chargingOff();
     g_OBD.Update(OBD_UPD_FORCE);
 #ifdef RAPI
-    g_ERP.sendEvseState();
+    RapiSendEvseState();
 #endif // RAPI
   }
 }
@@ -472,7 +475,7 @@ void J1772EVSEController::Sleep()
 
     g_OBD.Update(OBD_UPD_FORCE);
 #ifdef RAPI
-    g_ERP.sendEvseState();
+    RapiSendEvseState();
 #endif // RAPI
     // try to prevent arcing of our relay by waiting for EV to open its contacts first
     // use the charge end time variable temporarily to count down
@@ -773,6 +776,11 @@ uint8_t J1772EVSEController::doPost()
 
 void J1772EVSEController::Init()
 {
+  m_EvseState = EVSE_STATE_UNKNOWN;
+  m_PrevEvseState = EVSE_STATE_UNKNOWN;
+
+  RapiSendEvseState(0);
+
   // read settings from EEPROM
   uint16_t rflgs = eeprom_read_word((uint16_t*)EOFS_FLAGS);
 
@@ -879,10 +887,6 @@ void J1772EVSEController::Init()
   m_NoGndStart = 0;
 #endif // ADVPWR
 
-  m_EvseState = EVSE_STATE_UNKNOWN;
-  m_PrevEvseState = EVSE_STATE_UNKNOWN;
-
-
 #ifdef ADVPWR
 
 #ifdef FT_READ_AC_PINS
@@ -911,6 +915,7 @@ void J1772EVSEController::Init()
     if (fault) {
 #ifdef UL_COMPLIANT
       // UL wants EVSE to hard fault until power cycle if POST fails
+      RapiSendEvseState();
       while (1) { // spin forever
 	  ProcessInputs();
       }
@@ -1357,7 +1362,7 @@ if (TempChkEnabled()) {
     }
 
 #ifdef RAPI
-    g_ERP.sendEvseState();
+    RapiSendEvseState();
 #endif // RAPI
 #ifdef SERDBG
     if (SerDbgEnabled()) {

diff --git a/LiquidTWI2.h b/LiquidTWI2.h
@@ -43,8 +43,6 @@
 // (the Panelolu2 encoder bits are subset of these bits)
 #define ALL_BUTTON_BITS (BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT|BUTTON_SELECT)
 
-#define MCP23008_ADDRESS 0x20
-
 // registers
 #define MCP23008_IODIR 0x00
 #define MCP23008_IPOL 0x01
@@ -58,8 +56,6 @@
 #define MCP23008_GPIO 0x09
 #define MCP23008_OLAT 0x0A
 
-#define MCP23017_ADDRESS 0x20
-
 // registers
 #define MCP23017_IODIRA 0x00
 #define MCP23017_IPOLA 0x02
@@ -180,7 +176,6 @@ class LiquidTWI2 : public Print {
 #endif //defined(MCP23017)&&defined(MCP23008)
 	}
 
-
 private:
 	void send(uint8_t, uint8_t);
 #ifdef MCP23017