Skip to content

Commit

Permalink
Merge pull request #131 from toofishes/remove-serialcli
Browse files Browse the repository at this point in the history
Remove the SERIALCLI code and references
  • Loading branch information
lincomatic authored Dec 9, 2020
2 parents 22b3980 + e2f8779 commit 00e837d
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 435 deletions.
6 changes: 6 additions & 0 deletions firmware/open_evse/CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
Change Log

202012 toofishes
- various code size optimizations for a smaller binary
- recode energy meter usage calculation for better accuracy using integer math
- remove Time.h and Time.cpp libraries, not needed as we track time in other ways
- remove SERIALCLI, it hasn't been maintained in years and is replaced by RAPI

20201001 SCL
- move MV_FOR_xx from EnergyMeter.h to openevse.h, and outside of KWH_RECORDING
to fix compile error when KWH_RECORDING not defined
Expand Down
17 changes: 0 additions & 17 deletions firmware/open_evse/open_evse.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,6 @@
// enable sending of RAPI commands
//#define RAPI_SENDER

// serial port command line
// For the RTC version, only CLI or LCD can be defined at one time.
// There is a directive to take care of that if you forget.
//#define SERIALCLI

// EVSE must call state transition function for permission to change states
//#define STATE_TRANSITION_REQ_FUNC

Expand Down Expand Up @@ -342,10 +337,6 @@ extern AutoCurrentCapacityController g_ACCController;
#undef BTN_MENU
#endif // RGBLCD || I2CLCD

#if defined(RAPI) && defined(SERIALCLI)
#error INVALID CONFIG - CANNOT DEFINE SERIALCLI AND RAPI TOGETHER SINCE THEY BOTH USE THE SERIAL PORT
#endif

#if defined(OPENEVSE_2) && !defined(ADVPWR)
#error INVALID CONFIG - OPENEVSE_2 implies/requires ADVPWR
#endif
Expand Down Expand Up @@ -413,13 +404,7 @@ extern AutoCurrentCapacityController g_ACCController;

#define LCD_MAX_CHARS_PER_LINE 16


#ifdef SERIALCLI
#define TMP_BUF_SIZE 64
#else
#define TMP_BUF_SIZE ((LCD_MAX_CHARS_PER_LINE+1)*2)
#endif // SERIALCLI



// n.b. DEFAULT_SERVICE_LEVEL is ignored if ADVPWR defined, since it's autodetected
Expand Down Expand Up @@ -814,8 +799,6 @@ typedef union union4b {
#define WDT_ENABLE()
#endif // WATCHDOG

#include "serialcli.h"

// OnboardDisplay.m_bFlags
#define OBDF_MONO_BACKLIGHT 0x01
#define OBDF_AMMETER_DIRTY 0x80
Expand Down
8 changes: 0 additions & 8 deletions firmware/open_evse/open_evse.ino
Original file line number Diff line number Diff line change
Expand Up @@ -2404,9 +2404,6 @@ void ProcessInputs()
#ifdef RAPI
RapiDoCmd();
#endif
#ifdef SERIALCLI
g_CLI.getInput();
#endif // SERIALCLI
#ifdef BTN_MENU
g_BtnHandler.ChkBtn();
#endif
Expand All @@ -2419,11 +2416,6 @@ void ProcessInputs()
void EvseReset()
{
Wire.begin();

#ifdef SERIALCLI
g_CLI.Init();
#endif // SERIALCLI

g_OBD.Init();

#ifdef RAPI
Expand Down
Loading

0 comments on commit 00e837d

Please sign in to comment.