aaribaud/ESPSomfy-RTS
0
0
Fork 0
mirror of https://github.com/rstrouse/ESPSomfy-RTS.git synced 2025-12-13 11:02:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix saving MQTT port settings #12

Browse source
This commit is contained in:
Robert Strouse 2023-04-01 13:33:28 -07:00
parent d239ce857a
commit 209a2d7960
7 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ConfigSettings.cpp
View file

@ -141,6 +141,7 @@ bool MQTTSettings::fromJSON(JsonObject &obj) {
this->parseValueString(obj, "username", this->username, sizeof(this->username)); this->parseValueString(obj, "username", this->username, sizeof(this->username));
this->parseValueString(obj, "password", this->password, sizeof(this->password)); this->parseValueString(obj, "password", this->password, sizeof(this->password));
this->parseValueString(obj, "rootTopic", this->rootTopic, sizeof(this->rootTopic)); this->parseValueString(obj, "rootTopic", this->rootTopic, sizeof(this->rootTopic));
if(obj.containsKey("port")) this->port = obj["port"];
return true; return true;
} }
bool MQTTSettings::save() { bool MQTTSettings::save() {

2
ConfigSettings.h
View file

@ -3,7 +3,7 @@
#ifndef configsettings_h #ifndef configsettings_h
#define configsettings_h #define configsettings_h
#define FW_VERSION "v1.4.4" #define FW_VERSION "v1.4.5"
enum DeviceStatus { enum DeviceStatus {
DS_OK = 0, DS_OK = 0,
DS_ERROR = 1, DS_ERROR = 1,

1
Somfy.cpp
View file

@ -1603,7 +1603,6 @@ static const uint32_t tempo_inter_frame_gap = 30415;
static int16_t bitMin = SYMBOL * TOLERANCE_MIN; static int16_t bitMin = SYMBOL * TOLERANCE_MIN;
static uint16_t timing_index = 0; static uint16_t timing_index = 0;
//static uint32_t timings[MAX_TIMINGS];
static somfy_rx_t somfy_rx; static somfy_rx_t somfy_rx;
static somfy_rx_queue_t rx_queue; static somfy_rx_queue_t rx_queue;

BIN
SomfyController.ino.esp32.bin
View file

Binary file not shown.

BIN
SomfyController.littlefs.bin
View file

Binary file not shown.

6
data/index.html
View file

@ -3,10 +3,10 @@
<head> <head>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" href="main.css?v=1.4.4" type="text/css" /> <link rel="stylesheet" href="main.css?v=1.4.5" type="text/css" />
<link rel="stylesheet" href="icons.css?v=1.4.4" type="text/css" /> <link rel="stylesheet" href="icons.css?v=1.4.5" type="text/css" />
<link rel="icon" type="image/png" href="favicon.png" /> <link rel="icon" type="image/png" href="favicon.png" />
<script type="text/javascript" src="index.js?v=1.4.4"></script> <script type="text/javascript" src="index.js?v=1.4.5"></script>
</head> </head>
<body> <body>
<div id="divContainer" class="container" style="user-select:none;position:relative;border-radius:27px;"> <div id="divContainer" class="container" style="user-select:none;position:relative;border-radius:27px;">

2
data/index.js
View file

@ -378,7 +378,7 @@ async function reopenSocket() {
await initSockets(); await initSockets();
} }
class General { class General {
appVersion = 'v1.4.4'; appVersion = 'v1.4.5';
reloadApp = false; reloadApp = false;
async init() { async init() {
this.setAppVersion(); this.setAppVersion();