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

Update to version 0.10.3 on file headers

This commit is contained in:
Robert van den Breemen 2024-04-17 06:52:21 +02:00
parent e334c42d99
commit 32d9a1d465
22 changed files with 29 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FSexplorer.ino
View File

@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : FSexplorer
** Version : v0.10.2
** Version : v0.10.3
**
** Mostly stolen from https://www.arduinoforum.de/User-Fips
** For more information visit: https://fipsok.de

2
MQTTstuff.ino
View File

@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : MQTTstuff
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Modified version from (c) 2020 Willem Aandewiel

2
OTGW-Core.h
View File

@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : Header file: OTGW-Core.h
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Borrowed from OpenTherm library from:

2
OTGW-Core.ino
View File

@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : OTGW-Core.ino
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Borrowed from OpenTherm library from:

2
OTGW-firmware.h
View File

@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : OTGW-firmware.h
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Robert van den Breemen
**

2
OTGW-firmware.ino
View File

@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : OTGW-firmware.ino
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Robert van den Breemen
**

2
data/FSexplorer.css
View File

@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : FSexplorer.html
** Version : v0.10.2
** Version : v0.10.3
** For more information visit: https://fipsok.de
***************************************************************************
*/

2
data/FSexplorer.html
View File

@ -1,7 +1,7 @@
<!--
***************************************************************************
** Program : FSexplorer.html
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Robert van den Breemen
**

2
data/index.css
View File

@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : index.css
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Robert van den Breemen
**

2
data/index.js
View File

@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : index.js, part of OTGW-firmware project
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Robert van den Breemen
**

2
helperStuff.ino
View File

@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : helperStuff
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Robert van den Breemen
** based on Framework ESP8266 from Willem Aandewiel

2
jsonStuff.ino
View File

@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : jsonStuff
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Robert van den Breemen
** based on Framework ESP8266 from Willem Aandewiel

2
networkStuff.h
View File

@ -2,7 +2,7 @@
***************************************************************************
** Program : networkStuff.h
**
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Robert van den Breemen
**

2
outputs_ext.ino
View File

@ -1,6 +1,6 @@
/*********
** Program : output_ext.ino
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Contributed by Sjorsjuhmaniac

99
outputs_ext.ino.tmp
View File

@ -1,99 +0,0 @@
/*********
** Program : output_ext.ino
** Version : v0.10.2
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Contributed by Sjorsjuhmaniac
**
** TERMS OF USE: MIT License. See bottom of file.
*********/
// adds support to activiate a digital output
//
void setOutputState(bool set_HIGH);
void initOutputs() {
DebugTf(PSTR("inside initOutputsO%d...\r\n"), 1);
if (!settingGPIOOUTPUTSenabled) return;
DebugTf(PSTR("init GPIO Output on GPIO%d...\r\n"), settingGPIOOUTPUTSpin);
pinMode(settingGPIOOUTPUTSpin, OUTPUT);
setOutputState(OFF);
// set the LED with the ledState of the variable:
// digitalWrite(ledPin, ledState);
}
// still need to hook into processOTGW
void setOutputState(uint8_t status = ON){
(status == ON) ? setOutputState(true) : setOutputState(false);
}
void setOutputState(bool set_HIGH = true){
if(!settingGPIOOUTPUTSenabled) return;
digitalWrite(settingGPIOOUTPUTSpin,set_HIGH?HIGH:LOW);
DebugTf(PSTR("Output GPIO%d set to %d"), settingGPIOOUTPUTSpin, digitalRead(settingGPIOOUTPUTSpin));
}
void evalOutputs(){
if(!settingGPIOOUTPUTSenabled) return;
// master HB
// bit: [clear/0, set/1]
// 0: CH enable [ CH is disabled, CH is enabled]
// 1: DHW enable [ DHW is disabled, DHW is enabled]
// 2: Cooling enable [ Cooling is disabled, Cooling is enabled]]
// 3: OTC active [OTC not active, OTC is active]
// 4: CH2 enable [CH2 is disabled, CH2 is enabled]
// 5: reserved
// 6: reserved
// 7: reserved
// slave LB
// 0: fault indication [ no fault, fault ]
// 1: CH mode [CH not active, CH active]
// 2: DHW mode [ DHW not active, DHW active]
// 3: Flame status [ flame off, flame on ]
// 4: Cooling status [ cooling mode not active, cooling mode active ]
// 5: CH2 mode [CH2 not active, CH2 active]
// 6: diagnostic indication [no diagnostics, diagnostic event]
// 7: reserved
if (!settingMyDEBUG) return;
settingMyDEBUG = false;
DebugTf(PSTR("current gpio output state: %d \r\n"), digitalRead(settingGPIOOUTPUTSpin));
DebugFlush();
bool bitState = (OTcurrentSystemState.Statusflags & (2^settingGPIOOUTPUTStriggerBit));
DebugTf(PSTR("bitState: bit: %d , state %d \r\n"), settingGPIOOUTPUTStriggerBit, bitState);
setOutputState(bitState);
DebugTf(PSTR("end void: current gpio output state: %d \r\n"), digitalRead(settingGPIOOUTPUTSpin));
}
/***************************************************************************
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to permit
* persons to whom the Software is furnished to do so, subject to the
* following conditions:
*
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
* OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
****************************************************************************
*/

2
restAPI.ino
View File

@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : restAPI
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Robert van den Breemen
** based on Framework ESP8266 from Willem Aandewiel

2
s0PulseCount.ino
View File

@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : s0PulseCount
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Rob Roos / Robert van Breemen
** based on Framework ESP8266 from Willem Aandewiel

2
sensors_ext.ino
View File

@ -1,6 +1,6 @@
/*
** Program : output_ext.ino
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Contributed by Sjorsjuhmaniac

2
settingStuff.ino
View File

@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : settingsStuff
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Robert van den Breemen
** based on Framework ESP8266 from Willem Aandewiel

2
theme/OTGW_Dark_Theme/index.css
View File

@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : index.css
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Robert van den Breemen
**

2
theme/OTGW_Dark_Theme/index.js
View File

@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : index.js, part of OTGW-firmware project
** Version : v0.10.2
** Version : v0.10.3
**
** Copyright (c) 2021-2023 Robert van den Breemen
**

32
version.h
View File

@ -2,29 +2,15 @@
#define _VERSION_MAJOR 0
#define _VERSION_MINOR 10
#define _VERSION_PATCH 3
<<<<<<< HEAD
#define _VERSION_BUILD 2114
#define _VERSION_GITHASH "b6bf90e"
#define _VERSION_BUILD 2118
#define _VERSION_GITHASH "e334c42"
//#define _VERSION_PRERELEASE beta //uncomment to define prerelease labels: alpha - beta - rc
#define _VERSION_DATE "14-04-2024"
#define _VERSION_TIME "23:30:44"
#define _VERSION_DATE "17-04-2024"
#define _VERSION_TIME "06:51:42"
#define _SEMVER_CORE "0.10.3"
#define _SEMVER_BUILD "0.10.3+2114"
#define _SEMVER_GITHASH "0.10.3+b6bf90e"
#define _SEMVER_FULL "0.10.3+b6bf90e"
#define _SEMVER_NOBUILD "0.10.3 (14-04-2024)"
#define _VERSION "0.10.3+b6bf90e (14-04-2024)"
=======
#define _VERSION_BUILD 2117
#define _VERSION_GITHASH "019a3ca"
//#define _VERSION_PRERELEASE beta //uncomment to define prerelease labels: alpha - beta - rc
#define _VERSION_DATE "15-04-2024"
#define _VERSION_TIME "23:21:15"
#define _SEMVER_CORE "0.10.3"
#define _SEMVER_BUILD "0.10.3+2117"
#define _SEMVER_GITHASH "0.10.3+019a3ca"
#define _SEMVER_FULL "0.10.3+019a3ca"
#define _SEMVER_NOBUILD "0.10.3 (15-04-2024)"
#define _VERSION "0.10.3+019a3ca (15-04-2024)"
>>>>>>> parent of 3e0aeac (before update 0.10.3)
#define _SEMVER_BUILD "0.10.3+2118"
#define _SEMVER_GITHASH "0.10.3+e334c42"
#define _SEMVER_FULL "0.10.3+e334c42"
#define _SEMVER_NOBUILD "0.10.3 (17-04-2024)"
#define _VERSION "0.10.3+e334c42 (17-04-2024)"
//The version information is created automatically, more information here: https://github.com/rvdbreemen/autoinc-semver