andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix standalone compiling

Browse Source
This commit is contained in:
proddy
2021-01-25 15:57:26 +01:00
parent 3f9995340c
commit e0a35644a8
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/framework/MqttSettingsService.h
View File

@@ -8,10 +8,6 @@
#include <ESPUtils.h>
#include <uuid/common.h>
#include "../../src/system.h"
#include "../../src/mqtt.h"
#include "../../src/dallassensor.h"
#define MQTT_RECONNECTION_DELAY 1000
#define MQTT_SETTINGS_FILE "/config/mqttSettings.json"
@@ -71,6 +67,10 @@ static String generateClientId() {
#define EMSESP_DEFAULT_HA_ENABLED false
#define EMSESP_DEFAULT_PUBLISH_TIME 10
#include "../../src/system.h"
#include "../../src/mqtt.h"
#include "../../src/dallassensor.h"
class MqttSettings {
public:
// host and port - if enabled

17
lib_standalone/ESP8266React.h
View File

@@ -27,13 +27,14 @@ class DummySettings {
bool api_enabled = true;
// MQTT
uint16_t publish_time = 10; // seconds
uint8_t mqtt_qos = 0;
bool mqtt_retain = false;
bool enabled = true;
uint8_t dallas_format = 1;
uint8_t ha_climate_format = 1;
bool ha_enabled = true;
uint16_t publish_time = 10; // seconds
uint8_t mqtt_qos = 0;
bool mqtt_retain = false;
bool enabled = true;
uint8_t dallas_format = 1;
uint8_t ha_climate_format = 1;
bool ha_enabled = true;
std::string base = "ems-esp";
String hostname = "ems-esp";
String jwtSecret = "ems-esp";
@@ -54,6 +55,8 @@ class DummySettings {
uint16_t publish_time_sensor = 10;
uint8_t bool_format = 1; // on off
#define FACTORY_MQTT_MAX_TOPIC_LENGTH 128
static void read(DummySettings & settings, JsonObject & root){};
static void read(DummySettings & settings){};

2
src/mqtt.h
View File

@@ -88,7 +88,7 @@ class Mqtt {
enum Dallas_Format : uint8_t { SENSORID = 1, NUMBER };
enum HA_Climate_Format : uint8_t { CURRENT = 1, SETPOINT, ZERO };
static constexpr uint8_t MQTT_TOPIC_MAX_SIZE = FACTORY_MQTT_MAX_TOPIC_LENGTH; // note this should really match the user setting in mqttSettings.maxTopicLength
static constexpr uint8_t MQTT_TOPIC_MAX_SIZE = 128; // note this should really match the user setting in mqttSettings.maxTopicLength
static void on_connect();