2018-12-13 12:19:10 +00:00
|
|
|
/*
|
|
|
|
* This file is part of the "bluetoothheater" distribution
|
|
|
|
* (https://gitlab.com/mrjones.id.au/bluetoothheater)
|
|
|
|
*
|
|
|
|
* Copyright (C) 2018 Ray Jones <ray@mrjones.id.au>
|
|
|
|
*
|
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "BTC_JSON.h"
|
|
|
|
#include "DebugPort.h"
|
2018-12-16 07:34:39 +00:00
|
|
|
#include "../Protocol/helpers.h"
|
2018-12-15 09:34:58 +00:00
|
|
|
#include "NVstorage.h"
|
2018-12-16 07:34:39 +00:00
|
|
|
#include "../RTC/BTCDateTime.h"
|
2018-12-19 08:39:07 +00:00
|
|
|
#include "../RTC/Timers.h"
|
2019-03-05 09:40:00 +00:00
|
|
|
#include "../RTC/TimerManager.h"
|
2018-12-20 04:19:59 +00:00
|
|
|
#include "../Bluetooth/BluetoothAbstract.h"
|
|
|
|
#include "../WiFi/BTCWebServer.h"
|
|
|
|
#include "../cfg/BTCConfig.h"
|
2018-12-13 12:19:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
char defaultJSONstr[64];
|
2018-12-20 04:19:59 +00:00
|
|
|
CModerator JSONmoderator;
|
2019-03-03 08:48:52 +00:00
|
|
|
CTimerModerator TimerModerator;
|
2019-03-05 09:40:00 +00:00
|
|
|
int timerConflict = 0;
|
2018-12-13 12:19:10 +00:00
|
|
|
|
2019-03-05 09:40:00 +00:00
|
|
|
void validateTimer(int ID);
|
2018-12-15 09:34:58 +00:00
|
|
|
|
2018-12-13 12:19:10 +00:00
|
|
|
void interpretJsonCommand(char* pLine)
|
|
|
|
{
|
|
|
|
if(strlen(pLine) == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
DebugPort.print("JSON parse... "); DebugPort.print(pLine);
|
2019-01-14 03:30:41 +00:00
|
|
|
/* for(int i=0; i<strlen(pLine); i++) {
|
|
|
|
char msg[8];
|
|
|
|
sprintf(msg, "%02X ", pLine[i]);
|
|
|
|
DebugPort.print(msg);
|
|
|
|
}*/
|
2018-12-13 12:19:10 +00:00
|
|
|
|
|
|
|
StaticJsonBuffer<512> jsonBuffer; // create a JSON buffer on the heap
|
|
|
|
JsonObject& obj = jsonBuffer.parseObject(pLine);
|
|
|
|
if(!obj.success()) {
|
|
|
|
DebugPort.println(" FAILED");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
DebugPort.println(" OK");
|
|
|
|
|
|
|
|
JsonObject::iterator it;
|
|
|
|
for(it = obj.begin(); it != obj.end(); ++it) {
|
|
|
|
|
2018-12-15 14:09:10 +00:00
|
|
|
if(strcmp("TempDesired", it->key) == 0) {
|
2018-12-20 04:19:59 +00:00
|
|
|
if(!reqTemp(it->value.as<unsigned char>())) { // this request is blocked if OEM controller active
|
|
|
|
JSONmoderator.reset("TempDesired");
|
|
|
|
}
|
2018-12-13 12:19:10 +00:00
|
|
|
}
|
|
|
|
else if(strcmp("RunState", it->key) == 0) {
|
|
|
|
if(it->value.as<unsigned char>()) {
|
|
|
|
requestOn();
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
requestOff();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(strcmp("PumpMin", it->key) == 0) {
|
|
|
|
setPumpMin(it->value.as<float>());
|
|
|
|
}
|
|
|
|
else if(strcmp("PumpMax", it->key) == 0) {
|
|
|
|
setPumpMax(it->value.as<float>());
|
|
|
|
}
|
|
|
|
else if(strcmp("FanMin", it->key) == 0) {
|
|
|
|
setFanMin(it->value.as<short>());
|
|
|
|
}
|
|
|
|
else if(strcmp("FanMax", it->key) == 0) {
|
|
|
|
setFanMax(it->value.as<short>());
|
|
|
|
}
|
2019-04-04 19:39:58 +00:00
|
|
|
else if(strcmp("ThermostatOvertemp", it->key) == 0) {
|
|
|
|
NVstore.setCyclicMode(it->value.as<unsigned char>());
|
|
|
|
}
|
2019-03-15 08:08:05 +00:00
|
|
|
else if(strcmp("ThermostatMethod", it->key) == 0) {
|
|
|
|
NVstore.setThermostatMethodMode(it->value.as<unsigned char>());
|
|
|
|
}
|
|
|
|
else if(strcmp("ThermostatWindow", it->key) == 0) {
|
|
|
|
NVstore.setThermostatMethodWindow(it->value.as<float>());
|
|
|
|
}
|
2018-12-13 12:19:10 +00:00
|
|
|
else if(strcmp("Thermostat", it->key) == 0) {
|
2018-12-20 04:19:59 +00:00
|
|
|
if(!setThermostatMode(it->value.as<unsigned char>())) { // this request is blocked if OEM controller active
|
|
|
|
JSONmoderator.reset("ThermoStat");
|
|
|
|
}
|
2018-12-13 12:19:10 +00:00
|
|
|
}
|
2018-12-15 09:34:58 +00:00
|
|
|
else if(strcmp("NVsave", it->key) == 0) {
|
|
|
|
if(it->value.as<int>() == 8861)
|
|
|
|
saveNV();
|
|
|
|
}
|
|
|
|
else if(strcmp("DateTime", it->key) == 0) {
|
|
|
|
setDateTime(it->value.as<const char*>());
|
|
|
|
}
|
|
|
|
else if(strcmp("Date", it->key) == 0) {
|
|
|
|
setDate(it->value.as<const char*>());
|
|
|
|
}
|
|
|
|
else if(strcmp("Time", it->key) == 0) {
|
|
|
|
setTime(it->value.as<const char*>());
|
|
|
|
}
|
|
|
|
else if(strcmp("PumpPrime", it->key) == 0) {
|
|
|
|
reqPumpPrime(it->value.as<unsigned char>());
|
|
|
|
}
|
|
|
|
else if(strcmp("Refresh", it->key) == 0) {
|
2018-12-19 12:07:51 +00:00
|
|
|
resetJSONmoderator();
|
2019-01-11 05:40:25 +00:00
|
|
|
}
|
|
|
|
else if(strcmp("SystemVoltage", it->key) == 0) {
|
|
|
|
setSystemVoltage(it->value.as<float>());
|
2018-12-15 09:34:58 +00:00
|
|
|
}
|
2019-03-03 08:48:52 +00:00
|
|
|
else if(strcmp("TimerDays", it->key) == 0) {
|
|
|
|
// value encoded as "ID Days,Days"
|
2019-03-14 10:52:59 +00:00
|
|
|
decodeJSONTimerDays(it->value.as<const char*>());
|
2018-12-15 09:34:58 +00:00
|
|
|
}
|
2019-03-03 08:48:52 +00:00
|
|
|
else if(strcmp("TimerStart", it->key) == 0) {
|
|
|
|
// value encoded as "ID HH:MM"
|
2019-03-14 10:52:59 +00:00
|
|
|
decodeJSONTimerTime(0, it->value.as<const char*>());
|
2018-12-15 09:34:58 +00:00
|
|
|
}
|
2019-03-03 08:48:52 +00:00
|
|
|
else if(strcmp("TimerStop", it->key) == 0) {
|
|
|
|
// value encoded as "ID HH:MM"
|
2019-03-14 10:52:59 +00:00
|
|
|
decodeJSONTimerTime(1, it->value.as<const char*>());
|
2018-12-15 09:34:58 +00:00
|
|
|
}
|
2019-03-03 08:48:52 +00:00
|
|
|
else if(strcmp("TimerRepeat", it->key) == 0) {
|
|
|
|
// value encoded as "ID val"
|
2019-03-14 10:52:59 +00:00
|
|
|
decodeJSONTimerNumeric(0, it->value.as<const char*>());
|
2018-12-15 09:34:58 +00:00
|
|
|
}
|
2019-03-03 08:48:52 +00:00
|
|
|
else if(strcmp("TimerTemp", it->key) == 0) {
|
2019-03-14 10:52:59 +00:00
|
|
|
decodeJSONTimerNumeric(1, it->value.as<const char*>());
|
2019-03-05 09:40:00 +00:00
|
|
|
}
|
|
|
|
else if(strcmp("TimerConflict", it->key) == 0) {
|
|
|
|
validateTimer(it->value.as<int>());
|
|
|
|
}
|
|
|
|
else if(strcmp("TimerRefresh", it->key) == 0) {
|
|
|
|
TimerModerator.reset();
|
2018-12-15 09:34:58 +00:00
|
|
|
}
|
2019-01-11 05:40:25 +00:00
|
|
|
else if(strcmp("FanSensor", it->key) == 0) {
|
|
|
|
setFanSensor(it->value.as<unsigned char>());
|
|
|
|
}
|
2018-12-13 12:19:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-05 09:40:00 +00:00
|
|
|
void validateTimer(int ID)
|
|
|
|
{
|
|
|
|
ID--; // supplied as +1
|
|
|
|
if(!(ID >= 0 && ID < 14))
|
|
|
|
return;
|
|
|
|
|
|
|
|
timerConflict = CTimerManager::conflictTest(ID); // check targeted timer against other timers
|
2018-12-13 12:19:10 +00:00
|
|
|
|
2019-03-14 10:52:59 +00:00
|
|
|
TimerModerator.reset(ID); // ensure we update client with our (real) version of the selected timer
|
2019-03-05 09:40:00 +00:00
|
|
|
}
|
2018-12-13 12:19:10 +00:00
|
|
|
|
2019-03-14 10:52:59 +00:00
|
|
|
bool makeJSONString(CModerator& moderator, char* opStr, int len)
|
2018-12-13 12:19:10 +00:00
|
|
|
{
|
2019-01-14 03:30:41 +00:00
|
|
|
StaticJsonBuffer<800> jsonBuffer; // create a JSON buffer on the stack
|
2018-12-15 09:34:58 +00:00
|
|
|
JsonObject& root = jsonBuffer.createObject(); // create object to add JSON commands to
|
|
|
|
|
|
|
|
bool bSend = false; // reset should send flag
|
|
|
|
|
2019-03-14 10:52:59 +00:00
|
|
|
float tidyTemp = getTemperatureSensor();
|
2019-01-11 05:40:25 +00:00
|
|
|
tidyTemp = int(tidyTemp * 10) * 0.1f; // round to 0.1 resolution
|
|
|
|
if(tidyTemp > -80) {
|
|
|
|
bSend |= moderator.addJson("TempCurrent", tidyTemp, root);
|
|
|
|
}
|
2019-03-14 10:52:59 +00:00
|
|
|
bSend |= moderator.addJson("TempDesired", getTemperatureDesired(), root);
|
2018-12-15 09:34:58 +00:00
|
|
|
bSend |= moderator.addJson("TempMin", getHeaterInfo().getTemperature_Min(), root);
|
|
|
|
bSend |= moderator.addJson("TempMax", getHeaterInfo().getTemperature_Max(), root);
|
|
|
|
bSend |= moderator.addJson("TempBody", getHeaterInfo().getTemperature_HeatExchg(), root);
|
2019-04-04 10:48:05 +00:00
|
|
|
// bSend |= moderator.addJson("RunState", getHeaterInfo().getRunState(), root);
|
2019-04-04 19:39:58 +00:00
|
|
|
bSend |= moderator.addJson("RunState", getHeaterInfo().getRunStateEx(), root);
|
2018-12-16 02:45:13 +00:00
|
|
|
bSend |= moderator.addJson("RunString", getHeaterInfo().getRunStateStr(), root); // verbose it up!
|
2018-12-21 01:27:03 +00:00
|
|
|
bSend |= moderator.addJson("ErrorState", getHeaterInfo().getErrState(), root );
|
|
|
|
bSend |= moderator.addJson("ErrorString", getHeaterInfo().getErrStateStrEx(), root); // verbose it up!
|
2019-03-14 10:52:59 +00:00
|
|
|
bSend |= moderator.addJson("Thermostat", getThermostatModeActive(), root );
|
2018-12-15 09:34:58 +00:00
|
|
|
bSend |= moderator.addJson("PumpFixed", getHeaterInfo().getPump_Fixed(), root );
|
|
|
|
bSend |= moderator.addJson("PumpMin", getHeaterInfo().getPump_Min(), root );
|
|
|
|
bSend |= moderator.addJson("PumpMax", getHeaterInfo().getPump_Max(), root );
|
|
|
|
bSend |= moderator.addJson("PumpActual", getHeaterInfo().getPump_Actual(), root );
|
|
|
|
bSend |= moderator.addJson("FanMin", getHeaterInfo().getFan_Min(), root );
|
|
|
|
bSend |= moderator.addJson("FanMax", getHeaterInfo().getFan_Max(), root );
|
|
|
|
bSend |= moderator.addJson("FanRPM", getHeaterInfo().getFan_Actual(), root );
|
|
|
|
bSend |= moderator.addJson("FanVoltage", getHeaterInfo().getFan_Voltage(), root );
|
2019-01-11 05:40:25 +00:00
|
|
|
bSend |= moderator.addJson("FanSensor", getHeaterInfo().getFan_Sensor(), root );
|
|
|
|
bSend |= moderator.addJson("InputVoltage", getHeaterInfo().getBattVoltage(), root );
|
|
|
|
bSend |= moderator.addJson("SystemVoltage", getHeaterInfo().getSystemVoltage(), root );
|
2018-12-15 09:34:58 +00:00
|
|
|
bSend |= moderator.addJson("GlowVoltage", getHeaterInfo().getGlow_Voltage(), root );
|
|
|
|
bSend |= moderator.addJson("GlowCurrent", getHeaterInfo().getGlow_Current(), root );
|
2018-12-20 22:22:29 +00:00
|
|
|
bSend |= moderator.addJson("BluewireStat", getBlueWireStatStr(), root );
|
2019-02-07 10:36:54 +00:00
|
|
|
bSend |= moderator.addJson("TempMode", NVstore.getDegFMode(), root);
|
2018-12-15 09:34:58 +00:00
|
|
|
|
|
|
|
if(bSend) {
|
|
|
|
root.printTo(opStr, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
return bSend;
|
|
|
|
}
|
2018-12-13 12:19:10 +00:00
|
|
|
|
2019-03-15 08:08:05 +00:00
|
|
|
bool makeJSONStringEx(CModerator& moderator, char* opStr, int len)
|
|
|
|
{
|
|
|
|
StaticJsonBuffer<800> jsonBuffer; // create a JSON buffer on the stack
|
|
|
|
JsonObject& root = jsonBuffer.createObject(); // create object to add JSON commands to
|
|
|
|
|
|
|
|
bool bSend = false; // reset should send flag
|
|
|
|
|
|
|
|
bSend |= moderator.addJson("ThermostatMethod", NVstore.getThermostatMethodMode(), root);
|
|
|
|
bSend |= moderator.addJson("ThermostatWindow", NVstore.getThermostatMethodWindow(), root);
|
2019-04-04 19:39:58 +00:00
|
|
|
bSend |= moderator.addJson("ThermostatOvertemp", NVstore.getCyclicMode(), root);
|
2019-03-15 08:08:05 +00:00
|
|
|
|
|
|
|
if(bSend) {
|
|
|
|
root.printTo(opStr, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
return bSend;
|
|
|
|
}
|
|
|
|
|
2019-03-03 08:48:52 +00:00
|
|
|
// the way the JSON timer strings are crafted, we have to iterate over each timer's parameters
|
|
|
|
// individually, the JSON name is always the same for each timer, the payload IDs the specific
|
|
|
|
// timer
|
|
|
|
// Only timer parameters that have changed will be sent, after reset the typical string will be
|
|
|
|
// {"TimerStart":XX:XX,"TimerStop":XX:XX,"TimerDays":XX,"TimerRepeat":X}
|
2019-03-14 10:52:59 +00:00
|
|
|
bool makeJSONTimerString(int channel, char* opStr, int len)
|
2019-03-03 08:48:52 +00:00
|
|
|
{
|
|
|
|
StaticJsonBuffer<800> jsonBuffer; // create a JSON buffer on the stack
|
|
|
|
JsonObject& root = jsonBuffer.createObject(); // create object to add JSON commands to
|
|
|
|
|
|
|
|
bool bSend = false; // reset should send flag
|
|
|
|
|
|
|
|
sTimer timerInfo;
|
|
|
|
NVstore.getTimerInfo(channel, timerInfo);
|
|
|
|
bSend |= TimerModerator.addJson(channel, timerInfo, root );
|
|
|
|
|
|
|
|
if(bSend) {
|
|
|
|
root.printTo(opStr, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
return bSend;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-12-13 12:19:10 +00:00
|
|
|
|
2018-12-20 04:19:59 +00:00
|
|
|
void updateJSONclients(bool report)
|
|
|
|
{
|
2019-03-03 08:48:52 +00:00
|
|
|
// update general parameters
|
2019-03-05 09:40:00 +00:00
|
|
|
char jsonStr[800];
|
2019-03-03 08:48:52 +00:00
|
|
|
{
|
2019-03-14 10:52:59 +00:00
|
|
|
if(makeJSONString(JSONmoderator, jsonStr, sizeof(jsonStr))) {
|
2019-03-03 08:48:52 +00:00
|
|
|
if (report) {
|
|
|
|
DebugPort.print("JSON send: "); DebugPort.println(jsonStr);
|
|
|
|
}
|
|
|
|
getBluetoothClient().send( jsonStr );
|
|
|
|
sendWebServerString( jsonStr );
|
|
|
|
}
|
|
|
|
}
|
2019-03-15 08:08:05 +00:00
|
|
|
// update extended params
|
|
|
|
{
|
|
|
|
if(makeJSONStringEx(JSONmoderator, jsonStr, sizeof(jsonStr))) {
|
|
|
|
if (report) {
|
|
|
|
DebugPort.print("JSON send: "); DebugPort.println(jsonStr);
|
|
|
|
}
|
|
|
|
getBluetoothClient().send( jsonStr );
|
|
|
|
sendWebServerString( jsonStr );
|
|
|
|
}
|
|
|
|
}
|
2019-03-03 08:48:52 +00:00
|
|
|
// update timer parameters
|
2019-03-05 09:40:00 +00:00
|
|
|
bool bNewTimerInfo = false;
|
2019-03-03 08:48:52 +00:00
|
|
|
for(int tmr=0; tmr<14; tmr++)
|
|
|
|
{
|
2019-03-14 10:52:59 +00:00
|
|
|
if(makeJSONTimerString(tmr, jsonStr, sizeof(jsonStr))) {
|
2019-03-03 08:48:52 +00:00
|
|
|
if (report) {
|
|
|
|
DebugPort.print("JSON send: "); DebugPort.println(jsonStr);
|
|
|
|
}
|
|
|
|
getBluetoothClient().send( jsonStr );
|
|
|
|
sendWebServerString( jsonStr );
|
2019-03-05 09:40:00 +00:00
|
|
|
bNewTimerInfo = true;
|
2018-12-20 04:19:59 +00:00
|
|
|
}
|
|
|
|
}
|
2019-03-05 09:40:00 +00:00
|
|
|
// request timer refesh upon clients
|
|
|
|
if(bNewTimerInfo) {
|
|
|
|
StaticJsonBuffer<800> jsonBuffer; // create a JSON buffer on the stack
|
|
|
|
JsonObject& root = jsonBuffer.createObject(); // create object to add JSON commands to
|
|
|
|
|
|
|
|
if(timerConflict) {
|
|
|
|
root.set("TimerConflict", timerConflict);
|
|
|
|
timerConflict = 0;
|
|
|
|
}
|
|
|
|
root.set("TimerRefresh", 1);
|
|
|
|
root.printTo(jsonStr, 800);
|
|
|
|
|
|
|
|
DebugPort.print("JSON send: "); DebugPort.println(jsonStr);
|
|
|
|
getBluetoothClient().send( jsonStr );
|
|
|
|
sendWebServerString( jsonStr );
|
|
|
|
}
|
2018-12-20 04:19:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void resetJSONmoderator()
|
|
|
|
{
|
|
|
|
JSONmoderator.reset();
|
2019-03-05 09:40:00 +00:00
|
|
|
TimerModerator.reset();
|
2018-12-20 04:19:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|