github
/
OTGW-firmware
mirror of https://github.com/rvdbreemen/OTGW-firmware
1
Fork 0
Code Releases Activity

fixing serial device bug for sending MQTT commands

This commit is contained in:
Robert van den Breemen 2021-02-24 08:13:46 +01:00
parent 0aaaa949c4
commit eb411c00c3
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OTGW-Core.ino
View File

@ -768,9 +768,9 @@ uint16_t print_daytime()
int sendOTGW(const char* buf, int len)
{
//Send the buffer to OTGW when the Serial interface is available
if (Serial) {
if (OTGWSerial.availableForWrite()>=len+2) {
//check the write buffer
Debugf("Serial Write Buffer space = [%d] - needed [%d]\r\n",OTGWSerial.availableForWrite(), (len+2));
//Debugf("Serial Write Buffer space = [%d] - needed [%d]\r\n",OTGWSerial.availableForWrite(), (len+2));
DebugT("Sending to Serial [");
for (int i = 0; i < len; i++) {
Debug((char)buf[i]);

4
OTGW-ModUpdateServer-impl.h
View File

@ -122,7 +122,7 @@ void ESP8266HTTPUpdateServerTemplate<ServerType>::setup(ESP8266WebServerTemplate
size_t fsSize = ((size_t) &_FS_end - (size_t) &_FS_start);
close_all_fs();
if (!Update.begin(fsSize, U_FS)){//start with max available size
if (_serial_output) Update.printError(Serial);
if (_serial_output) Update.printError(OTGWSerial);
}
} else {
uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
@ -169,7 +169,7 @@ void ESP8266HTTPUpdateServerTemplate<ServerType>::setSuccessPage(const char *suc
template <typename ServerType>
void ESP8266HTTPUpdateServerTemplate<ServerType>::_setUpdaterError()
{
if (_serial_output) Update.printError(Serial);
if (_serial_output) Update.printError(OTGWSerial);
StreamString str;
Update.printError(str);
_updaterError = str.c_str();

1
README.md
View File

@ -46,6 +46,7 @@ Looking for the documentation, go here (work in progress): <br> https://github.
| Version | Release notes |
|-|-|
| 0.7.7 | UI improved: Only show updates values in web UI <br> Bugifx: Serial not found error when sending commands thru MQTT fixed |
| 0.7.6 | PIC firmware integration done. <br> New setting: NTP configurable <br> New setting: heartbeat led on/off <br> Update to REST API to include epoch of last update to message|
| 0.7.5 | Complete set of status bits in UI and Central Heating 2 information |
| 0.7.4 | Integration of the otgw-pic firmware upgrade code - upgrade to pic firmware version 5.0 (by Schelte Bron) |

18
version.h
View File

@ -1,14 +1,14 @@
//The version number conforms to semver.org format
#define _VERSION_MAJOR 0
#define _VERSION_MINOR 7
#define _VERSION_PATCH 6
#define _VERSION_BUILD 688
#define _VERSION_PATCH 7
#define _VERSION_BUILD 691
//#define _VERSION_PRERELEASE beta //uncomment to define prerelease labels: alpha - beta - rc
#define _VERSION_DATE "22-02-2021"
#define _VERSION_TIME "08:10:13"
#define _SEMVER_CORE "0.7.6"
#define _SEMVER_BUILD "0.7.6+688"
#define _SEMVER_FULL "0.7.6+688"
#define _SEMVER_NOBUILD "0.7.6 (22-02-2021)"
#define _VERSION "0.7.6+688 (22-02-2021)"
#define _VERSION_DATE "24-02-2021"
#define _VERSION_TIME "08:13:20"
#define _SEMVER_CORE "0.7.7"
#define _SEMVER_BUILD "0.7.7+691"
#define _SEMVER_FULL "0.7.7+691"
#define _SEMVER_NOBUILD "0.7.7 (24-02-2021)"
#define _VERSION "0.7.7+691 (24-02-2021)"
//The version information is created automatically, more information here: https://github.com/rvdbreemen/autoinc-semver