From 557892bbc7fee628bd3545ba9c352d27103cbe99 Mon Sep 17 00:00:00 2001
From: Proddy <paul@derbyshire.nl>
Date: Mon, 27 Feb 2023 16:38:56 +0100
Subject: [PATCH] updates for 3.6.0-dev-0

---
 Makefile                 | 2 +-
 interface/package.json   | 4 ++--
 mock-api/server.js       | 2 +-
 platformio.ini           | 2 +-
 sonar-project.properties | 2 +-
 src/devices/boiler.h     | 8 --------
 src/system.cpp           | 2 +-
 7 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 5d4f38c98..a08d2be7b 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ DEFINES += -DARDUINOJSON_ENABLE_STD_STRING=1 -DARDUINOJSON_ENABLE_PROGMEM=1 -DAR
 DEFINES += -DEMSESP_DEBUG -DEMSESP_STANDALONE -DEMSESP_TEST
 DEFINES += $(ARGS)
 
-DEFAULTS = -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.5.0-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
+DEFAULTS = -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.6.0-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
 
 #----------------------------------------------------------------------
 # Sources & Files
diff --git a/interface/package.json b/interface/package.json
index b3a71dacd..11e04a3ad 100644
--- a/interface/package.json
+++ b/interface/package.json
@@ -8,8 +8,8 @@
   "private": true,
   "scripts": {
     "dev": "vite",
-    "build": "tsc && vite build",
-    "build-hosted": "tsc && vite build --mode hosted",
+    "build": "vite build",
+    "build-hosted": "vite build --mode hosted",
     "preview": "vite preview",
     "preview-standalone": "npm-run-all -p preview typesafe-i18n mock-api",
     "mock-api": "nodemon --watch ../mock-api ../mock-api/server.js",
diff --git a/mock-api/server.js b/mock-api/server.js
index 7356767dc..eb71fc2c1 100644
--- a/mock-api/server.js
+++ b/mock-api/server.js
@@ -1273,7 +1273,7 @@ rest_server.post(EMSESP_BOARDPROFILE_ENDPOINT, (req, res) => {
 // EMS-ESP API specific
 const emsesp_info = {
   System: {
-    version: '3.5.0',
+    version: '3.6.0',
     uptime: '001+06:40:34.018',
     'uptime (seconds)': 110434,
     freemem: 131,
diff --git a/platformio.ini b/platformio.ini
index beed6ecbe..41cb8ff8f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -150,7 +150,7 @@ build_flags =
 	-DARDUINO
   -DARDUINOJSON_ENABLE_STD_STRING=1 -DARDUINOJSON_ENABLE_PROGMEM=1 -DARDUINOJSON_ENABLE_ARDUINO_STRING -DARDUINOJSON_USE_DOUBLE=0 
   -DEMSESP_DEBUG -DEMSESP_STANDALONE -DEMSESP_TEST
-  -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.5.0-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
+  -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.6.0-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
 	-lpthread
   -std=gnu++17 -Og -ggdb
 build_src_flags = 
diff --git a/sonar-project.properties b/sonar-project.properties
index beda1fb0d..701849280 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,7 +1,7 @@
 sonar.organization=emsesp
 sonar.projectKey=emsesp_EMS-ESP32
 sonar.projectName=EMS-ESP32
-sonar.projectVersion=3.5.0
+sonar.projectVersion=3.6.0
 sonar.sources=./src
 sonar.cfamily.build-wrapper-output=build_wrapper_output_directory
 sonar.sourceEncoding=UTF-8
diff --git a/src/devices/boiler.h b/src/devices/boiler.h
index dcb412881..c0f81c07a 100644
--- a/src/devices/boiler.h
+++ b/src/devices/boiler.h
@@ -389,14 +389,6 @@ class Boiler : public EMSdevice {
     bool set_pvCooling(const char * value, const int8_t id);
     bool set_hpCircPumpWw(const char * value, const int8_t id);
 
-    bool        set_auxLimit(const char * value, const int8_t id);
-    inline bool set_auxMaxLimit(const char * value, const int8_t id) {
-        return set_auxLimit(value, 14);
-    }
-    inline bool set_auxLimitStart(const char * value, const int8_t id) {
-        return set_auxLimit(value, 15);
-    }
-
     bool        set_auxLimit(const char * value, const int8_t id);
     inline bool set_auxMaxLimit(const char * value, const int8_t id) {
         return set_auxLimit(value, 14);
diff --git a/src/system.cpp b/src/system.cpp
index 399f99532..232ceeaee 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -1034,7 +1034,7 @@ bool System::check_upgrade(bool factory_settings) {
         missing_version = (settingsVersion.empty() || (settingsVersion.length() < 5));
         if (missing_version) {
             LOG_DEBUG("No version information found (%s)", settingsVersion.c_str());
-            settingsVersion = "3.4.4"; // this was the last stable version
+            settingsVersion = "3.5.0"; // this was the last stable version
         }
     }