From c5c92f48d71318f0f9abad851da05ef37d4ac6f2 Mon Sep 17 00:00:00 2001 From: Coscolin Date: Thu, 1 Feb 2024 03:32:45 +0100 Subject: [PATCH 01/83] Buzzer implementation --- CO2_Gadget.ino | 20 ++++ CO2_Gadget_Buzzer.h | 52 ++++++++++ CO2_Gadget_Menu.h | 40 ++++++++ WiFiMenu.h | 224 ++++++++++++++++++++++++++++++++++++++++++++ platformio.ini | 1 + 5 files changed, 337 insertions(+) create mode 100644 CO2_Gadget_Buzzer.h create mode 100644 WiFiMenu.h diff --git a/CO2_Gadget.ino b/CO2_Gadget.ino index 9afb978c..cd7d2525 100644 --- a/CO2_Gadget.ino +++ b/CO2_Gadget.ino @@ -61,6 +61,13 @@ uint16_t measurementInterval = 10; bool bleInitialized = false; int8_t selectedCO2Sensor = -1; bool outputsModeRelay = false; +bool activeAlarm = true; +bool repeatAlarm = true; +uint16_t toneAlarmBeep = 1000; +uint16_t durationAlarmBeep = 100; +uint16_t timeBetweenAlarmBeep = 10; +uint64_t lastTimeAlarmBeep = 0; // Time of last Buzzer loop + uint8_t channelESPNow = 1; uint16_t boardIdESPNow = 0; uint64_t timeInitializationCompleted = 0; @@ -240,6 +247,15 @@ uint16_t batteryFullyChargedMillivolts = 4200; // Voltage of battery when it is #include "CO2_Gadget_TFT.h" #endif +/*****************************************************************************************************/ +/********* *********/ +/********* INCLUDE MENU FUNCIONALITY *********/ +/********* *********/ +/*****************************************************************************************************/ +#if defined SUPPORT_BUZZER +#include "CO2_Gadget_Buzzer.h" +#endif + /*****************************************************************************************************/ /********* *********/ /********* INCLUDE MENU FUNCIONALITY *********/ @@ -247,6 +263,7 @@ uint16_t batteryFullyChargedMillivolts = 4200; // Voltage of battery when it is /*****************************************************************************************************/ #include "CO2_Gadget_Menu.h" + /*****************************************************************************************************/ /********* *********/ /********* SETUP PUSH BUTTONS FUNCTIONALITY *********/ @@ -513,4 +530,7 @@ void loop() { buttonsLoop(); menuLoop(); BLELoop(); + #if defined SUPPORT_BUZZER + buzzerLoop(); + #endif } diff --git a/CO2_Gadget_Buzzer.h b/CO2_Gadget_Buzzer.h new file mode 100644 index 00000000..4200725e --- /dev/null +++ b/CO2_Gadget_Buzzer.h @@ -0,0 +1,52 @@ +/*****************************************************************************************************/ +/********* *********/ +/********* SETUP BUZZER *********/ +/********* *********/ +/*****************************************************************************************************/ + +#define BUZZZER_PIN 13 // ESP32 pin GPIO13 connected to piezo buzzer + +int lowestco2=10000; +int highestco2=0; + +bool downOrangeRange = true; +bool downRedRange = true; + + +void buzzerLoop(){ + + if(!activeAlarm) + return; + + if(inMenu){ // Inside Menu stop BEEPING + noTone(BUZZZER_PIN); + return; + } + + if ((millis() - lastTimeAlarmBeep >= timeBetweenAlarmBeep * 1000) || (lastTimeAlarmBeep == 0)) { + lastTimeAlarmBeep = millis(); + + if(co2>co2RedRange){ + if(downRedRange || repeatAlarm){ + tone(BUZZZER_PIN, toneAlarmBeep+co2 , durationAlarmBeep); + delay(durationAlarmBeep*1.3); + tone(BUZZZER_PIN, toneAlarmBeep+250+co2 , durationAlarmBeep); + delay(durationAlarmBeep*1.3); + tone(BUZZZER_PIN, toneAlarmBeep+500+co2 , durationAlarmBeep); + downRedRange = false; + } + return; + } else downRedRange = true; + + if(co2>co2OrangeRange){ + if(downOrangeRange || repeatAlarm){ + tone(BUZZZER_PIN, toneAlarmBeep+co2 , durationAlarmBeep); + delay(durationAlarmBeep*1.3); + tone(BUZZZER_PIN, toneAlarmBeep+co2 , durationAlarmBeep); + downOrangeRange = false; + } + return; + } else downOrangeRange = true; + return; + } +} \ No newline at end of file diff --git a/CO2_Gadget_Menu.h b/CO2_Gadget_Menu.h index 73316e3c..00f97f4b 100644 --- a/CO2_Gadget_Menu.h +++ b/CO2_Gadget_Menu.h @@ -744,6 +744,43 @@ MENU(outputsConfigMenu, "Outputs Config", doNothing, noEvent, wrapStyle ,SUBMENU(outputsModeMenu) ,EXIT(" + +using namespace Menu; + +//minimalist WiFi driver (using arduino WiFi scan) +//we avoid allocating memory here, instead we read all info from WiFi.scanNetworks(true) +template +class FSO { +public: + using Type=SDC; + Type& WiFi; + //idx_t selIdx=0;//preserve selection context, because we preserve folder ctx too + //we should use filename instead! idx is useful for delete operations thou... + + int n = WiFi.scanNetworks(false); // Wait until scan complete + + FSO(Type& WiFi):WiFi(WiFi) {} + + virtual ~FSO() { + WiFi.scanDelete(); + } + +/* + String retrieveSSID(int index) { + //dir.close(); + // Serial.println("reopen dir, context"); + //dir=sdc.open(folderName.c_str()); + return WiFi.SSID(index).c_str(); + } +*/ + // number of WiFi's founded + int count() { + // Serial.print("count:"); + return n; + } + + //get WiFi SSID name selected by index + String entry(long idx) { + idx_t cnt=0; + for (int i = 0; i < n; ++i) { + // Print SSID for each network found + Serial.printf("%2d", i + 1); + Serial.print(" | "); + Serial.printf("%-32.32s", WiFi.SSID(i).c_str()); + if(idx==cnt++) { + Serial.print(" | SELECTED\n"); + String n=String(WiFi.SSID(i).c_str()); + return n; + } + Serial.println(); + } + return ""; + } +}; + +////////////////////////////////////////////////////////////////////// +// WiFi's available cached menu +template +class CachedFSO:public FSO { +public: + using Type=SDC; + long cacheStart=0; + String cache[maxSz]; + long size=0;//folder size (count of files and folders) + CachedFSO(Type& WiFi):FSO(WiFi) {} + + void refresh(long start=0) { + if (start<0) start=0; + // Serial.print("Refreshing from:"); + // Serial.println(start); + cacheStart=start; + +// FSO::dir.rewindDirectory(); + int n = FSO::WiFi.scanNetworks(false); // Wait until scan complete + size=0; + for (int i = 0; i < n; ++i) { + if (start<=size&&size::retrieveSSID(folderName)) return false; + // refresh(); + // return true; + //} + + long count() {return size;} + + long entryIdx(String name) { + idx_t sz=min(count(),(long)maxSz); + for(int i=0;i::entryIdx(name); + //put cache around the missing item + refresh(at-(maxSz>>1)); + return at; + } + + String entry(long idx) { + if (0>idx||idx>=size) return ""; + if (cacheStart<=idx&&idx<(cacheStart+maxSz)) return cache[idx-cacheStart]; + refresh(idx-(maxSz>>1)); + return entry(idx); + } +}; + +//////////////////////////////////////////////////////////////////////////// +#include +// On this example we assume the existence of an esc button as we are not drawing +// an exit option (or [..] as would be appropriate for a file system) +// not the mennu presents it self as the menu and as the options +// ands does all drawing navigation. +//TODO: we can specialize input too, for typing filename select + #define USE_BACKDOTS 1 + +template +class WiFiMenuT:public menuNode,public FS { +public: + String folderName="/";//set this to other folder when needed + String selectedFolder="/"; + String selectedSSID=""; + + // using menuNode::menuNode;//do not use default constructors as we wont allocate for data + WiFiMenuT(typename FS::Type& sd,constText* title,const char* at,Menu::action act=doNothing,Menu::eventMask mask=noEvent) + :menuNode(title,0,NULL,act,mask, + wrapStyle,(systemStyles)(_menuData|_canNav)) + ,FS(sd) + {} + + void begin() {} + + //this requires latest menu version to virtualize data tables + prompt& operator[](idx_t i) const override {return *(prompt*)this;}//this will serve both as menu and as its own prompt + result sysHandler(SYS_FUNC_PARAMS) override { + switch(event) { + case enterEvent: + if (nav.root->navFocus!=nav.target) {//on sd card entry + nav.sel=((WiFiMenuT*)(&item))->entryIdx(((WiFiMenuT*)(&item))->selectedSSID)+USE_BACKDOTS;//restore context + } + } + return proceed; + } + + void doNav(navNode& nav,navCmd cmd) { + switch(cmd.cmd) { + case enterCmd: if (nav.sel>=USE_BACKDOTS) { + + String selFile=WiFiMenuT::entry(nav.sel-USE_BACKDOTS); + + //Serial.print("\nFile selected:"); + //select a file and return + selectedSSID=selFile; + selectedFolder=folderName; + nav.root->node().event(enterEvent); + menuNode::doNav(nav,escCmd); + return; + } + case escCmd: + menuNode::doNav(nav,escCmd);//then exit + /* NO ES NECESARIO PORQUE SOLO HAY UN NIVEL DE MENÚ DINAMICO + if(folderName=="/")//at root? + menuNode::doNav(nav,escCmd);//then exit + else {//previous folder + idx_t at=folderName.lastIndexOf("/",folderName.length()-2)+1; + String fn=folderName.substring(at,folderName.length()-1); + folderName.remove(folderName.lastIndexOf("/",folderName.length()-2)+1); + WiFiMenuT::goFolder(folderName); + dirty=true;//redraw menu + nav.sel=WiFiMenuT::entryIdx(fn)+USE_BACKDOTS; + } + */ + return; + } + menuNode::doNav(nav,cmd); + } + + //print menu and items as this is a virtual data menu + Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t pn) { + if(root.navFocus!=this) {//show given title or filename if selected + return selectedSSID==""? + /*menuNode::printTo(root,sel,out,idx,len,pn)*/ + out.printRaw(shadow->text,len): + out.printRaw(selectedSSID.c_str(),len); + } else if(idx==-1) {//when menu open (show folder name) + ((menuNodeShadow*)shadow)->sz=WiFiMenuT::count()+USE_BACKDOTS; + idx_t at=folderName.lastIndexOf("/",folderName.length()-2)+1; + String fn=folderName.substring(at,folderName.length()-1); + return out.printRaw(fn.c_str(),len); + // return out.printRaw(folderName.c_str(),len); + // return out.printRaw(WiFiMenuT::dir.name(),len); + } + //drawing options + out.setColor(fgColor, sel); + idx_t i=out.tops[root.level]+idx; + if (i::entry(out.tops[root.level]+idx-USE_BACKDOTS).c_str(),len); + return len; + } +}; + +class WiFiMenu:public WiFiMenuT> { +public: + WiFiMenu(constText* title,const char* at,Menu::action act=doNothing,Menu::eventMask mask=noEvent) + :WiFiMenuT>(WiFi,title,at,act,mask) {} +}; + +template +class CachedWiFiMenu:public WiFiMenuT> { +public: + CachedWiFiMenu(constText* title,const char* at,Menu::action act=doNothing,Menu::eventMask mask=noEvent) + :WiFiMenuT>(WiFi,title,at,act,mask) {} +}; \ No newline at end of file diff --git a/platformio.ini b/platformio.ini index 301bf2e4..e7af3f05 100644 --- a/platformio.ini +++ b/platformio.ini @@ -77,6 +77,7 @@ build_flags = -DPIN_HYSTERESIS=100 ; Hysteresis PPM to avoid pins going ON and OFF continuously. TODO : Minimum time to switch -DWIFI_PRIVACY ; Comment to show WiFi password in serial and the menu (intended for debugging) -DSUPPORT_BLE ; Comment to dissable Bluetooth (makes more memory available) + -DSUPPORT_BUZZER ; -DSUPPORT_ESPNOW -USUPPORT_OTA ; -DSUPPORT_MDNS ; From 444730e6b95b13ea82d220d2778115bb02f2bf45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Coscol=C3=ADn?= Date: Thu, 1 Feb 2024 11:52:00 +0100 Subject: [PATCH 02/83] Delete WiFiMenu.h This file is for another develop branch. --- WiFiMenu.h | 224 ----------------------------------------------------- 1 file changed, 224 deletions(-) delete mode 100644 WiFiMenu.h diff --git a/WiFiMenu.h b/WiFiMenu.h deleted file mode 100644 index 6192e728..00000000 --- a/WiFiMenu.h +++ /dev/null @@ -1,224 +0,0 @@ -/* -*- C++ -*- */ -#pragma once -// a full automated WiFi select network -// plugin for arduino menu library -// requires a dynamic menu (MENU_USERAM) -// IO: Serial -// Based on library SDMenu.h by Rui Azevedo [ruihfazevedo@gmail.com] -// Feb 2024 - Sergio Coscolín [coscolin.sergio@gmail.com] - -#include - -using namespace Menu; - -//minimalist WiFi driver (using arduino WiFi scan) -//we avoid allocating memory here, instead we read all info from WiFi.scanNetworks(true) -template -class FSO { -public: - using Type=SDC; - Type& WiFi; - //idx_t selIdx=0;//preserve selection context, because we preserve folder ctx too - //we should use filename instead! idx is useful for delete operations thou... - - int n = WiFi.scanNetworks(false); // Wait until scan complete - - FSO(Type& WiFi):WiFi(WiFi) {} - - virtual ~FSO() { - WiFi.scanDelete(); - } - -/* - String retrieveSSID(int index) { - //dir.close(); - // Serial.println("reopen dir, context"); - //dir=sdc.open(folderName.c_str()); - return WiFi.SSID(index).c_str(); - } -*/ - // number of WiFi's founded - int count() { - // Serial.print("count:"); - return n; - } - - //get WiFi SSID name selected by index - String entry(long idx) { - idx_t cnt=0; - for (int i = 0; i < n; ++i) { - // Print SSID for each network found - Serial.printf("%2d", i + 1); - Serial.print(" | "); - Serial.printf("%-32.32s", WiFi.SSID(i).c_str()); - if(idx==cnt++) { - Serial.print(" | SELECTED\n"); - String n=String(WiFi.SSID(i).c_str()); - return n; - } - Serial.println(); - } - return ""; - } -}; - -////////////////////////////////////////////////////////////////////// -// WiFi's available cached menu -template -class CachedFSO:public FSO { -public: - using Type=SDC; - long cacheStart=0; - String cache[maxSz]; - long size=0;//folder size (count of files and folders) - CachedFSO(Type& WiFi):FSO(WiFi) {} - - void refresh(long start=0) { - if (start<0) start=0; - // Serial.print("Refreshing from:"); - // Serial.println(start); - cacheStart=start; - -// FSO::dir.rewindDirectory(); - int n = FSO::WiFi.scanNetworks(false); // Wait until scan complete - size=0; - for (int i = 0; i < n; ++i) { - if (start<=size&&size::retrieveSSID(folderName)) return false; - // refresh(); - // return true; - //} - - long count() {return size;} - - long entryIdx(String name) { - idx_t sz=min(count(),(long)maxSz); - for(int i=0;i::entryIdx(name); - //put cache around the missing item - refresh(at-(maxSz>>1)); - return at; - } - - String entry(long idx) { - if (0>idx||idx>=size) return ""; - if (cacheStart<=idx&&idx<(cacheStart+maxSz)) return cache[idx-cacheStart]; - refresh(idx-(maxSz>>1)); - return entry(idx); - } -}; - -//////////////////////////////////////////////////////////////////////////// -#include -// On this example we assume the existence of an esc button as we are not drawing -// an exit option (or [..] as would be appropriate for a file system) -// not the mennu presents it self as the menu and as the options -// ands does all drawing navigation. -//TODO: we can specialize input too, for typing filename select - #define USE_BACKDOTS 1 - -template -class WiFiMenuT:public menuNode,public FS { -public: - String folderName="/";//set this to other folder when needed - String selectedFolder="/"; - String selectedSSID=""; - - // using menuNode::menuNode;//do not use default constructors as we wont allocate for data - WiFiMenuT(typename FS::Type& sd,constText* title,const char* at,Menu::action act=doNothing,Menu::eventMask mask=noEvent) - :menuNode(title,0,NULL,act,mask, - wrapStyle,(systemStyles)(_menuData|_canNav)) - ,FS(sd) - {} - - void begin() {} - - //this requires latest menu version to virtualize data tables - prompt& operator[](idx_t i) const override {return *(prompt*)this;}//this will serve both as menu and as its own prompt - result sysHandler(SYS_FUNC_PARAMS) override { - switch(event) { - case enterEvent: - if (nav.root->navFocus!=nav.target) {//on sd card entry - nav.sel=((WiFiMenuT*)(&item))->entryIdx(((WiFiMenuT*)(&item))->selectedSSID)+USE_BACKDOTS;//restore context - } - } - return proceed; - } - - void doNav(navNode& nav,navCmd cmd) { - switch(cmd.cmd) { - case enterCmd: if (nav.sel>=USE_BACKDOTS) { - - String selFile=WiFiMenuT::entry(nav.sel-USE_BACKDOTS); - - //Serial.print("\nFile selected:"); - //select a file and return - selectedSSID=selFile; - selectedFolder=folderName; - nav.root->node().event(enterEvent); - menuNode::doNav(nav,escCmd); - return; - } - case escCmd: - menuNode::doNav(nav,escCmd);//then exit - /* NO ES NECESARIO PORQUE SOLO HAY UN NIVEL DE MENÚ DINAMICO - if(folderName=="/")//at root? - menuNode::doNav(nav,escCmd);//then exit - else {//previous folder - idx_t at=folderName.lastIndexOf("/",folderName.length()-2)+1; - String fn=folderName.substring(at,folderName.length()-1); - folderName.remove(folderName.lastIndexOf("/",folderName.length()-2)+1); - WiFiMenuT::goFolder(folderName); - dirty=true;//redraw menu - nav.sel=WiFiMenuT::entryIdx(fn)+USE_BACKDOTS; - } - */ - return; - } - menuNode::doNav(nav,cmd); - } - - //print menu and items as this is a virtual data menu - Used printTo(navRoot &root,bool sel,menuOut& out, idx_t idx,idx_t len,idx_t pn) { - if(root.navFocus!=this) {//show given title or filename if selected - return selectedSSID==""? - /*menuNode::printTo(root,sel,out,idx,len,pn)*/ - out.printRaw(shadow->text,len): - out.printRaw(selectedSSID.c_str(),len); - } else if(idx==-1) {//when menu open (show folder name) - ((menuNodeShadow*)shadow)->sz=WiFiMenuT::count()+USE_BACKDOTS; - idx_t at=folderName.lastIndexOf("/",folderName.length()-2)+1; - String fn=folderName.substring(at,folderName.length()-1); - return out.printRaw(fn.c_str(),len); - // return out.printRaw(folderName.c_str(),len); - // return out.printRaw(WiFiMenuT::dir.name(),len); - } - //drawing options - out.setColor(fgColor, sel); - idx_t i=out.tops[root.level]+idx; - if (i::entry(out.tops[root.level]+idx-USE_BACKDOTS).c_str(),len); - return len; - } -}; - -class WiFiMenu:public WiFiMenuT> { -public: - WiFiMenu(constText* title,const char* at,Menu::action act=doNothing,Menu::eventMask mask=noEvent) - :WiFiMenuT>(WiFi,title,at,act,mask) {} -}; - -template -class CachedWiFiMenu:public WiFiMenuT> { -public: - CachedWiFiMenu(constText* title,const char* at,Menu::action act=doNothing,Menu::eventMask mask=noEvent) - :WiFiMenuT>(WiFi,title,at,act,mask) {} -}; \ No newline at end of file From 7ccbd2086f3e809800db412c1ed64e25864bc8a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Coscol=C3=ADn?= Date: Thu, 1 Feb 2024 12:21:21 +0100 Subject: [PATCH 03/83] Wake up screen when CO2 rise limits If displaybrightness is OFF when co2 values rise limits wake up screen using function that wake up screen when any button is clicked. If activeAlarm is OFF this functionality doesn't work. Maybe we can redefine logical buzzerLoog() workflow to allow wakeup display althought alarm is off. --- CO2_Gadget_Buzzer.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CO2_Gadget_Buzzer.h b/CO2_Gadget_Buzzer.h index 4200725e..6132bb77 100644 --- a/CO2_Gadget_Buzzer.h +++ b/CO2_Gadget_Buzzer.h @@ -28,6 +28,7 @@ void buzzerLoop(){ if(co2>co2RedRange){ if(downRedRange || repeatAlarm){ + buttonUpISR(); // wake up screen tone(BUZZZER_PIN, toneAlarmBeep+co2 , durationAlarmBeep); delay(durationAlarmBeep*1.3); tone(BUZZZER_PIN, toneAlarmBeep+250+co2 , durationAlarmBeep); @@ -40,6 +41,7 @@ void buzzerLoop(){ if(co2>co2OrangeRange){ if(downOrangeRange || repeatAlarm){ + buttonUpISR(); // wake up screen tone(BUZZZER_PIN, toneAlarmBeep+co2 , durationAlarmBeep); delay(durationAlarmBeep*1.3); tone(BUZZZER_PIN, toneAlarmBeep+co2 , durationAlarmBeep); @@ -49,4 +51,4 @@ void buzzerLoop(){ } else downOrangeRange = true; return; } -} \ No newline at end of file +} From 4c8a669f9f8ca854375512f609da46d4c4b53f05 Mon Sep 17 00:00:00 2001 From: Coscolin Date: Fri, 2 Feb 2024 02:02:56 +0100 Subject: [PATCH 04/83] Buzzer async implementation --- CO2_Gadget.ino | 12 ++++----- CO2_Gadget_Buzzer.h | 64 +++++++++++++++++++++++++++++---------------- platformio.ini | 2 ++ 3 files changed, 49 insertions(+), 29 deletions(-) diff --git a/CO2_Gadget.ino b/CO2_Gadget.ino index cd7d2525..c568ab4c 100644 --- a/CO2_Gadget.ino +++ b/CO2_Gadget.ino @@ -61,12 +61,12 @@ uint16_t measurementInterval = 10; bool bleInitialized = false; int8_t selectedCO2Sensor = -1; bool outputsModeRelay = false; -bool activeAlarm = true; -bool repeatAlarm = true; -uint16_t toneAlarmBeep = 1000; -uint16_t durationAlarmBeep = 100; -uint16_t timeBetweenAlarmBeep = 10; -uint64_t lastTimeAlarmBeep = 0; // Time of last Buzzer loop +bool activeBuzzer = true; +bool repeatBuzzer = true; +uint16_t toneBuzzerBeep = 1000; +uint16_t durationBuzzerBeep = 100; +uint16_t timeBetweenBuzzerBeep = 10; +uint64_t lastTimeBuzzerBeep = 0; // Time of last Buzzer loop uint8_t channelESPNow = 1; uint16_t boardIdESPNow = 0; diff --git a/CO2_Gadget_Buzzer.h b/CO2_Gadget_Buzzer.h index 6132bb77..755a5036 100644 --- a/CO2_Gadget_Buzzer.h +++ b/CO2_Gadget_Buzzer.h @@ -3,52 +3,70 @@ /********* SETUP BUZZER *********/ /********* *********/ /*****************************************************************************************************/ - -#define BUZZZER_PIN 13 // ESP32 pin GPIO13 connected to piezo buzzer - -int lowestco2=10000; -int highestco2=0; + +#include // library to async functions +Ticker buzz; bool downOrangeRange = true; bool downRedRange = true; +void wakeUpDisplay(){ + if (actualDisplayBrightness == 0) // Turn on the display only if it's OFF + { +#if defined(SUPPORT_OLED) || defined(SUPPORT_TFT) + setDisplayBrightness(DisplayBrightness); // Turn on the display at DisplayBrightness brightness +#endif + lastTimeButtonPressed = millis(); + } + return; +} + +void buzzerRedRange(){ + Serial.println("[ASYNC] Buzzer RED range"); + tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); + delay(durationBuzzerBeep*1.3); + tone(BUZZER_PIN, toneBuzzerBeep+250+co2 , durationBuzzerBeep); + delay(durationBuzzerBeep*1.3); + tone(BUZZER_PIN, toneBuzzerBeep+500+co2 , durationBuzzerBeep); +} + +void buzzerOrangeRange(){ + Serial.println("[ASYNC] Buzzer ORANGE range"); + tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); + delay(durationBuzzerBeep*1.3); + tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); +} void buzzerLoop(){ - if(!activeAlarm) + if(!activeBuzzer) return; if(inMenu){ // Inside Menu stop BEEPING - noTone(BUZZZER_PIN); + noTone(BUZZER_PIN); return; } - if ((millis() - lastTimeAlarmBeep >= timeBetweenAlarmBeep * 1000) || (lastTimeAlarmBeep == 0)) { - lastTimeAlarmBeep = millis(); + if ((millis() - lastTimeBuzzerBeep >= timeBetweenBuzzerBeep * 1000) || (lastTimeBuzzerBeep == 0)) { + lastTimeBuzzerBeep = millis(); if(co2>co2RedRange){ - if(downRedRange || repeatAlarm){ - buttonUpISR(); // wake up screen - tone(BUZZZER_PIN, toneAlarmBeep+co2 , durationAlarmBeep); - delay(durationAlarmBeep*1.3); - tone(BUZZZER_PIN, toneAlarmBeep+250+co2 , durationAlarmBeep); - delay(durationAlarmBeep*1.3); - tone(BUZZZER_PIN, toneAlarmBeep+500+co2 , durationAlarmBeep); + if(downRedRange || repeatBuzzer){ + wakeUpDisplay(); + buzz.once(0, buzzerRedRange); downRedRange = false; } return; - } else downRedRange = true; + } else if(co2 < (co2RedRange - BUZZER_HYSTERESIS)) downRedRange = true; if(co2>co2OrangeRange){ - if(downOrangeRange || repeatAlarm){ - buttonUpISR(); // wake up screen - tone(BUZZZER_PIN, toneAlarmBeep+co2 , durationAlarmBeep); - delay(durationAlarmBeep*1.3); - tone(BUZZZER_PIN, toneAlarmBeep+co2 , durationAlarmBeep); + if(downOrangeRange || repeatBuzzer){ + wakeUpDisplay(); + buzz.once(0, buzzerOrangeRange); downOrangeRange = false; } return; - } else downOrangeRange = true; + } else if(co2 < (co2OrangeRange - BUZZER_HYSTERESIS)) downOrangeRange = true; return; } } diff --git a/platformio.ini b/platformio.ini index e7af3f05..19e69f50 100644 --- a/platformio.ini +++ b/platformio.ini @@ -60,6 +60,8 @@ build_flags = -D CO2_GADGET_REV="\"001"\" -D CORE_DEBUG_LEVEL=0 + -DBUZZER_PIN=13 ; ESP32 pin GPIO13 connected to piezo buzzer + -DBUZZER_HYSTERESIS=50 ; Hysteresis PPM to avoid BUZZER ON and OFF continuously if repeat is once -DNEOPIXEL_PIN=26 ; Pinnumber for button for down/next and back / exit actions -DNEOPIXEL_COUNT=16 ; How many neopixels to control -DENABLE_PIN=27 ; Reserved for the future to enable the sensor From 4b85c5f35a02d7d78ce83f1d75b93843634aaf06 Mon Sep 17 00:00:00 2001 From: Coscolin Date: Fri, 2 Feb 2024 02:03:52 +0100 Subject: [PATCH 05/83] Buzzer menu --- CO2_Gadget_Menu.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/CO2_Gadget_Menu.h b/CO2_Gadget_Menu.h index 00f97f4b..148c0c9b 100644 --- a/CO2_Gadget_Menu.h +++ b/CO2_Gadget_Menu.h @@ -745,15 +745,15 @@ MENU(outputsConfigMenu, "Outputs Config", doNothing, noEvent, wrapStyle ,EXIT(" Date: Fri, 2 Feb 2024 09:38:17 +0100 Subject: [PATCH 06/83] Change alarmConfigMenu to buzzerConfigMenu --- CO2_Gadget_Menu.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CO2_Gadget_Menu.h b/CO2_Gadget_Menu.h index 148c0c9b..ae8f4ea2 100644 --- a/CO2_Gadget_Menu.h +++ b/CO2_Gadget_Menu.h @@ -772,7 +772,7 @@ TOGGLE(durationBuzzerBeep, durationBuzzerBeepMenu, "Span: ", doNothing, noEvent, ,VALUE("MED.", 100, doNothing, noEvent) ,VALUE("LONG", 200, doNothing, noEvent)); -MENU(alarmConfigMenu, "Buzzer Config", doNothing, noEvent, wrapStyle +MENU(buzzerConfigMenu, "Buzzer Config", doNothing, noEvent, wrapStyle ,SUBMENU(activeBuzzerOffMenu) ,SUBMENU(repeatBuzzerMenu) ,SUBMENU(timeBetweenBuzzerBeepMenu) @@ -795,7 +795,7 @@ MENU(configMenu, "Configuration", doNothing, noEvent, wrapStyle ,SUBMENU(temperatureConfigMenu) ,SUBMENU(displayConfigMenu) #ifdef SUPPORT_BUZZER - ,SUBMENU(alarmConfigMenu) + ,SUBMENU(buzzerConfigMenu) #endif ,SUBMENU(outputsConfigMenu) ,OP("Save preferences", doSavePreferences, enterEvent) @@ -1127,4 +1127,4 @@ void menu_init() { Serial.println(""); } -#endif // CO2_Gadget_Menu_h \ No newline at end of file +#endif // CO2_Gadget_Menu_h From 8a04b420106bbba31c683e1edc589f73bab3123a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Coscol=C3=ADn?= Date: Fri, 2 Feb 2024 10:55:44 +0100 Subject: [PATCH 07/83] Menu options to buzzer alarm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added buzzer configuration in menu: - Alarm: ON / OFF - Repeat: ONCE / EVERY · REPEAT ONCE: Only buzzer one time orange or red CO2 range is raised. Don't buzzer again until CO2 values downs "HYSTERIC" value down orange/red range and raise again. · REPEAT EVERY: Buzzer all time while CO2 values are upper orange or red range. - Each: 5s / 10s / 15s / 30s / 1m / 2m / 5m · Time between buzzers if repeat is "EVERY" - Tone: HIGH / MED. / LOW · Frecuency of buzzer tone. - Span: SHORT / MED / LONG · Duration of buzzer tones. --- CO2_Gadget_Menu.h | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/CO2_Gadget_Menu.h b/CO2_Gadget_Menu.h index 73316e3c..ae8f4ea2 100644 --- a/CO2_Gadget_Menu.h +++ b/CO2_Gadget_Menu.h @@ -744,6 +744,43 @@ MENU(outputsConfigMenu, "Outputs Config", doNothing, noEvent, wrapStyle ,SUBMENU(outputsModeMenu) ,EXIT(" Date: Fri, 2 Feb 2024 10:59:09 +0100 Subject: [PATCH 08/83] Revert CO2_Gadget_Menu.h to create a PR without menu changes --- CO2_Gadget_Menu.h | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/CO2_Gadget_Menu.h b/CO2_Gadget_Menu.h index ae8f4ea2..5c7fb82b 100644 --- a/CO2_Gadget_Menu.h +++ b/CO2_Gadget_Menu.h @@ -744,43 +744,6 @@ MENU(outputsConfigMenu, "Outputs Config", doNothing, noEvent, wrapStyle ,SUBMENU(outputsModeMenu) ,EXIT(" Date: Fri, 2 Feb 2024 11:08:15 +0100 Subject: [PATCH 09/83] Remove last line to merge without changes --- CO2_Gadget_Menu.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/CO2_Gadget_Menu.h b/CO2_Gadget_Menu.h index 5c7fb82b..104b8fc3 100644 --- a/CO2_Gadget_Menu.h +++ b/CO2_Gadget_Menu.h @@ -1086,5 +1086,3 @@ void menu_init() { Serial.println("-->[MENU] to control the menu navigation"); Serial.println(""); } - -#endif // CO2_Gadget_Menu_h From 73b2c49b5134c163e7fe76149b9aca0182701094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Coscol=C3=ADn?= Date: Fri, 2 Feb 2024 11:10:21 +0100 Subject: [PATCH 10/83] Add two lines to merge without changes --- CO2_Gadget_Menu.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CO2_Gadget_Menu.h b/CO2_Gadget_Menu.h index 104b8fc3..5c7fb82b 100644 --- a/CO2_Gadget_Menu.h +++ b/CO2_Gadget_Menu.h @@ -1086,3 +1086,5 @@ void menu_init() { Serial.println("-->[MENU] to control the menu navigation"); Serial.println(""); } + +#endif // CO2_Gadget_Menu_h From 7b4014378049e555099606e282b5bcdc1356d831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Coscol=C3=ADn?= Date: Fri, 2 Feb 2024 11:16:45 +0100 Subject: [PATCH 11/83] Update CO2_Gadget_Menu.h to merge with feature-buzzer branch of melkati From 62bb9eca0bb27bebb45b1e1997933c25d9d0c66a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Coscol=C3=ADn?= Date: Fri, 2 Feb 2024 13:52:48 +0100 Subject: [PATCH 12/83] Change MENU -> BUZZER in comment header --- CO2_Gadget.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CO2_Gadget.ino b/CO2_Gadget.ino index c568ab4c..c06309aa 100644 --- a/CO2_Gadget.ino +++ b/CO2_Gadget.ino @@ -249,7 +249,7 @@ uint16_t batteryFullyChargedMillivolts = 4200; // Voltage of battery when it is /*****************************************************************************************************/ /********* *********/ -/********* INCLUDE MENU FUNCIONALITY *********/ +/********* INCLUDE BUZZER FUNCIONALITY *********/ /********* *********/ /*****************************************************************************************************/ #if defined SUPPORT_BUZZER From 090cf9187c4b146e30d9c46892e749022e29332c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Coscol=C3=ADn?= Date: Fri, 2 Feb 2024 14:00:15 +0100 Subject: [PATCH 13/83] Add ifndef CO2_Gadget_Buzzer_h --- CO2_Gadget_Buzzer.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CO2_Gadget_Buzzer.h b/CO2_Gadget_Buzzer.h index 755a5036..f1f0f589 100644 --- a/CO2_Gadget_Buzzer.h +++ b/CO2_Gadget_Buzzer.h @@ -1,3 +1,6 @@ +#ifndef CO2_Gadget_Buzzer_h +#define CO2_Gadget_Buzzer_h + /*****************************************************************************************************/ /********* *********/ /********* SETUP BUZZER *********/ @@ -70,3 +73,4 @@ void buzzerLoop(){ return; } } +#endif From 01573a5390ea5872f0932e5e2458211253d0849c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Coscol=C3=ADn?= Date: Fri, 2 Feb 2024 14:02:34 +0100 Subject: [PATCH 14/83] Move buzzerLoop() into outputsLoop() and remove #ifdef --- CO2_Gadget.ino | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CO2_Gadget.ino b/CO2_Gadget.ino index c06309aa..c0852766 100644 --- a/CO2_Gadget.ino +++ b/CO2_Gadget.ino @@ -358,6 +358,7 @@ void outputsLoop() { outputsRelays(); outputsRGBLeds(); neopixelLoop(); + buzzerLoop(); } void readingsLoop() { @@ -530,7 +531,4 @@ void loop() { buttonsLoop(); menuLoop(); BLELoop(); - #if defined SUPPORT_BUZZER - buzzerLoop(); - #endif } From 1010bbd70fdf3a0282343def79c953aae7aa8673 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Fri, 2 Feb 2024 15:07:43 +0100 Subject: [PATCH 15/83] Change debug messages to be of module "BUZZ" --- CO2_Gadget_Buzzer.h | 4 ++-- platformio.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CO2_Gadget_Buzzer.h b/CO2_Gadget_Buzzer.h index f1f0f589..cef653e8 100644 --- a/CO2_Gadget_Buzzer.h +++ b/CO2_Gadget_Buzzer.h @@ -25,7 +25,7 @@ void wakeUpDisplay(){ } void buzzerRedRange(){ - Serial.println("[ASYNC] Buzzer RED range"); + Serial.println("[BUZZ] Buzzer RED range"); tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); delay(durationBuzzerBeep*1.3); tone(BUZZER_PIN, toneBuzzerBeep+250+co2 , durationBuzzerBeep); @@ -34,7 +34,7 @@ void buzzerRedRange(){ } void buzzerOrangeRange(){ - Serial.println("[ASYNC] Buzzer ORANGE range"); + Serial.println("[BUZZ] Buzzer ORANGE range"); tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); delay(durationBuzzerBeep*1.3); tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); diff --git a/platformio.ini b/platformio.ini index 19e69f50..8f4fc082 100644 --- a/platformio.ini +++ b/platformio.ini @@ -58,7 +58,7 @@ build_flags = -D MQTT_BROKER_SERVER="\"192.168.1.145"\" -D CO2_GADGET_VERSION="\"0.9."\" - -D CO2_GADGET_REV="\"001"\" + -D CO2_GADGET_REV="\"004-feature-buzzer"\" -D CORE_DEBUG_LEVEL=0 -DBUZZER_PIN=13 ; ESP32 pin GPIO13 connected to piezo buzzer -DBUZZER_HYSTERESIS=50 ; Hysteresis PPM to avoid BUZZER ON and OFF continuously if repeat is once From c6fac5662750b5b472173f3e76abc82e29076287 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Fri, 2 Feb 2024 16:08:01 +0100 Subject: [PATCH 16/83] Add buzzer-related settings to Preferences to save in NVR --- CO2_Gadget.ino | 3 ++- CO2_Gadget_Buzzer.h | 2 ++ CO2_Gadget_Preferences.h | 50 +++++++++++++++++++++++++++++++++++++--- platformio.ini | 2 +- 4 files changed, 52 insertions(+), 5 deletions(-) diff --git a/CO2_Gadget.ino b/CO2_Gadget.ino index c0852766..b295ad88 100644 --- a/CO2_Gadget.ino +++ b/CO2_Gadget.ino @@ -61,12 +61,13 @@ uint16_t measurementInterval = 10; bool bleInitialized = false; int8_t selectedCO2Sensor = -1; bool outputsModeRelay = false; + +// Variables for buzzer functionality bool activeBuzzer = true; bool repeatBuzzer = true; uint16_t toneBuzzerBeep = 1000; uint16_t durationBuzzerBeep = 100; uint16_t timeBetweenBuzzerBeep = 10; -uint64_t lastTimeBuzzerBeep = 0; // Time of last Buzzer loop uint8_t channelESPNow = 1; uint16_t boardIdESPNow = 0; diff --git a/CO2_Gadget_Buzzer.h b/CO2_Gadget_Buzzer.h index cef653e8..07cf4784 100644 --- a/CO2_Gadget_Buzzer.h +++ b/CO2_Gadget_Buzzer.h @@ -10,6 +10,8 @@ #include // library to async functions Ticker buzz; +uint64_t lastTimeBuzzerBeep = 0; // Time of last Buzzer loop + bool downOrangeRange = true; bool downRedRange = true; diff --git a/CO2_Gadget_Preferences.h b/CO2_Gadget_Preferences.h index 1458c4d7..15fa7fa7 100644 --- a/CO2_Gadget_Preferences.h +++ b/CO2_Gadget_Preferences.h @@ -47,7 +47,7 @@ void printPreferences() { Serial.printf("-->[PREF] selCO2Sensor:\t #%d#\n", selectedCO2Sensor); Serial.printf("-->[PREF] debugSensors is:\t#%s# (%d)\n", ((debugSensors) ? "Enabled" : "Disabled"), debugSensors); Serial.printf("-->[PREF] displayReverse is:\t#%s# (%d)\n", ((displayReverse) ? "Reversed" : "Normal"), displayReverse); - Serial.printf("-->[PREF] showFahrenheit is:\t#%s#\n", ((showFahrenheit) ? "Farenheit" : "Celsius")); + Serial.printf("-->[PREF] showFahrenheit is:\t#%s#\n", ((showFahrenheit) ? "Fahrenheit" : "Celsius")); Serial.printf("-->[PREF] measInterval:\t #%d#\n", measurementInterval); Serial.printf("-->[PREF] outModeRelay is:\t#%s#\n", ((outputsModeRelay) ? "Relay" : "RGB LED")); Serial.printf("-->[PREF] channelESPNow:\t #%d#\n", channelESPNow); @@ -59,6 +59,14 @@ void printPreferences() { Serial.printf("-->[PREF] showBattery:\t #%s#\n", ((displayShowBattery) ? "Show" : "Hide")); Serial.printf("-->[PREF] showCO2:\t #%s#\n", ((displayShowCO2) ? "Show" : "Hide")); Serial.printf("-->[PREF] showPM25:\t #%s#\n", ((displayShowPM25) ? "Show" : "Hide")); + + // Buzzer preferences + Serial.printf("-->[PREF] activeBuzzer is:\t#%s# (%d)\n", ((activeBuzzer) ? "Enabled" : "Disabled"), activeBuzzer); + Serial.printf("-->[PREF] repeatBuzzer is:\t#%s# (%d)\n", ((repeatBuzzer) ? "Enabled" : "Disabled"), repeatBuzzer); + Serial.printf("-->[PREF] toneBuzzerBeep is:\t#%d#\n", toneBuzzerBeep); + Serial.printf("-->[PREF] durationBuzzerBeep is:\t#%d#\n", durationBuzzerBeep); + Serial.printf("-->[PREF] timeBetweenBuzzerBeep is:\t#%d#\n", timeBetweenBuzzerBeep); + Serial.printf("-->[PREF] \n"); } @@ -145,6 +153,13 @@ void initPreferences() { displayShowCO2 = preferences.getBool("showCO2", true); displayShowPM25 = preferences.getBool("showPM25", true); + // Retrieve buzzer preferences + activeBuzzer = preferences.getBool("actvBuzzer", false); // Set to true if buzzer is active + repeatBuzzer = preferences.getBool("rptBuzzer", true); // Set to true if the buzzer beep should be repeated + toneBuzzerBeep = preferences.getUInt("toneBzrBeep", 1000); // Frequency of the buzzer beep + durationBuzzerBeep = preferences.getUInt("durBzrBeep", 100); // Duration of the buzzer beep + timeBetweenBuzzerBeep = preferences.getUInt("timeBtwnBzr", 10); // Time between consecutive beeps + rootTopic.trim(); mqttClientId.trim(); mqttBroker.trim(); @@ -154,9 +169,9 @@ void initPreferences() { wifiPass.trim(); hostName.trim(); preferences.end(); - #ifdef DEBUG_PREFERENCES +#ifdef DEBUG_PREFERENCES printPreferences(); - #endif +#endif } void putPreferences() { @@ -219,6 +234,13 @@ void putPreferences() { preferences.putBool("showCO2", displayShowCO2); preferences.putBool("showPM25", displayShowPM25); + // Buzzer preferences + preferences.putBool("actvBuzzer", activeBuzzer); // Buzzer active + preferences.putBool("rptBuzzer", repeatBuzzer); // Repeat buzzer beep + preferences.putUInt("toneBzrBeep", toneBuzzerBeep); // Buzzer frequency + preferences.putUInt("durBzrBeep", durationBuzzerBeep); // Buzzer duration + preferences.putUInt("timeBtwnBzr", timeBetweenBuzzerBeep); // Time between beeps + preferences.end(); } @@ -273,6 +295,14 @@ String getPreferencesAsJson() { doc["showCO2"] = preferences.getBool("showCO2", true); doc["showPM25"] = preferences.getBool("showPM25", true); doc["measInterval"] = preferences.getInt("measInterval", 10); + + // Buzzer preferences + doc["actvBuzzer"] = preferences.getBool("actvBuzzer", false); // Buzzer active + doc["rptBuzzer"] = preferences.getBool("rptBuzzer", true); // Repeat buzzer beep + doc["toneBzrBeep"] = preferences.getUInt("toneBzrBeep", 1000); // Buzzer frequency + doc["durBzrBeep"] = preferences.getUInt("durBzrBeep", 100); // Buzzer duration + doc["timeBtwnBzr"] = preferences.getUInt("timeBtwnBzr", 10); // Time between beeps + preferences.end(); String preferencesJson; @@ -340,6 +370,13 @@ String getActualSettingsAsJson() { doc["showPM25"] = displayShowPM25; doc["measInterval"] = measurementInterval; + // Buzzer preferences + doc["actvBuzzer"] = activeBuzzer; // Buzzer active + doc["rptBuzzer"] = repeatBuzzer; // Repeat buzzer beep + doc["toneBzrBeep"] = toneBuzzerBeep; // Buzzer frequency + doc["durBzrBeep"] = durationBuzzerBeep; // Buzzer duration + doc["timeBtwnBzr"] = timeBetweenBuzzerBeep; // Time between beeps + String preferencesJson; serializeJson(doc, preferencesJson); // Serial.printf("-->[PREF] Preferences JSON: %s\n", preferencesJson.c_str()); @@ -429,6 +466,13 @@ bool handleSavePreferencesfromJSON(String jsonPreferences) { displayShowCO2 = JsonDocument["showCO2"]; displayShowPM25 = JsonDocument["showPM25"]; + // Buzzer preferences + activeBuzzer = JsonDocument["actvBuzzer"]; // Buzzer active + repeatBuzzer = JsonDocument["rptBuzzer"]; // Repeat buzzer beep + toneBuzzerBeep = JsonDocument["toneBzrBeep"]; // Buzzer frequency + durationBuzzerBeep = JsonDocument["durBzrBeep"]; // Buzzer duration + timeBetweenBuzzerBeep = JsonDocument["timeBtwnBzr"]; // Time between beeps + // mqttPass = JsonDocument["mqttPass"].as().c_str(); // wifiPass = JsonDocument["wifiPass"].as().c_str(); preferences.end(); diff --git a/platformio.ini b/platformio.ini index 8f4fc082..6f25ebc6 100644 --- a/platformio.ini +++ b/platformio.ini @@ -58,7 +58,7 @@ build_flags = -D MQTT_BROKER_SERVER="\"192.168.1.145"\" -D CO2_GADGET_VERSION="\"0.9."\" - -D CO2_GADGET_REV="\"004-feature-buzzer"\" + -D CO2_GADGET_REV="\"005-feature-buzzer"\" -D CORE_DEBUG_LEVEL=0 -DBUZZER_PIN=13 ; ESP32 pin GPIO13 connected to piezo buzzer -DBUZZER_HYSTERESIS=50 ; Hysteresis PPM to avoid BUZZER ON and OFF continuously if repeat is once From 37bdf8e9c5589a11475993a03b08edca54d9a390 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Fri, 2 Feb 2024 16:22:55 +0100 Subject: [PATCH 17/83] Add buzzer-related settings to Preferences to save in NVR --- ...d 320e66c11e6e5382b8677e99c23b9e2336d0e203 | 225 ++++++++++++++++++ 1 file changed, 225 insertions(+) create mode 100644 et --hard 320e66c11e6e5382b8677e99c23b9e2336d0e203 diff --git a/et --hard 320e66c11e6e5382b8677e99c23b9e2336d0e203 b/et --hard 320e66c11e6e5382b8677e99c23b9e2336d0e203 new file mode 100644 index 00000000..d01dc5ec --- /dev/null +++ b/et --hard 320e66c11e6e5382b8677e99c23b9e2336d0e203 @@ -0,0 +1,225 @@ +commit c6fac5662750b5b472173f3e76abc82e29076287 (HEAD -> feature-buzzer, origin/feature-buzzer) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Feb 2 16:08:01 2024 +0100 + + Add buzzer-related settings to Preferences to save in NVR + +commit 1010bbd70fdf3a0282343def79c953aae7aa8673 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Feb 2 15:07:43 2024 +0100 + + Change debug messages to be of module "BUZZ" + +commit 320e66c11e6e5382b8677e99c23b9e2336d0e203 +Merge: 06a38df 8a04b42 +Author: Mariete +Date: Fri Feb 2 14:31:20 2024 +0100 + + Merge pull request #156 from Coscolin/buzzer-menu + + Menu options to configure buzzer alarm + +commit 06a38df9e56a0c00aa8df93a7e3d4ca4dc1f075a +Merge: bfe3e8e 01573a5 +Author: Mariete +Date: Fri Feb 2 14:16:14 2024 +0100 + + Merge pull request #157 from Coscolin/buzzer + + Buzzer implementation to drive the buzzer + +commit 01573a5390ea5872f0932e5e2458211253d0849c +Author: Sergio Coscolín +Date: Fri Feb 2 14:02:34 2024 +0100 + + Move buzzerLoop() into outputsLoop() and remove #ifdef + +commit 090cf9187c4b146e30d9c46892e749022e29332c +Author: Sergio Coscolín +Date: Fri Feb 2 14:00:15 2024 +0100 + + Add ifndef CO2_Gadget_Buzzer_h + +commit 62bb9eca0bb27bebb45b1e1997933c25d9d0c66a +Author: Sergio Coscolín +Date: Fri Feb 2 13:52:48 2024 +0100 + + Change MENU -> BUZZER in comment header + +commit 7b4014378049e555099606e282b5bcdc1356d831 +Author: Sergio Coscolín +Date: Fri Feb 2 11:16:45 2024 +0100 + + Update CO2_Gadget_Menu.h to merge with feature-buzzer branch of melkati + +commit 73b2c49b5134c163e7fe76149b9aca0182701094 +Author: Sergio Coscolín +Date: Fri Feb 2 11:10:21 2024 +0100 + + Add two lines to merge without changes + +commit 834b12f892be192cca9acc92e63c6442657187b1 +Author: Sergio Coscolín +Date: Fri Feb 2 11:08:15 2024 +0100 + + Remove last line to merge without changes + +commit 0a902b153f699ec97056258cba00d834c219520d +Author: Sergio Coscolín +Date: Fri Feb 2 10:59:09 2024 +0100 + + Revert CO2_Gadget_Menu.h to create a PR without menu changes + +commit 8a04b420106bbba31c683e1edc589f73bab3123a +Author: Sergio Coscolín +Date: Fri Feb 2 10:55:44 2024 +0100 + + Menu options to buzzer alarm + + Added buzzer configuration in menu: + + - Alarm: ON / OFF + + - Repeat: ONCE / EVERY + · REPEAT ONCE: Only buzzer one time orange or red CO2 range is raised. Don't buzzer again until CO2 values downs "HYSTERIC" value down orange/red range and raise again. + · REPEAT EVERY: Buzzer all time while CO2 values are upper orange or red range. + + - Each: 5s / 10s / 15s / 30s / 1m / 2m / 5m + · Time between buzzers if repeat is "EVERY" + + - Tone: HIGH / MED. / LOW + · Frecuency of buzzer tone. + + - Span: SHORT / MED / LONG + · Duration of buzzer tones. + +commit d4628db0e54661862fff649d5e255f8edcf0ea45 +Author: Sergio Coscolín +Date: Fri Feb 2 09:38:17 2024 +0100 + + Change alarmConfigMenu to buzzerConfigMenu + +commit 972e073a4fa6b3e58523a6fe4d16fd68bc506e85 +Merge: 4b85c5f 9fdaae6 +Author: Sergio Coscolín +Date: Fri Feb 2 02:05:31 2024 +0100 + + Merge branch 'melkati:master' into buzzer + +commit 4b85c5f35a02d7d78ce83f1d75b93843634aaf06 +Author: Coscolin +Date: Fri Feb 2 02:03:52 2024 +0100 + + Buzzer menu + +commit 4c8a669f9f8ca854375512f609da46d4c4b53f05 +Author: Coscolin +Date: Fri Feb 2 02:02:56 2024 +0100 + + Buzzer async implementation + +commit 9fdaae61e3cb85a6d0be287816676a28bd3a6554 (origin/master, origin/HEAD) +Author: Mariete +Date: Thu Feb 1 20:11:29 2024 +0100 + + Update README.md Fix sensors table + +commit 7ccbd2086f3e809800db412c1ed64e25864bc8a0 +Author: Sergio Coscolín +Date: Thu Feb 1 12:21:21 2024 +0100 + + Wake up screen when CO2 rise limits + + If displaybrightness is OFF when co2 values rise limits wake up screen using function that wake up screen when any button is clicked. + + If activeAlarm is OFF this functionality doesn't work. + Maybe we can redefine logical buzzerLoog() workflow to allow wakeup display althought alarm is off. + +commit 444730e6b95b13ea82d220d2778115bb02f2bf45 +Author: Sergio Coscolín +Date: Thu Feb 1 11:52:00 2024 +0100 + + Delete WiFiMenu.h + + This file is for another develop branch. + +commit c5c92f48d71318f0f9abad851da05ef37d4ac6f2 +Author: Coscolin +Date: Thu Feb 1 03:32:45 2024 +0100 + + Buzzer implementation + +commit bfe3e8e4ba3a0f2f8186abb90ee8ed9c9d669553 (tag: v0.9.001, master) +Merge: 853d4ce 152baf7 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 30 11:56:22 2024 +0100 + + Merge branch 'development' of https://github.com/melkati/CO2-Gadget + +commit 152baf708ef9c9bbdf1a62a7207886fad256efd8 (development) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 30 11:47:36 2024 +0100 + + Enable/disable MQTT menu based on activeWIFI status and prevent unnecessary screen fill when wifiChanged and not inMenu + Fix WiFi initialitation issues with display and menu when WiFi activated from menu + +commit d6ab6a340ed5272ada6745d84bf657c3e8a7c95b +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 30 10:32:19 2024 +0100 + + Update README.md + +commit 64e13a2cb17ef2c6520595ca0a1a796658db76d1 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 30 10:31:56 2024 +0100 + + Modify partition table and Disable OTA for ESP32 to free up a lot of memory. + Add activeOTA flag for ESP32 S3 and include in menu. False by default for security. + Add a 5 secs delay until menu is active for better Improv-WiFi response + Looks like freeing memory fixes #145 + +commit 6953c97efd4d0f7d0f43032d90039f042edbf033 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 30 08:40:47 2024 +0100 + + Fix WiFi initialization issue (disable WiFi if SSID not set) + +commit 853d4ce38b8f6bcfb5f8c317f68cd866424dd00b (tag: v0.9.000) +Merge: e4f48a5 7c19c13 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Mon Jan 29 19:52:36 2024 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit e4f48a536e334a861043720c7f81378d1c83cf9a +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Mon Jan 29 19:52:27 2024 +0100 + + Version bump. Prepare for release 0.9.000 + +commit 7c19c13f3fad487ef46d9e3c0cdb8a95bdafd3d2 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Mon Jan 29 19:50:31 2024 +0100 + + Version bump. Prepare for release 0.9.000 + +commit 12324ef40b82ca8698c875cc931d8a1e38c921ba +Merge: 92f567e 670f511 +Author: Mariete +Date: Mon Jan 29 19:46:45 2024 +0100 + + Merge pull request #149 from melkati/development + + Development + +commit 670f51141556eb65014e6003d95e5a338bd08244 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Mon Jan 29 18:49:57 2024 +0100 + + Workaround to determine whether the Wi-Fi data has been changed via BLE + +commit e74b6e1c2256a4fc4ae7b6036505e42582b72495 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Mon Jan 29 18:46:34 2024 +0100 + + Don't send data by BLE if measurem \ No newline at end of file From a3ce869cb8ffa6e0134ed2049caff37b037aa0b9 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Fri, 2 Feb 2024 16:23:03 +0100 Subject: [PATCH 18/83] Fix bug in login functionality --- ...d 320e66c11e6e5382b8677e99c23b9e2336d0e203 | 4917 ++++++++++++++++- 1 file changed, 4916 insertions(+), 1 deletion(-) diff --git a/et --hard 320e66c11e6e5382b8677e99c23b9e2336d0e203 b/et --hard 320e66c11e6e5382b8677e99c23b9e2336d0e203 index d01dc5ec..81f9f557 100644 --- a/et --hard 320e66c11e6e5382b8677e99c23b9e2336d0e203 +++ b/et --hard 320e66c11e6e5382b8677e99c23b9e2336d0e203 @@ -222,4 +222,4919 @@ Date: Mon Jan 29 18:49:57 2024 +0100 Author: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Mon Jan 29 18:46:34 2024 +0100 - Don't send data by BLE if measurem \ No newline at end of file + Don't send data by BLE if measurements is not available (CO2 > 0) + +commit d81f83dbc673df70d29f75bc8987dcbcbfe654de +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Mon Jan 29 14:26:31 2024 +0100 + + Fix initialization order in setup() function + +commit 27c45a48d9047cf6cca79386ebe8f8a1eb3acd37 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Mon Jan 29 13:19:40 2024 +0100 + + Update CO2_Gadget_WIFI.h to include instructions for credentials.h file + +commit e1bdf213eb4a8efa596125b642017471241c10c9 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Mon Jan 29 13:19:06 2024 +0100 + + Add debug print statement in initPreferences() function + +commit e8392fb0c3a8832b6886e0cdcb05b4911bf6a157 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Mon Jan 29 13:11:12 2024 +0100 + + Print SSID on WiFi connect and include define DEBUG_WIFI_EVENTS for serial clarity + +commit b7cbeb4b168c28ce2edd530925787e703ca13da6 +Merge: 2b21522 92f567e +Author: Mariete +Date: Mon Jan 29 08:28:52 2024 +0100 + + Merge pull request #148 from melkati/master + + Sync branches master -> development + +commit 92f567ee75020621da3f4d10f2239b50405971c0 (tag: v0.8.088) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Mon Jan 29 07:31:30 2024 +0100 + + Better improv-WiFi support. + +commit 59e18324f0fc26c1c3f1fc31b9e3b972332c5e8d (tag: v0.8.087) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 28 19:44:11 2024 +0100 + + Add Improv-WiFi save credentials to NVR + +commit 3ebd3e23674f5dcb40a6068172d97ce1513cbdcc +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 28 19:35:35 2024 +0100 + + Fix ESP32 S3 spiffs_offset value in release3.yml + +commit 4c796fe9aa326ade7b2008335080b2dd4c7d39a5 (tag: v0.8.086) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 28 15:05:37 2024 +0100 + + Fix typo in manifest creation step + +commit 59a65144cc018a03340022dfa1fd062bfd44d68b (tag: v0.8.085) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 28 14:44:26 2024 +0100 + + Update environment matrix in release3.yml + +commit 3233bc028760fe2aa3e999d28d3f527eb25712ec (tag: v0.8.084) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 28 14:24:48 2024 +0100 + + Fix CHIP_FAMILY value in release3.yml + +commit a40322a9d16880fbff095319936aae84b10b7aad (tag: v0.8.083) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 28 14:18:28 2024 +0100 + + Fix CHIP_FAMILY value for ESP32-S3 in release3.yml + +commit 84445d425ef30f5d8de9985f2ce100c32ee779ef (tag: v0.8.082) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 28 13:53:43 2024 +0100 + + Update CO2_GADGET_REV to "082" + +commit 3157020b5b17635ee4b741ed11d4c495b3ec44e3 +Author: Mariete +Date: Sun Jan 28 13:52:54 2024 +0100 + + Update release3.yml to build only T-Display S3 (temp change) + +commit 231ffa416556bd6b40b54a4d7460b47fe86809f1 (tag: v0.8.081) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 28 13:43:08 2024 +0100 + + Update CO2_GADGET_REV to "081" in platformio.ini + +commit ed03ceb34514721d2491c42e45b37c42504fe801 (tag: v0.8.080) +Author: Mariete +Date: Sun Jan 28 13:18:27 2024 +0100 + + Update release2.yml to build only T-Display S3 (temp change) + +commit 09a21d6fdbe82fa8cd170428a20f2dca79454285 +Author: Mariete +Date: Sun Jan 28 13:08:14 2024 +0100 + + Update release3.yml to build only TTGO T-Display Sandwich (temp change) + +commit eba9bdd3f8d27a3dd182c17b3bb5cba344e11754 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 28 12:57:51 2024 +0100 + + Update CHIP_FAMILY environment variable in release3.yml + +commit dd7daf78ceaad301296f25a75e3940affd472eb9 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 28 12:57:29 2024 +0100 + + Fix with fonts in MENU for esp32dev and esp32dev_OLED + +commit c76a72b46517227d60f5a870556a9aeeafec71a4 +Author: Mariete +Date: Sun Jan 28 12:53:59 2024 +0100 + + Update release3.yml to build only T-Display S3 (temp change) + +commit 911c332239032df30148ecd9500556b6b06f123d +Author: Mariete +Date: Sun Jan 28 12:31:29 2024 +0100 + + Update release3.yml to Draft true + +commit fcf78daaf293c15ba6126739ec0acb7e2bffa1b6 +Merge: 2b2cccf 2b21522 +Author: Mariete +Date: Sun Jan 28 12:30:11 2024 +0100 + + Merge pull request #147 from melkati/development + + Development + +commit 2b21522cb60b839112e18c3abf0015973b2d87b4 +Merge: 4d73101 2b2cccf +Author: Mariete +Date: Sun Jan 28 12:30:00 2024 +0100 + + Merge branch 'master' into development + +commit 4d731017df070165c33de66d74345a94dabe32db +Merge: c3fc76c 0c2830e +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 28 12:27:59 2024 +0100 + + Merge branch 'development' of https://github.com/melkati/CO2-Gadget into development + +commit c3fc76c17d03e2689aad6751913d06c430b7b60c +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 28 12:21:48 2024 +0100 + + Add ESP32 S3 support to workflows + +commit 0c2830e36b33bf554aeafecf354819036e82550d +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 28 12:20:21 2024 +0100 + + Add ESP32 S3 support to workflows + +commit 2b2cccf0e488de003348eda05ab1eede4b13ba9f +Author: Mariete +Date: Sun Jan 28 09:57:50 2024 +0100 + + Version bump + +commit d81557c3d054700ff9757ec0b830e7caf7f60da5 +Merge: 33039a8 5e2b9b0 +Author: Mariete +Date: Sun Jan 28 09:56:01 2024 +0100 + + Merge pull request #146 from melkati/development + + Replace font 15pt regular with bold for clarity + +commit 5e2b9b0b0b055754a8a7bc5b6a7427e22e4717f7 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 28 09:54:53 2024 +0100 + + Replace font 15pt regular with bold for clarity + +commit 33039a80e32c1dac7f1eb5778619328723b25cc1 +Merge: 7280c39 c6b521f +Author: Mariete +Date: Sun Jan 28 08:58:05 2024 +0100 + + Merge pull request #144 from melkati/development + + Development + +commit c6b521fb6c10d9882d05d6143c83645d88ab11af +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 28 08:24:01 2024 +0100 + + Add use Anti-Aliased fonts in menu. + Change font to bold. + +commit 215cdaedf411cd4414ddaa4b83767ce780bcf819 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sat Jan 27 11:16:31 2024 +0100 + + Refactor utilityLoop and setCpuFrequencyAndReinitSerial functions + +commit f29c7a40e2bc586d12ce3d115aef336dc15d8bb9 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sat Jan 27 10:45:25 2024 +0100 + + Remove battery voltage field from main screen in menu and disable timeout as temporary workaround to fix #134 + +commit 7b3ffa1ad045fbdd73c32b76388b65485a450a91 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 26 20:07:54 2024 +0100 + + Remove some debug code left by mistake + +commit 8d0e05fd96ed5ec1a1b7b41f4f14a09e4276518e +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 26 19:36:56 2024 +0100 + + Try to solve #96. Update utilityLoop() to not use Serial.flush on S3 + +commit 04fc43cc4a1dc2fcc6dcda175f4c0dc6ac01015e +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 26 15:42:54 2024 +0100 + + Update TFT_POWER_ON_BATTERY pin value in platformio.ini + +commit 3a5fa8ed8dbb3291a92adffe553a8ad296c0dece +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 26 11:09:41 2024 +0100 + + T-Display S3 display on when running on battery. Closes #96 + +commit 7a80b15c206575a67a3e06f3e96170f15a3ed473 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 26 10:41:45 2024 +0100 + + Adjust CO2 Y position for T-Display S3 + +commit d7459f889196582b2f2d398a992303b1b5c670bd +Merge: 6517c70 9c2441c +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 26 10:31:15 2024 +0100 + + Merge branch 'development' of https://github.com/melkati/CO2-Gadget into development + +commit 6517c70fa75297e4e9d77dc8c0034a4441741718 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 26 10:27:05 2024 +0100 + + T-Display S3 won't turn display off by time. Fixes TFT #125 + +commit 9c2441c9b906814640f9c3e8fabf6059ff94ce22 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 26 10:24:35 2024 +0100 + + TTGO T-Display won't turn display off by time. Fixes TFT #125 + +commit faeb7bebf075309c628784aecf310499b920cf23 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 26 10:05:03 2024 +0100 + + Repair bug: Brightness adjustment doesn't work for TFT #125 (just for TTGO T-Display) + +commit 54baa14c0fb094df8e59f75b4fa65db24948557d +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 26 08:05:43 2024 +0100 + + Remove out.clear() in CO2_Gadget_Menu.h as it was causing flickering at each display update. Reverts b320c3b + +commit 725a7bbeebee05ae08362f37e4ae42ae00befaba +Author: Mariete +Date: Fri Jan 26 07:47:36 2024 +0100 + + Delete compile_commands.json + +commit 78a66bebf5586c906d10dff6817615d9a20e9f59 +Merge: 5923cf1 b320c3b +Author: Mariete +Date: Fri Jan 26 07:45:29 2024 +0100 + + Merge pull request #140 from Coscolin/develop + + Repair brightness bug #125 and clean screen after menu idle #134 + +commit 5923cf19e9c5d910b07afab039a3a245550a58cc +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 26 07:44:28 2024 +0100 + + Refactor CO2 display and color logic + +commit b320c3b368e42b80a9a92450c2819cca773f227c +Author: Coscolin +Date: Fri Jan 26 03:21:49 2024 +0100 + + Repair bug: clean screen after menu idle. + +commit db0b2444d4cccc032b385c4d8d49b88f532febc5 +Author: Coscolin +Date: Fri Jan 26 02:23:47 2024 +0100 + + Repair brightness bug + +commit 45b25c90637d3c2677d8b51610d823d08d3505e9 +Merge: 264dae6 714ae45 +Author: Mariete +Date: Thu Jan 25 19:57:51 2024 +0100 + + Merge pull request #139 from melkati/feature-improv + + Feature improv + +commit 714ae458c8dc92fa8ce4d8ae2f0e7e9b83bd6db1 (origin/feature-improv, feature-improv) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 25 19:53:38 2024 +0100 + + Update CO2 element position and font height + +commit f90f5f8c73adfc2a502d97517bcd9a12038ffd49 +Merge: 33ae3eb 264dae6 +Author: Mariete +Date: Thu Jan 25 11:52:55 2024 +0100 + + Merge pull request #137 from melkati/development + + Sync with Development branch + +commit 264dae62d199763d74f58e531badb238bb1b0694 +Merge: 8a40c5c 33ae3eb +Author: Mariete +Date: Thu Jan 25 11:52:32 2024 +0100 + + Merge branch 'feature-improv' into development + +commit 8a40c5c4e2f03c247c33db4eb9a77408a51b8bf8 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 25 11:33:54 2024 +0100 + + Attemp to fix #134 + +commit 08f824f6dc0ebb53c22ccff2d8aac22521a90831 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 25 10:23:27 2024 +0100 + + Fix MQTT connection, discovery and publishing conditions + +commit ecace015fe11344580f72fb3b8c1e65d73a6a7fb +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 25 10:22:35 2024 +0100 + + Implement timeToKeepAliveMQTT + +commit e1d6453c84c72201c824f7f80855cd26c38b0786 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 25 09:58:16 2024 +0100 + + Implement timeToKeepAliveMQTT + +commit 3360253940a3871b6a75d7424654dc14d9f670ed +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 25 09:32:34 2024 +0100 + + Update CO2_Gadget_TFT.h: Adjust CO2 element position + +commit 33ae3ebcc88601de1205c2337beb9b78b977f141 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 25 08:42:28 2024 +0100 + + Refactor to include Improv-WiFi + +commit b37684aa05301b6af2d18dde62de6b6431f15524 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 25 08:40:51 2024 +0100 + + Refactor MenuLoop for Improv-Wifi + +commit a015c05d9f0c29b4e9ac6d26d5df7fceecea22f8 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 25 08:39:43 2024 +0100 + + Refactor setup and loop functions for Improv + +commit 4f3c4f8a2f5ca2f9c8989e3401a06a8c41c659ae +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Wed Jan 24 22:25:33 2024 +0100 + + Add version information to initImprov() function + +commit 2693cb9f826f236c139d0b2cc1d2e76688680cba +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Wed Jan 24 15:31:22 2024 +0100 + + Fix onImprovWiFiErrorCb error handling + +commit 0d4936b85a055583c432e1fda9ca193e40ef332e +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Wed Jan 24 14:50:24 2024 +0100 + + Migrate to https://github.com/jnthas/Improv-WiFi-Library + Add conditional check for serial menu input + Initialize Improv library in setup function + Reorder loop functions for better performance + Update platformio.ini with new dependencies and build flags + +commit 9d261d6b11038e1108b610cc1958f3ee6f5420ec +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Wed Jan 24 06:59:24 2024 +0100 + + Refactor utilityLoop() for clarity + +commit 197f06bed204490ec7b852c664caba2fca7f04a6 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Wed Jan 24 06:55:49 2024 +0100 + + Clear screen at menu exit. Fixes #134 + +commit 54f8dbcf55683f71cbafd3d9c64e849d10512450 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Wed Jan 24 06:51:57 2024 +0100 + + Update CO2_GADGET_REV to 052-feature-improv + +commit 066561c91356fc9575ef2d4c87d023089df85078 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Wed Jan 24 06:49:09 2024 +0100 + + Fix ESP32 reset delay in web server handler + +commit 5b1693150181895d5f47ae3e134647236064e81b +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Wed Jan 24 06:48:28 2024 +0100 + + Refactor CO2_Gadget_Improv.h for improved functionality and debugging + +commit 43b6045418b1d0d31da4b1b7d16f1b03cf8e5805 +Merge: 200b5f6 87573ef +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 23 19:54:45 2024 +0100 + + Merge branch 'development' of https://github.com/melkati/CO2-Gadget into feature-improv + +commit 87573ef278cff9d088e72cb659cfdd7c6648510c +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 23 15:42:09 2024 +0100 + + Remove ENABLE_PIN configuration for T-Display S3 (not supported) + +commit c0be874c7b562445bb6d1c5d79fb17d65790af27 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 23 15:34:28 2024 +0100 + + Add GPIO configuration for TDISPLAY_S3 to README.md + +commit b78db83b30333deb9cd379a2d2bbffec0bbcae3b +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 23 15:16:52 2024 +0100 + + Add TDISPLAY_S3 board configuration to README.md + +commit c30223286d59d6c33834c6b4c127ee79298a8950 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 23 15:07:30 2024 +0100 + + Commented out battery level print statement + +commit 02e6974a0faee800299a34047077a8258e0899ca +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 23 14:29:43 2024 +0100 + + Fix display setDisplayBrightness() issue at compile time with boards other than TTGO T-Display + +commit 1bc0fddee3e747797bceda211875103e0b57872f +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 23 14:23:01 2024 +0100 + + Refactored displayShowValues function + +commit a445645900168d0634624086056a167be5894638 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 23 14:22:31 2024 +0100 + + Refactor rightPad function and loadTempArraysWithActualValues function + +commit 682b73231bcc0cdf38dcde90e38713cbac38942e +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 23 12:45:00 2024 +0100 + + Disable ESP-NOW support per default to free up some memory + +commit 94baf480cd102e27de91faf1c2aba90d3305d04f +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 23 12:26:28 2024 +0100 + + Update display brightness handling and version number + +commit cb05b24da0018ba43ee002e69c1e4b16dd832151 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 23 11:05:44 2024 +0100 + + Update element positions in CO2_Gadget_TFT.h + +commit 905792bf1f5d805bc0acc2bea29733c51a5db1bc +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 23 09:30:09 2024 +0100 + + Edit release2.yml build list to include: esp32dev, esp32dev_OLED, TTGO_TDISPLAY, TTGO_TDISPLAY_SANDWICH and TDISPLAY_S3 + +commit 6699be175ebd3dea373a05076083ade97f8558cd (feature-smooth) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 23 09:07:21 2024 +0100 + + Remove need to define I2C_SDA and I2C_SCL (calls generic Wire.begin() if not defined) + +commit 69ca59f158ad90e44cf478e3ebdade9b36c91e68 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 23 09:05:38 2024 +0100 + + Anti-aliased fonts + Use sprites for flicker-free updates + Better support for different resolutions + Improvements in display layouts + Code refactoring for clarity and modularity + +commit 5fdce44bf8144b72c60f6992e3894d45b22ed923 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Mon Jan 22 07:50:05 2024 +0100 + + Fix battery icon line position + +commit 431ce4e1df7d076c5bb947c849baa2329c63410b +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 21 15:18:54 2024 +0100 + + Fix sensorsGetMainDeviceSelected() + +commit 03648cef4ec7f649836db7a965cbe8788daab12d +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 21 15:18:03 2024 +0100 + + Update I2C pin configuration + +commit baca52e298aadc9b9afa5e325e6103ebc52b7753 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 21 13:55:30 2024 +0100 + + First MQTT publish without waiting for timeBetweenMQTTPublish + +commit 977dce481bebd1a18593dd31b7108f7e7d557fa4 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 21 13:26:22 2024 +0100 + + Fix issue with DFRobot_MultiGasSensor and SoftwareSerial on S3 + +commit a3a931de1a75f4bb653a412afbdab485d9fa4eca +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 21 12:56:15 2024 +0100 + + Fix merge issues + +commit 566e5c3a2ac407250f178f9b8e36325fb1eba67b +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 21 10:23:19 2024 +0100 + + Update default_envs in platformio.ini + +commit aa4e6af99e8fdb868ba2a6113c640326b080be9b +Merge: e11e7ae 61f3dbe +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 21 09:59:39 2024 +0100 + + Merge branch 'refactor-CO2_Gadget_TFT' into development + +commit e11e7ae7d2faf1559a0479da4fd4f4536eb7a59d +Merge: 95a6027 bdfc508 +Author: Mariete +Date: Sun Jan 21 09:40:51 2024 +0100 + + Merge pull request #131 from melkati/update-canairio_sensorlib + + Update CanAirIO Air Quality Sensors Library version + +commit bdfc508ca6fa970d5ff8ecda0acf2f5bb587af58 (origin/update-canairio_sensorlib) +Merge: 436726d 95a6027 +Author: Mariete +Date: Sun Jan 21 09:40:35 2024 +0100 + + Merge branch 'development' into update-canairio_sensorlib + +commit 436726de9cb9ec4695222409edac3ca92661aea2 (update-canairio_sensorlib) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 21 09:35:53 2024 +0100 + + Update CanAirIO Air Quality Sensors Library version + +commit 61f3dbe80f6c7fb70f797e887733c277b51e8d88 (refactor-CO2_Gadget_TFT) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sat Jan 20 23:29:57 2024 +0100 + + Revert "Add support for T-Display S3. Refactor for layout flexibility to support more resolutions. Add support for 320x170 px displays" + + This reverts commit 09f153cdb508732c5d674cf90d470cf19f220381. + +commit 77be64d9366e1da93cd5301502bd516e792af0fb +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sat Jan 20 23:28:38 2024 +0100 + + Add support for T-Display S3. Refactor function to improve performance + +commit a373b40b69838a16e6609ac0a1fd54f71d3c6f6a +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sat Jan 20 23:27:18 2024 +0100 + + Refactor GPIO initialization and pin handling + Remove unsupported code for T-Display-S3 + Update CPU frequency for power consumption reduction + +commit 96280db89dddead9fde3a0b32f4ef8618104332c +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sat Jan 20 23:26:33 2024 +0100 + + Add support for ESP32 S3. Refactor I2C pin configuration. + +commit 09f153cdb508732c5d674cf90d470cf19f220381 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sat Jan 20 23:22:17 2024 +0100 + + Add support for ESP32 S3. Refactor for layout flexibility to support more resolutions. Add support for 320x170 px displays + +commit dc0bc8a37d62db238545d68c37e45bb64ffeab21 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sat Jan 20 23:20:05 2024 +0100 + + Changes to CO2_Gadget_Sensors.h for readability + +commit 7b956d2bf747c0e885b2f4c9af76e402b50feb86 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sat Jan 20 23:18:46 2024 +0100 + + Add conditional compilation for SUPPORT_BLE + +commit 0a552f305449177094237469937aea6e66f8cecb +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sat Jan 20 12:04:26 2024 +0100 + + Add conditional compilation for MQTT support. Disable Discovery if MQTT is not supported + +commit 5a30096b49c1cde55f51dc7e2e65498400087f60 +Merge: 7a9e75c 95a6027 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 19 18:07:02 2024 +0100 + + Merge branch 'development' of https://github.com/melkati/CO2-Gadget into refactor-CO2_Gadget_TFT + +commit 95a60270b0b74389c9d6133d1e9662edb628863f +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 19 13:22:20 2024 +0100 + + Refactor env:esp32dev_OLED environment configuration in platformio.ini + +commit bab85381087e78b779266db805776a3bf97ab278 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 19 13:18:01 2024 +0100 + + Add TTGO_TDISPLAY_S3 environment to release2.yml + +commit 565cfbd781138fe5a520aa4fb60a4f0301e1e53e +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 19 13:17:22 2024 +0100 + + Add TTGO T-Display S3 environment configuration to platformio.ini + +commit c71b52408d8079caa340b1f7cc98cca6518ddcad +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 19 12:49:19 2024 +0100 + + Refactor platformio.ini build configurations + +commit 7a9e75cf7af1c3d23d2ea34510e8d9add48ea4d5 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 19 10:44:29 2024 +0100 + + Refactor CO2_Gadget_TFT and update CO2_GADGET_REV + +commit a234fcbc97aa05397621ef34a072a761664e836c +Merge: b8ac74f 1644431 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 19 10:39:05 2024 +0100 + + Merge branch 'development' of https://github.com/melkati/CO2-Gadget into refactor-CO2_Gadget_TFT + +commit 1644431c58aeaafa46e452591af939ebea590685 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 19 10:33:01 2024 +0100 + + Show big ASCII IP adress in serial port after initilization (if it's connected to a WiFi network) + +commit b8ac74f4c1f032ab0923afe0acdb39c08a53626f +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 19 10:03:07 2024 +0100 + + Refactor CO2_Gadget_TFT for flexibility to modify add more display resolutions (new TFT displays) + +commit b0d9fbd22a41ed023b049d8f06aa58aae082c4fb +Merge: d217d5d 5359bb9 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 18 21:42:06 2024 +0100 + + Merge branch 'development' of https://github.com/melkati/CO2-Gadget into development + +commit 5359bb98cd74d11e983c5486ca69d90dc395934d +Merge: 1d7d556 7280c39 +Author: Mariete +Date: Thu Jan 18 21:39:56 2024 +0100 + + Merge pull request #129 from melkati/master + + Sync developer branch with master + +commit 7280c39090e3197ad8ab35e09afd63caa8efb276 +Author: Mariete +Date: Thu Jan 18 21:13:18 2024 +0100 + + Update release2.yml. Remove esp32dev_OLED_OTA from default builds (not needed anymore) + +commit 91fd1b28192ef0f595b4e61e1fb0b869b8691b89 +Author: Mariete +Date: Thu Jan 18 21:11:34 2024 +0100 + + Update release2.yml set draft to false (make release) + +commit d217d5df179defcffbf93c1a8f1d7a25ddcf5bb8 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 18 19:58:06 2024 +0100 + + Update CO2_GADGET_REV to "018-development" + +commit 79caf329520d596ae06b1d57e4157169bdcf9677 (tag: v8.0.017) +Merge: 11c3eff 1d7d556 +Author: Mariete +Date: Thu Jan 18 19:56:37 2024 +0100 + + Merge pull request #128 from melkati/development + + Merge Development branch into Master + +commit 1d7d556a36b9b3439afca999fbcceec32bbd8a6f +Merge: 4cbf170 11c3eff +Author: Mariete +Date: Thu Jan 18 19:56:07 2024 +0100 + + Merge branch 'master' into development + +commit 4cbf1708a6b45ad202a3a01ba8cf9e07ce1b4943 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 18 19:53:34 2024 +0100 + + Update CO2_GADGET_REV to "016-development" + +commit ed2fc8f8581823ca109f636ea92734209d9a5568 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 18 19:52:44 2024 +0100 + + Update release2.yml with environment and manifest changes + +commit 11c3eff8970cf8e28b8be4e41df40549a63ac84e (tag: v8.0.015) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 18 15:22:08 2024 +0100 + + Update CO2_GADGET_REV to "015" + +commit 8b2c71175911cd8c6f097ecbad44ddc5487e787a +Merge: e0e2173 7ef0076 +Author: Mariete +Date: Thu Jan 18 15:20:08 2024 +0100 + + Merge pull request #127 from melkati/development + + Merge Development branch with new feature and fixes + +commit 7ef0076c042492ad30d616d06010040da0c2a817 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 18 15:14:18 2024 +0100 + + Add function to print large ASCII characters for IP address + +commit 6fd9717189d7115d437a0f41f6b62c5ae76fb1e7 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 18 09:45:14 2024 +0100 + + Update CO2_GADGET_REV to "013-development" + +commit ce7dd6e04902ecebc1c4630e9d7f8d7057b3df78 +Merge: a28fa7c a15e028 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 18 09:43:59 2024 +0100 + + Merge branch 'development' of https://github.com/melkati/CO2-Gadget into development + +commit a28fa7c3cdddc886abcc32bb87434ad199927e9c +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 18 09:36:00 2024 +0100 + + Update display brightness handling and configuration + +commit 974918fd66382552a49b2c37fdda32a099000382 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Thu Jan 18 09:32:28 2024 +0100 + + Add support for setting WiFi SSID and password over BLE + +commit 68d114ec125dc1e0a8f58368364d325e579be9f6 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Wed Jan 17 13:30:15 2024 +0100 + + Fix OLED display brightness issue and update actual display brightness value + +commit 92fc3f6b959e4c9b654fd920edc9c35b4fadf753 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Wed Jan 17 13:29:41 2024 +0100 + + Update display brightness and add more debug logging + +commit e0e217380954e935d44d93dc8718bc75fcb57984 +Merge: a3a680d a15e028 +Author: Mariete +Date: Wed Jan 17 11:48:25 2024 +0100 + + Merge pull request #124 from melkati/development + + Merge Development branch + +commit a15e028526192894e0487926d2dd51120d2d2887 +Merge: 7d5502d a3a680d +Author: Mariete +Date: Wed Jan 17 11:47:52 2024 +0100 + + Merge branch 'master' into development + +commit 7d5502daff033cb8613852342dadb84a42f28fae +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Wed Jan 17 09:58:30 2024 +0100 + + Fix WiFi connection retries bug + +commit 943e3d797599027105c2d6e68bd3cffe30f2d6df +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Wed Jan 17 09:29:05 2024 +0100 + + Refactor InitWifi(). Add non-blocking timing helper function. Update CO2_Gadget_REV to 009-development + +commit f10ffbcfa70a233dc603b45a7b76af564f3863ec +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 16 22:47:38 2024 +0100 + + Update WiFi credentials and CO2 gadget version + +commit 4820999a87497269f5dadac9ecfe4fa35fdb6c10 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 16 22:46:58 2024 +0100 + + Increase WiFi connection delay and add retry mechanism + +commit d042894f819cf99b1f92c11f3d3f9c81c0313d5a +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 16 22:46:33 2024 +0100 + + Disable clear preferences in initPreferences function + +commit 2e1ca44470c863f74c5c3ad70fe53e9cae1004ab +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 16 22:43:26 2024 +0100 + + Update maxWiFiConnectionRetries value to 10 + +commit 7fc3a1bd0f0a55625ff0a6664f1688a567afc217 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 16 19:20:13 2024 +0100 + + Update CO2_GADGET_REV to "006-development" + +commit a3a680df0dc1926c71038989867ab9dca9b7efa0 (tag: v8.0.003) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 16 14:40:36 2024 +0100 + + Update CO2_GADGET_REV to "003" + +commit 6d45100d833cb4cfc89a4a67828e0287d35ab3eb +Merge: 346b29b 94ce924 +Author: Mariete +Date: Tue Jan 16 14:36:28 2024 +0100 + + Merge pull request #123 from melkati/development + + Merge Development branch + +commit 94ce9245d9c8dddc89b8b5340548be7b2b9b4d39 +Merge: e8065c5 346b29b +Author: Mariete +Date: Tue Jan 16 14:35:57 2024 +0100 + + Merge branch 'master' into development + +commit e8065c5eee3ac08f3343b2283f234324eb7d863e +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 16 13:14:59 2024 +0100 + + Temporary remove utilityLoop + +commit 346b29b18b815b05aa26799b5df7f5b8fea2c15a +Author: Mariete +Date: Tue Jan 16 12:52:54 2024 +0100 + + Update bug_report.md + +commit 4112670ce38a4237a1e4bbe61001028ba022583e +Author: Mariete +Date: Tue Jan 16 12:46:33 2024 +0100 + + Update bug_report.md + +commit 200b5f6a2624aa143985259bacbe93a386c1addd +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 16 09:17:30 2024 +0100 + + Add Improv functionality (WIP) + +commit fe86fdcc14220c5432719ba10af8c9e6622b4bfb (tag: v8.0.000) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 14 21:02:57 2024 +0100 + + Update CO2 Gadget version and revision + +commit 9d937017dd7050be24bd93566eba559fce008e3b +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 14 21:00:55 2024 +0100 + + Update release2.yml with new environment and increased timeout + +commit c0a4bb77ede09a03f1a87f26657db44088b01e4f +Author: Mariete +Date: Sun Jan 14 20:45:52 2024 +0100 + + Development (#122) + + * Fix esp32dev environent (#93) (#120) + + Co-authored-by: errolt <6266552+errolt@users.noreply.github.com> + Co-authored-by: errol t + + * Update README + + * Add ESP32 board configurations to README + + * Fix display brightness issue and add debug message #121 + + * Update CO2_Gadget_Preferences.h and platformio.ini + + Change activeWIFI be true by default + + * Fixes #if defined(SUPPORT_OLED) || defined(SUPPORT_TFT) closes #121 + + --------- + + Co-authored-by: errolt <6266552+errolt@users.noreply.github.com> + Co-authored-by: errol t + Co-authored-by: Mario Mariete <11509521+melkati@users.noreply.github.com> + +commit e0b533c24b03e0706d2021ce26b904e4f0df5172 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 14 20:34:40 2024 +0100 + + Fixes #if defined(SUPPORT_OLED) || defined(SUPPORT_TFT) closes #121 + +commit c38d885a3704a451eba6a5d4da190301f1f98b73 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 14 15:44:56 2024 +0100 + + Update CO2_Gadget_Preferences.h and platformio.ini + + Change activeWIFI to true in CO2_Gadget_Preferences.h and update CO2_GADGET_REV to 036 in platformio.ini. + +commit 4d0666a6bcf6cd3a5f7d4917e9447ccc7bb67e51 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 14 15:00:26 2024 +0100 + + Fix display brightness issue and add debug message #121 + +commit f0ca950d2b71618b2b8a185493d0b40ae6302ca7 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 14 13:57:40 2024 +0100 + + Fix typos and add ESP32 board configurations to README + +commit dbaac6033a44698d0f84cf4c580d6ca61a6f0499 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 14 13:40:09 2024 +0100 + + Fix typo in README + +commit 3cc70b4a027bd01d667b207b1850d5fe6c0e861d +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 14 13:38:35 2024 +0100 + + Update README + +commit 9cac59ab37b2078350df52a4da806de34b9479b0 +Author: Mariete +Date: Sun Jan 14 13:17:27 2024 +0100 + + Fix esp32dev environent (#93) (#120) + + Co-authored-by: errolt <6266552+errolt@users.noreply.github.com> + Co-authored-by: errol t + +commit cd482e8ddde03d97681e488308a6419ebe5774f8 +Author: Mariete +Date: Sun Jan 14 12:36:29 2024 +0100 + + Update release2.yml + +commit 9761e4483a7bf060baf301b07ee3cad63930b7e4 (melkati/issue121) +Author: Mariete +Date: Sun Jan 14 12:09:20 2024 +0100 + + Version bump + +commit b222c9dd4092211b717c8b3f67f3fb548c97b814 +Author: Mariete +Date: Sun Jan 14 11:35:53 2024 +0100 + + Add web based configuration at http://ip/preferences.html (WIP) (#117) (#118) (#119) + + * Update CO2_GADGET_REV to "014-web-config-new" in platformio.ini + + * Add preferences page and handler for saving preferences + + * Add onload function to fetch CO2, temperature, and humidity data + + * Display Git HEAD in setup (Add .py and platformio_extra_configs.ini to .gitignore) + + * Modify preferences.html + + * Load preferences form (first version, non functional) + + * Add ArduinoJson library and implement API endpoint to get preferences as JSON + + * Preferences received on Save Preferences from configuration web page + + * Update CO2_GADGET_REV to "020-web-config-new" in platformio.ini + + * Update CO2_GADGET_REV to "024-web-config-new" + + * Enable mDNS support for WiFi + + * Increase size of DynamicJsonDocument in getPreferencesAsJson() function + + * First rude web-config working (WIP no tested. no error checking) + + * Enable utilityLoop() function in main loop + + * Update publish functions to use int64_t and fix MQTT publish calls + + * Add Restart ESP32 button to settings form. CSS styles + + * Fix altitude misspelling + + * Fix tempOffset assignment and update sensors + + * Update vRef and battery voltage calculation on change from web settings page + + * Add flash memory information to setup() function + + * Fix utilityLoop() + + --------- + + Co-authored-by: Mario Mariete <11509521+melkati@users.noreply.github.com> + +commit ffddf1e765f1a12b16cd852ff84604fda036a0bb +Author: Mariete +Date: Sun Jan 14 11:27:15 2024 +0100 + + Add web based configuration at http://ip/preferences.html (WIP) (#117) + + * Update CO2_GADGET_REV to "014-web-config-new" in platformio.ini + + * Add preferences page and handler for saving preferences + + * Add onload function to fetch CO2, temperature, and humidity data + + * Display Git HEAD in setup (Add .py and platformio_extra_configs.ini to .gitignore) + + * Modify preferences.html + + * Load preferences form (first version, non functional) + + * Add ArduinoJson library and implement API endpoint to get preferences as JSON + + * Preferences received on Save Preferences from configuration web page + + * Update CO2_GADGET_REV to "020-web-config-new" in platformio.ini + + * Update CO2_GADGET_REV to "024-web-config-new" + + * Enable mDNS support for WiFi + + * Increase size of DynamicJsonDocument in getPreferencesAsJson() function + + * First rude web-config working (WIP no tested. no error checking) + + * Enable utilityLoop() function in main loop + + * Update publish functions to use int64_t and fix MQTT publish calls + + * Add Restart ESP32 button to settings form. CSS styles + + * Fix altitude misspelling + + * Fix tempOffset assignment and update sensors + + * Update vRef and battery voltage calculation on change from web settings page + + * Add flash memory information to setup() function + + * Fix utilityLoop() + + --------- + + Co-authored-by: Mario Mariete <11509521+melkati@users.noreply.github.com> + +commit d836e3a9d693de29a023275938a0af40360a96f8 +Merge: fd84fdd 30cd603 +Author: Mariete +Date: Fri Jan 12 08:15:07 2024 +0100 + + Merge pull request #114 from melkati/development + + Development + +commit 30cd603b6b0dc1e9ef81bd02d90cd39d90a3e7ed +Merge: dfdf8f5 fd84fdd +Author: Mariete +Date: Fri Jan 12 08:14:02 2024 +0100 + + Merge branch 'master' into development + +commit dfdf8f5a23dbde859e28f461ddbe48930e76c53b +Merge: bcf47d1 881e666 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 12 08:10:21 2024 +0100 + + Merge branch 'development' of https://github.com/melkati/CO2-Gadget into development + +commit bcf47d13a4c9e8326b3e827c63aef8869d30c54a +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 12 08:10:08 2024 +0100 + + Update MQTT publishing. Some clean up. + +commit fd84fdd2499596a95b3e781f41b20606d8852072 +Author: Mariete +Date: Fri Jan 12 06:51:30 2024 +0100 + + Fix serial console input (#113) + + * Fix serial console input + +commit 881e666eaa30d99f03f40680dd1ca1ec2876b5d3 +Merge: e3d6221 531adae +Author: Mariete +Date: Fri Jan 12 06:50:22 2024 +0100 + + Merge branch 'master' into development + +commit e3d62219074afbe22f94800474d8adbec7059d82 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 12 06:48:36 2024 +0100 + + Update CO2_GADGET_REV to "019" + +commit 3a7b40808038720c795c0a12ee61f739f1fdafb1 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Fri Jan 12 06:45:23 2024 +0100 + + Fix serial console input + +commit 531adae99ff0df44303aa6c50819b478a576f1aa +Author: Mariete +Date: Wed Jan 10 21:50:12 2024 +0100 + + Update CO2_Gadget_REV to 013 and remove unused code (#110) + + Co-authored-by: Mario Mariete <11509521+melkati@users.noreply.github.com> + +commit 076688c288d012f2fa4cf425d88616263e4c2059 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Wed Jan 10 20:58:11 2024 +0100 + + Update CO2_Gadget_REV to 013 and remove unused code + +commit 10ebc44f5b3df25ee190ccd0ab03f6f1aafb4121 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Wed Jan 10 20:36:22 2024 +0100 + + Update CO2_GADGET_REV to "012" + +commit 3b29774f41939e8bd12cfe87d606d9bfa20f75b8 +Author: Mariete +Date: Wed Jan 10 20:21:19 2024 +0100 + + Fix serial communication when changing CPU frequency (#109) + + Co-authored-by: Mario Mariete <11509521+melkati@users.noreply.github.com> + +commit ebe1d5176105efc83abb99724bfb03e5d7638211 +Author: Mariete +Date: Wed Jan 10 20:07:15 2024 +0100 + + Update Sensirion Gadget BLE library and refactor code (#108) + + Co-authored-by: Mario Mariete <11509521+melkati@users.noreply.github.com> + +commit 25de3029a1b3fec252bdfa1e535660e01b7f21bf +Author: Mariete +Date: Wed Jan 10 13:49:03 2024 +0100 + + Fix serial communication when changing CPU frequency (#106) + + Co-authored-by: Mario Mariete <11509521+melkati@users.noreply.github.com> + +commit 565f1ad9487e560d6a4e2d445abef78d69bbcb6c +Merge: cf4a49a ae05ae8 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Wed Jan 10 13:28:42 2024 +0100 + + Update CO2_Gadget_Battery.h, README.md, platformio.ini, CO2_Gadget_WIFI.h, and CO2_Gadget.ino + +commit ae05ae83e19068db0627494ad529b1ba53888077 +Author: Mariete +Date: Wed Jan 10 12:46:37 2024 +0100 + + Add Home Assistant (and others) MQTT Discovery (#103) + + * Add MQTT Discovery support + + * Add header guards to all header files + + * Update setup() function to print system information + + * Send system data by MQTT + + * Add battery level and voltage reporting to MQTT + + * Add QoS parameter to publishStrDiscoveryMQTT function + + * Temporary remove MAC Address, Hostname, IP and Status from discovery + + * Update README.md (#105) + + --------- + + Co-authored-by: Mario Mariete <11509521+melkati@users.noreply.github.com> + +commit fcb1f4d5cf5c098b192416b603ba142b3bca6dc5 +Author: Mariete +Date: Wed Jan 10 10:34:49 2024 +0100 + + Update README.md + +commit cf4a49a07297bb0ec782f221e2f9b89fcb17d156 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Wed Jan 10 09:10:21 2024 +0100 + + Update CO2_GADGET_REV to "008" + +commit f2cbcc5e6643745a0d44b8755d6b31d4c0c31d26 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Wed Jan 10 09:05:44 2024 +0100 + + Adjust CPU to 240Mhz if on USB power (voltage > 4.5V) + +commit c7d1a456397d53fe6c5f71883988fe1542c9cbba +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 9 10:47:02 2024 +0100 + + Update CO2_GADGET_REV to "007" in platformio.ini + +commit 5b88e2b73c1b5f507a9bfd032a9ec5eb44fe70e3 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 9 09:59:41 2024 +0100 + + Update setup() function to print system information + +commit 03793beebe93eb4d844cd6308e9db4c659bac23f +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Tue Jan 9 08:28:08 2024 +0100 + + Add header guards to all header files + +commit 70aaaa06ea40db3ad947cf2d6dc135d09808b091 +Author: Mariete +Date: Mon Jan 8 15:06:06 2024 +0100 + + Update README.md + +commit 5228c774bfcfaa906712d478e839b4479c60b0fb +Author: Mariete +Date: Mon Jan 8 15:05:26 2024 +0100 + + Update README.md + +commit 536ecd026cca88a4bed68e1d52e7e5411f973193 +Author: Mariete +Date: Mon Jan 8 10:00:05 2024 +0100 + + Add ESPNOW icon (#98) + + * Add icon EspNow (thanks @Kartoffel) + * Add showEspNowIcon function to display icons on TFT screen + +commit be5f8d96d8785450323aa954d9bb4bf8e85f6706 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 7 22:26:33 2024 +0100 + + Update environments in release2.yml + +commit d63e627087d6fcae7b12d6fbd9fd4c254e3a9b54 (tag: v7.0.005) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 7 22:24:54 2024 +0100 + + Update CO2_GADGET_REV to "005" + +commit 4ec9b5045109e1a7832c6088d5351be43f02e90b +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 7 22:24:24 2024 +0100 + + Update firmware file paths in release workflow + +commit 990e758410d74cf8ff18734b3cc93132e39f9851 +Merge: 25570fd 5532497 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 7 22:08:23 2024 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 25570fd11a5081d65f9a40c807219e7e20e5051b (tag: v7.0.004) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 7 22:07:53 2024 +0100 + + Update release.yml for multicore + +commit b4352969efbfdccd9e526a2390b1431eeff981d2 (tag: v7.0.003) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 7 21:43:49 2024 +0100 + + Bump version + +commit e2a1b8431b8ac6e118a2de64b3f250062c77bf3c +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 7 21:36:44 2024 +0100 + + Bump version + +commit 553249720d978c38abd1e42abc25ba06ff6c2bda +Author: Mariete +Date: Sun Jan 7 21:14:08 2024 +0100 + + Update platformio.yml + +commit edc8ea8f8b806c11fa7cc622517c7fd1693ccfca +Merge: da834aa 8b26a01 +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 7 21:11:51 2024 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit da834aa1df604ff6ffdd298c983fffdb76310d08 (tag: v0.7.001) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 7 21:09:22 2024 +0100 + + Bump version + +commit 8b26a018872173d6977ee1bbfbe87091fe654539 +Author: Mariete +Date: Sun Jan 7 15:55:12 2024 +0100 + + Update release2.yml + +commit 74a6e10f6648e2dbe80c8226ce9989de49111505 +Author: Mariete +Date: Sun Jan 7 15:44:46 2024 +0100 + + Update release2.yml + +commit ceff10df7087d5bc94ba76dba76f207455bd7de4 +Author: Mariete +Date: Sun Jan 7 15:05:11 2024 +0100 + + Update release2.yml + +commit 4d857fa2b9bd49daf9dd2252eb69a88481f427f7 +Author: Mariete +Date: Sun Jan 7 14:35:53 2024 +0100 + + Update release2.yml + +commit 8fe84e3cbfda838817f60ddf4b479b86ed492015 +Author: Mariete +Date: Sun Jan 7 14:26:46 2024 +0100 + + Update release2.yml + +commit 891789d250fc14267973b10fec8f7055b323d6e6 (tag: v0.7.000) +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 7 13:21:43 2024 +0100 + + Update WiFi Troubleshooting Variable and Version/Revision Numbers + +commit e8d1a60afd8e506d8973ae291b11d1101ad61eba +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 7 13:10:42 2024 +0100 + + Refactory WiFi and MQTT connection strategy + +commit 41e644bd6c15d00949490109ca2eaf759f8f91cd +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 7 08:56:03 2024 +0100 + + Add credentials.h to .gitignore + +commit 7dc4085a97ae3911c8ec3a9c6fa6282bdbf9de6b +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sun Jan 7 08:54:54 2024 +0100 + + Comment doubleclick test code + +commit 3562b483d470dabc06048528c9b3e37c14ef733a +Author: Mario Mariete <11509521+melkati@users.noreply.github.com> +Date: Sat Jan 6 21:08:54 2024 +0100 + + Update dependencies in platformio.ini + +commit 19f2a26bbc60e3e4f1c88b345e6938d392f4d87d +Author: eMariete.com +Date: Sat Feb 26 13:55:10 2022 +0100 + + ESP-NOW peer address defaults to broadcast (FFFFFF) + +commit cc28eddaf453fa15933585934c362a6c1f7737aa +Author: eMariete.com +Date: Sat Feb 26 13:16:28 2022 +0100 + + Add ESP-NOW PEER to menu and preferences + +commit 6bb36774b421d7c9c6dead3b5bfb19eeb855e131 +Author: eMariete.com +Date: Thu Feb 24 14:14:27 2022 +0100 + + Add ESP-NOW unicast + +commit 60f20ee248aa65de747835aadd127a82211f45de (tag: v0.6.000) +Author: eMariete.com +Date: Wed Feb 23 14:54:44 2022 +0100 + + Version Bump + +commit 2f85f7ef03d02da3375d855360f94e56a90a15a4 (tag: v0.5.088) +Author: eMariete.com +Date: Wed Feb 23 14:45:09 2022 +0100 + + Version Bump + +commit 95c95abe0b15c6551d9bf9a1471fd97a9082f173 +Merge: 70ac213 dd81858 +Author: eMariete.com +Date: Wed Feb 23 14:17:41 2022 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 70ac213fbe2a1ba961224c4d8b33e8fde4a92e8d +Author: eMariete.com +Date: Wed Feb 23 14:17:31 2022 +0100 + + Improvements to ESP-Now + +commit dd81858b6d04e7f8e656f79ead756dc352913c51 +Author: Mariete +Date: Thu Feb 17 13:59:32 2022 +0100 + + Update README.md + +commit 6452b00b3ce57c4dd8876671bd0a4696b83eada0 +Author: Mariete +Date: Sun Feb 13 22:59:03 2022 +0100 + + Update README.md + +commit 9c763c784896cc315cacea831c0406e1feeebeae +Author: eMariete.com +Date: Tue Feb 8 21:22:17 2022 +0100 + + Avoid call to BLELoop() if SUPPORT_BLE no defined + +commit edb9acf3a17bb242b1eb6d7f8e7268973499be8b +Author: eMariete.com +Date: Tue Feb 8 21:18:35 2022 +0100 + + Rename define CO2_Gadget_ESP-NOW as CO2_Gadget_ESP_NOW + +commit c392f70560cd95deff081d7887866bc391610245 +Author: eMariete.com +Date: Tue Feb 1 08:57:30 2022 +0100 + + Version bump + +commit 68ade22add96799103059b8cb24eb6a68b977fa3 +Author: Mariete +Date: Tue Feb 1 07:04:22 2022 +0100 + + Fix issue with BLE fetch from MyAmbiance App not downloading historical data (#87) + +commit d64560de025ee36eaa9414471f388b1ef52ba8fc +Merge: 909c7be 7bac0ad +Author: eMariete.com +Date: Mon Jan 31 19:42:25 2022 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 7bac0addc1fe9b53a94170ad8e38053dc79858eb +Author: Mariete +Date: Mon Jan 31 19:40:48 2022 +0100 + + Create .gitattributes + +commit 909c7be7981e6af1f032fe75f63bff4ebf922848 +Author: eMariete.com +Date: Sat Jan 22 10:03:32 2022 +0100 + + Remove "Test menu event" from calibration menu + +commit b0c25aaa3a70762af0fd9c795289f4356bdef2fe +Author: Mariete +Date: Sat Jan 22 01:32:11 2022 +0100 + + Add options to menu to Hide/Show specific measurements on the display (#85) + + * Add variables and preferences for display show/hide options + * Add options to menu + * Add logic to show/hide options on display + +commit e76762c0c5d53d2edb81452afcf88cc134ecdbb3 +Author: eMariete.com +Date: Fri Jan 21 20:52:49 2022 +0100 + + Update README.md + +commit 07971ae150664f9e5b323431347a3885cdcddc08 +Merge: b1a4df6 4cc4b50 +Author: eMariete.com +Date: Fri Jan 21 20:17:45 2022 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit b1a4df61b904992e0a2669bae8aa0d94b3478d9a +Author: eMariete.com +Date: Fri Jan 21 20:17:36 2022 +0100 + + Add support for OLED brightness control (contrast) + +commit 4cc4b50b53e1516267b9d991e29f6fdb35423cea +Author: Mariete +Date: Thu Jan 20 23:58:56 2022 +0100 + + Update README.md + +commit 3a996f84c2d53bf0fd04aefd0f891140999a0b1b +Author: eMariete.com +Date: Thu Jan 20 20:23:25 2022 +0100 + + Update README.md + +commit 9dee1ff9367b99c12002c3ac2a4380537afc3126 +Author: eMariete.com +Date: Thu Jan 20 19:38:56 2022 +0100 + + Makes variables modified in ISR and callbacks volatile + +commit 4669b67d3188821a34559d559eeb09543c7a6a79 +Merge: e5e4ffc d56f9e1 +Author: eMariete.com +Date: Thu Jan 20 08:45:41 2022 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit e5e4ffc2c135caf2852bf1d29a61c14ee95bb6e4 +Author: eMariete.com +Date: Thu Jan 20 08:44:04 2022 +0100 + + Merge upstream + +commit d56f9e175a2b87a4e906bd89453bd6b73be00650 +Author: Mariete +Date: Thu Jan 20 08:31:46 2022 +0100 + + Update platformio.yml + +commit a083bae8809db08cc266787bb6a7686d2a99d486 +Author: Mariete +Date: Thu Jan 20 08:16:36 2022 +0100 + + Fix #50 millis() overflow (#84) + +commit fa8f681a1dc25b9ddd9bf9b93d9cb9958bfa42e2 +Author: eMariete.com +Date: Wed Jan 19 23:27:19 2022 +0100 + + Version bump + +commit 031ee28e002003357f0bff81f6609b2ac5412e05 +Author: Mariete +Date: Wed Jan 19 23:26:18 2022 +0100 + + Update README.md + +commit 7044841d7e3f2a26529bfec69c085d39932a06c2 +Author: Mariete +Date: Wed Jan 19 23:21:20 2022 +0100 + + Add ESP-NOW communications protocol from Espressif (#83) + + * Add basic ESP-NOW functionality + * Fix make ESP-NOW work without WiFi enabled + * Add ESP-NOW enable/disable to configuration menu and preferences + +commit e58bd9595d5623f37d6ee71dcae1cc383eb588b1 +Author: eMariete.com +Date: Tue Jan 18 12:59:34 2022 +0100 + + Add .clang-format Google Style 4 spaces indent + +commit a751bc6b26ed7f0981af3e764a08ba011f3288fd +Author: Mariete +Date: Mon Jan 17 20:51:41 2022 +0100 + + Update README.md + +commit a3251907e910603b1daf08d108144604b4947bd3 (tag: v0.5.069) +Author: eMariete.com +Date: Mon Jan 17 10:53:04 2022 +0100 + + For general release v0.5.069 + +commit 56fd93e799d27cd0db4d207c71bc9999d291ea63 +Merge: 58c72bb 24eee98 +Author: eMariete.com +Date: Mon Jan 17 10:51:58 2022 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 58c72bb8815bb8181a7a4f65b8243e6bc9240e34 +Author: eMariete.com +Date: Mon Jan 17 10:51:30 2022 +0100 + + For general release v0.5.067 + +commit 24eee9892946bfb93250311bb40419da25f350ef +Author: Mariete +Date: Mon Jan 17 10:48:44 2022 +0100 + + Update platformio.yml + +commit 7722f3cd86c487aac374472e20f269f8a7b0a84f +Author: eMariete.com +Date: Mon Jan 17 10:44:18 2022 +0100 + + For general release v0.5.0667 + +commit 4d7c26c12dc3c2e064c43cc5d8f92dffc6090c84 +Merge: f7a6589 c2bc215 +Author: eMariete.com +Date: Mon Jan 17 10:37:46 2022 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit f7a6589c22473d5b5c141687e92186dc71a0e9a6 +Author: eMariete.com +Date: Mon Jan 17 10:37:31 2022 +0100 + + For general release v0.5.066 + +commit c2bc215ed9f786b948830af26cfc4391e2ee598d (tag: v0.5.066) +Author: eMariete.com +Date: Mon Jan 17 10:01:59 2022 +0100 + + For general release v0.5.066 + +commit c716f6fbd2e22c6681f51f9ca4c4c22df382f904 +Author: Mariete +Date: Mon Jan 17 09:22:49 2022 +0100 + + Update release2.yml + +commit e88f848abd847f529bca52e248d7bda3f52e460e +Author: eMariete.com +Date: Sun Jan 16 21:25:44 2022 +0100 + + For general release v0.5.065 + +commit 3c57b44f12b683629cba056399863bc25ccd1e2d (tag: v0.5.065) +Author: Mariete +Date: Sun Jan 16 16:01:43 2022 +0100 + + Add selection to MENU for Relay or RGB LED (#79) + + * Rename Neopixel Config Menu as Outputs Config Menu + * Add bool outputsModeRelay in preferences + * Add GPIO Outputs Mode to MENU + * Refactor outputsLoop() + * Fix cosmetic typo in menu + * Version bump + +commit 6b00dc2d8cda33fdd2d1c764c8d9ba87c573f53b +Author: Mariete +Date: Sat Jan 15 22:25:00 2022 +0100 + + Add ambient measurements (temperature and humidity) to OLED display (#78) + + * Add ambient measurements to OLED display + * Refactored display functions names + +commit 95b196ca4bd7817c6f1f16f31e3dbeaf7b4cb261 +Author: eMariete.com +Date: Sat Jan 15 12:54:15 2022 +0100 + + Version bump + +commit f27163f05fa5179873cddab870412dbe45a6f08f +Author: Mariete +Date: Sat Jan 15 12:30:45 2022 +0100 + + Added support for Neoxixel LED (WS2812B and others) (#75) + + * Add feature neopixel + * Changed WS2812B color from orange to yellow + * Add Neopixel flavor selection to config menu + * Improve Neopixel menu selection + * Improve Neopixel colors + * Set neopixelBrightness default value to 50 + * Fix apply neopixelBrightness on init + * Fix I2C_SDA and I2C_SCL duplicate definition warning + * Update GPIO used in README.md + +commit 141c8b45eb26c9a36da34a99dc1682f1de8df64d +Author: Mariete +Date: Tue Jan 11 21:55:55 2022 +0100 + + Update README.md + +commit cb39d87e7e25f07cec82b1340af0a6deaaa35173 +Author: Mariete +Date: Mon Jan 10 20:03:26 2022 +0100 + + Update README.md + +commit 41092bbcd042643ca8fb481c7554d67d2f62e7d6 +Author: Mariete +Date: Wed Jan 5 13:25:53 2022 +0100 + + Update README.md + +commit ffce188f80cc9537e0b44b0ab0f7b2f5c36334b7 +Author: Mariete +Date: Mon Jan 3 15:06:21 2022 +0100 + + Update README.md + +commit d69294294bdaa790c71a2eee84285cf9e1bac1d1 +Author: Mariete +Date: Mon Jan 3 14:48:21 2022 +0100 + + Update README.md + +commit b32737e1f9371f5884fa9b354be0c2af0ec100ea +Author: Mariete +Date: Mon Jan 3 09:06:11 2022 +0100 + + Update README.md + +commit b72443915f137481ee5ae27afb3eb97429e128f1 (tag: v0.5.041) +Author: eMariete.com +Date: Tue Dec 28 22:05:10 2021 +0100 + + Version bump for release v0.5.041 + +commit a78454436604762c2bbda9869ce6bdd9741562c4 +Author: eMariete.com +Date: Tue Dec 28 21:52:39 2021 +0100 + + Prepare for release v0.5.040 + +commit 1226579d1826616dbed0e6c8b2b8bcc73d48e5a9 +Author: Mariete +Date: Tue Dec 28 21:50:28 2021 +0100 + + Add functionality for MQTT Alarms (#71) + + The concentrations at which these messages are sent are customizable and coincide with those you have configured as orange level and red level. + + Messages are sent with ON payload when reaching the level of that color and do not send OFF payload ultil the CO2 level drops at least 100 ppm below that level (hysteresis = 100ppm). + + Hysteresis prevents to continually sending on and off messages if the concentration keeps fluctuating around that concentration. + + Message for green is sent with payload ON when CO2 concentration is bellow the orange level and with payload OFF as soon as the concentration reaches the orange level. + + Publishing topics: + + - topic/green + - topic/orange + - topic/red + +commit 0ca8267b126344ac09bf6fd6ef0fd301a8dbf1d0 +Author: Mariete +Date: Tue Dec 28 20:31:34 2021 +0100 + + Feature GPIO outputs for relays, LEDs, etc. (#68) + + * Add functionality for relay outputs (GPIO) + + * Updated README for relay outputs (GPIO) + + * Active relay outputs (GPIO) when CO2 value equal to threshold (not only greater) + + * Add GPIO GREEN_PIN to functionality relay outputs (for LEDs) + + * Update README.md + +commit 1732548ca5fa7799321169915aee0aa95bab80e1 +Author: eMariete.com +Date: Tue Dec 28 19:37:27 2021 +0100 + + Make BTN_DWN board dependant (platformio.ini) + +commit c1a1f9cf2fe26431d80a85d6f440ccbb09dd0c31 +Author: eMariete.com +Date: Mon Dec 27 05:36:51 2021 +0100 + + Move button pins to platformio.ini + +commit 313f1db407a161f84c80d59277b5ac2bdc0ebb59 +Author: eMariete.com +Date: Sat Dec 25 13:13:27 2021 +0100 + + For general release v0.5.026 + +commit e185cd4158f15ae8b79ea263028ea242e24b2789 (tag: v0.5.026) +Merge: 843ac59 002cf04 +Author: eMariete.com +Date: Sat Dec 25 13:10:04 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 843ac59226d660e54c24c30472d4cef3b052c819 +Author: eMariete.com +Date: Sat Dec 25 13:09:53 2021 +0100 + + Prepare for release + +commit e12ce00da2c36893e8247c332e3b6da691ff19b0 +Author: eMariete.com +Date: Sat Dec 25 13:09:16 2021 +0100 + + Prepare for release + +commit 002cf046cfb5519967fd0e92d4b05beba6625209 +Author: Mariete +Date: Sat Dec 25 13:02:00 2021 +0100 + + Add notifications (pop-ups) on display + + Added displayNotification() and overload for display of two lines (#66) + +commit f2b889bbc51b0e9d466f49b529a2e7e893e3ce37 +Author: eMariete.com +Date: Sat Dec 25 08:23:11 2021 +0100 + + Fix OTALoop + +commit fce8ee7e609175ad3954ee716bf678db46b49280 +Author: eMariete.com +Date: Fri Dec 24 22:07:51 2021 +0100 + + Add env:esp32dev_OLED_OTA + +commit db9618c8dcf4818142c50c8c7e398542945d4020 +Author: Mariete +Date: Fri Dec 24 19:11:09 2021 +0100 + + Add Feature OTA (Over The Air Update) (#64) + +commit 2cc30ba09e18cf689308d224868b4f227ea17fa3 +Author: eMariete.com +Date: Wed Dec 22 08:58:45 2021 +0100 + + Version bump + +commit 0a026bb148e9e451fadaabf4bb1c2e171598f234 +Author: eMariete.com +Date: Wed Dec 22 07:16:17 2021 +0100 + + SUPPORT_BLE by default + +commit b8c13b1022ad0ceb17f4faf077d0299a20f034ab +Author: eMariete.com +Date: Wed Dec 22 07:11:33 2021 +0100 + + Add define SUPPORT_BLE + +commit 26f9555ef266230bad2242d6aea20cdbd6981b62 +Author: eMariete.com +Date: Tue Dec 21 22:42:09 2021 +0100 + + Rename FAKE sensor type as DEMO (for future use) + +commit 152d8c3dd5bd8892b8b8238abf0d13d2ccdb5cbc +Author: eMariete.com +Date: Tue Dec 21 21:30:49 2021 +0100 + + Clean up reverseButtons + +commit 5aa854c8e5ba257776551caf76641331e9fd1e2f +Merge: 77f938e 7b35e1a +Author: eMariete.com +Date: Tue Dec 21 20:59:49 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 7b35e1add63052d21484e1b2911ea99e606afb1c +Author: Mariete +Date: Tue Dec 21 20:51:13 2021 +0100 + + Test + +commit 77f938e71e9f687c7610ff828f4559464c6ce29e +Author: eMariete.com +Date: Tue Dec 21 20:47:42 2021 +0100 + + Version bump + +commit e258e2c278afaad0e3898ae97f9a6261747b7f35 +Author: Mariete +Date: Tue Dec 21 17:38:37 2021 +0100 + + Feature reverse display (#57) + + * Add feature display reverse the display (rotate 180º) and swap buttons on display reverse + +commit 4f138c8d5440991a2292f6388ad3f905a509bb1a +Author: eMariete.com +Date: Tue Dec 21 12:53:35 2021 +0100 + + Update Arduino IDE notes + +commit 89840707930bdf089b014c9966d895e7a58022cc +Author: eMariete.com +Date: Tue Dec 21 12:46:34 2021 +0100 + + Update Arduino IDE notes + +commit 668b66c5f9f5a2ec6979fb84d6de42c99a7447e1 +Author: Mariete +Date: Mon Dec 20 23:22:24 2021 +0100 + + Add feature to change measurement interval (#60) + +commit 78fab981314a947766c8e71b5faf88c3b3534503 +Author: Mariete +Date: Mon Dec 20 19:12:19 2021 +0100 + + Update README.md + +commit 2892f97338d7410d1ae3f6b04809a2892e459f5b +Author: Mariete +Date: Mon Dec 20 15:29:51 2021 +0100 + + Add option to show Fahrenheit units on display for temperature (#58) + + * Add feature displaying temp in Farenheit + +commit 8b55114596b1c5b811b091d794e3dccd75928657 +Author: Mariete +Date: Mon Dec 20 08:32:16 2021 +0100 + + Show CO2 Gadget Flavour on menu and on console at startup (#56) + +commit ede1d5ba89f0fe8bce68449633d8d0d0e6fe102c +Merge: c5f45ec 140b6f7 +Author: eMariete.com +Date: Mon Dec 20 07:25:37 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit c5f45ec387b0fd7e7e02761a5a046da9eec043f7 +Author: eMariete.com +Date: Mon Dec 20 07:25:28 2021 +0100 + + Fixed issue with TFT_eSPI library + +commit 140b6f74b5d38cb59a646aae13d3c92c720c0e34 +Author: Mariete +Date: Sun Dec 19 11:06:12 2021 +0100 + + Update platformio.yml + +commit 29641b8aaf76ab9c4a26842db48fcd4c67f5d037 +Author: eMariete.com +Date: Sun Dec 19 11:04:38 2021 +0100 + + Try to fix compilation time errors with TFT_eSPI + +commit fddfaccd6d77c207bdf422d864c03c2d21aa91e5 +Author: eMariete.com +Date: Sun Dec 19 01:35:22 2021 +0100 + + Fix setDisplayBrightness() compile error if defined SUPPORT_OLED + +commit 54485a1a8bfd770160bc72dceae0b25179ebe1b6 +Merge: 6dddf73 e9740cf +Author: eMariete.com +Date: Sat Dec 18 22:55:56 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 6dddf732ee3e0e86fc0ee945d9d1fac3ee72f48d +Author: eMariete.com +Date: Sat Dec 18 22:55:48 2021 +0100 + + Rename setTFTBrightness() as setDisplayBrightness() + +commit 958f95072663c8549e81cf7c096700caa483329a +Author: eMariete.com +Date: Sat Dec 18 22:55:17 2021 +0100 + + Rename setTFTBrightness() as setDisplayBrightness() + +commit e9740cf1697b4edd190cdae8a1480929fe9aa9ff +Author: Mariete +Date: Sat Dec 18 22:46:40 2021 +0100 + + Update platformio.yml + + Try to avoid running on release (release has his own workflow) + +commit 6a98b947501dd58075311a43ff2fe811541ce1ff +Author: eMariete.com +Date: Sat Dec 18 22:37:48 2021 +0100 + + No define DEBUG_ARDUINOMENU by default + +commit 2b4aeab4de05e1318441d6ab52fda4c880a7593f +Merge: 964f262 451b3bf +Author: eMariete.com +Date: Sat Dec 18 22:13:18 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 964f262ef818db88b789b86fd6845a8d9d5d507b +Author: eMariete.com +Date: Sat Dec 18 22:12:51 2021 +0100 + + Print MAC Address to Serial at initWiFi + +commit 1e00844a824c5b5620e3e157457e764a23c35be4 +Author: eMariete.com +Date: Sat Dec 18 22:11:39 2021 +0100 + + Fix last merge conflict + +commit 451b3bfbb29a9e2955c8550a4dc17f69a18ca599 +Author: Mariete +Date: Sat Dec 18 10:25:48 2021 +0100 + + Update README.md + +commit 457de56b75ea62b2899f27775568149dd7e2a6b3 +Author: Mariete +Date: Sat Dec 18 10:21:52 2021 +0100 + + Update README.md + +commit 25752c8172bd066380cbd310f54110dfa85b2bfa +Author: Mariete +Date: Sat Dec 18 09:29:12 2021 +0100 + + Update README.md + +commit 00b6bb854b554cd651ff274f1251277e5e3d0d55 +Author: Sergio Coscolín +Date: Sat Dec 18 09:17:46 2021 +0100 + + Turn ON TFT when USB is connected (#47) + +commit d12b63d5aef91381f3cb2ce1efe3e52c76cb3889 +Author: Sergio Coscolín +Date: Sat Dec 18 09:16:57 2021 +0100 + + When click button turn on the display only if it's OFF (#49) + +commit 5d769c00ef0ac2afa3e4269263381bed0fc9091d +Author: Sergio Coscolín +Date: Sat Dec 18 09:15:33 2021 +0100 + + Missing new line in Terminal debug (#48) + + 01:56:29.509 > -->[SENS] Using CanAirIO Sensorlib v0.4.2 Rev:341-->[SENS] Turning on sensor.. + 01:56:29.555 > -->[SENS] Detecting sensors.. + +commit 68055c63a49d161c289225fd99772a81cd96436b +Author: eMariete.com +Date: Fri Dec 17 22:03:42 2021 +0100 + + Some code clean up + +commit 673d22264a285615d5b31e3d04f0eb2c597bcaba +Author: Mariete +Date: Fri Dec 17 21:57:59 2021 +0100 + + Add support for I2C OLED Displays (#52) + + * First refactory to support OLED (tested TFT still working) + + * First OLED working version with menu + + * Some code clean up + +commit f099be98a89f51c57e2daf4c55fca693cb7cb236 (tag: v0.5.001) +Author: eMariete.com +Date: Tue Dec 14 23:54:00 2021 +0100 + + Fix to platformio.ini for general release + +commit f85b8f07eb586c7b083d477c0a0dae15857d59e4 (tag: v0.5.000) +Author: eMariete.com +Date: Tue Dec 14 23:13:19 2021 +0100 + + Version bump + +commit cec677da886569b37e837ab84b4a2a6f7702fbf3 +Author: Mariete +Date: Tue Dec 14 23:11:18 2021 +0100 + + Feature select co2 sensor (#46) + + * Add sensor selection to menu + + * Add selected sensor initialization + + * Add enable debug sensors functionality to menu + + * Sensor selection menu functional + + * Sensor selection menu functional + + * Version bump + + * Fix external Temp and Humidity issue (#45) + + * added GPIO pin enable for CanAirIO CO2 version + + * I2C enable and USB ports for Linux + + * fixed merge + + * disable some messages for testing + + * enable S8 sensor for testing + + * fix merge issues + + * fixed issue with temperature and humidity with external sensor + + * restored windows monitor ports + + * Add compilation date & time to serial start log + + * Improvements in CO2 Sensor selection + + * Manages breaking change in Sensors::setSampleTime() + + * Minor code cleaning + + Co-authored-by: Antonio Vanegas + +commit 2a1c57f0fe033f70e32f116f195b7d083af56cf9 +Author: eMariete.com +Date: Sun Dec 12 19:00:43 2021 +0100 + + WIFI_PRIVACY defined by default + +commit a58d83d2a52f6fcd4cb5ba56bc7d7fd29f6d6ad7 +Author: eMariete.com +Date: Sun Dec 12 18:59:23 2021 +0100 + + Don't show passwords in menu if WIFI_PRIVACY is defined + +commit d1137648f129d1155e1a47bb7cd153372761f9d5 +Author: eMariete.com +Date: Sat Dec 11 15:24:47 2021 +0100 + + Version bump + +commit 13031c347fab02b84a9a042908679b755f0aaff8 (tag: v0.4.035) +Author: eMariete.com +Date: Thu Dec 9 12:55:23 2021 +0100 + + Version bump + +commit 2742c750c6726367c06ad41792a3a0794999f321 (tag: v0.4.034) +Author: eMariete.com +Date: Thu Dec 9 12:49:17 2021 +0100 + + Improvements in release2.yml + +commit 77aff082f9c65a5938496ba18770e221ec43cb62 (tag: v0.4.032) +Author: eMariete.com +Date: Wed Dec 8 19:48:17 2021 +0100 + + Improvements in release2.yml + +commit c5194e35e10dfa5a8664c72718b0f8bbc977b8e9 (tag: v0.4.031) +Author: eMariete.com +Date: Wed Dec 8 19:00:21 2021 +0100 + + New release2.yml V2 version + +commit 91b8c94b04237c239ba515f7af59ca3ec38dca18 (tag: v0.4.30) +Author: eMariete.com +Date: Wed Dec 8 18:47:26 2021 +0100 + + Version bump + +commit b458423014aa42c09cc36787abedda31b5d91f80 +Author: eMariete.com +Date: Wed Dec 8 18:47:12 2021 +0100 + + Version bump + +commit 5c73610b4a74b964a899e7d166a4d47e2c9f3c43 +Author: eMariete.com +Date: Wed Dec 8 18:44:19 2021 +0100 + + New release2.yml V2 version + +commit 840c677d6a15f0a6d74e195d5c391b9df7e7db98 +Author: eMariete.com +Date: Wed Dec 8 18:38:59 2021 +0100 + + New release2.yml V2 version + +commit 5b204293767b4c65b263c4838b64b9cbc7affbeb +Author: eMariete.com +Date: Wed Dec 8 18:24:30 2021 +0100 + + New release2.yml V2 version + +commit 5828c46f53447bd2ed74cb8e44887ff6d05a09da +Author: eMariete.com +Date: Wed Dec 8 18:17:04 2021 +0100 + + New release2.yml V2 version + +commit 06cfc34bdb8baf9bdf010fecf8008f1bbc3b85d6 (tag: v0.4.028) +Author: eMariete.com +Date: Wed Dec 8 17:55:11 2021 +0100 + + New release2.yml V2 version + +commit 9eb11dfed79f7f3121305e7ef4fb0b618d9c5d0e (tag: v0.4.027) +Author: eMariete.com +Date: Wed Dec 8 17:38:31 2021 +0100 + + Version bump + +commit 8999fa7c78e1acaebdbe28541da31bd471178091 +Author: eMariete.com +Date: Wed Dec 8 17:37:55 2021 +0100 + + New release2.yml V2 version + +commit 2e622a8fd40895255fbf772114997ff5015bd506 +Author: Mariete +Date: Wed Dec 8 17:31:30 2021 +0100 + + Update release2.yml + +commit 811a74848ba1beda05596725c2b500b9fbb05b40 (tag: v0.4.026) +Author: eMariete.com +Date: Wed Dec 8 17:24:04 2021 +0100 + + Version bump + +commit ec20d48dde891fe92ef91826dab7549276da9494 +Merge: 8ba1ba3 1173c13 +Author: eMariete.com +Date: Wed Dec 8 17:00:06 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 1173c13b81a55da8a5753a60d82d672af6e2ffca +Author: Mariete +Date: Wed Dec 8 16:59:12 2021 +0100 + + Update release2.yml + +commit 8ba1ba329c818a46ebecf577cfbf8519d9f8ee58 (tag: v0.4.025) +Author: eMariete.com +Date: Wed Dec 8 16:55:43 2021 +0100 + + Version bump + +commit 3a2f6aacbf58947d097e1ff372110a04e7c0bac8 +Author: Mariete +Date: Wed Dec 8 16:50:24 2021 +0100 + + Update release2.yml + +commit b0ff81a65551b5c55db84b348b5e4bf6a57fe1c8 +Author: Mariete +Date: Wed Dec 8 16:43:14 2021 +0100 + + Update release2.yml + +commit 048ae96a5714d3f63e76cfd3c1380abc2b5c8bb1 +Author: Mariete +Date: Wed Dec 8 16:38:53 2021 +0100 + + Update release2.yml + +commit 7d1cd2b2b5dbeeb8cdffa6fe7036fee8467516da +Author: Mariete +Date: Wed Dec 8 16:32:29 2021 +0100 + + Update release2.yml + +commit be93a6c9248d8d304fde5e3f351c77fb2c8c9cb7 +Author: Mariete +Date: Wed Dec 8 16:24:25 2021 +0100 + + Update release2.yml + +commit a496b12c3a85e0683d6a305464b26398ef1462a9 (tag: v0.4.024) +Author: eMariete.com +Date: Wed Dec 8 15:26:44 2021 +0100 + + Version bump + +commit b39ddbfdb7714da6e841ea1bf6e8adec1eafbc47 (tag: v0.4.023) +Author: eMariete.com +Date: Wed Dec 8 15:19:22 2021 +0100 + + Version bump + +commit 5320d0b4781216fd472164a5f012aca3bc1bfb3a (tag: v0.4.022) +Author: eMariete.com +Date: Wed Dec 8 15:13:47 2021 +0100 + + Version bump + +commit 2d6e357bbd1eeffbf2c049514b0bd73566a1f5eb (tag: v0.4.021) +Author: eMariete.com +Date: Wed Dec 8 15:08:28 2021 +0100 + + Version bump + +commit 93e5754d3ae95e9a83748f69fe4fd76f7d70cf86 (tag: v0.4.020) +Author: eMariete.com +Date: Wed Dec 8 15:06:26 2021 +0100 + + New release2.yml V2 version + +commit e886c4d3ea0f61e4a527a897f35adddead48a993 +Author: eMariete.com +Date: Wed Dec 8 15:05:24 2021 +0100 + + v0.4.019 + +commit 7a7616723e949130496e578a9e810e3859b13dd5 (tag: v0.4.019) +Author: eMariete.com +Date: Wed Dec 8 15:04:46 2021 +0100 + + New release2.yml V2 version + +commit 846c6af0958042e40743efd4120b0789e91efe1d +Author: eMariete.com +Date: Wed Dec 8 15:04:04 2021 +0100 + + New release2.yml V2 version + +commit abfabf7588a309b763d66b35e911f96a9bd7eb8d (tag: v0.4.018) +Author: eMariete.com +Date: Wed Dec 8 13:51:10 2021 +0100 + + Version bump + +commit 9cec65b05a65f35f8cd91603bb4425c642bf7da4 +Author: eMariete.com +Date: Wed Dec 8 13:49:20 2021 +0100 + + Version bump + +commit 88e7331a566e679fc67e2da6438abf316f53d809 +Author: eMariete.com +Date: Wed Dec 8 13:21:17 2021 +0100 + + Fix release.yml + +commit 312b7e94d296300b5940061154fd80e8011b8f8a (tag: v0.4.15) +Author: eMariete.com +Date: Wed Dec 8 13:14:18 2021 +0100 + + Move web to SPIFFS file system + +commit 51b92d4b1aa05bb119cf22603e671d0a0c36dfca +Merge: 40604ab 3504bd3 +Author: eMariete.com +Date: Wed Dec 8 12:22:03 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 40604ab4ce34d345e320ed1d21aa3c89c87a95a7 +Author: eMariete.com +Date: Wed Dec 8 12:21:49 2021 +0100 + + Add CO2_Gadget_Partitions.csv + +commit 3504bd3c99f954e6167b44c0c9e70d27ab17fe95 +Author: A. Carlos Marrero <39680078+acmatl@users.noreply.github.com> +Date: Wed Dec 8 11:04:54 2021 +0000 + + Include dark or light theme switch with separate web files (#33) + + * smartphone styles + + * Update smartphone styles + + adjusts the graphics column to the full width of the screen + + * Review of view proportionality and labels + + * Improve label styling + + * Add forgotten files + + Co-authored-by: Mariete + +commit 00a990982dea329b68bb02b03c606e623fea8794 +Author: Antonio Vanegas +Date: Wed Dec 8 11:49:36 2021 +0100 + + Fix sensorlib 0 4 1 implementation (#32) + + * added GPIO pin enable for CanAirIO CO2 version + + * I2C enable and USB ports for Linux + + * fixed merge + + * disable some messages for testing + + * enable S8 sensor for testing + + * fixed and restore the default values from upstream + +commit fc16ea95e35fdebbc438d7d7f2986dfbf7bd82a6 +Author: eMariete.com +Date: Wed Dec 8 11:45:33 2021 +0100 + + Minor changes + +commit 7d7d3278eae5fbd4a52e01ef763f5c987c3fb0cb +Author: eMariete.com +Date: Sun Dec 5 00:08:55 2021 +0100 + + Change logo to save memory + +commit 3ebb9331a3d2fbe429b885f22714888de4778cab +Author: eMariete.com +Date: Sat Dec 4 22:35:48 2021 +0100 + + Renamed LONGCLICK_MS to LONGCLICK_TIME_MS to avoid redefinition warning + +commit 439a97ca7476cb178bdbc0419872c84e8e3b90c5 +Author: eMariete.com +Date: Sat Dec 4 22:32:07 2021 +0100 + + Remove web page SIMPLE_page + +commit faf9455258dd497ec361e480895c9f819a06e447 +Author: eMariete.com +Date: Sat Dec 4 20:30:14 2021 +0100 + + Improve BLE messages to console (tag) + +commit 91a622c1a1e829129ec3bf50f4006f1935ea62eb +Author: eMariete.com +Date: Sat Dec 4 11:14:33 2021 +0100 + + Fix typo in release.yml + +commit e9b0f2115a5480de0be1a54744e8166ad0f55e62 (tag: v0.4.011) +Author: eMariete.com +Date: Sat Dec 4 10:03:15 2021 +0100 + + Adjust enviroments for release CI build + +commit 00bde1a312d07d01215e8dfe15d563b9b240c434 +Author: eMariete.com +Date: Sat Dec 4 10:02:38 2021 +0100 + + Rename fonts + +commit 431f5f698a1648f69ba40ef3720de599ad29b1f0 +Author: Mariete +Date: Sat Dec 4 09:51:42 2021 +0100 + + Feature icons (#31) + + * Add icons (first version). Improvements in display values + + * Set sensors debug mode to false + + * Add icons and display improvements + + * Fonts memory optimizations and custom fonts + + * Bump version. New enviroments for TTGO T-Display + + * Display improvements (thanks @SergioCoscolin) + +commit 61c594e4297555a9f33a05d047b74987b5973f5c (tag: v0.4.002) +Author: eMariete.com +Date: Thu Dec 2 20:10:42 2021 +0100 + + Turn off debug options + +commit acf04b617b88b2f6e538787cfc1afc69e3a12d12 +Author: eMariete.com +Date: Thu Dec 2 20:08:47 2021 +0100 + + Fix manifest bin path for erase version + +commit b5d24579998442152da3af44a9a177be472dd48a (tag: v0.4.000) +Author: eMariete.com +Date: Thu Dec 2 07:22:38 2021 +0100 + + Edit readme no need to use development branch anymore + +commit 1e396cb3e4b7fbb1239440d104c0eac2a5b927b5 +Author: eMariete.com +Date: Thu Dec 2 07:20:37 2021 +0100 + + Version bump + +commit 1bb3e7ba411a93bd58da84493bd44cb978f67b96 +Author: eMariete.com +Date: Thu Dec 2 07:20:11 2021 +0100 + + Set back cpu frequency at 80Mhz + +commit 9e64da8883eea35ca97cc1c279d1cfb2e02b60ba +Author: eMariete.com +Date: Thu Dec 2 06:55:59 2021 +0100 + + Removed setTempOffset workaround + +commit 5c31b57ad62904bebdc304096dee7afbc7625e17 +Author: eMariete.com +Date: Thu Dec 2 06:55:25 2021 +0100 + + Removed setTempOffset workaround + +commit b9391c9523dc1aab4db35d508c9627b13ff74379 +Merge: 43f49fa f94610a +Author: eMariete.com +Date: Mon Nov 29 21:23:25 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 43f49fa636e3904631ce0d5208da02cfdedf1647 +Author: eMariete.com +Date: Mon Nov 29 21:23:18 2021 +0100 + + Fix issue at merge inMenu duplicate + +commit f94610a474cc5e3cb20f4f620690d3f5f8e86809 +Author: A. Carlos Marrero <39680078+acmatl@users.noreply.github.com> +Date: Mon Nov 29 20:02:46 2021 +0000 + + Review of view proportionality and labels (#29) + + * smartphone styles + + * Update smartphone styles + + adjusts the graphics column to the full width of the screen + + * Review of view proportionality and labels + + * Improve label styling + +commit 04a0965501031c3ecbcd67bc9f01f609c973376b +Merge: e028f89 510e05f +Author: eMariete.com +Date: Mon Nov 29 20:34:36 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 510e05f9f46becf66e9dad0a745ac2206349d3c2 +Author: Mariete +Date: Mon Nov 29 20:25:35 2021 +0100 + + Temporary fix to memory problems. Fixes and improvements. (#30) + + * Remove internal /main web page + + * Improve MQTT console messages + + * Improve console messages + + * Add inMenu status. Improve console messages + + * Fix typo in [WiFi] console messages + + * Improve console messages + + * Avoid printing to serial MQTT activity if in menu + + * Avoid printing to serial SENS activity if in menu + + * Add doSetHostName to menu + + * Add navigation instructions to menu_init + + * Data logger default interval 60 seconds + + * Convert logo array to static + + * Use setSampleIntervalMs melkati/arduino-ble-gadget branch of arduino-ble-gadget modified to avoid memory issues + + * Add tempOffset + + * Show battery voltaje on display + + * Fix temperature offset workaraound https://t.me/canairio/18464 + + * Add getBatteryPercentage + + * Add BLE info to menu + + * Add battery. temp and humidity to display + +commit e732d539a13ff05e12b34b2a883973eca051e0f1 +Author: Mariete +Date: Fri Nov 26 14:41:07 2021 +0100 + + Update README.md + +commit a1608c32bbebb71032d81d6ab716dc861a52c5b9 +Author: Mariete +Date: Fri Nov 26 14:40:00 2021 +0100 + + Update README.md + +commit 96650d6abd5b42bd639ea5d46a7863722aafc47a +Author: Mariete +Date: Fri Nov 26 14:38:23 2021 +0100 + + Update README.md + +commit 1c025f816c935f341fa4a51708c80e6036be3a7b +Author: Mariete +Date: Fri Nov 26 14:37:25 2021 +0100 + + Notice: please, use development branch + + 👉 Please, due to a issue with memory use development branch while problem gets sorted out. It uses a modified version of the Sensirion Gadget BLE Arduino Lib + +commit e028f89d9bb2b5292087826eec36894131c84750 +Author: eMariete.com +Date: Fri Nov 26 14:27:59 2021 +0100 + + Use setSampleIntervalMs melkati/arduino-ble-gadget branch of arduino-ble-gadget modified to avoid memory issues + +commit db18ca10e040e3ec4740839483766a4e4e5e6512 +Author: eMariete.com +Date: Fri Nov 26 14:24:25 2021 +0100 + + Convert logo array to static + +commit be408a73793c080ab061e9bcff2036227ea3e6a6 +Author: eMariete.com +Date: Fri Nov 26 14:23:58 2021 +0100 + + Data logger default interval 60 seconds + +commit df42b3fcfb3248bcb79ff9152283d8e794a8165c +Author: eMariete.com +Date: Fri Nov 26 13:56:13 2021 +0100 + + Add navigation instructions to menu_init + +commit cbadef9b4d4b851ad462041be640dd3bf50915b4 +Author: eMariete.com +Date: Fri Nov 26 13:55:24 2021 +0100 + + Add doSetHostName to menu + +commit 38937e3aad91f7a88d9b854261226061025700b5 +Author: eMariete.com +Date: Fri Nov 26 11:59:17 2021 +0100 + + Avoid printing to serial SENS activity if in menu + +commit 90dd8dc7f13b6d8c787846de7cef5681f4eef234 +Author: eMariete.com +Date: Fri Nov 26 09:56:27 2021 +0100 + + Avoid printing to serial MQTT activity if in menu + +commit a0a462960f8ab7bf426992e888e17869158a1ecd +Author: eMariete.com +Date: Fri Nov 26 09:44:14 2021 +0100 + + Improve console messages + +commit c017911f8778fb247b793627dac3b91d008b109d +Author: eMariete.com +Date: Wed Nov 24 12:20:36 2021 +0100 + + Fix typo in [WiFi] console messages + +commit 360e1abc88f032f535f31097aece28e5a9e1feb1 +Author: eMariete.com +Date: Wed Nov 24 12:18:06 2021 +0100 + + Add inMenu status. Improve console messages + +commit fb710f683d81c2a973bd3fa97802d05a59a6c114 +Author: eMariete.com +Date: Wed Nov 24 11:44:49 2021 +0100 + + Improve console messages + +commit 5465e5f59bb1fdfd009c59cfb654dafee18b9e32 +Author: eMariete.com +Date: Wed Nov 24 08:43:38 2021 +0100 + + Improve MQTT console messages + +commit 53e47313da3f55a5ca9658db7034d5a556b0a832 +Author: eMariete.com +Date: Tue Nov 23 23:28:40 2021 +0100 + + Remove internal /main web page + +commit 5d5474f1e0172b78a8ab88d73d78132437253897 +Author: A. Carlos Marrero <39680078+acmatl@users.noreply.github.com> +Date: Tue Nov 23 22:20:02 2021 +0000 + + smartphone styles (#27) + + * smartphone styles + adjusts the graphics column to the full width of the screen + +commit 15fc2a86cf84f3f436246cc849490d6ef71a7cfc +Author: eMariete.com +Date: Tue Nov 23 23:12:34 2021 +0100 + + Permits WiFi SSID and passwords containing spaces + +commit 6b5cb6876638f2f3fa515ecbbe49ff31b3e64059 +Author: eMariete.com +Date: Tue Nov 23 20:52:54 2021 +0100 + + Extended character set for SSID + +commit 07ab77c93230ae9df41fbdf3f7a4ab1395b7e188 +Author: eMariete.com +Date: Tue Nov 23 16:32:21 2021 +0100 + + Refactor initBLE() + +commit 7331d8542580ca51ccf50e7ea9b20b59ed1a50c1 +Author: eMariete.com +Date: Tue Nov 23 16:31:49 2021 +0100 + + Remove display of battery_voltage + +commit bc68b439c0e9b2d74dda5bb43d4dc0b1540c3613 +Author: eMariete.com +Date: Tue Nov 23 13:24:49 2021 +0100 + + Fix problems with web server (hopefully) + +commit 6d5a8fd47187c130ef15827987cc2f1f33c67f95 +Author: eMariete.com +Date: Mon Nov 22 08:39:57 2021 +0100 + + Add define SUPPORT_MQTT + +commit 0afcf5c2c7027c5ab0151231328530a5ec32bfed +Author: eMariete.com +Date: Sun Nov 21 23:11:54 2021 +0100 + + Add SUPPORT_MDNS and better status messages for WiFi + +commit cfed8e43fdd1e6e3108042a58a6ee4a313c90c97 (tag: v0.3.079) +Author: eMariete.com +Date: Sun Nov 21 10:23:45 2021 +0100 + + Fix temp arrays space padding. + +commit 9874b9a7266861087505748bd5c31de3ab137c5c (tag: v0.3.078) +Author: eMariete.com +Date: Sun Nov 21 08:51:30 2021 +0100 + + Version bump + +commit 33584b33eb896ffb1c3bfe10076a22a413cc0122 +Author: eMariete.com +Date: Sun Nov 21 08:39:12 2021 +0100 + + Fix rootTopic space padding + +commit 31c0b02d444b26b71274d3ec0179cf6bf44108d7 +Author: eMariete.com +Date: Sun Nov 21 08:38:09 2021 +0100 + + Add MQTT authentication + +commit 3c6f707c4626ad333686db9ca566e576be95039b (tag: v0.3.076) +Author: eMariete.com +Date: Sat Nov 20 23:00:23 2021 +0100 + + Add authentication (user/pass) to MQTT broker + +commit fdd5312cab05e2069272340985958658946891d5 +Author: eMariete.com +Date: Sat Nov 20 22:21:06 2021 +0100 + + Menu on enter Load Temp Arrays With Actual Values + +commit cc65f447a526545fa1f242f47331f0cc05b1a275 +Author: eMariete.com +Date: Sat Nov 20 21:49:47 2021 +0100 + + Version bump + +commit 7fe6ec6b62ca9718df191a934bf47a91cbf80bf2 (tag: v0.3.074) +Author: eMariete.com +Date: Sat Nov 20 21:18:54 2021 +0100 + + Version bump + +commit 07aace017fc426015d429c9b7ed15255570af5b7 +Author: eMariete.com +Date: Sat Nov 20 21:18:17 2021 +0100 + + Version bump + +commit c95c298e8de6ed35698133597225aeb84103ac29 (tag: v0.3.073) +Author: eMariete.com +Date: Sat Nov 20 21:17:01 2021 +0100 + + Permit more chars for WiFi password + +commit f8b69e55acdda315773af3610e85f79c5010a073 (tag: v0.3.072) +Author: eMariete.com +Date: Sat Nov 20 16:39:17 2021 +0100 + + Update release.yml + +commit f244650d47f2a5a0abc8839a09bf636b7945e9df (tag: v0.3.071) +Author: eMariete.com +Date: Sat Nov 20 16:11:02 2021 +0100 + + Update release.yml + +commit 90873d805247cad2ee077d374e68ece803015240 (tag: v0.3.070) +Merge: 74dfdaa 53b9087 +Author: eMariete.com +Date: Sat Nov 20 15:58:14 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 74dfdaaaccac3e383370ccedf7c7c8942b0d9784 +Author: eMariete.com +Date: Sat Nov 20 15:58:05 2021 +0100 + + Fix short temp arrays in menu + +commit 53b9087634aacd1ff1b60253413054eea03695dd +Author: Mariete +Date: Sat Nov 20 15:05:41 2021 +0100 + + Update release.yml + +commit 4cbb60b151288b98cb1188bcd626ccf6ed1cef7c +Merge: c6536a6 fb59747 +Author: eMariete.com +Date: Sat Nov 20 14:21:23 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit c6536a6f7a5c3ba70a78adc3fe5a2810c77cf750 +Author: eMariete.com +Date: Sat Nov 20 14:20:54 2021 +0100 + + Increase batterySecondsBetweenReads to 60 + +commit b637a3788edcbcee60fba95ca1674d988620f078 +Author: eMariete.com +Date: Sat Nov 20 14:19:11 2021 +0100 + + Version bump + +commit fb597474080305a844454967724adcebeee2fd49 +Author: Mariete +Date: Sat Nov 20 14:17:16 2021 +0100 + + Update release.yml + +commit 7d2cc9e72bf323ba625981eedf698e92749e6bb1 (tag: v0.3.068) +Author: eMariete.com +Date: Sat Nov 20 14:09:46 2021 +0100 + + Version bump + +commit 580c436f89da2aa69df96283e2c673f312958d64 +Merge: ff5399f f86fd11 +Author: eMariete.com +Date: Sat Nov 20 13:48:39 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit ff5399f2e5b6de0b8c5dcc243c243de96a3f22eb (tag: v0.3.067) +Author: eMariete.com +Date: Sat Nov 20 13:47:30 2021 +0100 + + Version bump + +commit f86fd11b572056c69dc97989b59b87e22c2cbd64 +Author: Mariete +Date: Sat Nov 20 13:46:31 2021 +0100 + + Update release.yml + +commit 35e64756029bbb1ff49bfc8db31b818f8b6f88ca +Author: eMariete.com +Date: Sat Nov 20 13:36:22 2021 +0100 + + Adjust vRef to 930 (due to a bug, probably) + +commit ac9d80108623da090d8075a6b419d983f0a50150 +Author: eMariete.com +Date: Sat Nov 20 12:47:32 2021 +0100 + + Update release.yml + +commit 1c290789e47c7a5d507cfc914cf7ac0f44ca47cb (tag: v0.3.066) +Author: eMariete.com +Date: Sat Nov 20 12:10:41 2021 +0100 + + Version bump + +commit 2831e58576d198f2466fb6b790931fb37b7d70f3 +Author: Mariete +Date: Sat Nov 20 12:08:44 2021 +0100 + + Update release.yml + +commit c20ff38a417422cd3b8e774852ea6bd72112d90c (tag: v0.3.065) +Author: eMariete.com +Date: Sat Nov 20 10:53:16 2021 +0100 + + Menu color changes to improve readability + +commit de5793984de647345f09f2aa453e47cc01dd0e22 (tag: v0.3.064) +Author: eMariete.com +Date: Sat Nov 20 09:53:10 2021 +0100 + + Add menu option to reboot CO2 Gadget + +commit a5dda2c2135412f6e21e533b028bc81d3d1d1c30 (tag: v0.3.063) +Author: eMariete.com +Date: Fri Nov 19 11:52:19 2021 +0100 + + Version bump + +commit d5302bded5fad7a07a6fd775d9b75225b43f89ae (tag: v0.3.062) +Author: eMariete.com +Date: Fri Nov 19 11:29:51 2021 +0100 + + Version bump + +commit e9565101686c6484728f43d32df033fce8dda136 +Merge: fe0258c 2cce0e5 +Author: eMariete.com +Date: Fri Nov 19 11:25:46 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit fe0258c144cf39bfab54087530e47e009cc92488 (tag: v0.3.061) +Author: eMariete.com +Date: Fri Nov 19 11:25:14 2021 +0100 + + Version bump + +commit 2cce0e5e8b90bab904224c53121585cdab8dc6da +Author: Mariete +Date: Fri Nov 19 11:21:14 2021 +0100 + + Fix release.yml + +commit 0be3c4b15921c59353d252932343c54bfb4bfb1c (tag: v0.3.060) +Author: eMariete.com +Date: Fri Nov 19 11:18:40 2021 +0100 + + Version bump + +commit 06694091397143df11d618bad35bb6d1e5816169 +Author: eMariete.com +Date: Fri Nov 19 11:18:12 2021 +0100 + + Add clean WP Rocket cache to CI Release + +commit b448f39084acc0fb87640850599501890d0aa111 (tag: v0.3.059) +Author: eMariete.com +Date: Fri Nov 19 10:51:02 2021 +0100 + + Version bump + +commit c656a3977116c30d7411853805727b934456e4f0 +Author: eMariete.com +Date: Fri Nov 19 10:50:39 2021 +0100 + + Fix ENABLE_PIN + +commit 020d59060351cd08aeb41c30620b76b8421e8174 (tag: v0.3.058) +Author: eMariete.com +Date: Fri Nov 19 10:03:31 2021 +0100 + + Fixes in WiFi and MQTT menu config + +commit 0738d96e85e03969c224fa1ad1dea0e186e6039c (tag: v0.3.057) +Author: eMariete.com +Date: Fri Nov 19 08:33:03 2021 +0100 + + Version bump + +commit 36e513121c21c234048c0d0fb7e2a50c92cb8bba (tag: v0.3.056) +Author: eMariete.com +Date: Fri Nov 19 07:06:15 2021 +0100 + + Version bump + +commit 093f338081771722797fd552c62566347b62c99e +Author: eMariete.com +Date: Fri Nov 19 07:05:51 2021 +0100 + + Removed setCpuFrequencyMhz(80); + +commit ef09564f42b50a0c629362810b684978a56c6642 (tag: v0.3.055) +Author: eMariete.com +Date: Fri Nov 19 06:30:07 2021 +0100 + + Change board_build.partitions = min_spiffs.csv + +commit 3285a1f540abf85c2130f78bc8652891ecaefc14 (tag: v0.3.054) +Author: eMariete.com +Date: Thu Nov 18 22:22:11 2021 +0100 + + Fix binaries path + +commit 5b5afec5a0333f12466b927bd56ebff6cba4c74a (tag: v0.3.053) +Author: eMariete.com +Date: Thu Nov 18 14:49:01 2021 +0100 + + Version bump + +commit 339dbf3b351a17dbab13f1d6625d9cff440c760f +Author: eMariete.com +Date: Thu Nov 18 14:48:43 2021 +0100 + + Fix memory erase manifest in release.yml + +commit ee0fab7727bbc7aaf3ddb1796a1688466c001503 (tag: v0.3.052) +Author: eMariete.com +Date: Thu Nov 18 14:39:57 2021 +0100 + + Version bump + +commit dde137aed28f8392338d0ea2d6169c48ce415bf7 +Author: eMariete.com +Date: Thu Nov 18 14:39:22 2021 +0100 + + Fix typo in release.yml + +commit bba1e9c8412d0127af47261f20a20a672efaafac (tag: v0.3.051) +Author: eMariete.com +Date: Thu Nov 18 14:31:26 2021 +0100 + + Version bump + +commit c4cb694f282034d1c7c562326f93da0ca357eb95 +Author: eMariete.com +Date: Thu Nov 18 14:31:04 2021 +0100 + + Disable turning OFF BLE to avoid restart of device + +commit df53720ace783352837035543cac306e5b8bc9f7 +Author: eMariete.com +Date: Thu Nov 18 14:30:25 2021 +0100 + + Update release.yml to create erase-manifest + +commit a99307b2243c3b3e906b08d9ba7c703f788963bc +Author: eMariete.com +Date: Thu Nov 18 13:28:57 2021 +0100 + + Fix typo in create release name + +commit e50d63ee147eae4c2dda2b6129e4637073bcf533 (tag: v0.3.050) +Author: eMariete.com +Date: Thu Nov 18 13:15:59 2021 +0100 + + Version bump + +commit 0f71176dced5ba144762ff206e0bd2e78d7f90a9 +Author: eMariete.com +Date: Thu Nov 18 13:15:30 2021 +0100 + + Modify: new_install_skip_erase: true + +commit 3d13ad7ea6f2c55a0562bb1f4e62365be7c10c2b (tag: v0.3.049) +Author: eMariete.com +Date: Thu Nov 18 12:52:17 2021 +0100 + + Update release.yml + +commit 457718ab000aaf6bae122c018087f220272990ec (tag: v0.3.048) +Author: eMariete.com +Date: Thu Nov 18 12:48:48 2021 +0100 + + Update release.yml + +commit e976abf7b3af592cb0c7248a84b5c3cd66175ba4 (tag: v0.3.047) +Author: eMariete.com +Date: Thu Nov 18 11:41:45 2021 +0100 + + Version bump + +commit b9050b1d0b55213ae2d238718d13c2b21fd82337 (tag: v0.3.046) +Author: eMariete.com +Date: Thu Nov 18 11:40:41 2021 +0100 + + Update release.yml + +commit 839c5566712e31bd33efe7269cd472a09642a455 (tag: v0.3.045) +Author: eMariete.com +Date: Thu Nov 18 10:55:28 2021 +0100 + + Update release.yml + +commit f4a8697c2b8c0a203a39e2fbec329a262b1960db +Author: eMariete.com +Date: Thu Nov 18 10:52:33 2021 +0100 + + Update release.yml + +commit 6c053b9082730c2045be8817e3b63c0fbba42bc5 (tag: v0.3.044) +Author: eMariete.com +Date: Thu Nov 18 10:45:37 2021 +0100 + + Update release.yml + +commit edcfa5c73cc9fd6fc6daa4f001dc98f7800782be (tag: v0.3.043) +Author: eMariete.com +Date: Thu Nov 18 10:39:55 2021 +0100 + + Update release.yml + +commit 0b60f0461f6aee439f7a80e0eae6730220a29deb (tag: v0.3.042) +Author: eMariete.com +Date: Thu Nov 18 10:28:46 2021 +0100 + + Update release.yml + +commit baedab0ae5ab2ead086515b59e1bf89dfd93453a (tag: v0.3.041) +Author: eMariete.com +Date: Thu Nov 18 10:18:39 2021 +0100 + + Update release.yml + +commit ded9f5c5fd3191e7526333bbe59da0dcc48aba60 (tag: v0.3.040) +Author: eMariete.com +Date: Thu Nov 18 10:13:34 2021 +0100 + + Update release.yml + +commit 735acbd8df2aa666dfd57e0cc49fd51f173a34c5 (tag: v0.3.39) +Author: eMariete.com +Date: Thu Nov 18 09:53:41 2021 +0100 + + Update release.yml + +commit 04ac94462ea8ffc980e0211b9a0483741ea2cbe6 (tag: v0.3.38) +Author: eMariete.com +Date: Thu Nov 18 09:48:48 2021 +0100 + + Update release.yml + +commit a567b3509ae1eb66c17499a39030a25b5f888489 (tag: v0.3.37) +Author: eMariete.com +Date: Thu Nov 18 09:43:00 2021 +0100 + + Version Bump + +commit 87dd6bc9ada5b0ce16d008e155440c613706b4a0 +Author: eMariete.com +Date: Thu Nov 18 09:42:29 2021 +0100 + + Update release.yml + +commit 4b70fa79e1a1a9a88177af56169c3d5f32ea2747 (tag: v0.3.036) +Author: eMariete.com +Date: Thu Nov 18 09:13:05 2021 +0100 + + Bump version + +commit 94dfd544fd03ce97ca466786eef56932c1609385 +Merge: 5f80035 20da3f6 +Author: eMariete.com +Date: Thu Nov 18 08:59:12 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 5f800354ba3a163a5809164eb848ece33db9538f (tag: v0.3.35) +Author: eMariete.com +Date: Thu Nov 18 08:58:48 2021 +0100 + + Version bump + +commit 20da3f6901c55ba76b3b12c7ea7ce95ec8740924 +Author: Mariete +Date: Thu Nov 18 08:53:26 2021 +0100 + + Update release.yml + +commit 0d1bd2f6f7238ccecb45e9d37d943ec3578d9adf +Merge: c6ebd80 32140b5 +Author: eMariete.com +Date: Thu Nov 18 08:44:42 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit c6ebd80e0c8a0f162e747eee60ae2acc921c9120 (tag: v0.3.34) +Author: eMariete.com +Date: Thu Nov 18 08:44:15 2021 +0100 + + Version bump + +commit 32140b5701f62eb481e3a5b1eef7a621a2e53c61 +Author: Mariete +Date: Thu Nov 18 08:39:04 2021 +0100 + + Update release.yml + +commit 007d6e34e492ec1fffc45163209514168bb7a1b6 (tag: v0.3.033) +Author: eMariete.com +Date: Thu Nov 18 08:31:01 2021 +0100 + + v0.3.032 + +commit cb9662d70c61ca4875e63344514d9360e27848bb +Author: Mariete +Date: Thu Nov 18 08:26:01 2021 +0100 + + Update release.yml + +commit 67f1f1c5497c49b7a230c39c1bd035537578663c +Author: Mariete +Date: Wed Nov 17 22:08:11 2021 +0100 + + Update release.yml + +commit 8613d0df03d5f24bddd6e1127a9eb711e891663a +Author: Mariete +Date: Wed Nov 17 21:38:45 2021 +0100 + + Update release.yml + +commit d3c211f5c7a598db5fce9af39ab3dbd89ccc9f8f (tag: v0.3.032, tag: v0.3.031) +Author: eMariete.com +Date: Wed Nov 17 21:23:51 2021 +0100 + + Version bump + +commit d3d37f5889fe561ae9189087836899d14001f7f3 +Author: eMariete.com +Date: Wed Nov 17 21:19:52 2021 +0100 + + Version bump + +commit 0d9b6e27200f5625dbdc2c2b2810c70733fd29d2 +Author: Mariete +Date: Wed Nov 17 21:18:38 2021 +0100 + + Update release.yml + +commit e776511723cce2d7547c812739e096f0f789f82e (tag: v0.3.030) +Author: eMariete.com +Date: Wed Nov 17 09:18:35 2021 +0100 + + Update release.yml + +commit e1912d7bb2c5b53c6eb7f0295fc2714f4ae7fd1b (tag: v0.3.029) +Author: eMariete.com +Date: Wed Nov 17 08:46:49 2021 +0100 + + Update release.yml + +commit aa6b53f1396cb2e387a339f12316d639f5a6fdd1 (tag: v0.3.028) +Author: eMariete.com +Date: Wed Nov 17 08:27:14 2021 +0100 + + Add [default_envs] to platformio.ini + +commit 38205d0e1d379d3d77fc0b5b5f1ab4ffb282135c (tag: v0.3.027) +Author: eMariete.com +Date: Wed Nov 17 08:08:09 2021 +0100 + + Update release.yml + +commit c3cc4a61c84c029d4479111cc36c7983b8654a3f (tag: v0.3.026) +Author: eMariete.com +Date: Wed Nov 17 08:05:53 2021 +0100 + + Update release.yml + +commit 078e755538b2e812ddbbb0f69b0f94a13bc1f9a1 +Merge: 3917afb dc19129 +Author: eMariete.com +Date: Wed Nov 17 08:03:50 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 3917afb6e48fd1aa98bae46795739f9755af9a89 (tag: v0.3.025) +Author: eMariete.com +Date: Wed Nov 17 08:03:21 2021 +0100 + + Update release.yml + +commit dc19129a75502ead84ff5b40c37b7000f66399a8 +Author: Mariete +Date: Wed Nov 17 07:58:57 2021 +0100 + + Update release.yml + +commit ae165c0c5dce3a132dfaea073e8ee4adfe5114bd +Author: Mariete +Date: Wed Nov 17 07:57:17 2021 +0100 + + Update release.yml + +commit ee006197e6b5bb720009f9da00169f5101cc82e8 (tag: v0.3.024) +Author: eMariete.com +Date: Mon Nov 15 22:56:38 2021 +0100 + + Version bump to v0.3.024 + +commit 5978d269ba08e4ab8fdd701513af3cd596bc5bd6 +Merge: 8d2fe95 93c2112 +Author: eMariete.com +Date: Mon Nov 15 22:54:42 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 8d2fe951f6b7c43ddc051063b82ef0563fdff38e (tag: v0.3.023) +Author: eMariete.com +Date: Mon Nov 15 22:54:08 2021 +0100 + + Version bump to v0.3.023 + +commit 93c21124ec344561a0c1302f90d9de9854ef3493 +Author: Mariete +Date: Mon Nov 15 22:53:18 2021 +0100 + + Create release.yml + +commit e1d7991c22f154c2a3241826f62243b7d6bd33f3 +Author: Mariete +Date: Mon Nov 15 21:33:39 2021 +0100 + + Update issue templates + +commit 9c079142255f1d17dc6886f4bd34f0ebc418574c +Merge: 0ace7cc a6868b5 +Author: eMariete.com +Date: Mon Nov 15 21:01:25 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 0ace7cc6e4ea058d9dadc57696eb35bfc13cfc6b +Author: eMariete.com +Date: Mon Nov 15 20:57:38 2021 +0100 + + Modify platformio.ini + +commit e4dd0625d039fde60712df91548ea81f4c9d3406 +Author: eMariete.com +Date: Mon Nov 15 20:28:40 2021 +0100 + + Fix typo + +commit 4be4f35a1bb8a27ca35a9eec79f1cefaf74bbe2a +Author: eMariete.com +Date: Mon Nov 15 20:28:19 2021 +0100 + + Add ENABLE_PIN for sensor + +commit 3869551921757b088c3ddcfc9b6bb20b97769e17 +Author: eMariete.com +Date: Mon Nov 15 20:27:34 2021 +0100 + + Increase long button press to 300ms (from 200ms) + +commit a6868b5a2641f9cd12c151c65d83c0a9da9e5519 +Author: Mariete +Date: Sun Nov 14 15:34:27 2021 +0100 + + Update platformio.yml + +commit 37567bc74076bd5893a75e3a5b71a4f345d5573d +Author: Mariete +Date: Sun Nov 14 14:00:27 2021 +0100 + + Version bump + +commit 0bd60a8b7603fffe8877a310f7f20c830e100fe1 +Author: eMariete.com +Date: Sun Nov 14 13:20:27 2021 +0100 + + Add ENABLE_PIN Reserv. for future to enable sensor + +commit 466e101ff0e6a8853db95fee7fbcad8e385c5c3d +Merge: 216ed00 a53c9c3 +Author: eMariete.com +Date: Sat Nov 13 21:46:23 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 216ed004fbe329f5a9beb3bff058b4a6ed3aecd7 +Author: eMariete.com +Date: Sat Nov 13 21:46:16 2021 +0100 + + Refactor e improvements hostName + +commit a6f5cdaff220f4f113c30d0cfe73838a781b2218 +Author: eMariete.com +Date: Sat Nov 13 21:14:38 2021 +0100 + + Fix BLE Enable menu + +commit a53c9c3614b162d838e6ada95458ee91762f63ad +Merge: 02048aa ae970b6 +Author: Mariete +Date: Sat Nov 13 16:36:15 2021 +0100 + + Merge pull request #23 from melkati/Feature-Webpage + + Feature webpage + +commit ae970b6904e756c1cf6a590e08001a3a98507bbf +Merge: ab95b12 1fa8c9b +Author: eMariete.com +Date: Sat Nov 13 15:49:54 2021 +0100 + + Merge branch 'master' into Feature-Webpage + +commit 1fa8c9b40b1b6e1355b7a05e9c96691432962acf +Author: eMariete.com +Date: Sat Nov 13 15:34:43 2021 +0100 + + Version bump + +commit 02048aa233d3f2dac07f7d07841f1909497706b3 +Author: eMariete.com +Date: Sat Nov 13 14:33:36 2021 +0100 + + Version bump + +commit 82d0c7923723fd2de0453554816cbf8de6c9a4a7 +Author: eMariete.com +Date: Sat Nov 13 14:32:50 2021 +0100 + + Add some power consumption optimizations + +commit f2aceaeb682adb5ad1eaa7f5ecd40115c0275f98 +Author: eMariete.com +Date: Sat Nov 13 13:05:15 2021 +0100 + + Minor BLE fix + +commit aa4021bb7e3295f75a24a34f1bae7905a0f26b0d +Author: eMariete.com +Date: Sat Nov 13 11:23:36 2021 +0100 + + Set sensors library debug mode to false + +commit e74e853fe6d514dabbc0ad7e82a445e7cf85a632 +Author: eMariete.com +Date: Sat Nov 13 11:22:57 2021 +0100 + + Fix reboot on BLE init + +commit c00c149660deb410552aa7bf2b4ff8e3a837361e +Author: eMariete.com +Date: Fri Nov 12 11:55:23 2021 +0100 + + Fix typo in menu + +commit 6352b8389f2d48d0705d849f9613af75a6880310 +Author: eMariete.com +Date: Fri Nov 12 08:25:18 2021 +0100 + + Version bump to v0.3.12 + +commit bb35bc5723d235a95b6845afa6d44ce02684dc5e +Author: eMariete.com +Date: Fri Nov 12 08:24:22 2021 +0100 + + Minor mod in Display Config Menu + +commit e12fbfec536fd62f0e50e4fb2fe8592f202b9c5b +Author: eMariete.com +Date: Fri Nov 12 08:19:19 2021 +0100 + + Add functionality displayOffOnExternalPower + +commit 1df15d44cdb64b014582247e95ebee978556b704 +Author: eMariete.com +Date: Fri Nov 12 07:35:40 2021 +0100 + + Add funcionality automatic display off + +commit 5fae5c80ebadfcaa82b6f91e28db0422afeb1d1a +Author: eMariete.com +Date: Fri Nov 12 05:59:40 2021 +0100 + + Fix merge + +commit 6dfb64e0a20b57b2191f6a9668a7606b816beaf4 +Merge: 2b2c636 b303de7 +Author: eMariete.com +Date: Fri Nov 12 05:38:30 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 2b2c6360b7aa0f858fb008e5aa0e605a302d028a +Author: eMariete.com +Date: Thu Nov 11 23:44:40 2021 +0100 + + Add timeToDisplayOff menu prefs (no functionality) + +commit b303de7cd059ddd1c2df224783ea97ef3e657973 +Merge: 898dc9c 1c39f91 +Author: Mariete +Date: Thu Nov 11 23:30:05 2021 +0100 + + Merge pull request #22 from melkati/WiFiCredentials-Menu + + Add WiFi credentials config to menu/preferences + +commit 1c39f91f1c89a45dcef1d2accdc6fd7e5f368682 +Author: eMariete.com +Date: Thu Nov 11 23:25:47 2021 +0100 + + Add WiFi credentials config to menu/preferences + +commit 898dc9cf05028e582da8c852206fc1812e31a0de +Author: Mariete +Date: Thu Nov 11 20:07:21 2021 +0100 + + Update README.md + +commit b3c6ae69f36bd078d8c067741859c6d804954e27 +Merge: af2e0aa 5876636 +Author: eMariete.com +Date: Thu Nov 11 19:57:21 2021 +0100 + + Merge branch 'master' + +commit 5876636e8b81fa662f2b81c61e72f48dfb568a67 +Author: Mariete +Date: Thu Nov 11 19:11:56 2021 +0100 + + Update README.md + +commit af2e0aa93baf42a36c1330efc0a5954612bc75f8 +Author: eMariete.com +Date: Thu Nov 11 18:49:00 2021 +0100 + + Adjust platformio.ini for local + +commit d05e3268e369027ffb3265dca8565ae6389acb98 +Author: Mariete +Date: Thu Nov 11 09:07:59 2021 +0100 + + Fix for BatterySense + + Add library https://github.com/rlogiacco/BatterySense.git to platformio.ini + +commit 2843561c435ffeb4aee590c54cc093610e9a64d0 +Author: eMariete.com +Date: Thu Nov 11 08:57:12 2021 +0100 + + Fix menu typos + +commit d1a2ffe28aaf886324fe330eca87d77bc50deb2b +Author: eMariete.com +Date: Wed Nov 10 21:59:41 2021 +0100 + + Clean up CO2_Gadget_Preferences.h + +commit 60ec7301072168818c1ddcc208c825014d2c36fb +Merge: 7935de7 13a77db +Author: eMariete.com +Date: Wed Nov 10 21:54:10 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 7935de7f6b93f8ac75fdb3d38790990ce36f86a7 +Author: eMariete.com +Date: Wed Nov 10 21:53:55 2021 +0100 + + Fixes to Batterysense and Menu + +commit 13a77db1fff14428093b4e01de8a0eb36df72e73 +Author: Mariete +Date: Wed Nov 10 21:27:23 2021 +0100 + + Update .gitignore + +commit 53dafe34feeb0f3a2d2062321c3008009cfadab9 +Merge: a4b553e 792f0a3 +Author: Mariete +Date: Wed Nov 10 20:48:43 2021 +0100 + + Merge pull request #21 from melkati/BatterySense + + Improve battery measurements (Battery sense) + +commit 792f0a3f777ac373abb4f56135aa19452d0b53b4 +Merge: e5781ff a4b553e +Author: Mariete +Date: Wed Nov 10 20:38:15 2021 +0100 + + Merge branch 'master' into BatterySense + +commit a4b553ee4060afdef36477b49501c6a91af026aa +Merge: f6f26dd 7ca6918 +Author: eMariete.com +Date: Wed Nov 10 20:25:38 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit f6f26dd4810ea626046244eee92ac0af7c5b1060 +Author: eMariete.com +Date: Wed Nov 10 20:25:27 2021 +0100 + + Add MQTT Credentials + +commit 7ca69187fe6aa2d1ddc47609d7b057dbbaedb1ef +Author: Mariete +Date: Mon Nov 8 21:00:41 2021 +0100 + + Bump version + +commit bb5124f1948018044f889841df6b239859d71997 +Merge: 8ea5788 ada1510 +Author: eMariete.com +Date: Mon Nov 8 20:58:42 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 8ea5788e32044a235093da9beca49941829edcb7 +Author: eMariete.com +Date: Mon Nov 8 20:53:00 2021 +0100 + + MQTT menu config, fixes and improvements to MQTT + +commit ada1510db8d5fbba2a2c3dba8e7f3afccefc211d +Author: Mariete +Date: Mon Nov 8 10:20:12 2021 +0100 + + Update platformio.ini + +commit f7640ea7d18803ab8f047863ad1f8b9ca343da5c +Merge: 3f228f6 219cfbb +Author: eMariete.com +Date: Mon Nov 8 10:17:18 2021 +0100 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget + +commit 3f228f6d16f4d7a1b5bb65081586dc0f13c1a012 +Author: eMariete.com +Date: Mon Nov 8 10:11:22 2021 +0100 + + Fix .gitignore + +commit 219cfbb69ac7aeebda2d4a19e57f255ad1945967 +Merge: 4299df1 6f2025c +Author: Mariete +Date: Mon Nov 8 09:56:20 2021 +0100 + + Merge pull request #20 from melkati/mqttReconnect + + Mqtt reconnect and update README.md + +commit 6f2025c503b738680c2c801e9e754d8ce9ae2aa8 +Author: eMariete.com +Date: Mon Nov 8 09:50:06 2021 +0100 + + Update README.md + +commit 694439c17abfa4817cc691ef318d9c360dcf3d11 +Author: eMariete.com +Date: Mon Nov 8 09:48:54 2021 +0100 + + Fix names in initWifi() + +commit 4299df164a59f7005e2e96c4a4ec9c88a8edc290 +Author: Mariete +Date: Mon Nov 8 09:38:24 2021 +0100 + + Update platformio.ini + +commit 9064ee8f3f2c1a15abee16313432f5d8d1ff54ce +Author: Mariete +Date: Mon Nov 8 09:35:54 2021 +0100 + + Update .gitignore + +commit d118f0a7f367bee30523f302814f7c478f5aab76 +Merge: 67df8cd 42bb02e +Author: Mariete +Date: Mon Nov 8 09:34:33 2021 +0100 + + Merge pull request #19 from melkati/mqttReconnect + + Improvements to mqttReconnect() + Closes #18 + +commit 42bb02eb7bbd4c318b616948d8180321976e19d4 +Author: eMariete.com +Date: Mon Nov 8 09:22:43 2021 +0100 + + Improvements to mqttReconnect() + +commit 67df8cda24075cd34c46c9e1320709b964427cd6 +Author: eMariete.com +Date: Mon Nov 8 07:47:38 2021 +0100 + + Connection to MQTT broker: Max one try each 5 secs + +commit 0372650fd87bff7f3d9fe92febe14f9eba832e55 +Author: eMariete.com +Date: Sun Nov 7 19:28:14 2021 +0100 + + Add platformio.ini to .gitignore + +commit 501683f6019a9e802e53a0be0b9b2eba9ff9401a +Merge: d4e3f37 58e77c9 +Author: Mariete +Date: Sun Nov 7 14:16:39 2021 +0100 + + Merge pull request #17 from hpsaturn/master + + Some minors project config improvements + +commit d4e3f373dccb4e739f02e2c1fd34bf2b9e8655ef +Author: eMariete.com +Date: Sun Nov 7 14:10:56 2021 +0100 + + Add .vscode to .gitignore + +commit 58e77c973eab11e93fad8169c74bc235f6521a97 +Author: Hpsaturn +Date: Sun Nov 7 13:43:36 2021 +0100 + + removed custom upload and monitor (better auto for other OS) + +commit f0bf9489bb991a20e12f3b5d68ba78411c8d2bd9 +Author: Hpsaturn +Date: Sun Nov 7 13:37:35 2021 +0100 + + removed unnecesary and conflictive directory, .vscode + +commit 3bf271340b5aac0c6a865f8ab34f412bcba976aa +Author: Hpsaturn +Date: Sun Nov 7 13:32:56 2021 +0100 + + resync with upstream + +commit ea3c2ace398c98b4ed69bf53402bfbde0cc85ba2 +Author: Hpsaturn +Date: Sun Nov 7 13:30:44 2021 +0100 + + removed file that on original repo dont exist (?) + +commit bc3186ce58bf9f98856d23d6644771016eb5e72f +Author: Hpsaturn +Date: Sun Nov 7 13:28:16 2021 +0100 + + unsaved file from merge + +commit e5781ff2c019b4d73e423ad399dc890eda8695d1 +Author: eMariete.com +Date: Sun Nov 7 13:27:09 2021 +0100 + + User can set battery full and empty values o menu + +commit 449a8a30fe61c0febce7e9145f16a3317065b0b8 +Author: eMariete.com +Date: Sun Nov 7 13:25:55 2021 +0100 + + Battery options save to NVR + +commit 1abb671baa0165d2aed965e336040c3f434579db +Merge: 14e95f3 130d1c8 +Author: Hpsaturn +Date: Sun Nov 7 13:25:40 2021 +0100 + + Merge remote-tracking branch 'upstream/master' + +commit 0951f676eba87606387cf32c81c0dce295b63c18 +Author: eMariete.com +Date: Sun Nov 7 12:41:02 2021 +0100 + + Add adjust vRef from menu calibrate battery + +commit 94ee498f920eebe2ebf626b9e8487c8b1efb7e0f +Author: eMariete.com +Date: Sun Nov 7 12:40:21 2021 +0100 + + Add library BatterySense + +commit ab95b12be784bed2fdcc73af4b50a6ffa1a33d66 +Author: eMariete.com +Date: Sun Nov 7 10:18:22 2021 +0100 + + Add new webpage (concept draft) with CSS gauges + +commit aec3393692c051d9998d0df680e621a214e5f535 +Author: eMariete.com +Date: Tue Nov 2 21:19:31 2021 +0100 + + First basic no reloading page + +commit 130d1c815c48a8ad2fcb1366e5fdcb74d08a435d +Author: eMariete.com +Date: Sun Oct 31 09:17:09 2021 +0100 + + Enable/disable BLE from menu + +commit 1512e4c4146a96d37be7d9b355812c4bd8daa600 +Author: eMariete.com +Date: Sat Oct 30 21:46:47 2021 +0200 + + Rev update + +commit 278b535799a8a8c8a834bcffbca546af3bac1714 +Author: eMariete.com +Date: Sat Oct 30 21:44:24 2021 +0200 + + Better IP info screen if disconnected/disabled + +commit 467e5ae7510cb4ac5438e38d5e32bf9558050626 +Author: eMariete.com +Date: Sat Oct 30 21:24:49 2021 +0200 + + Ability to enable and disable WiFi from menu + +commit c1b14c80f44cb8b3d4f571da14db09930a7e8f4c +Author: eMariete.com +Date: Sat Oct 30 21:08:40 2021 +0200 + + Ability to enable and disable MQTT from menu + +commit 32ca6c43f75161e1e60e5229dde110b58c36ccb7 +Author: eMariete.com +Date: Sat Oct 30 20:13:29 2021 +0200 + + Show IP address in information screen + +commit 8941609b1135611f9dfb2e617c84d03c3d1e7946 +Author: eMariete.com +Date: Sat Oct 30 20:07:19 2021 +0200 + + Save activeBLE activeWIFI activeMQTT in preferencs + +commit 930916c55a3f2eee45b13a6553dd714e4d582d5a +Author: eMariete.com +Date: Sat Oct 30 14:10:59 2021 +0200 + + Separate buttons funct. into CO2_Gadget_Buttons.h + +commit 8ecf93a0dd2be29850f51b746acee44e914510db +Author: eMariete.com +Date: Sat Oct 30 13:39:20 2021 +0200 + + Some code cleaning + +commit 197c44f5daf31a939da6107732f0bc674d9c7769 +Author: eMariete.com +Date: Sat Oct 30 09:50:07 2021 +0200 + + Move global variables to main file + +commit ee20c81f5226b9fd7746985aec03108f8b606dc0 +Author: eMariete.com +Date: Sat Oct 30 09:17:48 2021 +0200 + + Fixed hostName + +commit 35872bac29a68c0e99a489cdb6d766cce83bfb0b +Author: eMariete.com +Date: Sat Oct 30 09:14:48 2021 +0200 + + Renamed button_init() as buttonsInit() + +commit 6d9bd260009d4c22aae048dd3579ac150f216a32 +Author: eMariete.com +Date: Fri Oct 29 20:55:38 2021 +0200 + + Fix issue environment variables and credentials.h + +commit 6899494744c4c6262efa16ab83008145ed546052 +Author: eMariete.com +Date: Fri Oct 29 20:05:30 2021 +0200 + + Fix dupl. definition of const char *mqtt_server + +commit 5bdcbd99197793c5797710c5362600f6d7ddcc37 +Author: eMariete.com +Date: Fri Oct 29 16:54:36 2021 +0200 + + Version update to 0.2.001 + +commit 1fe5b8eeadb3e5dc005ab2ca69c20b5577fdc35b +Author: eMariete.com +Date: Fri Oct 29 16:45:10 2021 +0200 + + Revision update + +commit 012e9121debb13a5358b2ada8d4f15abe2fc24da +Author: eMariete.com +Date: Fri Oct 29 16:42:20 2021 +0200 + + Limit WiFi connection tries before disabling WiFi + +commit c8648f7514331fdc88a28b5e4cd307d3cfcd057f +Author: eMariete.com +Date: Fri Oct 29 16:26:25 2021 +0200 + + Refactoring sensors to => CO2_Gadget_Sensors.h + +commit 4db6ca6eb20857cc7f3ad4fe96430452572a42f5 +Author: eMariete.com +Date: Fri Oct 29 16:09:18 2021 +0200 + + Get rid of credentials.tpl.h + +commit c447828bce33e4546817eac892de30261c3495eb +Author: eMariete.com +Date: Fri Oct 29 15:29:22 2021 +0200 + + Refactor BLE + +commit 220d2d089170c265bcdfb75b15803f63a852a509 +Author: eMariete.com +Date: Fri Oct 29 15:15:50 2021 +0200 + + Get rid of SUPPORT_BLE, SUPPORT_WIFI, SUPPORT_MQTT + +commit c79b23b89bd13366cf4736a0c100e3713d5321dd +Author: eMariete.com +Date: Fri Oct 29 15:14:07 2021 +0200 + + Refactoring to enable BLE, WiFi and MQTT from menu + +commit 8b0417dd82cbac8437f54edd11ac957c731b0f89 +Author: eMariete.com +Date: Fri Oct 29 08:19:41 2021 +0200 + + WiFi credentials in system enviroment variables + +commit 96ce1ea47981046b482f999cbb63144a1287cb66 +Merge: bc3dfa5 a228e29 +Author: eMariete.com +Date: Thu Oct 28 21:11:12 2021 +0200 + + Merge master https://github.com/melkati/CO2-Gadget + +commit bc3dfa5e3db60e7125918342f6168d998821a4e1 +Author: eMariete.com +Date: Thu Oct 28 21:09:06 2021 +0200 + + Show IP adress at startup + +commit d67148883d02989a09d019c715e33493e15c612f +Author: eMariete.com +Date: Thu Oct 28 21:08:39 2021 +0200 + + Fix credentials file after last merge + +commit a228e2961d284d0e398c58eaca6d6df079a6badf +Author: Mariete +Date: Thu Oct 28 21:00:03 2021 +0200 + + Update README.md + +commit b86ee1914d49f04ba41b58bbce6bf8cb322123c9 +Author: Mariete +Date: Thu Oct 28 20:46:29 2021 +0200 + + Update README.md + +commit 19b8b71d734d72222f5ace5112a2547074f67604 +Author: Mariete +Date: Thu Oct 28 19:43:38 2021 +0200 + + Update credentials.tpl.h + +commit 8be979452a1ebd20044e1292f7e9483fc3bc76a9 +Merge: 3a899cc 7458631 +Author: Mariete +Date: Thu Oct 28 19:09:20 2021 +0200 + + Merge pull request #15 from melkati/Feature-wifi + + Feature wifi + +commit 74586313d06c82a140cf2e1f034cea876cb423ff +Author: Mariete +Date: Thu Oct 28 16:43:55 2021 +0200 + + Update README.md + +commit 3aa8effaa820cd36b63dc9fe0be006ec984165ff +Author: eMariete.com +Date: Thu Oct 28 11:11:39 2021 +0200 + + Improvements and fixes to MQTT + +commit 010f28524e8310ffcaa9968c3024a70396761890 +Author: eMariete.com +Date: Thu Oct 28 11:09:28 2021 +0200 + + Improvements and fixes to MQTT + +commit cf4e736c51650f12afe6101884482b28b4b380d9 +Author: eMariete.com +Date: Wed Oct 27 22:31:47 2021 +0200 + + Refactoring. WiFi & BLE fixes and improvements + +commit 12a99a31417477a4d5612f4b7ed37023da565523 +Author: eMariete.com +Date: Wed Oct 27 15:16:58 2021 +0200 + + Fix: BLE and WiFi working at same time (testing) + +commit babb72fe296be136cd506111ef8b3209f36a3095 +Author: eMariete.com +Date: Wed Oct 27 11:53:41 2021 +0200 + + Define SUPPORT_WIFI & SUPPORT_MQTT + +commit ab84895b5fa3a4beaf074a5129730da4b9dfc61d +Merge: 77c32cf 757f75f +Author: eMariete.com +Date: Wed Oct 27 11:52:03 2021 +0200 + + Merge branch 'Feature-wifi' of https://github.com/melkati/CO2-Gadget into Feature-wifi + +commit 77c32cfe77d144e547037536696e25514e776142 +Author: eMariete.com +Date: Wed Oct 27 11:51:12 2021 +0200 + + Fixes and improvements to WiFi and MQTT + +commit 757f75f83875abca86a42368672a1afb41f341f1 +Author: Mariete +Date: Tue Oct 26 15:06:11 2021 +0200 + + Update README.md + +commit 247c2bba26694d6cfd208efaaffb99279068c9ea +Author: Mariete +Date: Tue Oct 26 15:03:57 2021 +0200 + + Update readme BLE/WIFI + +commit 08efddb71769d0815aa0844c160e48eec200e243 +Author: eMariete.com +Date: Tue Oct 26 14:24:26 2021 +0200 + + WiFi & MQTT working alone (without BLE) choose one + +commit 29f376da5ed12a6f5e391a52b3ff7ccbea41e1c0 +Author: eMariete.com +Date: Tue Oct 26 07:53:49 2021 +0200 + + Remove MultiWifi + +commit 654ca3fab431eb97fc78dd18241de698384ee9e8 +Author: eMariete.com +Date: Tue Oct 26 07:52:51 2021 +0200 + + Remove MultiWifi + +commit 3a899cc0b2b14b9722b6b6181676173d091e4b8c +Author: Mariete +Date: Mon Oct 25 21:49:08 2021 +0200 + + Update README.md + +commit e7dc61fbd8282426ce5edb1844f2a539d7a4a47c +Author: Mariete +Date: Mon Oct 25 21:21:13 2021 +0200 + + Update README.md + +commit a664cd60d441d4b4f9dbd414f734f748ea5f2480 +Author: Mariete +Date: Mon Oct 25 21:17:29 2021 +0200 + + Update README.md + +commit 29906f6846770cbb6edbc71156050e17291aecad +Merge: 3b826de 3567517 +Author: Mariete +Date: Mon Oct 25 20:57:19 2021 +0200 + + Merge pull request #14 from melkati/Feature-wifi + + Clang-format protect comments (temporary fix) + +commit 3567517f4e3ee213a1c6108adb539b4d8cfec05b +Author: eMariete.com +Date: Mon Oct 25 20:39:31 2021 +0200 + + Clang-format protect comments + +commit 59f630b40c6b2b1daa4f6f43ab4bdf497a3a7860 +Author: eMariete.com +Date: Mon Oct 25 20:37:34 2021 +0200 + + Clang-format protect comments (temporary solution) + +commit 1d25055ed7e68a794852907f881ab82d8b7a2ab4 +Author: eMariete.com +Date: Mon Oct 25 20:16:55 2021 +0200 + + Fix CO2_Gadget_WIFI.h + +commit 3b826de327fbc3411570129463f7669bae88e2c8 +Merge: ee860dd 3de2ffe +Author: Mariete +Date: Sat Oct 23 19:38:09 2021 +0200 + + Merge pull request #13 from melkati/development + + Removed #define SUPPORT_ARDUINOMENU + +commit 3de2ffec2dad4af52c5af516c1b649d5d924cbb6 +Author: eMariete.com +Date: Sat Oct 23 19:28:29 2021 +0200 + + Removed #define SUPPORT_ARDUINOMENU + +commit 3ce42ef2b73739a90216940401924974b4fb1151 +Author: eMariete.com +Date: Sat Oct 23 16:37:29 2021 +0200 + + Add version + revision variables + +commit 6eb63a0cb983077819f0676069db588f64d56407 +Author: eMariete.com +Date: Sat Oct 23 13:23:48 2021 +0200 + + Update README.md + +commit ee860dd6c0c78ad17a72b88a3bfbfe6b9cf8cd6d +Merge: 8cbec59 4e606a5 +Author: Mariete +Date: Sat Oct 23 09:55:36 2021 +0200 + + Merge pull request #12 from melkati/development + + Fixed main screen overwrite menu + +commit 4e606a52ae6aaa54850f2f77b43f8feaf8b966d4 +Merge: 22e8c7e b895ac0 +Author: eMariete.com +Date: Sat Oct 23 09:52:11 2021 +0200 + + Merge branch development github.com development + +commit 22e8c7e88a8957838272a435dfaf72372e666dc4 +Author: eMariete.com +Date: Sat Oct 23 09:48:38 2021 +0200 + + Fixed platformio.ini + +commit b895ac010b983a4efd9509ab788d1f7ea40ebbc2 +Merge: 2f10dd0 8cbec59 +Author: Mariete +Date: Sat Oct 23 09:46:01 2021 +0200 + + Merge branch 'master' into development + +commit 2f10dd0a03d39ec14539b8e5e60485e6740e1c1c +Author: eMariete.com +Date: Sat Oct 23 09:04:31 2021 +0200 + + Fixed main screen overwrite menu + +commit a439501c85134a77c70d8306f60c901d289fc0b2 +Author: eMariete.com +Date: Fri Oct 22 22:25:48 2021 +0200 + + Organize defines for PlatformIO and Arduino + +commit 8cbec59d81329c3f27a0bfa15d4038a24e175c7c +Merge: da2a005 0ab6db6 +Author: Mariete +Date: Fri Oct 22 20:47:31 2021 +0200 + + Merge pull request #11 from melkati/development + + Menu improvements + +commit 3e364a793a85387313bd325760f5c14351988066 +Author: eMariete.com +Date: Fri Oct 22 20:45:34 2021 +0200 + + Battery field not selectable + +commit 0ab6db6d6f226d2fdcfb20cc6f3b3dcea8f5211d +Author: eMariete.com +Date: Fri Oct 22 20:37:51 2021 +0200 + + Menu improvements + +commit da2a005ef184b8a2c377e20f542bf48df41f524b +Author: eMariete.com +Date: Thu Oct 21 22:19:33 2021 +0200 + + Fixed #define ST7789_DRIVER in User_Setup.h + +commit a6ca50f0f4f4d4c5a168a17c7f17571b8d63f9d8 +Merge: 8cbfeab ee3804c +Author: Mariete +Date: Thu Oct 21 21:07:24 2021 +0200 + + Merge pull request #10 from melkati/Use-CanAirIO-Air-Quality-Sensors-sensorslib + + Use CanAirIO Air Quality Sensors Library (sensorslib) + +commit ee3804c071e4de826fa65d25e4bc9125884d08fb +Author: eMariete.com +Date: Thu Oct 21 20:57:00 2021 +0200 + + Set CORE_DEBUG_LEVEL=0 + +commit 743ca4554c37c4aae77d7afba154e24bb1e2684a +Author: eMariete.com +Date: Thu Oct 21 16:49:59 2021 +0200 + + Add TFT configuration in platformio + +commit 24ee5513b5bdb5d22cc18d394933c33aaf1f48c9 +Merge: 5968d25 345c1d9 +Author: eMariete.com +Date: Thu Oct 21 16:20:21 2021 +0200 + + Add TFTBrightness + +commit 5968d25659c536f910f0088180f12c2fe252ad05 +Author: eMariete.com +Date: Thu Oct 21 14:55:25 2021 +0200 + + Fixes for SCD4x + +commit 345c1d9f4ca7702778999ac29ae5136cbf8e9919 +Merge: d181604 8cbfeab +Author: Mariete +Date: Wed Oct 20 21:55:51 2021 +0200 + + Merge branch 'master' into Use-CanAirIO-Air-Quality-Sensors-sensorslib + +commit d181604e2d1875d314e07c4eadfd27cae1c3e02f +Author: eMariete.com +Date: Wed Oct 20 21:50:39 2021 +0200 + + Use https://github.com/melkati/TFT_eSPI.gig + +commit 8cbfeab2544d60e630ef7384d16eb550081d4d70 +Merge: 0fb8c5f f3010e5 +Author: Mariete +Date: Wed Oct 20 21:00:27 2021 +0200 + + Merge pull request #8 from hpsaturn/ci_badge_platformio + + build badge for CI with PlatformIO + +commit f3010e50e3a8d727bee207be456dc8b455d74b08 +Author: Antonio Vanegas +Date: Wed Oct 20 19:18:39 2021 +0200 + + added build badge for CI with PlatformIO + +commit 14e95f316fef89fbfde98843eeae16eae22a1cef +Merge: 3134357 c26633f +Author: Mariete +Date: Wed Oct 20 16:06:02 2021 +0200 + + Merge pull request #7 from hpsaturn/ci_workflow_build_upload + + CI workflow for firmware test and upload + +commit 0fb8c5f35c0c67a8e6835cbb72a5a792f3a62668 +Merge: aef4efa 00dd2d9 +Author: Mariete +Date: Wed Oct 20 16:06:02 2021 +0200 + + Merge pull request #7 from hpsaturn/ci_workflow_build_upload + + CI workflow for firmware test and upload + +commit c26633f0d05196382d534179edf789a1c86371f3 +Author: Antonio Vanegas +Date: Wed Oct 20 13:39:37 2021 +0200 + + testing new CI workflow for firmware test and upload + +commit 00dd2d98105b32eb0941bd227a6ab6cf93d7b960 +Author: Antonio Vanegas +Date: Wed Oct 20 13:39:37 2021 +0200 + + testing new CI workflow for firmware test and upload + +commit 3134357f372c470fb2215913ee1ef2d1b607348a +Merge: 1d05020 f56d59c +Author: eMariete.com +Date: Wed Oct 20 11:06:53 2021 +0200 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget into development + +commit aef4efa4ec3cc232d45f58b648c6f7dd8726d11c +Merge: 0e85668 60e8b3f +Author: eMariete.com +Date: Wed Oct 20 11:06:53 2021 +0200 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget into development + +commit 1d05020893fe9ca9e0c8e29001515d6050be8e8a +Author: eMariete.com +Date: Wed Oct 20 11:06:38 2021 +0200 + + Mod #include "CO2_Gadget_Menu.h" Arduino IDE comp. + +commit 0e856686e1bb47e6023157b58f90b9c4eeb95ef9 +Author: eMariete.com +Date: Wed Oct 20 11:06:38 2021 +0200 + + Mod #include "CO2_Gadget_Menu.h" Arduino IDE comp. + +commit f56d59cf783b94d2d12281d8e9f923ce935ab943 +Author: Mariete +Date: Tue Oct 19 22:46:11 2021 +0200 + + Delete Bootlogo directory + +commit 60e8b3f50b9e7b90818877aafcc1a1d69eea7703 +Author: Mariete +Date: Tue Oct 19 22:46:11 2021 +0200 + + Delete Bootlogo directory + +commit a8c11ad905b178701378cb97565a2d5971521bdc +Author: Mariete +Date: Tue Oct 19 22:37:22 2021 +0200 + + Update README.md + +commit 148696f9779d781375a438da1b12e0c730c7ba50 +Author: Mariete +Date: Tue Oct 19 22:37:22 2021 +0200 + + Update README.md + +commit 3e8ed2283126cc66d94763614ff1d8910f30f5c8 +Author: Mariete +Date: Tue Oct 19 22:35:18 2021 +0200 + + Update README.md + +commit fa834980dd7388053781c52830cce363ade1c50b +Author: Mariete +Date: Tue Oct 19 22:35:18 2021 +0200 + + Update README.md + +commit f5a13b7958913f60e0d7bf3322dbb49cc3d20be0 +Author: Mariete +Date: Tue Oct 19 22:34:40 2021 +0200 + + Update README.md + +commit fe4fc34725fb56e8a58cfa95de614b38596c9b02 +Author: Mariete +Date: Tue Oct 19 22:34:40 2021 +0200 + + Update README.md + +commit 7f3a57c11dffc3f492dbb0cafdb2ddf74552670e +Author: Mariete +Date: Tue Oct 19 22:19:11 2021 +0200 + + Update README.md + +commit ccc0343c7ab26cf37f4c7a91498f6ec0b294d6ef +Author: Mariete +Date: Tue Oct 19 22:19:11 2021 +0200 + + Update README.md + +commit 69526522ec5ed613a852f04e02c7abe1ce11b2cc +Author: Mariete +Date: Tue Oct 19 21:37:39 2021 +0200 + + Create first README version + + Heavily based on CanAirIO sensorlib + +commit 5dff63b3baf44fa3a1b7f7d285c112e4c0d01a5f +Author: Mariete +Date: Tue Oct 19 21:37:39 2021 +0200 + + Create first README version + + Heavily based on CanAirIO sensorlib + +commit 5700d83db1e2ca45747a4504c5a9221803c9460b +Author: eMariete.com +Date: Tue Oct 19 19:29:56 2021 +0200 + + Implement #ifdef DEBUG_ARDUINOMENU + +commit 0d8750bff9901a26ddc8611ae1dbcaa3f5964351 +Author: eMariete.com +Date: Tue Oct 19 19:29:56 2021 +0200 + + Implement #ifdef DEBUG_ARDUINOMENU + +commit c28ad13fd6b88f4859c526042863989be03f5f9a +Merge: 84c8cbc 415c5b4 +Author: eMariete.com +Date: Tue Oct 19 19:11:36 2021 +0200 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget into development + +commit 9ca618e067d65fbf36ebd4f843cbe31fb11b3cc6 +Merge: 31362cd ea9db65 +Author: eMariete.com +Date: Tue Oct 19 19:11:36 2021 +0200 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget into development + +commit 84c8cbc343f185a62dadddd840082e39c2c63d3a +Author: eMariete.com +Date: Tue Oct 19 19:11:26 2021 +0200 + + Use https://github.com/melkati/TFT_eSPI.git + +commit 31362cd5e253ad360e653f91ba1682b7ca30d054 +Author: eMariete.com +Date: Tue Oct 19 19:11:26 2021 +0200 + + Use https://github.com/melkati/TFT_eSPI.git + +commit 415c5b470510297d63c6be2b16555751b4f7600f +Merge: 1fdcb1a 5a0105e +Author: Mariete +Date: Tue Oct 19 18:24:37 2021 +0200 + + Merge pull request #6 from melkati/TFT-Brightness + + TFT-Brightness + +commit ea9db65b4ad59dfb3377874144e86a6060dd7359 +Merge: aeb985e dd47116 +Author: Mariete +Date: Tue Oct 19 18:24:37 2021 +0200 + + Merge pull request #6 from melkati/TFT-Brightness + + TFT-Brightness + +commit 5a0105e664c329d3aa16b211c95c95eaf228eef4 +Author: eMariete.com +Date: Tue Oct 19 18:18:29 2021 +0200 + + TFT-Brightness + +commit dd47116b3e6650e33f1d89ffd42a3db049ae19d9 +Author: eMariete.com +Date: Tue Oct 19 18:18:29 2021 +0200 + + TFT-Brightness + +commit 1fdcb1adf647b07606cb9eb4ba8a509e2df19614 +Merge: 72c9d9c 1597267 +Author: Mariete +Date: Tue Oct 19 15:46:33 2021 +0200 + + Merge pull request #5 from melkati/TFT-Brightness + + Implemented TFTBrightness + +commit aeb985e4df575314a2f896a1ee496f4400faae21 +Merge: 2e6adb5 064800b +Author: Mariete +Date: Tue Oct 19 15:46:33 2021 +0200 + + Merge pull request #5 from melkati/TFT-Brightness + + Implemented TFTBrightness + +commit 1597267844bfc2d9aae357567bf899ca8ae7e7d2 +Author: eMariete.com +Date: Tue Oct 19 15:44:52 2021 +0200 + + Implemented TFTBrightness + +commit 064800b2af0b6961a03b529ce3855690143d05b9 +Author: eMariete.com +Date: Tue Oct 19 15:44:52 2021 +0200 + + Implemented TFTBrightness + +commit 72c9d9cbba488d7d65e61f75a951bf5556894d7b +Merge: 562b686 eb3f115 +Author: Mariete +Date: Tue Oct 19 15:15:48 2021 +0200 + + Merge pull request #4 from melkati/add-license-1 + + Add license + +commit 2e6adb522a6fa57068266b81468cbeab177090f3 +Merge: 4d0915a 90fea66 +Author: Mariete +Date: Tue Oct 19 15:15:48 2021 +0200 + + Merge pull request #4 from melkati/add-license-1 + + Add license + +commit eb3f115541f72bbcc3eb1fe5e8f9b3bcc40de511 +Author: Mariete +Date: Tue Oct 19 15:15:31 2021 +0200 + + Add license + +commit 90fea66f24eb9fa6b97c9d59f09e6aef3b7d13f7 +Author: Mariete +Date: Tue Oct 19 15:15:31 2021 +0200 + + Add license + +commit 65073162889f10ad211b3a59ba19de1e3c1804a8 +Author: eMariete.com +Date: Tue Oct 19 13:50:37 2021 +0200 + + Fix conflicts. Merge master. + +commit 309efe34604da6066a77999152c8e44bdcb29aa5 +Merge: 0641833 4d0915a +Author: eMariete.com +Date: Tue Oct 19 12:07:49 2021 +0200 + + Merge branch 'development' into Use-CanAirIO-Air-Quality-Sensors-sensorslib + +commit 064183307e80779339a7ba6e26a42c2e8583f73a +Author: eMariete.com +Date: Tue Oct 19 11:19:05 2021 +0200 + + Modified .gitignore exclude Bootlogo folder + +commit 562b686b13e3ec85b11bf0010cc2f0d1499d0736 +Author: eMariete.com +Date: Tue Oct 19 11:09:32 2021 +0200 + + Implemented preferences + +commit 4d0915af013d1a872e4efd7a905f3392fe660adc +Author: eMariete.com +Date: Tue Oct 19 11:09:32 2021 +0200 + + Implemented preferences + +commit 176be691d37a7a43fad8a7ffb8734442d18295a3 +Author: eMariete.com +Date: Tue Oct 19 10:57:09 2021 +0200 + + Impemented save preferences to NVM + +commit 3c3f60a7e0d92a478dcc808b1a23672dc4b088d5 +Author: eMariete.com +Date: Tue Oct 19 10:57:09 2021 +0200 + + Impemented save preferences to NVM + +commit c3b806d32c22d3eb0bbc2e546d8af4ede1e51fa0 +Merge: 68310c0 3f19749 +Author: Mariete +Date: Mon Oct 18 20:44:48 2021 +0200 + + Merge pull request #3 from melkati/ArduinoMenu + + Calibration working. Battery display fixed. + +commit 667768db42e5fe2de3e169337c2ae869a37c43d1 +Merge: 93d7844 fa5bef1 +Author: Mariete +Date: Mon Oct 18 20:44:48 2021 +0200 + + Merge pull request #3 from melkati/ArduinoMenu + + Calibration working. Battery display fixed. + +commit 3f1974984dc79b1a4d86420402a7aaa3b97e433e +Author: eMariete.com +Date: Mon Oct 18 20:19:11 2021 +0200 + + Custom calibration functionality + +commit fa5bef16245b111f9a15d1f28a9d01cd8e81b13b +Author: eMariete.com +Date: Mon Oct 18 20:19:11 2021 +0200 + + Custom calibration functionality + +commit d042600e4eb3ac30097991334b8d3563caa04ba5 +Author: eMariete.com +Date: Mon Oct 18 19:16:12 2021 +0200 + + doCalibration400ppm working Fix readBatteryVoltage + +commit 26ff887a3c626d08d43d1a262916b0056c6baa25 +Author: eMariete.com +Date: Mon Oct 18 19:16:12 2021 +0200 + + doCalibration400ppm working Fix readBatteryVoltage + +commit ac956cf84c20e341d23914064b447978c2fe9603 +Author: eMariete.com +Date: Mon Oct 18 18:50:15 2021 +0200 + + Fix readBatteryVoltage() + +commit b2a3f9bdf13a0a316df492d3395103fa0fe04201 +Author: eMariete.com +Date: Mon Oct 18 18:50:15 2021 +0200 + + Fix readBatteryVoltage() + +commit 78be8c43bcfba50a2380004411ddebedddd5897a +Author: eMariete.com +Date: Mon Oct 18 11:24:44 2021 +0200 + + Fixed buttons changing num value reversed-Genfixes + +commit 8806faa480237ee75d7b744f98a5f40268bf64a2 +Author: eMariete.com +Date: Mon Oct 18 11:24:44 2021 +0200 + + Fixed buttons changing num value reversed-Genfixes + +commit 68310c010e28c7bb7c3b8874116948964bae3b21 +Author: eMariete.com +Date: Sun Oct 17 15:41:14 2021 +0200 + + Empty + +commit 93d78445d75f023ad1ad4e68389ebf309cc35abc +Author: eMariete.com +Date: Sun Oct 17 15:40:42 2021 +0200 + + Menu skeleton working + +commit d04d2ae2557b63855d793eb7f270c68c6d2b46a0 +Author: eMariete.com +Date: Sun Oct 17 15:40:42 2021 +0200 + + Menu skeleton working + +commit ba1ff430d41edef65c750af9ae3c845a18a3648d +Author: eMariete.com +Date: Sun Oct 17 12:17:49 2021 +0200 + + ArduinoMenu First Time Working + +commit 5b2ea79e0465c2ebfefe12f7c3db512fb42db54f +Author: eMariete.com +Date: Sun Oct 17 12:17:49 2021 +0200 + + ArduinoMenu First Time Working + +commit 7c261177724cc73de49dfef549ceb346d8d068b6 +Author: eMariete.com +Date: Sat Oct 16 23:19:11 2021 +0200 + + ArdinoMenu First Working + +commit 358e7a1db4b3a88257b64750f319a5979def2251 +Author: eMariete.com +Date: Sat Oct 16 23:19:11 2021 +0200 + + ArdinoMenu First Working + +commit d9bd76a57dfdf68909f71add10b7ae55adff2c63 +Merge: ab159b0 b1fbdec +Author: eMariete.com +Date: Sat Oct 16 23:18:46 2021 +0200 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget into ArduinoMenu + +commit a40f5a25b9eb2b0d05e7514041decb14d07bfdd2 +Merge: d5cbb6d e9cf17c +Author: eMariete.com +Date: Sat Oct 16 23:18:46 2021 +0200 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget into ArduinoMenu + +commit b1fbdec4c40925e5097c4bf73b45fae6285f48a9 +Merge: 209a650 f41f744 +Author: Mariete +Date: Sat Oct 16 12:04:57 2021 +0200 + + Merge pull request #2 from melkati/Battery-refactory + + Battery refactory + +commit e9cf17c364328fb57f25ccf3fe3119255e4616d0 +Merge: 081b45a 2719ba2 +Author: Mariete +Date: Sat Oct 16 12:04:57 2021 +0200 + + Merge pull request #2 from melkati/Battery-refactory + + Battery refactory + +commit f41f744c563df82c28a3d7f3d132372e828f538a +Author: eMariete.com +Date: Sat Oct 16 12:04:00 2021 +0200 + + Battery refactory + +commit 2719ba2c40a3c954e160d7ac3172cb1e88ad41c7 +Author: eMariete.com +Date: Sat Oct 16 12:04:00 2021 +0200 + + Battery refactory + +commit 209a650bf8e7a269fcfa8c786e12eb0361bada45 +Merge: 1086d8a 73c356c +Author: eMariete.com +Date: Sat Oct 16 11:23:22 2021 +0200 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget into development + +commit 081b45a9afdc595fb257976215700c467d466d26 +Merge: 1086d8a 1e9d0c2 +Author: eMariete.com +Date: Sat Oct 16 11:23:22 2021 +0200 + + Merge branch 'master' of https://github.com/melkati/CO2-Gadget into development + +commit ab159b04a95f6f7bdea1ba5e42e09a49dcce40f6 +Author: eMariete.com +Date: Sat Oct 16 11:22:44 2021 +0200 + + Halfway + +commit d5cbb6d99d03d04fccbd78715d00aa861ec97d19 +Author: eMariete.com +Date: Sat Oct 16 11:22:44 2021 +0200 + + Halfway + +commit 1086d8a9335a05c7e41826f55588d767644c2966 +Author: eMariete.com +Date: Sat Oct 16 09:58:51 2021 +0200 + + Recovering + +commit 26f2f2640ab98e876ed8ba3011679d31b730dc04 +Author: eMariete.com +Date: Sat Oct 16 09:53:27 2021 +0200 + + Renamed CO2 Gadget.ino to CO2_Gadget.ino (Arduino IDE doesn't like space in name) + +commit ed365ed1498b65e07001d9e88aabaff76ef6293f +Author: eMariete.com +Date: Sat Oct 16 09:26:34 2021 +0200 + + Halfway + +commit 3f20a18ec10ffcae96777266f73746c897b424f7 +Author: eMariete.com +Date: Sat Oct 16 09:26:34 2021 +0200 + + Halfway + +commit 1c34f56f61da74bb569ef796973c70cd59f8d755 +Author: eMariete.com +Date: Fri Oct 15 21:11:50 2021 +0200 + + a medias + +commit fc7713b8d4f09414427681a80fd705380741d2d8 +Author: eMariete.com +Date: Fri Oct 15 21:11:50 2021 +0200 + + a medias + +commit 73c356c52ce1077737fced6f2c34d49736e1ebc3 +Merge: 29c7d38 6ded558 +Author: Mariete +Date: Fri Oct 15 13:12:12 2021 +0200 + + Merge pull request #1 from melkati/logomenu + + added eMariete Logo + +commit 1e9d0c27089874b44a6907edf943d245814006d7 +Merge: 29c7d38 6ded558 +Author: Mariete +Date: Fri Oct 15 13:12:12 2021 +0200 + + Merge pull request #1 from melkati/logomenu + + added eMariete Logo + +commit 6ded55812cc69e7f6bcceb2aab85691a717d3bf8 +Author: eMariete.com +Date: Fri Oct 15 13:08:41 2021 +0200 + + added eMariete Logo + +commit 6a31300b6cd2635cc50ce8c461b9ddb25eec73c2 +Author: eMariete.com +Date: Thu Oct 14 15:19:07 2021 +0200 + + Set TTGO_TDISPLAY=1 Use melkati/canairio_sensorlib + +commit 7e3c747520712bb38cb560b9fcbc200a1e54ee75 +Author: eMariete.com +Date: Thu Oct 14 11:33:34 2021 +0200 + + sensorslib first implemented + +commit 24b97c98aba83058f7eb7987e35849cce8852a16 +Author: eMariete.com +Date: Thu Oct 14 10:08:14 2021 +0200 + + Remote OLED skeleton + +commit 29c7d380cc4183269a0456b3878b2acb1b5932bf +Author: eMariete.com +Date: Thu Oct 14 09:31:55 2021 +0200 + + create development branch + +commit fb79666ab2f4fffbf395ebfde96dbaa13e78c8dd +Author: eMariete.com +Date: Thu Oct 14 08:59:32 2021 +0200 + + Renamed CO2 Gadget.ino to CO2_Gadget.ino (Arduino IDE doesn't like space in name) + +commit 2d46aa31c10e1dc8ff1d00d40d0bddd0a15273ca +Author: eMariete.com +Date: Wed Oct 13 20:15:53 2021 +0200 + + first commit From d228d7d0f779c59c8ce1f4473eb6dd814d5d3818 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Fri, 2 Feb 2024 16:37:09 +0100 Subject: [PATCH 19/83] Modify README.md with PIN definition for buzzer --- README.md | 18 ++++++++++-------- platformio.ini | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 55d95069..85019152 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ This repository is mainly addressed at developers. If you are an end user willin - Easy WiFi setup via bluetooth with the MyAmbiance App in iOS and Android - ESP-NOW communications protocol from Espressif for long range and low power consuption ([more info here](https://emariete.com/en/gateway-esp-now-mqtt/)) - Over the air updates OTA +- Support for buzzer alarms on CO2 level - Support for Neopixel (WS2812B) addressable LEDs (RGB, GBR and RGBW) - Support for RGB LEDs - GPIO outputs for alarms and activation of air circulation on CO2 concentration threshold with hysteresis. Check GPIO to use at [my blog CO2 Gadget firmware page](https://emariete.com/medidor-co2-gadget/) @@ -56,14 +57,14 @@ Supporting any other ESP32 board is very easy. Yoy just have to setup the pines These are the GPIOs used by each predefined board: -| Flavor | Display | RX/TX | I2C | UP/DWN | GPIO EN | GPIO Green | GPIO Orange | GPIO Red | GPIO Battery | GPIO Neopixel -|:-----------------------|:----------------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:| -| TTGO_TDISPLAY TFT | TFT 240×135 | 13/12 | 21/22 | 35/0 | 27 | 25 | 32 | 33 | 34 | 26 -| TTGO_TDISPLAY_SANDWICH | TFT 240×135 | 13/12 | 22/21 | 35/0 | 27 | 25 | 32 | 33 | 34 | 26 -| TDISPLAY_S3 | TFT 320x170 | 18/17 | 42/43 | 14/0 | -- | 02 | 03 | 01 | 04 | 16 -| esp32dev_OLED SSH1106 | SSH1106 128×64 | 17/16 | 21/22 | 15/0 | 27 | 25 | 32 | 33 | 34 | 26 -| esp32dev | No display | 17/16 | 21/22 | 15/0 | 27 | 25 | 32 | 33 | 34 | 26 -| esp32dev-sandwich | No display | 17/16 | 22/21 | 15/0 | 27 | 25 | 32 | 33 | 34 | 26 +| Flavor | Display | RX/TX | I2C | UP/DWN | GPIO EN | GPIO Green | GPIO Orange | GPIO Red | GPIO Battery | GPIO Neopixel | Buzzer +|:-----------------------|:----------------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:| +| TTGO_TDISPLAY TFT | TFT 240×135 | 13/12 | 21/22 | 35/0 | 27 | 25 | 32 | 33 | 34 | 26 | 13 +| TTGO_TDISPLAY_SANDWICH | TFT 240×135 | 13/12 | 22/21 | 35/0 | 27 | 25 | 32 | 33 | 34 | 26 | 13 +| TDISPLAY_S3 | TFT 320x170 | 18/17 | 42/43 | 14/0 | -- | 02 | 03 | 01 | 04 | 16 | 13 +| esp32dev_OLED SSH1106 | SSH1106 128×64 | 17/16 | 21/22 | 15/0 | 27 | 25 | 32 | 33 | 34 | 26 | 13 +| esp32dev | No display | 17/16 | 21/22 | 15/0 | 27 | 25 | 32 | 33 | 34 | 26 | 13 +| esp32dev-sandwich | No display | 17/16 | 22/21 | 15/0 | 27 | 25 | 32 | 33 | 34 | 26 | 13 - Flavor: Name of the firmware variant. - Display: Display supported by each flavor. @@ -76,6 +77,7 @@ These are the GPIOs used by each predefined board: - GPIO Red: Pin (GPIO) corresponding to the output when the orange level is reached (for relays, alarms, and RGB LED). - GPIO Battery: Pin for battery voltage measurement. - Neopixel GPIO: Pin to which you must connect the data line of the Neopixel (WS2812B) LEDs. +- Buzzer: Pin to connect an acgti e buzzer for CO2 level sound alarms. # Supported sensors diff --git a/platformio.ini b/platformio.ini index 6f25ebc6..9a99444a 100644 --- a/platformio.ini +++ b/platformio.ini @@ -58,7 +58,7 @@ build_flags = -D MQTT_BROKER_SERVER="\"192.168.1.145"\" -D CO2_GADGET_VERSION="\"0.9."\" - -D CO2_GADGET_REV="\"005-feature-buzzer"\" + -D CO2_GADGET_REV="\"006-feature-buzzer"\" -D CORE_DEBUG_LEVEL=0 -DBUZZER_PIN=13 ; ESP32 pin GPIO13 connected to piezo buzzer -DBUZZER_HYSTERESIS=50 ; Hysteresis PPM to avoid BUZZER ON and OFF continuously if repeat is once From 38f397dc225d929b1d636882fda6a9a29753de0f Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Fri, 2 Feb 2024 21:18:05 +0100 Subject: [PATCH 20/83] Add buzzer preferences to HTML form and needed CSS --- data/preferences.html | 52 ++++++++++++++++++++++++++++++++++++++++++- data/style.css | 10 +++++++++ platformio.ini | 2 +- 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/data/preferences.html b/data/preferences.html index d0d2f18c..7a07af5a 100644 --- a/data/preferences.html +++ b/data/preferences.html @@ -127,12 +127,62 @@

CO2 Gadget Preferences

+ +
+ Buzzer + +
+ + +
+
- + + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+
+
+ +
Connectivity diff --git a/data/style.css b/data/style.css index ff98cddb..7201c4f0 100644 --- a/data/style.css +++ b/data/style.css @@ -72,6 +72,16 @@ label { margin-bottom: 8px; } +select { + width: 100%; + padding: 8px; + margin-bottom: 10px; + box-sizing: border-box; + border: 1px solid #ccc; + border-radius: 4px; + font-size: 14px; +} + input[type="text"], input[type="password"], input[type="number"] { diff --git a/platformio.ini b/platformio.ini index 9a99444a..bb2bacbd 100644 --- a/platformio.ini +++ b/platformio.ini @@ -58,7 +58,7 @@ build_flags = -D MQTT_BROKER_SERVER="\"192.168.1.145"\" -D CO2_GADGET_VERSION="\"0.9."\" - -D CO2_GADGET_REV="\"006-feature-buzzer"\" + -D CO2_GADGET_REV="\"007-feature-buzzer"\" -D CORE_DEBUG_LEVEL=0 -DBUZZER_PIN=13 ; ESP32 pin GPIO13 connected to piezo buzzer -DBUZZER_HYSTERESIS=50 ; Hysteresis PPM to avoid BUZZER ON and OFF continuously if repeat is once From fca6eeda3bb089eeed590e7db6fae921054511f8 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Sat, 3 Feb 2024 00:09:33 +0100 Subject: [PATCH 21/83] Add buzzer preferences logic (JSON and server endpoint send and receive) --- CO2_Gadget_Preferences.h | 1 + data/preferences.html | 126 +++++++++++++++++++++++---------------- 2 files changed, 76 insertions(+), 51 deletions(-) diff --git a/CO2_Gadget_Preferences.h b/CO2_Gadget_Preferences.h index 15fa7fa7..c1ee1fa5 100644 --- a/CO2_Gadget_Preferences.h +++ b/CO2_Gadget_Preferences.h @@ -169,6 +169,7 @@ void initPreferences() { wifiPass.trim(); hostName.trim(); preferences.end(); +#define DEBUG_PREFERENCES #ifdef DEBUG_PREFERENCES printPreferences(); #endif diff --git a/data/preferences.html b/data/preferences.html index 7a07af5a..9874d067 100644 --- a/data/preferences.html +++ b/data/preferences.html @@ -20,7 +20,7 @@

CO2 Gadget Preferences

Networking
- +
@@ -127,54 +127,52 @@

CO2 Gadget Preferences

- -
- Buzzer -
- - -
+ +
+ Buzzer -
- - -
+
+ + +
+ + +
-
- - -
-
- - -
-
- - -
-
@@ -513,8 +511,24 @@

CO2 Gadget Preferences

if (getPreferencesDebug) console.log('Setting debugSensors to:', preferences.debugSensors); document.getElementById("debugSensors").checked = preferences.debugSensors; + + if (getPreferencesDebug) console.log('Setting actvBuzzer to:', preferences.actvBuzzer); + document.getElementById("actvBuzzer").checked = preferences.actvBuzzer; + + if (getPreferencesDebug) console.log('Setting rptBuzzer to:', preferences.rptBuzzer); + document.getElementById("rptBuzzer").value = preferences.rptBuzzer; + + if (getPreferencesDebug) console.log('Setting toneBzrBeep to:', preferences.toneBzrBeep); + document.getElementById("toneBzrBeep").value = preferences.toneBzrBeep; + + if (getPreferencesDebug) console.log('Setting durBzrBeep to:', preferences.durBzrBeep); + document.getElementById("durBzrBeep").value = preferences.durBzrBeep; + + if (getPreferencesDebug) console.log('Setting timeBtwnBzr to:', preferences.timeBtwnBzr); + document.getElementById("timeBtwnBzr").value = preferences.timeBtwnBzr; + }) - .catch(error => console.error('Error al obtener preferencias:', error)); + .catch(error => console.error('Error retrieving preferences:', error)); } function collectPreferencesData() { @@ -562,10 +576,14 @@

CO2 Gadget Preferences

// showPM25: document.getElementById("showPM25").checked, mqttClientId: document.getElementById("mqttClientId").value, mqttBroker: document.getElementById("mqttBroker").value, - mqttUser: document.getElementById("mqttUser").value + mqttUser: document.getElementById("mqttUser").value, // mqttPass: document.getElementById("mqttPass").value + actvBuzzer: document.getElementById("actvBuzzer").checked, + rptBuzzer: document.getElementById("rptBuzzer").selectedOptions[0].getAttribute("value") === "true", + toneBzrBeep: document.getElementById("toneBzrBeep").value, + durBzrBeep: document.getElementById("durBzrBeep").value, + timeBtwnBzr: document.getElementById("timeBtwnBzr").value }; - return preferencesData; } @@ -591,11 +609,7 @@

CO2 Gadget Preferences

}; } - // Set initial values when the page loads - document.addEventListener("DOMContentLoaded", loadPreferencesFromServer); - - From e1bf605bc68111a6c2668c53ece4be1b2d480890 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Sat, 3 Feb 2024 00:13:28 +0100 Subject: [PATCH 22/83] Disable DEBUG_PREFERENCES --- CO2_Gadget_Preferences.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CO2_Gadget_Preferences.h b/CO2_Gadget_Preferences.h index c1ee1fa5..52c45b6b 100644 --- a/CO2_Gadget_Preferences.h +++ b/CO2_Gadget_Preferences.h @@ -169,7 +169,7 @@ void initPreferences() { wifiPass.trim(); hostName.trim(); preferences.end(); -#define DEBUG_PREFERENCES +// #define DEBUG_PREFERENCES #ifdef DEBUG_PREFERENCES printPreferences(); #endif From c478f8e8c32b2cdad7311544ba09211eba374fc7 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Sat, 3 Feb 2024 00:36:35 +0100 Subject: [PATCH 23/83] Change downOrangeRange and down RedRange to belowOrangeRange and belowRedRange for clarity --- CO2_Gadget_Buzzer.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CO2_Gadget_Buzzer.h b/CO2_Gadget_Buzzer.h index 07cf4784..5c8712fe 100644 --- a/CO2_Gadget_Buzzer.h +++ b/CO2_Gadget_Buzzer.h @@ -12,8 +12,8 @@ Ticker buzz; uint64_t lastTimeBuzzerBeep = 0; // Time of last Buzzer loop -bool downOrangeRange = true; -bool downRedRange = true; +bool belowOrangeRange = true; +bool belowRedRange = true; void wakeUpDisplay(){ if (actualDisplayBrightness == 0) // Turn on the display only if it's OFF @@ -56,22 +56,22 @@ void buzzerLoop(){ lastTimeBuzzerBeep = millis(); if(co2>co2RedRange){ - if(downRedRange || repeatBuzzer){ + if(belowRedRange || repeatBuzzer){ wakeUpDisplay(); buzz.once(0, buzzerRedRange); - downRedRange = false; + belowRedRange = false; } return; - } else if(co2 < (co2RedRange - BUZZER_HYSTERESIS)) downRedRange = true; + } else if(co2 < (co2RedRange - BUZZER_HYSTERESIS)) belowRedRange = true; if(co2>co2OrangeRange){ - if(downOrangeRange || repeatBuzzer){ + if(belowOrangeRange || repeatBuzzer){ wakeUpDisplay(); buzz.once(0, buzzerOrangeRange); - downOrangeRange = false; + belowOrangeRange = false; } return; - } else if(co2 < (co2OrangeRange - BUZZER_HYSTERESIS)) downOrangeRange = true; + } else if(co2 < (co2OrangeRange - BUZZER_HYSTERESIS)) belowOrangeRange = true; return; } } From 9c8d5a476a2063065bca45a2e2f174aca92fa36b Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Sat, 3 Feb 2024 09:59:48 +0100 Subject: [PATCH 24/83] Update Buzzer pin description in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 85019152..1f517130 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ These are the GPIOs used by each predefined board: - GPIO Red: Pin (GPIO) corresponding to the output when the orange level is reached (for relays, alarms, and RGB LED). - GPIO Battery: Pin for battery voltage measurement. - Neopixel GPIO: Pin to which you must connect the data line of the Neopixel (WS2812B) LEDs. -- Buzzer: Pin to connect an acgti e buzzer for CO2 level sound alarms. +- Buzzer: Pin to connect a passive buzzer for CO2 level sound alarms (built in transistor needed). # Supported sensors From 83aa125abbb13966268b7d9a01ead8feec488083 Mon Sep 17 00:00:00 2001 From: Coscolin Date: Sat, 3 Feb 2024 20:29:15 +0100 Subject: [PATCH 25/83] Redefine buzzerLoop() workflow --- CO2_Gadget_Buzzer.h | 84 +++++++++++++++++++++++++-------------------- CO2_Gadget_Menu.h | 8 ++--- 2 files changed, 50 insertions(+), 42 deletions(-) diff --git a/CO2_Gadget_Buzzer.h b/CO2_Gadget_Buzzer.h index 5c8712fe..5c7beb3c 100644 --- a/CO2_Gadget_Buzzer.h +++ b/CO2_Gadget_Buzzer.h @@ -8,9 +8,8 @@ /*****************************************************************************************************/ #include // library to async functions -Ticker buzz; - -uint64_t lastTimeBuzzerBeep = 0; // Time of last Buzzer loop +Ticker buzz_red; +Ticker buzz_orange; bool belowOrangeRange = true; bool belowRedRange = true; @@ -27,52 +26,61 @@ void wakeUpDisplay(){ } void buzzerRedRange(){ - Serial.println("[BUZZ] Buzzer RED range"); - tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); - delay(durationBuzzerBeep*1.3); - tone(BUZZER_PIN, toneBuzzerBeep+250+co2 , durationBuzzerBeep); - delay(durationBuzzerBeep*1.3); - tone(BUZZER_PIN, toneBuzzerBeep+500+co2 , durationBuzzerBeep); + if(co2>co2RedRange){ + Serial.println("[BUZZ] Buzzer RED range"); + tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); + delay(durationBuzzerBeep*1.3); + tone(BUZZER_PIN, toneBuzzerBeep+250+co2 , durationBuzzerBeep); + delay(durationBuzzerBeep*1.3); + tone(BUZZER_PIN, toneBuzzerBeep+500+co2 , durationBuzzerBeep); + } } void buzzerOrangeRange(){ - Serial.println("[BUZZ] Buzzer ORANGE range"); - tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); - delay(durationBuzzerBeep*1.3); - tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); + if(co2>co2OrangeRange){ + Serial.println("[BUZZ] Buzzer ORANGE range"); + tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); + delay(durationBuzzerBeep*1.3); + tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); + } } void buzzerLoop(){ - if(!activeBuzzer) - return; - - if(inMenu){ // Inside Menu stop BEEPING - noTone(BUZZER_PIN); + if(!activeBuzzer || inMenu){ // Inside Menu OR activeBuzzer=OFF stop BEEPING + if(buzz_red.active() || buzz_orange.active()){ + noTone(BUZZER_PIN); + buzz_red.detach(); + buzz_orange.detach(); + } + belowRedRange = true; + belowOrangeRange = true; return; } - if ((millis() - lastTimeBuzzerBeep >= timeBetweenBuzzerBeep * 1000) || (lastTimeBuzzerBeep == 0)) { - lastTimeBuzzerBeep = millis(); - - if(co2>co2RedRange){ - if(belowRedRange || repeatBuzzer){ - wakeUpDisplay(); - buzz.once(0, buzzerRedRange); - belowRedRange = false; - } - return; - } else if(co2 < (co2RedRange - BUZZER_HYSTERESIS)) belowRedRange = true; + if(co2>co2RedRange && belowRedRange){ + wakeUpDisplay(); + buzz_orange.detach(); + belowOrangeRange = true; + if(repeatBuzzer) buzz_red.attach(timeBetweenBuzzerBeep, buzzerRedRange); + else buzz_red.once(0, buzzerRedRange); + belowRedRange = false; + return; + } else if(co2 < (co2RedRange - BUZZER_HYSTERESIS)){ + buzz_red.detach(); + belowRedRange = true; + } - if(co2>co2OrangeRange){ - if(belowOrangeRange || repeatBuzzer){ - wakeUpDisplay(); - buzz.once(0, buzzerOrangeRange); - belowOrangeRange = false; - } - return; - } else if(co2 < (co2OrangeRange - BUZZER_HYSTERESIS)) belowOrangeRange = true; + if(co2co2OrangeRange && belowOrangeRange){ + wakeUpDisplay(); + if(repeatBuzzer) buzz_orange.attach(timeBetweenBuzzerBeep, buzzerOrangeRange); + else buzz_orange.once(0, buzzerOrangeRange); + belowOrangeRange = false; return; - } + } else if(co2 < (co2OrangeRange - BUZZER_HYSTERESIS)){ + buzz_orange.detach(); + belowOrangeRange = true; + } + return; } #endif diff --git a/CO2_Gadget_Menu.h b/CO2_Gadget_Menu.h index 1f804447..1666bda3 100644 --- a/CO2_Gadget_Menu.h +++ b/CO2_Gadget_Menu.h @@ -764,13 +764,13 @@ TOGGLE(timeBetweenBuzzerBeep, timeBetweenBuzzerBeepMenu, "Each: ", doNothing, no TOGGLE(toneBuzzerBeep, toneBuzzerBeepMenu, "Tone: ", doNothing, noEvent, wrapStyle ,VALUE("HIGH", 1500, doNothing, noEvent) - ,VALUE("MED.", 1000, doNothing, noEvent) - ,VALUE("LOW", 300, doNothing, noEvent)); + ,VALUE("MED.", 600, doNothing, noEvent) + ,VALUE("LOW", 0, doNothing, noEvent)); TOGGLE(durationBuzzerBeep, durationBuzzerBeepMenu, "Span: ", doNothing, noEvent, wrapStyle ,VALUE("SHORT", 50, doNothing, noEvent) - ,VALUE("MED.", 100, doNothing, noEvent) - ,VALUE("LONG", 200, doNothing, noEvent)); + ,VALUE("MED.", 150, doNothing, noEvent) + ,VALUE("LONG", 300, doNothing, noEvent)); MENU(buzzerConfigMenu, "Buzzer Config", doNothing, noEvent, wrapStyle ,SUBMENU(activeBuzzerOffMenu) From c387535694fe98047a0f8cef5a55207f6a029376 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Sat, 3 Feb 2024 20:59:32 +0100 Subject: [PATCH 26/83] Update dependencies in platformio.ini --- platformio.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platformio.ini b/platformio.ini index 84a33e56..c1921dd7 100644 --- a/platformio.ini +++ b/platformio.ini @@ -36,7 +36,8 @@ lib_deps = bblanchon/ArduinoJson @ ^7.0.1 neu-rah/ArduinoMenu library @ ^4.21.4 lennarthennigs/Button2 @ ^1.6.5 - hpsaturn/CanAirIO Air Quality Sensors Library @ ^0.7.3 + ; hpsaturn/CanAirIO Air Quality Sensors Library @ ^0.7.3 ; Temprary remove until Issue with Sensors::setTempOffset(float offset) for SCD30 #155 is resolved + https://github.com/melkati/canairio_sensorlib.git#Issue-with-Sensors-setTempOffset-for-SCD30 https://github.com/Sensirion/arduino-ble-gadget.git https://github.com/melkati/Improv-WiFi-Library.git ; neu-rah/streamFlow @ 0.0.0-alpha+sha.bf16ce8926 ; Needed for -D MENU_DEBUG @@ -57,7 +58,7 @@ build_flags = -D MQTT_BROKER_SERVER="\"192.168.1.145"\" -D CO2_GADGET_VERSION="\"0.9."\" - -D CO2_GADGET_REV="\"003"\" + -D CO2_GADGET_REV="\"010"\" -D CORE_DEBUG_LEVEL=0 -DNEOPIXEL_PIN=26 ; Pinnumber for button for down/next and back / exit actions -DNEOPIXEL_COUNT=16 ; How many neopixels to control From 7cf4b89c8b9b7cea1a2aed09eb5a1ebc14190233 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Sun, 4 Feb 2024 00:14:39 +0100 Subject: [PATCH 27/83] Add initialize buzzer in setup() --- CO2_Gadget.ino | 3 ++- CO2_Gadget_Buzzer.h | 61 +++++++++++++++++++++++++++------------------ platformio.ini | 2 +- 3 files changed, 40 insertions(+), 26 deletions(-) diff --git a/CO2_Gadget.ino b/CO2_Gadget.ino index b295ad88..e6e48e60 100644 --- a/CO2_Gadget.ino +++ b/CO2_Gadget.ino @@ -311,7 +311,7 @@ void initGPIO() { pinMode(BLUE_PIN, OUTPUT); digitalWrite(BLUE_PIN, LOW); pinMode(RED_PIN, OUTPUT); - digitalWrite(RED_PIN, LOW); + digitalWrite(RED_PIN, LOW); } void outputsRelays() { @@ -490,6 +490,7 @@ void setup() { initBattery(); initGPIO(); initNeopixel(); + initBuzzer(); #if defined(SUPPORT_OLED) || defined(SUPPORT_TFT) initDisplay(); #endif diff --git a/CO2_Gadget_Buzzer.h b/CO2_Gadget_Buzzer.h index 5c8712fe..4d3581fb 100644 --- a/CO2_Gadget_Buzzer.h +++ b/CO2_Gadget_Buzzer.h @@ -6,7 +6,7 @@ /********* SETUP BUZZER *********/ /********* *********/ /*****************************************************************************************************/ - + #include // library to async functions Ticker buzz; @@ -15,8 +15,8 @@ uint64_t lastTimeBuzzerBeep = 0; // Time of last Buzzer loop bool belowOrangeRange = true; bool belowRedRange = true; -void wakeUpDisplay(){ - if (actualDisplayBrightness == 0) // Turn on the display only if it's OFF +void wakeUpDisplay() { + if (actualDisplayBrightness == 0) // Turn on the display only if it's OFF { #if defined(SUPPORT_OLED) || defined(SUPPORT_TFT) setDisplayBrightness(DisplayBrightness); // Turn on the display at DisplayBrightness brightness @@ -24,30 +24,29 @@ void wakeUpDisplay(){ lastTimeButtonPressed = millis(); } return; -} +} -void buzzerRedRange(){ +void buzzerRedRange() { Serial.println("[BUZZ] Buzzer RED range"); - tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); - delay(durationBuzzerBeep*1.3); - tone(BUZZER_PIN, toneBuzzerBeep+250+co2 , durationBuzzerBeep); - delay(durationBuzzerBeep*1.3); - tone(BUZZER_PIN, toneBuzzerBeep+500+co2 , durationBuzzerBeep); + tone(BUZZER_PIN, toneBuzzerBeep + co2, durationBuzzerBeep); + delay(durationBuzzerBeep * 1.3); + tone(BUZZER_PIN, toneBuzzerBeep + 250 + co2, durationBuzzerBeep); + delay(durationBuzzerBeep * 1.3); + tone(BUZZER_PIN, toneBuzzerBeep + 500 + co2, durationBuzzerBeep); } -void buzzerOrangeRange(){ +void buzzerOrangeRange() { Serial.println("[BUZZ] Buzzer ORANGE range"); - tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); - delay(durationBuzzerBeep*1.3); - tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); + tone(BUZZER_PIN, toneBuzzerBeep + co2, durationBuzzerBeep); + delay(durationBuzzerBeep * 1.3); + tone(BUZZER_PIN, toneBuzzerBeep + co2, durationBuzzerBeep); } -void buzzerLoop(){ - - if(!activeBuzzer) +void buzzerLoop() { + if (!activeBuzzer) return; - if(inMenu){ // Inside Menu stop BEEPING + if (inMenu) { // Inside Menu stop BEEPING noTone(BUZZER_PIN); return; } @@ -55,24 +54,38 @@ void buzzerLoop(){ if ((millis() - lastTimeBuzzerBeep >= timeBetweenBuzzerBeep * 1000) || (lastTimeBuzzerBeep == 0)) { lastTimeBuzzerBeep = millis(); - if(co2>co2RedRange){ - if(belowRedRange || repeatBuzzer){ + if (co2 > co2RedRange) { + if (belowRedRange || repeatBuzzer) { wakeUpDisplay(); buzz.once(0, buzzerRedRange); belowRedRange = false; } return; - } else if(co2 < (co2RedRange - BUZZER_HYSTERESIS)) belowRedRange = true; + } else if (co2 < (co2RedRange - BUZZER_HYSTERESIS)) + belowRedRange = true; - if(co2>co2OrangeRange){ - if(belowOrangeRange || repeatBuzzer){ + if (co2 > co2OrangeRange) { + if (belowOrangeRange || repeatBuzzer) { wakeUpDisplay(); buzz.once(0, buzzerOrangeRange); belowOrangeRange = false; } return; - } else if(co2 < (co2OrangeRange - BUZZER_HYSTERESIS)) belowOrangeRange = true; + } else if (co2 < (co2OrangeRange - BUZZER_HYSTERESIS)) + belowOrangeRange = true; return; } } + +void initBuzzer() { +#ifdef SUPPORT_BUZZER + Serial.println("-->[BUZZ] Initializing Buzzer.."); + pinMode(BUZZER_PIN, OUTPUT); + + // LEDC initialization + ledcSetup(0, 5000, 8); // LEDC channel 0, 5000 Hz, 8-bit resolution + ledcAttachPin(BUZZER_PIN, 0); // Attach BUZZER_PIN to channel 0 +#endif +} + #endif diff --git a/platformio.ini b/platformio.ini index bb2bacbd..e1d38f22 100644 --- a/platformio.ini +++ b/platformio.ini @@ -58,7 +58,7 @@ build_flags = -D MQTT_BROKER_SERVER="\"192.168.1.145"\" -D CO2_GADGET_VERSION="\"0.9."\" - -D CO2_GADGET_REV="\"007-feature-buzzer"\" + -D CO2_GADGET_REV="\"008-feature-buzzer"\" -D CORE_DEBUG_LEVEL=0 -DBUZZER_PIN=13 ; ESP32 pin GPIO13 connected to piezo buzzer -DBUZZER_HYSTERESIS=50 ; Hysteresis PPM to avoid BUZZER ON and OFF continuously if repeat is once From 0a19567225f49d678f8fff9201bafff988811ce1 Mon Sep 17 00:00:00 2001 From: Mariete Date: Sun, 4 Feb 2024 08:38:25 +0100 Subject: [PATCH 28/83] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1f517130..352ab82c 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ Supporting any other ESP32 board is very easy. Yoy just have to setup the pines These are the GPIOs used by each predefined board: -| Flavor | Display | RX/TX | I2C | UP/DWN | GPIO EN | GPIO Green | GPIO Orange | GPIO Red | GPIO Battery | GPIO Neopixel | Buzzer +| Flavor | Display | RX/TX | I2C | UP/DWN | GPIO EN | GPIO Green | GPIO Orange | GPIO Red | GPIO Battery | GPIO Neopixel | GPIO Buzzer |:-----------------------|:----------------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:|:--------:| | TTGO_TDISPLAY TFT | TFT 240×135 | 13/12 | 21/22 | 35/0 | 27 | 25 | 32 | 33 | 34 | 26 | 13 | TTGO_TDISPLAY_SANDWICH | TFT 240×135 | 13/12 | 22/21 | 35/0 | 27 | 25 | 32 | 33 | 34 | 26 | 13 From 130f845e1e3fca177c00baaa645b04cb39408d53 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Sun, 4 Feb 2024 08:41:56 +0100 Subject: [PATCH 29/83] Remove unrelated file --- ...d 320e66c11e6e5382b8677e99c23b9e2336d0e203 | 5140 ----------------- 1 file changed, 5140 deletions(-) delete mode 100644 et --hard 320e66c11e6e5382b8677e99c23b9e2336d0e203 diff --git a/et --hard 320e66c11e6e5382b8677e99c23b9e2336d0e203 b/et --hard 320e66c11e6e5382b8677e99c23b9e2336d0e203 deleted file mode 100644 index 81f9f557..00000000 --- a/et --hard 320e66c11e6e5382b8677e99c23b9e2336d0e203 +++ /dev/null @@ -1,5140 +0,0 @@ -commit c6fac5662750b5b472173f3e76abc82e29076287 (HEAD -> feature-buzzer, origin/feature-buzzer) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Feb 2 16:08:01 2024 +0100 - - Add buzzer-related settings to Preferences to save in NVR - -commit 1010bbd70fdf3a0282343def79c953aae7aa8673 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Feb 2 15:07:43 2024 +0100 - - Change debug messages to be of module "BUZZ" - -commit 320e66c11e6e5382b8677e99c23b9e2336d0e203 -Merge: 06a38df 8a04b42 -Author: Mariete -Date: Fri Feb 2 14:31:20 2024 +0100 - - Merge pull request #156 from Coscolin/buzzer-menu - - Menu options to configure buzzer alarm - -commit 06a38df9e56a0c00aa8df93a7e3d4ca4dc1f075a -Merge: bfe3e8e 01573a5 -Author: Mariete -Date: Fri Feb 2 14:16:14 2024 +0100 - - Merge pull request #157 from Coscolin/buzzer - - Buzzer implementation to drive the buzzer - -commit 01573a5390ea5872f0932e5e2458211253d0849c -Author: Sergio Coscolín -Date: Fri Feb 2 14:02:34 2024 +0100 - - Move buzzerLoop() into outputsLoop() and remove #ifdef - -commit 090cf9187c4b146e30d9c46892e749022e29332c -Author: Sergio Coscolín -Date: Fri Feb 2 14:00:15 2024 +0100 - - Add ifndef CO2_Gadget_Buzzer_h - -commit 62bb9eca0bb27bebb45b1e1997933c25d9d0c66a -Author: Sergio Coscolín -Date: Fri Feb 2 13:52:48 2024 +0100 - - Change MENU -> BUZZER in comment header - -commit 7b4014378049e555099606e282b5bcdc1356d831 -Author: Sergio Coscolín -Date: Fri Feb 2 11:16:45 2024 +0100 - - Update CO2_Gadget_Menu.h to merge with feature-buzzer branch of melkati - -commit 73b2c49b5134c163e7fe76149b9aca0182701094 -Author: Sergio Coscolín -Date: Fri Feb 2 11:10:21 2024 +0100 - - Add two lines to merge without changes - -commit 834b12f892be192cca9acc92e63c6442657187b1 -Author: Sergio Coscolín -Date: Fri Feb 2 11:08:15 2024 +0100 - - Remove last line to merge without changes - -commit 0a902b153f699ec97056258cba00d834c219520d -Author: Sergio Coscolín -Date: Fri Feb 2 10:59:09 2024 +0100 - - Revert CO2_Gadget_Menu.h to create a PR without menu changes - -commit 8a04b420106bbba31c683e1edc589f73bab3123a -Author: Sergio Coscolín -Date: Fri Feb 2 10:55:44 2024 +0100 - - Menu options to buzzer alarm - - Added buzzer configuration in menu: - - - Alarm: ON / OFF - - - Repeat: ONCE / EVERY - · REPEAT ONCE: Only buzzer one time orange or red CO2 range is raised. Don't buzzer again until CO2 values downs "HYSTERIC" value down orange/red range and raise again. - · REPEAT EVERY: Buzzer all time while CO2 values are upper orange or red range. - - - Each: 5s / 10s / 15s / 30s / 1m / 2m / 5m - · Time between buzzers if repeat is "EVERY" - - - Tone: HIGH / MED. / LOW - · Frecuency of buzzer tone. - - - Span: SHORT / MED / LONG - · Duration of buzzer tones. - -commit d4628db0e54661862fff649d5e255f8edcf0ea45 -Author: Sergio Coscolín -Date: Fri Feb 2 09:38:17 2024 +0100 - - Change alarmConfigMenu to buzzerConfigMenu - -commit 972e073a4fa6b3e58523a6fe4d16fd68bc506e85 -Merge: 4b85c5f 9fdaae6 -Author: Sergio Coscolín -Date: Fri Feb 2 02:05:31 2024 +0100 - - Merge branch 'melkati:master' into buzzer - -commit 4b85c5f35a02d7d78ce83f1d75b93843634aaf06 -Author: Coscolin -Date: Fri Feb 2 02:03:52 2024 +0100 - - Buzzer menu - -commit 4c8a669f9f8ca854375512f609da46d4c4b53f05 -Author: Coscolin -Date: Fri Feb 2 02:02:56 2024 +0100 - - Buzzer async implementation - -commit 9fdaae61e3cb85a6d0be287816676a28bd3a6554 (origin/master, origin/HEAD) -Author: Mariete -Date: Thu Feb 1 20:11:29 2024 +0100 - - Update README.md Fix sensors table - -commit 7ccbd2086f3e809800db412c1ed64e25864bc8a0 -Author: Sergio Coscolín -Date: Thu Feb 1 12:21:21 2024 +0100 - - Wake up screen when CO2 rise limits - - If displaybrightness is OFF when co2 values rise limits wake up screen using function that wake up screen when any button is clicked. - - If activeAlarm is OFF this functionality doesn't work. - Maybe we can redefine logical buzzerLoog() workflow to allow wakeup display althought alarm is off. - -commit 444730e6b95b13ea82d220d2778115bb02f2bf45 -Author: Sergio Coscolín -Date: Thu Feb 1 11:52:00 2024 +0100 - - Delete WiFiMenu.h - - This file is for another develop branch. - -commit c5c92f48d71318f0f9abad851da05ef37d4ac6f2 -Author: Coscolin -Date: Thu Feb 1 03:32:45 2024 +0100 - - Buzzer implementation - -commit bfe3e8e4ba3a0f2f8186abb90ee8ed9c9d669553 (tag: v0.9.001, master) -Merge: 853d4ce 152baf7 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 30 11:56:22 2024 +0100 - - Merge branch 'development' of https://github.com/melkati/CO2-Gadget - -commit 152baf708ef9c9bbdf1a62a7207886fad256efd8 (development) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 30 11:47:36 2024 +0100 - - Enable/disable MQTT menu based on activeWIFI status and prevent unnecessary screen fill when wifiChanged and not inMenu - Fix WiFi initialitation issues with display and menu when WiFi activated from menu - -commit d6ab6a340ed5272ada6745d84bf657c3e8a7c95b -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 30 10:32:19 2024 +0100 - - Update README.md - -commit 64e13a2cb17ef2c6520595ca0a1a796658db76d1 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 30 10:31:56 2024 +0100 - - Modify partition table and Disable OTA for ESP32 to free up a lot of memory. - Add activeOTA flag for ESP32 S3 and include in menu. False by default for security. - Add a 5 secs delay until menu is active for better Improv-WiFi response - Looks like freeing memory fixes #145 - -commit 6953c97efd4d0f7d0f43032d90039f042edbf033 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 30 08:40:47 2024 +0100 - - Fix WiFi initialization issue (disable WiFi if SSID not set) - -commit 853d4ce38b8f6bcfb5f8c317f68cd866424dd00b (tag: v0.9.000) -Merge: e4f48a5 7c19c13 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Mon Jan 29 19:52:36 2024 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit e4f48a536e334a861043720c7f81378d1c83cf9a -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Mon Jan 29 19:52:27 2024 +0100 - - Version bump. Prepare for release 0.9.000 - -commit 7c19c13f3fad487ef46d9e3c0cdb8a95bdafd3d2 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Mon Jan 29 19:50:31 2024 +0100 - - Version bump. Prepare for release 0.9.000 - -commit 12324ef40b82ca8698c875cc931d8a1e38c921ba -Merge: 92f567e 670f511 -Author: Mariete -Date: Mon Jan 29 19:46:45 2024 +0100 - - Merge pull request #149 from melkati/development - - Development - -commit 670f51141556eb65014e6003d95e5a338bd08244 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Mon Jan 29 18:49:57 2024 +0100 - - Workaround to determine whether the Wi-Fi data has been changed via BLE - -commit e74b6e1c2256a4fc4ae7b6036505e42582b72495 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Mon Jan 29 18:46:34 2024 +0100 - - Don't send data by BLE if measurements is not available (CO2 > 0) - -commit d81f83dbc673df70d29f75bc8987dcbcbfe654de -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Mon Jan 29 14:26:31 2024 +0100 - - Fix initialization order in setup() function - -commit 27c45a48d9047cf6cca79386ebe8f8a1eb3acd37 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Mon Jan 29 13:19:40 2024 +0100 - - Update CO2_Gadget_WIFI.h to include instructions for credentials.h file - -commit e1bdf213eb4a8efa596125b642017471241c10c9 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Mon Jan 29 13:19:06 2024 +0100 - - Add debug print statement in initPreferences() function - -commit e8392fb0c3a8832b6886e0cdcb05b4911bf6a157 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Mon Jan 29 13:11:12 2024 +0100 - - Print SSID on WiFi connect and include define DEBUG_WIFI_EVENTS for serial clarity - -commit b7cbeb4b168c28ce2edd530925787e703ca13da6 -Merge: 2b21522 92f567e -Author: Mariete -Date: Mon Jan 29 08:28:52 2024 +0100 - - Merge pull request #148 from melkati/master - - Sync branches master -> development - -commit 92f567ee75020621da3f4d10f2239b50405971c0 (tag: v0.8.088) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Mon Jan 29 07:31:30 2024 +0100 - - Better improv-WiFi support. - -commit 59e18324f0fc26c1c3f1fc31b9e3b972332c5e8d (tag: v0.8.087) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 28 19:44:11 2024 +0100 - - Add Improv-WiFi save credentials to NVR - -commit 3ebd3e23674f5dcb40a6068172d97ce1513cbdcc -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 28 19:35:35 2024 +0100 - - Fix ESP32 S3 spiffs_offset value in release3.yml - -commit 4c796fe9aa326ade7b2008335080b2dd4c7d39a5 (tag: v0.8.086) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 28 15:05:37 2024 +0100 - - Fix typo in manifest creation step - -commit 59a65144cc018a03340022dfa1fd062bfd44d68b (tag: v0.8.085) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 28 14:44:26 2024 +0100 - - Update environment matrix in release3.yml - -commit 3233bc028760fe2aa3e999d28d3f527eb25712ec (tag: v0.8.084) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 28 14:24:48 2024 +0100 - - Fix CHIP_FAMILY value in release3.yml - -commit a40322a9d16880fbff095319936aae84b10b7aad (tag: v0.8.083) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 28 14:18:28 2024 +0100 - - Fix CHIP_FAMILY value for ESP32-S3 in release3.yml - -commit 84445d425ef30f5d8de9985f2ce100c32ee779ef (tag: v0.8.082) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 28 13:53:43 2024 +0100 - - Update CO2_GADGET_REV to "082" - -commit 3157020b5b17635ee4b741ed11d4c495b3ec44e3 -Author: Mariete -Date: Sun Jan 28 13:52:54 2024 +0100 - - Update release3.yml to build only T-Display S3 (temp change) - -commit 231ffa416556bd6b40b54a4d7460b47fe86809f1 (tag: v0.8.081) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 28 13:43:08 2024 +0100 - - Update CO2_GADGET_REV to "081" in platformio.ini - -commit ed03ceb34514721d2491c42e45b37c42504fe801 (tag: v0.8.080) -Author: Mariete -Date: Sun Jan 28 13:18:27 2024 +0100 - - Update release2.yml to build only T-Display S3 (temp change) - -commit 09a21d6fdbe82fa8cd170428a20f2dca79454285 -Author: Mariete -Date: Sun Jan 28 13:08:14 2024 +0100 - - Update release3.yml to build only TTGO T-Display Sandwich (temp change) - -commit eba9bdd3f8d27a3dd182c17b3bb5cba344e11754 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 28 12:57:51 2024 +0100 - - Update CHIP_FAMILY environment variable in release3.yml - -commit dd7daf78ceaad301296f25a75e3940affd472eb9 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 28 12:57:29 2024 +0100 - - Fix with fonts in MENU for esp32dev and esp32dev_OLED - -commit c76a72b46517227d60f5a870556a9aeeafec71a4 -Author: Mariete -Date: Sun Jan 28 12:53:59 2024 +0100 - - Update release3.yml to build only T-Display S3 (temp change) - -commit 911c332239032df30148ecd9500556b6b06f123d -Author: Mariete -Date: Sun Jan 28 12:31:29 2024 +0100 - - Update release3.yml to Draft true - -commit fcf78daaf293c15ba6126739ec0acb7e2bffa1b6 -Merge: 2b2cccf 2b21522 -Author: Mariete -Date: Sun Jan 28 12:30:11 2024 +0100 - - Merge pull request #147 from melkati/development - - Development - -commit 2b21522cb60b839112e18c3abf0015973b2d87b4 -Merge: 4d73101 2b2cccf -Author: Mariete -Date: Sun Jan 28 12:30:00 2024 +0100 - - Merge branch 'master' into development - -commit 4d731017df070165c33de66d74345a94dabe32db -Merge: c3fc76c 0c2830e -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 28 12:27:59 2024 +0100 - - Merge branch 'development' of https://github.com/melkati/CO2-Gadget into development - -commit c3fc76c17d03e2689aad6751913d06c430b7b60c -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 28 12:21:48 2024 +0100 - - Add ESP32 S3 support to workflows - -commit 0c2830e36b33bf554aeafecf354819036e82550d -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 28 12:20:21 2024 +0100 - - Add ESP32 S3 support to workflows - -commit 2b2cccf0e488de003348eda05ab1eede4b13ba9f -Author: Mariete -Date: Sun Jan 28 09:57:50 2024 +0100 - - Version bump - -commit d81557c3d054700ff9757ec0b830e7caf7f60da5 -Merge: 33039a8 5e2b9b0 -Author: Mariete -Date: Sun Jan 28 09:56:01 2024 +0100 - - Merge pull request #146 from melkati/development - - Replace font 15pt regular with bold for clarity - -commit 5e2b9b0b0b055754a8a7bc5b6a7427e22e4717f7 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 28 09:54:53 2024 +0100 - - Replace font 15pt regular with bold for clarity - -commit 33039a80e32c1dac7f1eb5778619328723b25cc1 -Merge: 7280c39 c6b521f -Author: Mariete -Date: Sun Jan 28 08:58:05 2024 +0100 - - Merge pull request #144 from melkati/development - - Development - -commit c6b521fb6c10d9882d05d6143c83645d88ab11af -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 28 08:24:01 2024 +0100 - - Add use Anti-Aliased fonts in menu. - Change font to bold. - -commit 215cdaedf411cd4414ddaa4b83767ce780bcf819 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sat Jan 27 11:16:31 2024 +0100 - - Refactor utilityLoop and setCpuFrequencyAndReinitSerial functions - -commit f29c7a40e2bc586d12ce3d115aef336dc15d8bb9 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sat Jan 27 10:45:25 2024 +0100 - - Remove battery voltage field from main screen in menu and disable timeout as temporary workaround to fix #134 - -commit 7b3ffa1ad045fbdd73c32b76388b65485a450a91 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 26 20:07:54 2024 +0100 - - Remove some debug code left by mistake - -commit 8d0e05fd96ed5ec1a1b7b41f4f14a09e4276518e -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 26 19:36:56 2024 +0100 - - Try to solve #96. Update utilityLoop() to not use Serial.flush on S3 - -commit 04fc43cc4a1dc2fcc6dcda175f4c0dc6ac01015e -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 26 15:42:54 2024 +0100 - - Update TFT_POWER_ON_BATTERY pin value in platformio.ini - -commit 3a5fa8ed8dbb3291a92adffe553a8ad296c0dece -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 26 11:09:41 2024 +0100 - - T-Display S3 display on when running on battery. Closes #96 - -commit 7a80b15c206575a67a3e06f3e96170f15a3ed473 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 26 10:41:45 2024 +0100 - - Adjust CO2 Y position for T-Display S3 - -commit d7459f889196582b2f2d398a992303b1b5c670bd -Merge: 6517c70 9c2441c -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 26 10:31:15 2024 +0100 - - Merge branch 'development' of https://github.com/melkati/CO2-Gadget into development - -commit 6517c70fa75297e4e9d77dc8c0034a4441741718 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 26 10:27:05 2024 +0100 - - T-Display S3 won't turn display off by time. Fixes TFT #125 - -commit 9c2441c9b906814640f9c3e8fabf6059ff94ce22 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 26 10:24:35 2024 +0100 - - TTGO T-Display won't turn display off by time. Fixes TFT #125 - -commit faeb7bebf075309c628784aecf310499b920cf23 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 26 10:05:03 2024 +0100 - - Repair bug: Brightness adjustment doesn't work for TFT #125 (just for TTGO T-Display) - -commit 54baa14c0fb094df8e59f75b4fa65db24948557d -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 26 08:05:43 2024 +0100 - - Remove out.clear() in CO2_Gadget_Menu.h as it was causing flickering at each display update. Reverts b320c3b - -commit 725a7bbeebee05ae08362f37e4ae42ae00befaba -Author: Mariete -Date: Fri Jan 26 07:47:36 2024 +0100 - - Delete compile_commands.json - -commit 78a66bebf5586c906d10dff6817615d9a20e9f59 -Merge: 5923cf1 b320c3b -Author: Mariete -Date: Fri Jan 26 07:45:29 2024 +0100 - - Merge pull request #140 from Coscolin/develop - - Repair brightness bug #125 and clean screen after menu idle #134 - -commit 5923cf19e9c5d910b07afab039a3a245550a58cc -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 26 07:44:28 2024 +0100 - - Refactor CO2 display and color logic - -commit b320c3b368e42b80a9a92450c2819cca773f227c -Author: Coscolin -Date: Fri Jan 26 03:21:49 2024 +0100 - - Repair bug: clean screen after menu idle. - -commit db0b2444d4cccc032b385c4d8d49b88f532febc5 -Author: Coscolin -Date: Fri Jan 26 02:23:47 2024 +0100 - - Repair brightness bug - -commit 45b25c90637d3c2677d8b51610d823d08d3505e9 -Merge: 264dae6 714ae45 -Author: Mariete -Date: Thu Jan 25 19:57:51 2024 +0100 - - Merge pull request #139 from melkati/feature-improv - - Feature improv - -commit 714ae458c8dc92fa8ce4d8ae2f0e7e9b83bd6db1 (origin/feature-improv, feature-improv) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 25 19:53:38 2024 +0100 - - Update CO2 element position and font height - -commit f90f5f8c73adfc2a502d97517bcd9a12038ffd49 -Merge: 33ae3eb 264dae6 -Author: Mariete -Date: Thu Jan 25 11:52:55 2024 +0100 - - Merge pull request #137 from melkati/development - - Sync with Development branch - -commit 264dae62d199763d74f58e531badb238bb1b0694 -Merge: 8a40c5c 33ae3eb -Author: Mariete -Date: Thu Jan 25 11:52:32 2024 +0100 - - Merge branch 'feature-improv' into development - -commit 8a40c5c4e2f03c247c33db4eb9a77408a51b8bf8 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 25 11:33:54 2024 +0100 - - Attemp to fix #134 - -commit 08f824f6dc0ebb53c22ccff2d8aac22521a90831 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 25 10:23:27 2024 +0100 - - Fix MQTT connection, discovery and publishing conditions - -commit ecace015fe11344580f72fb3b8c1e65d73a6a7fb -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 25 10:22:35 2024 +0100 - - Implement timeToKeepAliveMQTT - -commit e1d6453c84c72201c824f7f80855cd26c38b0786 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 25 09:58:16 2024 +0100 - - Implement timeToKeepAliveMQTT - -commit 3360253940a3871b6a75d7424654dc14d9f670ed -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 25 09:32:34 2024 +0100 - - Update CO2_Gadget_TFT.h: Adjust CO2 element position - -commit 33ae3ebcc88601de1205c2337beb9b78b977f141 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 25 08:42:28 2024 +0100 - - Refactor to include Improv-WiFi - -commit b37684aa05301b6af2d18dde62de6b6431f15524 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 25 08:40:51 2024 +0100 - - Refactor MenuLoop for Improv-Wifi - -commit a015c05d9f0c29b4e9ac6d26d5df7fceecea22f8 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 25 08:39:43 2024 +0100 - - Refactor setup and loop functions for Improv - -commit 4f3c4f8a2f5ca2f9c8989e3401a06a8c41c659ae -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Wed Jan 24 22:25:33 2024 +0100 - - Add version information to initImprov() function - -commit 2693cb9f826f236c139d0b2cc1d2e76688680cba -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Wed Jan 24 15:31:22 2024 +0100 - - Fix onImprovWiFiErrorCb error handling - -commit 0d4936b85a055583c432e1fda9ca193e40ef332e -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Wed Jan 24 14:50:24 2024 +0100 - - Migrate to https://github.com/jnthas/Improv-WiFi-Library - Add conditional check for serial menu input - Initialize Improv library in setup function - Reorder loop functions for better performance - Update platformio.ini with new dependencies and build flags - -commit 9d261d6b11038e1108b610cc1958f3ee6f5420ec -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Wed Jan 24 06:59:24 2024 +0100 - - Refactor utilityLoop() for clarity - -commit 197f06bed204490ec7b852c664caba2fca7f04a6 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Wed Jan 24 06:55:49 2024 +0100 - - Clear screen at menu exit. Fixes #134 - -commit 54f8dbcf55683f71cbafd3d9c64e849d10512450 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Wed Jan 24 06:51:57 2024 +0100 - - Update CO2_GADGET_REV to 052-feature-improv - -commit 066561c91356fc9575ef2d4c87d023089df85078 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Wed Jan 24 06:49:09 2024 +0100 - - Fix ESP32 reset delay in web server handler - -commit 5b1693150181895d5f47ae3e134647236064e81b -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Wed Jan 24 06:48:28 2024 +0100 - - Refactor CO2_Gadget_Improv.h for improved functionality and debugging - -commit 43b6045418b1d0d31da4b1b7d16f1b03cf8e5805 -Merge: 200b5f6 87573ef -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 23 19:54:45 2024 +0100 - - Merge branch 'development' of https://github.com/melkati/CO2-Gadget into feature-improv - -commit 87573ef278cff9d088e72cb659cfdd7c6648510c -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 23 15:42:09 2024 +0100 - - Remove ENABLE_PIN configuration for T-Display S3 (not supported) - -commit c0be874c7b562445bb6d1c5d79fb17d65790af27 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 23 15:34:28 2024 +0100 - - Add GPIO configuration for TDISPLAY_S3 to README.md - -commit b78db83b30333deb9cd379a2d2bbffec0bbcae3b -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 23 15:16:52 2024 +0100 - - Add TDISPLAY_S3 board configuration to README.md - -commit c30223286d59d6c33834c6b4c127ee79298a8950 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 23 15:07:30 2024 +0100 - - Commented out battery level print statement - -commit 02e6974a0faee800299a34047077a8258e0899ca -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 23 14:29:43 2024 +0100 - - Fix display setDisplayBrightness() issue at compile time with boards other than TTGO T-Display - -commit 1bc0fddee3e747797bceda211875103e0b57872f -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 23 14:23:01 2024 +0100 - - Refactored displayShowValues function - -commit a445645900168d0634624086056a167be5894638 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 23 14:22:31 2024 +0100 - - Refactor rightPad function and loadTempArraysWithActualValues function - -commit 682b73231bcc0cdf38dcde90e38713cbac38942e -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 23 12:45:00 2024 +0100 - - Disable ESP-NOW support per default to free up some memory - -commit 94baf480cd102e27de91faf1c2aba90d3305d04f -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 23 12:26:28 2024 +0100 - - Update display brightness handling and version number - -commit cb05b24da0018ba43ee002e69c1e4b16dd832151 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 23 11:05:44 2024 +0100 - - Update element positions in CO2_Gadget_TFT.h - -commit 905792bf1f5d805bc0acc2bea29733c51a5db1bc -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 23 09:30:09 2024 +0100 - - Edit release2.yml build list to include: esp32dev, esp32dev_OLED, TTGO_TDISPLAY, TTGO_TDISPLAY_SANDWICH and TDISPLAY_S3 - -commit 6699be175ebd3dea373a05076083ade97f8558cd (feature-smooth) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 23 09:07:21 2024 +0100 - - Remove need to define I2C_SDA and I2C_SCL (calls generic Wire.begin() if not defined) - -commit 69ca59f158ad90e44cf478e3ebdade9b36c91e68 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 23 09:05:38 2024 +0100 - - Anti-aliased fonts - Use sprites for flicker-free updates - Better support for different resolutions - Improvements in display layouts - Code refactoring for clarity and modularity - -commit 5fdce44bf8144b72c60f6992e3894d45b22ed923 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Mon Jan 22 07:50:05 2024 +0100 - - Fix battery icon line position - -commit 431ce4e1df7d076c5bb947c849baa2329c63410b -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 21 15:18:54 2024 +0100 - - Fix sensorsGetMainDeviceSelected() - -commit 03648cef4ec7f649836db7a965cbe8788daab12d -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 21 15:18:03 2024 +0100 - - Update I2C pin configuration - -commit baca52e298aadc9b9afa5e325e6103ebc52b7753 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 21 13:55:30 2024 +0100 - - First MQTT publish without waiting for timeBetweenMQTTPublish - -commit 977dce481bebd1a18593dd31b7108f7e7d557fa4 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 21 13:26:22 2024 +0100 - - Fix issue with DFRobot_MultiGasSensor and SoftwareSerial on S3 - -commit a3a931de1a75f4bb653a412afbdab485d9fa4eca -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 21 12:56:15 2024 +0100 - - Fix merge issues - -commit 566e5c3a2ac407250f178f9b8e36325fb1eba67b -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 21 10:23:19 2024 +0100 - - Update default_envs in platformio.ini - -commit aa4e6af99e8fdb868ba2a6113c640326b080be9b -Merge: e11e7ae 61f3dbe -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 21 09:59:39 2024 +0100 - - Merge branch 'refactor-CO2_Gadget_TFT' into development - -commit e11e7ae7d2faf1559a0479da4fd4f4536eb7a59d -Merge: 95a6027 bdfc508 -Author: Mariete -Date: Sun Jan 21 09:40:51 2024 +0100 - - Merge pull request #131 from melkati/update-canairio_sensorlib - - Update CanAirIO Air Quality Sensors Library version - -commit bdfc508ca6fa970d5ff8ecda0acf2f5bb587af58 (origin/update-canairio_sensorlib) -Merge: 436726d 95a6027 -Author: Mariete -Date: Sun Jan 21 09:40:35 2024 +0100 - - Merge branch 'development' into update-canairio_sensorlib - -commit 436726de9cb9ec4695222409edac3ca92661aea2 (update-canairio_sensorlib) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 21 09:35:53 2024 +0100 - - Update CanAirIO Air Quality Sensors Library version - -commit 61f3dbe80f6c7fb70f797e887733c277b51e8d88 (refactor-CO2_Gadget_TFT) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sat Jan 20 23:29:57 2024 +0100 - - Revert "Add support for T-Display S3. Refactor for layout flexibility to support more resolutions. Add support for 320x170 px displays" - - This reverts commit 09f153cdb508732c5d674cf90d470cf19f220381. - -commit 77be64d9366e1da93cd5301502bd516e792af0fb -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sat Jan 20 23:28:38 2024 +0100 - - Add support for T-Display S3. Refactor function to improve performance - -commit a373b40b69838a16e6609ac0a1fd54f71d3c6f6a -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sat Jan 20 23:27:18 2024 +0100 - - Refactor GPIO initialization and pin handling - Remove unsupported code for T-Display-S3 - Update CPU frequency for power consumption reduction - -commit 96280db89dddead9fde3a0b32f4ef8618104332c -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sat Jan 20 23:26:33 2024 +0100 - - Add support for ESP32 S3. Refactor I2C pin configuration. - -commit 09f153cdb508732c5d674cf90d470cf19f220381 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sat Jan 20 23:22:17 2024 +0100 - - Add support for ESP32 S3. Refactor for layout flexibility to support more resolutions. Add support for 320x170 px displays - -commit dc0bc8a37d62db238545d68c37e45bb64ffeab21 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sat Jan 20 23:20:05 2024 +0100 - - Changes to CO2_Gadget_Sensors.h for readability - -commit 7b956d2bf747c0e885b2f4c9af76e402b50feb86 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sat Jan 20 23:18:46 2024 +0100 - - Add conditional compilation for SUPPORT_BLE - -commit 0a552f305449177094237469937aea6e66f8cecb -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sat Jan 20 12:04:26 2024 +0100 - - Add conditional compilation for MQTT support. Disable Discovery if MQTT is not supported - -commit 5a30096b49c1cde55f51dc7e2e65498400087f60 -Merge: 7a9e75c 95a6027 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 19 18:07:02 2024 +0100 - - Merge branch 'development' of https://github.com/melkati/CO2-Gadget into refactor-CO2_Gadget_TFT - -commit 95a60270b0b74389c9d6133d1e9662edb628863f -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 19 13:22:20 2024 +0100 - - Refactor env:esp32dev_OLED environment configuration in platformio.ini - -commit bab85381087e78b779266db805776a3bf97ab278 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 19 13:18:01 2024 +0100 - - Add TTGO_TDISPLAY_S3 environment to release2.yml - -commit 565cfbd781138fe5a520aa4fb60a4f0301e1e53e -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 19 13:17:22 2024 +0100 - - Add TTGO T-Display S3 environment configuration to platformio.ini - -commit c71b52408d8079caa340b1f7cc98cca6518ddcad -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 19 12:49:19 2024 +0100 - - Refactor platformio.ini build configurations - -commit 7a9e75cf7af1c3d23d2ea34510e8d9add48ea4d5 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 19 10:44:29 2024 +0100 - - Refactor CO2_Gadget_TFT and update CO2_GADGET_REV - -commit a234fcbc97aa05397621ef34a072a761664e836c -Merge: b8ac74f 1644431 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 19 10:39:05 2024 +0100 - - Merge branch 'development' of https://github.com/melkati/CO2-Gadget into refactor-CO2_Gadget_TFT - -commit 1644431c58aeaafa46e452591af939ebea590685 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 19 10:33:01 2024 +0100 - - Show big ASCII IP adress in serial port after initilization (if it's connected to a WiFi network) - -commit b8ac74f4c1f032ab0923afe0acdb39c08a53626f -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 19 10:03:07 2024 +0100 - - Refactor CO2_Gadget_TFT for flexibility to modify add more display resolutions (new TFT displays) - -commit b0d9fbd22a41ed023b049d8f06aa58aae082c4fb -Merge: d217d5d 5359bb9 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 18 21:42:06 2024 +0100 - - Merge branch 'development' of https://github.com/melkati/CO2-Gadget into development - -commit 5359bb98cd74d11e983c5486ca69d90dc395934d -Merge: 1d7d556 7280c39 -Author: Mariete -Date: Thu Jan 18 21:39:56 2024 +0100 - - Merge pull request #129 from melkati/master - - Sync developer branch with master - -commit 7280c39090e3197ad8ab35e09afd63caa8efb276 -Author: Mariete -Date: Thu Jan 18 21:13:18 2024 +0100 - - Update release2.yml. Remove esp32dev_OLED_OTA from default builds (not needed anymore) - -commit 91fd1b28192ef0f595b4e61e1fb0b869b8691b89 -Author: Mariete -Date: Thu Jan 18 21:11:34 2024 +0100 - - Update release2.yml set draft to false (make release) - -commit d217d5df179defcffbf93c1a8f1d7a25ddcf5bb8 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 18 19:58:06 2024 +0100 - - Update CO2_GADGET_REV to "018-development" - -commit 79caf329520d596ae06b1d57e4157169bdcf9677 (tag: v8.0.017) -Merge: 11c3eff 1d7d556 -Author: Mariete -Date: Thu Jan 18 19:56:37 2024 +0100 - - Merge pull request #128 from melkati/development - - Merge Development branch into Master - -commit 1d7d556a36b9b3439afca999fbcceec32bbd8a6f -Merge: 4cbf170 11c3eff -Author: Mariete -Date: Thu Jan 18 19:56:07 2024 +0100 - - Merge branch 'master' into development - -commit 4cbf1708a6b45ad202a3a01ba8cf9e07ce1b4943 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 18 19:53:34 2024 +0100 - - Update CO2_GADGET_REV to "016-development" - -commit ed2fc8f8581823ca109f636ea92734209d9a5568 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 18 19:52:44 2024 +0100 - - Update release2.yml with environment and manifest changes - -commit 11c3eff8970cf8e28b8be4e41df40549a63ac84e (tag: v8.0.015) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 18 15:22:08 2024 +0100 - - Update CO2_GADGET_REV to "015" - -commit 8b2c71175911cd8c6f097ecbad44ddc5487e787a -Merge: e0e2173 7ef0076 -Author: Mariete -Date: Thu Jan 18 15:20:08 2024 +0100 - - Merge pull request #127 from melkati/development - - Merge Development branch with new feature and fixes - -commit 7ef0076c042492ad30d616d06010040da0c2a817 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 18 15:14:18 2024 +0100 - - Add function to print large ASCII characters for IP address - -commit 6fd9717189d7115d437a0f41f6b62c5ae76fb1e7 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 18 09:45:14 2024 +0100 - - Update CO2_GADGET_REV to "013-development" - -commit ce7dd6e04902ecebc1c4630e9d7f8d7057b3df78 -Merge: a28fa7c a15e028 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 18 09:43:59 2024 +0100 - - Merge branch 'development' of https://github.com/melkati/CO2-Gadget into development - -commit a28fa7c3cdddc886abcc32bb87434ad199927e9c -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 18 09:36:00 2024 +0100 - - Update display brightness handling and configuration - -commit 974918fd66382552a49b2c37fdda32a099000382 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Thu Jan 18 09:32:28 2024 +0100 - - Add support for setting WiFi SSID and password over BLE - -commit 68d114ec125dc1e0a8f58368364d325e579be9f6 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Wed Jan 17 13:30:15 2024 +0100 - - Fix OLED display brightness issue and update actual display brightness value - -commit 92fc3f6b959e4c9b654fd920edc9c35b4fadf753 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Wed Jan 17 13:29:41 2024 +0100 - - Update display brightness and add more debug logging - -commit e0e217380954e935d44d93dc8718bc75fcb57984 -Merge: a3a680d a15e028 -Author: Mariete -Date: Wed Jan 17 11:48:25 2024 +0100 - - Merge pull request #124 from melkati/development - - Merge Development branch - -commit a15e028526192894e0487926d2dd51120d2d2887 -Merge: 7d5502d a3a680d -Author: Mariete -Date: Wed Jan 17 11:47:52 2024 +0100 - - Merge branch 'master' into development - -commit 7d5502daff033cb8613852342dadb84a42f28fae -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Wed Jan 17 09:58:30 2024 +0100 - - Fix WiFi connection retries bug - -commit 943e3d797599027105c2d6e68bd3cffe30f2d6df -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Wed Jan 17 09:29:05 2024 +0100 - - Refactor InitWifi(). Add non-blocking timing helper function. Update CO2_Gadget_REV to 009-development - -commit f10ffbcfa70a233dc603b45a7b76af564f3863ec -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 16 22:47:38 2024 +0100 - - Update WiFi credentials and CO2 gadget version - -commit 4820999a87497269f5dadac9ecfe4fa35fdb6c10 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 16 22:46:58 2024 +0100 - - Increase WiFi connection delay and add retry mechanism - -commit d042894f819cf99b1f92c11f3d3f9c81c0313d5a -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 16 22:46:33 2024 +0100 - - Disable clear preferences in initPreferences function - -commit 2e1ca44470c863f74c5c3ad70fe53e9cae1004ab -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 16 22:43:26 2024 +0100 - - Update maxWiFiConnectionRetries value to 10 - -commit 7fc3a1bd0f0a55625ff0a6664f1688a567afc217 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 16 19:20:13 2024 +0100 - - Update CO2_GADGET_REV to "006-development" - -commit a3a680df0dc1926c71038989867ab9dca9b7efa0 (tag: v8.0.003) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 16 14:40:36 2024 +0100 - - Update CO2_GADGET_REV to "003" - -commit 6d45100d833cb4cfc89a4a67828e0287d35ab3eb -Merge: 346b29b 94ce924 -Author: Mariete -Date: Tue Jan 16 14:36:28 2024 +0100 - - Merge pull request #123 from melkati/development - - Merge Development branch - -commit 94ce9245d9c8dddc89b8b5340548be7b2b9b4d39 -Merge: e8065c5 346b29b -Author: Mariete -Date: Tue Jan 16 14:35:57 2024 +0100 - - Merge branch 'master' into development - -commit e8065c5eee3ac08f3343b2283f234324eb7d863e -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 16 13:14:59 2024 +0100 - - Temporary remove utilityLoop - -commit 346b29b18b815b05aa26799b5df7f5b8fea2c15a -Author: Mariete -Date: Tue Jan 16 12:52:54 2024 +0100 - - Update bug_report.md - -commit 4112670ce38a4237a1e4bbe61001028ba022583e -Author: Mariete -Date: Tue Jan 16 12:46:33 2024 +0100 - - Update bug_report.md - -commit 200b5f6a2624aa143985259bacbe93a386c1addd -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 16 09:17:30 2024 +0100 - - Add Improv functionality (WIP) - -commit fe86fdcc14220c5432719ba10af8c9e6622b4bfb (tag: v8.0.000) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 14 21:02:57 2024 +0100 - - Update CO2 Gadget version and revision - -commit 9d937017dd7050be24bd93566eba559fce008e3b -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 14 21:00:55 2024 +0100 - - Update release2.yml with new environment and increased timeout - -commit c0a4bb77ede09a03f1a87f26657db44088b01e4f -Author: Mariete -Date: Sun Jan 14 20:45:52 2024 +0100 - - Development (#122) - - * Fix esp32dev environent (#93) (#120) - - Co-authored-by: errolt <6266552+errolt@users.noreply.github.com> - Co-authored-by: errol t - - * Update README - - * Add ESP32 board configurations to README - - * Fix display brightness issue and add debug message #121 - - * Update CO2_Gadget_Preferences.h and platformio.ini - - Change activeWIFI be true by default - - * Fixes #if defined(SUPPORT_OLED) || defined(SUPPORT_TFT) closes #121 - - --------- - - Co-authored-by: errolt <6266552+errolt@users.noreply.github.com> - Co-authored-by: errol t - Co-authored-by: Mario Mariete <11509521+melkati@users.noreply.github.com> - -commit e0b533c24b03e0706d2021ce26b904e4f0df5172 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 14 20:34:40 2024 +0100 - - Fixes #if defined(SUPPORT_OLED) || defined(SUPPORT_TFT) closes #121 - -commit c38d885a3704a451eba6a5d4da190301f1f98b73 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 14 15:44:56 2024 +0100 - - Update CO2_Gadget_Preferences.h and platformio.ini - - Change activeWIFI to true in CO2_Gadget_Preferences.h and update CO2_GADGET_REV to 036 in platformio.ini. - -commit 4d0666a6bcf6cd3a5f7d4917e9447ccc7bb67e51 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 14 15:00:26 2024 +0100 - - Fix display brightness issue and add debug message #121 - -commit f0ca950d2b71618b2b8a185493d0b40ae6302ca7 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 14 13:57:40 2024 +0100 - - Fix typos and add ESP32 board configurations to README - -commit dbaac6033a44698d0f84cf4c580d6ca61a6f0499 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 14 13:40:09 2024 +0100 - - Fix typo in README - -commit 3cc70b4a027bd01d667b207b1850d5fe6c0e861d -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 14 13:38:35 2024 +0100 - - Update README - -commit 9cac59ab37b2078350df52a4da806de34b9479b0 -Author: Mariete -Date: Sun Jan 14 13:17:27 2024 +0100 - - Fix esp32dev environent (#93) (#120) - - Co-authored-by: errolt <6266552+errolt@users.noreply.github.com> - Co-authored-by: errol t - -commit cd482e8ddde03d97681e488308a6419ebe5774f8 -Author: Mariete -Date: Sun Jan 14 12:36:29 2024 +0100 - - Update release2.yml - -commit 9761e4483a7bf060baf301b07ee3cad63930b7e4 (melkati/issue121) -Author: Mariete -Date: Sun Jan 14 12:09:20 2024 +0100 - - Version bump - -commit b222c9dd4092211b717c8b3f67f3fb548c97b814 -Author: Mariete -Date: Sun Jan 14 11:35:53 2024 +0100 - - Add web based configuration at http://ip/preferences.html (WIP) (#117) (#118) (#119) - - * Update CO2_GADGET_REV to "014-web-config-new" in platformio.ini - - * Add preferences page and handler for saving preferences - - * Add onload function to fetch CO2, temperature, and humidity data - - * Display Git HEAD in setup (Add .py and platformio_extra_configs.ini to .gitignore) - - * Modify preferences.html - - * Load preferences form (first version, non functional) - - * Add ArduinoJson library and implement API endpoint to get preferences as JSON - - * Preferences received on Save Preferences from configuration web page - - * Update CO2_GADGET_REV to "020-web-config-new" in platformio.ini - - * Update CO2_GADGET_REV to "024-web-config-new" - - * Enable mDNS support for WiFi - - * Increase size of DynamicJsonDocument in getPreferencesAsJson() function - - * First rude web-config working (WIP no tested. no error checking) - - * Enable utilityLoop() function in main loop - - * Update publish functions to use int64_t and fix MQTT publish calls - - * Add Restart ESP32 button to settings form. CSS styles - - * Fix altitude misspelling - - * Fix tempOffset assignment and update sensors - - * Update vRef and battery voltage calculation on change from web settings page - - * Add flash memory information to setup() function - - * Fix utilityLoop() - - --------- - - Co-authored-by: Mario Mariete <11509521+melkati@users.noreply.github.com> - -commit ffddf1e765f1a12b16cd852ff84604fda036a0bb -Author: Mariete -Date: Sun Jan 14 11:27:15 2024 +0100 - - Add web based configuration at http://ip/preferences.html (WIP) (#117) - - * Update CO2_GADGET_REV to "014-web-config-new" in platformio.ini - - * Add preferences page and handler for saving preferences - - * Add onload function to fetch CO2, temperature, and humidity data - - * Display Git HEAD in setup (Add .py and platformio_extra_configs.ini to .gitignore) - - * Modify preferences.html - - * Load preferences form (first version, non functional) - - * Add ArduinoJson library and implement API endpoint to get preferences as JSON - - * Preferences received on Save Preferences from configuration web page - - * Update CO2_GADGET_REV to "020-web-config-new" in platformio.ini - - * Update CO2_GADGET_REV to "024-web-config-new" - - * Enable mDNS support for WiFi - - * Increase size of DynamicJsonDocument in getPreferencesAsJson() function - - * First rude web-config working (WIP no tested. no error checking) - - * Enable utilityLoop() function in main loop - - * Update publish functions to use int64_t and fix MQTT publish calls - - * Add Restart ESP32 button to settings form. CSS styles - - * Fix altitude misspelling - - * Fix tempOffset assignment and update sensors - - * Update vRef and battery voltage calculation on change from web settings page - - * Add flash memory information to setup() function - - * Fix utilityLoop() - - --------- - - Co-authored-by: Mario Mariete <11509521+melkati@users.noreply.github.com> - -commit d836e3a9d693de29a023275938a0af40360a96f8 -Merge: fd84fdd 30cd603 -Author: Mariete -Date: Fri Jan 12 08:15:07 2024 +0100 - - Merge pull request #114 from melkati/development - - Development - -commit 30cd603b6b0dc1e9ef81bd02d90cd39d90a3e7ed -Merge: dfdf8f5 fd84fdd -Author: Mariete -Date: Fri Jan 12 08:14:02 2024 +0100 - - Merge branch 'master' into development - -commit dfdf8f5a23dbde859e28f461ddbe48930e76c53b -Merge: bcf47d1 881e666 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 12 08:10:21 2024 +0100 - - Merge branch 'development' of https://github.com/melkati/CO2-Gadget into development - -commit bcf47d13a4c9e8326b3e827c63aef8869d30c54a -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 12 08:10:08 2024 +0100 - - Update MQTT publishing. Some clean up. - -commit fd84fdd2499596a95b3e781f41b20606d8852072 -Author: Mariete -Date: Fri Jan 12 06:51:30 2024 +0100 - - Fix serial console input (#113) - - * Fix serial console input - -commit 881e666eaa30d99f03f40680dd1ca1ec2876b5d3 -Merge: e3d6221 531adae -Author: Mariete -Date: Fri Jan 12 06:50:22 2024 +0100 - - Merge branch 'master' into development - -commit e3d62219074afbe22f94800474d8adbec7059d82 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 12 06:48:36 2024 +0100 - - Update CO2_GADGET_REV to "019" - -commit 3a7b40808038720c795c0a12ee61f739f1fdafb1 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Fri Jan 12 06:45:23 2024 +0100 - - Fix serial console input - -commit 531adae99ff0df44303aa6c50819b478a576f1aa -Author: Mariete -Date: Wed Jan 10 21:50:12 2024 +0100 - - Update CO2_Gadget_REV to 013 and remove unused code (#110) - - Co-authored-by: Mario Mariete <11509521+melkati@users.noreply.github.com> - -commit 076688c288d012f2fa4cf425d88616263e4c2059 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Wed Jan 10 20:58:11 2024 +0100 - - Update CO2_Gadget_REV to 013 and remove unused code - -commit 10ebc44f5b3df25ee190ccd0ab03f6f1aafb4121 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Wed Jan 10 20:36:22 2024 +0100 - - Update CO2_GADGET_REV to "012" - -commit 3b29774f41939e8bd12cfe87d606d9bfa20f75b8 -Author: Mariete -Date: Wed Jan 10 20:21:19 2024 +0100 - - Fix serial communication when changing CPU frequency (#109) - - Co-authored-by: Mario Mariete <11509521+melkati@users.noreply.github.com> - -commit ebe1d5176105efc83abb99724bfb03e5d7638211 -Author: Mariete -Date: Wed Jan 10 20:07:15 2024 +0100 - - Update Sensirion Gadget BLE library and refactor code (#108) - - Co-authored-by: Mario Mariete <11509521+melkati@users.noreply.github.com> - -commit 25de3029a1b3fec252bdfa1e535660e01b7f21bf -Author: Mariete -Date: Wed Jan 10 13:49:03 2024 +0100 - - Fix serial communication when changing CPU frequency (#106) - - Co-authored-by: Mario Mariete <11509521+melkati@users.noreply.github.com> - -commit 565f1ad9487e560d6a4e2d445abef78d69bbcb6c -Merge: cf4a49a ae05ae8 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Wed Jan 10 13:28:42 2024 +0100 - - Update CO2_Gadget_Battery.h, README.md, platformio.ini, CO2_Gadget_WIFI.h, and CO2_Gadget.ino - -commit ae05ae83e19068db0627494ad529b1ba53888077 -Author: Mariete -Date: Wed Jan 10 12:46:37 2024 +0100 - - Add Home Assistant (and others) MQTT Discovery (#103) - - * Add MQTT Discovery support - - * Add header guards to all header files - - * Update setup() function to print system information - - * Send system data by MQTT - - * Add battery level and voltage reporting to MQTT - - * Add QoS parameter to publishStrDiscoveryMQTT function - - * Temporary remove MAC Address, Hostname, IP and Status from discovery - - * Update README.md (#105) - - --------- - - Co-authored-by: Mario Mariete <11509521+melkati@users.noreply.github.com> - -commit fcb1f4d5cf5c098b192416b603ba142b3bca6dc5 -Author: Mariete -Date: Wed Jan 10 10:34:49 2024 +0100 - - Update README.md - -commit cf4a49a07297bb0ec782f221e2f9b89fcb17d156 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Wed Jan 10 09:10:21 2024 +0100 - - Update CO2_GADGET_REV to "008" - -commit f2cbcc5e6643745a0d44b8755d6b31d4c0c31d26 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Wed Jan 10 09:05:44 2024 +0100 - - Adjust CPU to 240Mhz if on USB power (voltage > 4.5V) - -commit c7d1a456397d53fe6c5f71883988fe1542c9cbba -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 9 10:47:02 2024 +0100 - - Update CO2_GADGET_REV to "007" in platformio.ini - -commit 5b88e2b73c1b5f507a9bfd032a9ec5eb44fe70e3 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 9 09:59:41 2024 +0100 - - Update setup() function to print system information - -commit 03793beebe93eb4d844cd6308e9db4c659bac23f -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Tue Jan 9 08:28:08 2024 +0100 - - Add header guards to all header files - -commit 70aaaa06ea40db3ad947cf2d6dc135d09808b091 -Author: Mariete -Date: Mon Jan 8 15:06:06 2024 +0100 - - Update README.md - -commit 5228c774bfcfaa906712d478e839b4479c60b0fb -Author: Mariete -Date: Mon Jan 8 15:05:26 2024 +0100 - - Update README.md - -commit 536ecd026cca88a4bed68e1d52e7e5411f973193 -Author: Mariete -Date: Mon Jan 8 10:00:05 2024 +0100 - - Add ESPNOW icon (#98) - - * Add icon EspNow (thanks @Kartoffel) - * Add showEspNowIcon function to display icons on TFT screen - -commit be5f8d96d8785450323aa954d9bb4bf8e85f6706 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 7 22:26:33 2024 +0100 - - Update environments in release2.yml - -commit d63e627087d6fcae7b12d6fbd9fd4c254e3a9b54 (tag: v7.0.005) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 7 22:24:54 2024 +0100 - - Update CO2_GADGET_REV to "005" - -commit 4ec9b5045109e1a7832c6088d5351be43f02e90b -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 7 22:24:24 2024 +0100 - - Update firmware file paths in release workflow - -commit 990e758410d74cf8ff18734b3cc93132e39f9851 -Merge: 25570fd 5532497 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 7 22:08:23 2024 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 25570fd11a5081d65f9a40c807219e7e20e5051b (tag: v7.0.004) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 7 22:07:53 2024 +0100 - - Update release.yml for multicore - -commit b4352969efbfdccd9e526a2390b1431eeff981d2 (tag: v7.0.003) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 7 21:43:49 2024 +0100 - - Bump version - -commit e2a1b8431b8ac6e118a2de64b3f250062c77bf3c -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 7 21:36:44 2024 +0100 - - Bump version - -commit 553249720d978c38abd1e42abc25ba06ff6c2bda -Author: Mariete -Date: Sun Jan 7 21:14:08 2024 +0100 - - Update platformio.yml - -commit edc8ea8f8b806c11fa7cc622517c7fd1693ccfca -Merge: da834aa 8b26a01 -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 7 21:11:51 2024 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit da834aa1df604ff6ffdd298c983fffdb76310d08 (tag: v0.7.001) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 7 21:09:22 2024 +0100 - - Bump version - -commit 8b26a018872173d6977ee1bbfbe87091fe654539 -Author: Mariete -Date: Sun Jan 7 15:55:12 2024 +0100 - - Update release2.yml - -commit 74a6e10f6648e2dbe80c8226ce9989de49111505 -Author: Mariete -Date: Sun Jan 7 15:44:46 2024 +0100 - - Update release2.yml - -commit ceff10df7087d5bc94ba76dba76f207455bd7de4 -Author: Mariete -Date: Sun Jan 7 15:05:11 2024 +0100 - - Update release2.yml - -commit 4d857fa2b9bd49daf9dd2252eb69a88481f427f7 -Author: Mariete -Date: Sun Jan 7 14:35:53 2024 +0100 - - Update release2.yml - -commit 8fe84e3cbfda838817f60ddf4b479b86ed492015 -Author: Mariete -Date: Sun Jan 7 14:26:46 2024 +0100 - - Update release2.yml - -commit 891789d250fc14267973b10fec8f7055b323d6e6 (tag: v0.7.000) -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 7 13:21:43 2024 +0100 - - Update WiFi Troubleshooting Variable and Version/Revision Numbers - -commit e8d1a60afd8e506d8973ae291b11d1101ad61eba -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 7 13:10:42 2024 +0100 - - Refactory WiFi and MQTT connection strategy - -commit 41e644bd6c15d00949490109ca2eaf759f8f91cd -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 7 08:56:03 2024 +0100 - - Add credentials.h to .gitignore - -commit 7dc4085a97ae3911c8ec3a9c6fa6282bdbf9de6b -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sun Jan 7 08:54:54 2024 +0100 - - Comment doubleclick test code - -commit 3562b483d470dabc06048528c9b3e37c14ef733a -Author: Mario Mariete <11509521+melkati@users.noreply.github.com> -Date: Sat Jan 6 21:08:54 2024 +0100 - - Update dependencies in platformio.ini - -commit 19f2a26bbc60e3e4f1c88b345e6938d392f4d87d -Author: eMariete.com -Date: Sat Feb 26 13:55:10 2022 +0100 - - ESP-NOW peer address defaults to broadcast (FFFFFF) - -commit cc28eddaf453fa15933585934c362a6c1f7737aa -Author: eMariete.com -Date: Sat Feb 26 13:16:28 2022 +0100 - - Add ESP-NOW PEER to menu and preferences - -commit 6bb36774b421d7c9c6dead3b5bfb19eeb855e131 -Author: eMariete.com -Date: Thu Feb 24 14:14:27 2022 +0100 - - Add ESP-NOW unicast - -commit 60f20ee248aa65de747835aadd127a82211f45de (tag: v0.6.000) -Author: eMariete.com -Date: Wed Feb 23 14:54:44 2022 +0100 - - Version Bump - -commit 2f85f7ef03d02da3375d855360f94e56a90a15a4 (tag: v0.5.088) -Author: eMariete.com -Date: Wed Feb 23 14:45:09 2022 +0100 - - Version Bump - -commit 95c95abe0b15c6551d9bf9a1471fd97a9082f173 -Merge: 70ac213 dd81858 -Author: eMariete.com -Date: Wed Feb 23 14:17:41 2022 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 70ac213fbe2a1ba961224c4d8b33e8fde4a92e8d -Author: eMariete.com -Date: Wed Feb 23 14:17:31 2022 +0100 - - Improvements to ESP-Now - -commit dd81858b6d04e7f8e656f79ead756dc352913c51 -Author: Mariete -Date: Thu Feb 17 13:59:32 2022 +0100 - - Update README.md - -commit 6452b00b3ce57c4dd8876671bd0a4696b83eada0 -Author: Mariete -Date: Sun Feb 13 22:59:03 2022 +0100 - - Update README.md - -commit 9c763c784896cc315cacea831c0406e1feeebeae -Author: eMariete.com -Date: Tue Feb 8 21:22:17 2022 +0100 - - Avoid call to BLELoop() if SUPPORT_BLE no defined - -commit edb9acf3a17bb242b1eb6d7f8e7268973499be8b -Author: eMariete.com -Date: Tue Feb 8 21:18:35 2022 +0100 - - Rename define CO2_Gadget_ESP-NOW as CO2_Gadget_ESP_NOW - -commit c392f70560cd95deff081d7887866bc391610245 -Author: eMariete.com -Date: Tue Feb 1 08:57:30 2022 +0100 - - Version bump - -commit 68ade22add96799103059b8cb24eb6a68b977fa3 -Author: Mariete -Date: Tue Feb 1 07:04:22 2022 +0100 - - Fix issue with BLE fetch from MyAmbiance App not downloading historical data (#87) - -commit d64560de025ee36eaa9414471f388b1ef52ba8fc -Merge: 909c7be 7bac0ad -Author: eMariete.com -Date: Mon Jan 31 19:42:25 2022 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 7bac0addc1fe9b53a94170ad8e38053dc79858eb -Author: Mariete -Date: Mon Jan 31 19:40:48 2022 +0100 - - Create .gitattributes - -commit 909c7be7981e6af1f032fe75f63bff4ebf922848 -Author: eMariete.com -Date: Sat Jan 22 10:03:32 2022 +0100 - - Remove "Test menu event" from calibration menu - -commit b0c25aaa3a70762af0fd9c795289f4356bdef2fe -Author: Mariete -Date: Sat Jan 22 01:32:11 2022 +0100 - - Add options to menu to Hide/Show specific measurements on the display (#85) - - * Add variables and preferences for display show/hide options - * Add options to menu - * Add logic to show/hide options on display - -commit e76762c0c5d53d2edb81452afcf88cc134ecdbb3 -Author: eMariete.com -Date: Fri Jan 21 20:52:49 2022 +0100 - - Update README.md - -commit 07971ae150664f9e5b323431347a3885cdcddc08 -Merge: b1a4df6 4cc4b50 -Author: eMariete.com -Date: Fri Jan 21 20:17:45 2022 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit b1a4df61b904992e0a2669bae8aa0d94b3478d9a -Author: eMariete.com -Date: Fri Jan 21 20:17:36 2022 +0100 - - Add support for OLED brightness control (contrast) - -commit 4cc4b50b53e1516267b9d991e29f6fdb35423cea -Author: Mariete -Date: Thu Jan 20 23:58:56 2022 +0100 - - Update README.md - -commit 3a996f84c2d53bf0fd04aefd0f891140999a0b1b -Author: eMariete.com -Date: Thu Jan 20 20:23:25 2022 +0100 - - Update README.md - -commit 9dee1ff9367b99c12002c3ac2a4380537afc3126 -Author: eMariete.com -Date: Thu Jan 20 19:38:56 2022 +0100 - - Makes variables modified in ISR and callbacks volatile - -commit 4669b67d3188821a34559d559eeb09543c7a6a79 -Merge: e5e4ffc d56f9e1 -Author: eMariete.com -Date: Thu Jan 20 08:45:41 2022 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit e5e4ffc2c135caf2852bf1d29a61c14ee95bb6e4 -Author: eMariete.com -Date: Thu Jan 20 08:44:04 2022 +0100 - - Merge upstream - -commit d56f9e175a2b87a4e906bd89453bd6b73be00650 -Author: Mariete -Date: Thu Jan 20 08:31:46 2022 +0100 - - Update platformio.yml - -commit a083bae8809db08cc266787bb6a7686d2a99d486 -Author: Mariete -Date: Thu Jan 20 08:16:36 2022 +0100 - - Fix #50 millis() overflow (#84) - -commit fa8f681a1dc25b9ddd9bf9b93d9cb9958bfa42e2 -Author: eMariete.com -Date: Wed Jan 19 23:27:19 2022 +0100 - - Version bump - -commit 031ee28e002003357f0bff81f6609b2ac5412e05 -Author: Mariete -Date: Wed Jan 19 23:26:18 2022 +0100 - - Update README.md - -commit 7044841d7e3f2a26529bfec69c085d39932a06c2 -Author: Mariete -Date: Wed Jan 19 23:21:20 2022 +0100 - - Add ESP-NOW communications protocol from Espressif (#83) - - * Add basic ESP-NOW functionality - * Fix make ESP-NOW work without WiFi enabled - * Add ESP-NOW enable/disable to configuration menu and preferences - -commit e58bd9595d5623f37d6ee71dcae1cc383eb588b1 -Author: eMariete.com -Date: Tue Jan 18 12:59:34 2022 +0100 - - Add .clang-format Google Style 4 spaces indent - -commit a751bc6b26ed7f0981af3e764a08ba011f3288fd -Author: Mariete -Date: Mon Jan 17 20:51:41 2022 +0100 - - Update README.md - -commit a3251907e910603b1daf08d108144604b4947bd3 (tag: v0.5.069) -Author: eMariete.com -Date: Mon Jan 17 10:53:04 2022 +0100 - - For general release v0.5.069 - -commit 56fd93e799d27cd0db4d207c71bc9999d291ea63 -Merge: 58c72bb 24eee98 -Author: eMariete.com -Date: Mon Jan 17 10:51:58 2022 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 58c72bb8815bb8181a7a4f65b8243e6bc9240e34 -Author: eMariete.com -Date: Mon Jan 17 10:51:30 2022 +0100 - - For general release v0.5.067 - -commit 24eee9892946bfb93250311bb40419da25f350ef -Author: Mariete -Date: Mon Jan 17 10:48:44 2022 +0100 - - Update platformio.yml - -commit 7722f3cd86c487aac374472e20f269f8a7b0a84f -Author: eMariete.com -Date: Mon Jan 17 10:44:18 2022 +0100 - - For general release v0.5.0667 - -commit 4d7c26c12dc3c2e064c43cc5d8f92dffc6090c84 -Merge: f7a6589 c2bc215 -Author: eMariete.com -Date: Mon Jan 17 10:37:46 2022 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit f7a6589c22473d5b5c141687e92186dc71a0e9a6 -Author: eMariete.com -Date: Mon Jan 17 10:37:31 2022 +0100 - - For general release v0.5.066 - -commit c2bc215ed9f786b948830af26cfc4391e2ee598d (tag: v0.5.066) -Author: eMariete.com -Date: Mon Jan 17 10:01:59 2022 +0100 - - For general release v0.5.066 - -commit c716f6fbd2e22c6681f51f9ca4c4c22df382f904 -Author: Mariete -Date: Mon Jan 17 09:22:49 2022 +0100 - - Update release2.yml - -commit e88f848abd847f529bca52e248d7bda3f52e460e -Author: eMariete.com -Date: Sun Jan 16 21:25:44 2022 +0100 - - For general release v0.5.065 - -commit 3c57b44f12b683629cba056399863bc25ccd1e2d (tag: v0.5.065) -Author: Mariete -Date: Sun Jan 16 16:01:43 2022 +0100 - - Add selection to MENU for Relay or RGB LED (#79) - - * Rename Neopixel Config Menu as Outputs Config Menu - * Add bool outputsModeRelay in preferences - * Add GPIO Outputs Mode to MENU - * Refactor outputsLoop() - * Fix cosmetic typo in menu - * Version bump - -commit 6b00dc2d8cda33fdd2d1c764c8d9ba87c573f53b -Author: Mariete -Date: Sat Jan 15 22:25:00 2022 +0100 - - Add ambient measurements (temperature and humidity) to OLED display (#78) - - * Add ambient measurements to OLED display - * Refactored display functions names - -commit 95b196ca4bd7817c6f1f16f31e3dbeaf7b4cb261 -Author: eMariete.com -Date: Sat Jan 15 12:54:15 2022 +0100 - - Version bump - -commit f27163f05fa5179873cddab870412dbe45a6f08f -Author: Mariete -Date: Sat Jan 15 12:30:45 2022 +0100 - - Added support for Neoxixel LED (WS2812B and others) (#75) - - * Add feature neopixel - * Changed WS2812B color from orange to yellow - * Add Neopixel flavor selection to config menu - * Improve Neopixel menu selection - * Improve Neopixel colors - * Set neopixelBrightness default value to 50 - * Fix apply neopixelBrightness on init - * Fix I2C_SDA and I2C_SCL duplicate definition warning - * Update GPIO used in README.md - -commit 141c8b45eb26c9a36da34a99dc1682f1de8df64d -Author: Mariete -Date: Tue Jan 11 21:55:55 2022 +0100 - - Update README.md - -commit cb39d87e7e25f07cec82b1340af0a6deaaa35173 -Author: Mariete -Date: Mon Jan 10 20:03:26 2022 +0100 - - Update README.md - -commit 41092bbcd042643ca8fb481c7554d67d2f62e7d6 -Author: Mariete -Date: Wed Jan 5 13:25:53 2022 +0100 - - Update README.md - -commit ffce188f80cc9537e0b44b0ab0f7b2f5c36334b7 -Author: Mariete -Date: Mon Jan 3 15:06:21 2022 +0100 - - Update README.md - -commit d69294294bdaa790c71a2eee84285cf9e1bac1d1 -Author: Mariete -Date: Mon Jan 3 14:48:21 2022 +0100 - - Update README.md - -commit b32737e1f9371f5884fa9b354be0c2af0ec100ea -Author: Mariete -Date: Mon Jan 3 09:06:11 2022 +0100 - - Update README.md - -commit b72443915f137481ee5ae27afb3eb97429e128f1 (tag: v0.5.041) -Author: eMariete.com -Date: Tue Dec 28 22:05:10 2021 +0100 - - Version bump for release v0.5.041 - -commit a78454436604762c2bbda9869ce6bdd9741562c4 -Author: eMariete.com -Date: Tue Dec 28 21:52:39 2021 +0100 - - Prepare for release v0.5.040 - -commit 1226579d1826616dbed0e6c8b2b8bcc73d48e5a9 -Author: Mariete -Date: Tue Dec 28 21:50:28 2021 +0100 - - Add functionality for MQTT Alarms (#71) - - The concentrations at which these messages are sent are customizable and coincide with those you have configured as orange level and red level. - - Messages are sent with ON payload when reaching the level of that color and do not send OFF payload ultil the CO2 level drops at least 100 ppm below that level (hysteresis = 100ppm). - - Hysteresis prevents to continually sending on and off messages if the concentration keeps fluctuating around that concentration. - - Message for green is sent with payload ON when CO2 concentration is bellow the orange level and with payload OFF as soon as the concentration reaches the orange level. - - Publishing topics: - - - topic/green - - topic/orange - - topic/red - -commit 0ca8267b126344ac09bf6fd6ef0fd301a8dbf1d0 -Author: Mariete -Date: Tue Dec 28 20:31:34 2021 +0100 - - Feature GPIO outputs for relays, LEDs, etc. (#68) - - * Add functionality for relay outputs (GPIO) - - * Updated README for relay outputs (GPIO) - - * Active relay outputs (GPIO) when CO2 value equal to threshold (not only greater) - - * Add GPIO GREEN_PIN to functionality relay outputs (for LEDs) - - * Update README.md - -commit 1732548ca5fa7799321169915aee0aa95bab80e1 -Author: eMariete.com -Date: Tue Dec 28 19:37:27 2021 +0100 - - Make BTN_DWN board dependant (platformio.ini) - -commit c1a1f9cf2fe26431d80a85d6f440ccbb09dd0c31 -Author: eMariete.com -Date: Mon Dec 27 05:36:51 2021 +0100 - - Move button pins to platformio.ini - -commit 313f1db407a161f84c80d59277b5ac2bdc0ebb59 -Author: eMariete.com -Date: Sat Dec 25 13:13:27 2021 +0100 - - For general release v0.5.026 - -commit e185cd4158f15ae8b79ea263028ea242e24b2789 (tag: v0.5.026) -Merge: 843ac59 002cf04 -Author: eMariete.com -Date: Sat Dec 25 13:10:04 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 843ac59226d660e54c24c30472d4cef3b052c819 -Author: eMariete.com -Date: Sat Dec 25 13:09:53 2021 +0100 - - Prepare for release - -commit e12ce00da2c36893e8247c332e3b6da691ff19b0 -Author: eMariete.com -Date: Sat Dec 25 13:09:16 2021 +0100 - - Prepare for release - -commit 002cf046cfb5519967fd0e92d4b05beba6625209 -Author: Mariete -Date: Sat Dec 25 13:02:00 2021 +0100 - - Add notifications (pop-ups) on display - - Added displayNotification() and overload for display of two lines (#66) - -commit f2b889bbc51b0e9d466f49b529a2e7e893e3ce37 -Author: eMariete.com -Date: Sat Dec 25 08:23:11 2021 +0100 - - Fix OTALoop - -commit fce8ee7e609175ad3954ee716bf678db46b49280 -Author: eMariete.com -Date: Fri Dec 24 22:07:51 2021 +0100 - - Add env:esp32dev_OLED_OTA - -commit db9618c8dcf4818142c50c8c7e398542945d4020 -Author: Mariete -Date: Fri Dec 24 19:11:09 2021 +0100 - - Add Feature OTA (Over The Air Update) (#64) - -commit 2cc30ba09e18cf689308d224868b4f227ea17fa3 -Author: eMariete.com -Date: Wed Dec 22 08:58:45 2021 +0100 - - Version bump - -commit 0a026bb148e9e451fadaabf4bb1c2e171598f234 -Author: eMariete.com -Date: Wed Dec 22 07:16:17 2021 +0100 - - SUPPORT_BLE by default - -commit b8c13b1022ad0ceb17f4faf077d0299a20f034ab -Author: eMariete.com -Date: Wed Dec 22 07:11:33 2021 +0100 - - Add define SUPPORT_BLE - -commit 26f9555ef266230bad2242d6aea20cdbd6981b62 -Author: eMariete.com -Date: Tue Dec 21 22:42:09 2021 +0100 - - Rename FAKE sensor type as DEMO (for future use) - -commit 152d8c3dd5bd8892b8b8238abf0d13d2ccdb5cbc -Author: eMariete.com -Date: Tue Dec 21 21:30:49 2021 +0100 - - Clean up reverseButtons - -commit 5aa854c8e5ba257776551caf76641331e9fd1e2f -Merge: 77f938e 7b35e1a -Author: eMariete.com -Date: Tue Dec 21 20:59:49 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 7b35e1add63052d21484e1b2911ea99e606afb1c -Author: Mariete -Date: Tue Dec 21 20:51:13 2021 +0100 - - Test - -commit 77f938e71e9f687c7610ff828f4559464c6ce29e -Author: eMariete.com -Date: Tue Dec 21 20:47:42 2021 +0100 - - Version bump - -commit e258e2c278afaad0e3898ae97f9a6261747b7f35 -Author: Mariete -Date: Tue Dec 21 17:38:37 2021 +0100 - - Feature reverse display (#57) - - * Add feature display reverse the display (rotate 180º) and swap buttons on display reverse - -commit 4f138c8d5440991a2292f6388ad3f905a509bb1a -Author: eMariete.com -Date: Tue Dec 21 12:53:35 2021 +0100 - - Update Arduino IDE notes - -commit 89840707930bdf089b014c9966d895e7a58022cc -Author: eMariete.com -Date: Tue Dec 21 12:46:34 2021 +0100 - - Update Arduino IDE notes - -commit 668b66c5f9f5a2ec6979fb84d6de42c99a7447e1 -Author: Mariete -Date: Mon Dec 20 23:22:24 2021 +0100 - - Add feature to change measurement interval (#60) - -commit 78fab981314a947766c8e71b5faf88c3b3534503 -Author: Mariete -Date: Mon Dec 20 19:12:19 2021 +0100 - - Update README.md - -commit 2892f97338d7410d1ae3f6b04809a2892e459f5b -Author: Mariete -Date: Mon Dec 20 15:29:51 2021 +0100 - - Add option to show Fahrenheit units on display for temperature (#58) - - * Add feature displaying temp in Farenheit - -commit 8b55114596b1c5b811b091d794e3dccd75928657 -Author: Mariete -Date: Mon Dec 20 08:32:16 2021 +0100 - - Show CO2 Gadget Flavour on menu and on console at startup (#56) - -commit ede1d5ba89f0fe8bce68449633d8d0d0e6fe102c -Merge: c5f45ec 140b6f7 -Author: eMariete.com -Date: Mon Dec 20 07:25:37 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit c5f45ec387b0fd7e7e02761a5a046da9eec043f7 -Author: eMariete.com -Date: Mon Dec 20 07:25:28 2021 +0100 - - Fixed issue with TFT_eSPI library - -commit 140b6f74b5d38cb59a646aae13d3c92c720c0e34 -Author: Mariete -Date: Sun Dec 19 11:06:12 2021 +0100 - - Update platformio.yml - -commit 29641b8aaf76ab9c4a26842db48fcd4c67f5d037 -Author: eMariete.com -Date: Sun Dec 19 11:04:38 2021 +0100 - - Try to fix compilation time errors with TFT_eSPI - -commit fddfaccd6d77c207bdf422d864c03c2d21aa91e5 -Author: eMariete.com -Date: Sun Dec 19 01:35:22 2021 +0100 - - Fix setDisplayBrightness() compile error if defined SUPPORT_OLED - -commit 54485a1a8bfd770160bc72dceae0b25179ebe1b6 -Merge: 6dddf73 e9740cf -Author: eMariete.com -Date: Sat Dec 18 22:55:56 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 6dddf732ee3e0e86fc0ee945d9d1fac3ee72f48d -Author: eMariete.com -Date: Sat Dec 18 22:55:48 2021 +0100 - - Rename setTFTBrightness() as setDisplayBrightness() - -commit 958f95072663c8549e81cf7c096700caa483329a -Author: eMariete.com -Date: Sat Dec 18 22:55:17 2021 +0100 - - Rename setTFTBrightness() as setDisplayBrightness() - -commit e9740cf1697b4edd190cdae8a1480929fe9aa9ff -Author: Mariete -Date: Sat Dec 18 22:46:40 2021 +0100 - - Update platformio.yml - - Try to avoid running on release (release has his own workflow) - -commit 6a98b947501dd58075311a43ff2fe811541ce1ff -Author: eMariete.com -Date: Sat Dec 18 22:37:48 2021 +0100 - - No define DEBUG_ARDUINOMENU by default - -commit 2b4aeab4de05e1318441d6ab52fda4c880a7593f -Merge: 964f262 451b3bf -Author: eMariete.com -Date: Sat Dec 18 22:13:18 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 964f262ef818db88b789b86fd6845a8d9d5d507b -Author: eMariete.com -Date: Sat Dec 18 22:12:51 2021 +0100 - - Print MAC Address to Serial at initWiFi - -commit 1e00844a824c5b5620e3e157457e764a23c35be4 -Author: eMariete.com -Date: Sat Dec 18 22:11:39 2021 +0100 - - Fix last merge conflict - -commit 451b3bfbb29a9e2955c8550a4dc17f69a18ca599 -Author: Mariete -Date: Sat Dec 18 10:25:48 2021 +0100 - - Update README.md - -commit 457de56b75ea62b2899f27775568149dd7e2a6b3 -Author: Mariete -Date: Sat Dec 18 10:21:52 2021 +0100 - - Update README.md - -commit 25752c8172bd066380cbd310f54110dfa85b2bfa -Author: Mariete -Date: Sat Dec 18 09:29:12 2021 +0100 - - Update README.md - -commit 00b6bb854b554cd651ff274f1251277e5e3d0d55 -Author: Sergio Coscolín -Date: Sat Dec 18 09:17:46 2021 +0100 - - Turn ON TFT when USB is connected (#47) - -commit d12b63d5aef91381f3cb2ce1efe3e52c76cb3889 -Author: Sergio Coscolín -Date: Sat Dec 18 09:16:57 2021 +0100 - - When click button turn on the display only if it's OFF (#49) - -commit 5d769c00ef0ac2afa3e4269263381bed0fc9091d -Author: Sergio Coscolín -Date: Sat Dec 18 09:15:33 2021 +0100 - - Missing new line in Terminal debug (#48) - - 01:56:29.509 > -->[SENS] Using CanAirIO Sensorlib v0.4.2 Rev:341-->[SENS] Turning on sensor.. - 01:56:29.555 > -->[SENS] Detecting sensors.. - -commit 68055c63a49d161c289225fd99772a81cd96436b -Author: eMariete.com -Date: Fri Dec 17 22:03:42 2021 +0100 - - Some code clean up - -commit 673d22264a285615d5b31e3d04f0eb2c597bcaba -Author: Mariete -Date: Fri Dec 17 21:57:59 2021 +0100 - - Add support for I2C OLED Displays (#52) - - * First refactory to support OLED (tested TFT still working) - - * First OLED working version with menu - - * Some code clean up - -commit f099be98a89f51c57e2daf4c55fca693cb7cb236 (tag: v0.5.001) -Author: eMariete.com -Date: Tue Dec 14 23:54:00 2021 +0100 - - Fix to platformio.ini for general release - -commit f85b8f07eb586c7b083d477c0a0dae15857d59e4 (tag: v0.5.000) -Author: eMariete.com -Date: Tue Dec 14 23:13:19 2021 +0100 - - Version bump - -commit cec677da886569b37e837ab84b4a2a6f7702fbf3 -Author: Mariete -Date: Tue Dec 14 23:11:18 2021 +0100 - - Feature select co2 sensor (#46) - - * Add sensor selection to menu - - * Add selected sensor initialization - - * Add enable debug sensors functionality to menu - - * Sensor selection menu functional - - * Sensor selection menu functional - - * Version bump - - * Fix external Temp and Humidity issue (#45) - - * added GPIO pin enable for CanAirIO CO2 version - - * I2C enable and USB ports for Linux - - * fixed merge - - * disable some messages for testing - - * enable S8 sensor for testing - - * fix merge issues - - * fixed issue with temperature and humidity with external sensor - - * restored windows monitor ports - - * Add compilation date & time to serial start log - - * Improvements in CO2 Sensor selection - - * Manages breaking change in Sensors::setSampleTime() - - * Minor code cleaning - - Co-authored-by: Antonio Vanegas - -commit 2a1c57f0fe033f70e32f116f195b7d083af56cf9 -Author: eMariete.com -Date: Sun Dec 12 19:00:43 2021 +0100 - - WIFI_PRIVACY defined by default - -commit a58d83d2a52f6fcd4cb5ba56bc7d7fd29f6d6ad7 -Author: eMariete.com -Date: Sun Dec 12 18:59:23 2021 +0100 - - Don't show passwords in menu if WIFI_PRIVACY is defined - -commit d1137648f129d1155e1a47bb7cd153372761f9d5 -Author: eMariete.com -Date: Sat Dec 11 15:24:47 2021 +0100 - - Version bump - -commit 13031c347fab02b84a9a042908679b755f0aaff8 (tag: v0.4.035) -Author: eMariete.com -Date: Thu Dec 9 12:55:23 2021 +0100 - - Version bump - -commit 2742c750c6726367c06ad41792a3a0794999f321 (tag: v0.4.034) -Author: eMariete.com -Date: Thu Dec 9 12:49:17 2021 +0100 - - Improvements in release2.yml - -commit 77aff082f9c65a5938496ba18770e221ec43cb62 (tag: v0.4.032) -Author: eMariete.com -Date: Wed Dec 8 19:48:17 2021 +0100 - - Improvements in release2.yml - -commit c5194e35e10dfa5a8664c72718b0f8bbc977b8e9 (tag: v0.4.031) -Author: eMariete.com -Date: Wed Dec 8 19:00:21 2021 +0100 - - New release2.yml V2 version - -commit 91b8c94b04237c239ba515f7af59ca3ec38dca18 (tag: v0.4.30) -Author: eMariete.com -Date: Wed Dec 8 18:47:26 2021 +0100 - - Version bump - -commit b458423014aa42c09cc36787abedda31b5d91f80 -Author: eMariete.com -Date: Wed Dec 8 18:47:12 2021 +0100 - - Version bump - -commit 5c73610b4a74b964a899e7d166a4d47e2c9f3c43 -Author: eMariete.com -Date: Wed Dec 8 18:44:19 2021 +0100 - - New release2.yml V2 version - -commit 840c677d6a15f0a6d74e195d5c391b9df7e7db98 -Author: eMariete.com -Date: Wed Dec 8 18:38:59 2021 +0100 - - New release2.yml V2 version - -commit 5b204293767b4c65b263c4838b64b9cbc7affbeb -Author: eMariete.com -Date: Wed Dec 8 18:24:30 2021 +0100 - - New release2.yml V2 version - -commit 5828c46f53447bd2ed74cb8e44887ff6d05a09da -Author: eMariete.com -Date: Wed Dec 8 18:17:04 2021 +0100 - - New release2.yml V2 version - -commit 06cfc34bdb8baf9bdf010fecf8008f1bbc3b85d6 (tag: v0.4.028) -Author: eMariete.com -Date: Wed Dec 8 17:55:11 2021 +0100 - - New release2.yml V2 version - -commit 9eb11dfed79f7f3121305e7ef4fb0b618d9c5d0e (tag: v0.4.027) -Author: eMariete.com -Date: Wed Dec 8 17:38:31 2021 +0100 - - Version bump - -commit 8999fa7c78e1acaebdbe28541da31bd471178091 -Author: eMariete.com -Date: Wed Dec 8 17:37:55 2021 +0100 - - New release2.yml V2 version - -commit 2e622a8fd40895255fbf772114997ff5015bd506 -Author: Mariete -Date: Wed Dec 8 17:31:30 2021 +0100 - - Update release2.yml - -commit 811a74848ba1beda05596725c2b500b9fbb05b40 (tag: v0.4.026) -Author: eMariete.com -Date: Wed Dec 8 17:24:04 2021 +0100 - - Version bump - -commit ec20d48dde891fe92ef91826dab7549276da9494 -Merge: 8ba1ba3 1173c13 -Author: eMariete.com -Date: Wed Dec 8 17:00:06 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 1173c13b81a55da8a5753a60d82d672af6e2ffca -Author: Mariete -Date: Wed Dec 8 16:59:12 2021 +0100 - - Update release2.yml - -commit 8ba1ba329c818a46ebecf577cfbf8519d9f8ee58 (tag: v0.4.025) -Author: eMariete.com -Date: Wed Dec 8 16:55:43 2021 +0100 - - Version bump - -commit 3a2f6aacbf58947d097e1ff372110a04e7c0bac8 -Author: Mariete -Date: Wed Dec 8 16:50:24 2021 +0100 - - Update release2.yml - -commit b0ff81a65551b5c55db84b348b5e4bf6a57fe1c8 -Author: Mariete -Date: Wed Dec 8 16:43:14 2021 +0100 - - Update release2.yml - -commit 048ae96a5714d3f63e76cfd3c1380abc2b5c8bb1 -Author: Mariete -Date: Wed Dec 8 16:38:53 2021 +0100 - - Update release2.yml - -commit 7d1cd2b2b5dbeeb8cdffa6fe7036fee8467516da -Author: Mariete -Date: Wed Dec 8 16:32:29 2021 +0100 - - Update release2.yml - -commit be93a6c9248d8d304fde5e3f351c77fb2c8c9cb7 -Author: Mariete -Date: Wed Dec 8 16:24:25 2021 +0100 - - Update release2.yml - -commit a496b12c3a85e0683d6a305464b26398ef1462a9 (tag: v0.4.024) -Author: eMariete.com -Date: Wed Dec 8 15:26:44 2021 +0100 - - Version bump - -commit b39ddbfdb7714da6e841ea1bf6e8adec1eafbc47 (tag: v0.4.023) -Author: eMariete.com -Date: Wed Dec 8 15:19:22 2021 +0100 - - Version bump - -commit 5320d0b4781216fd472164a5f012aca3bc1bfb3a (tag: v0.4.022) -Author: eMariete.com -Date: Wed Dec 8 15:13:47 2021 +0100 - - Version bump - -commit 2d6e357bbd1eeffbf2c049514b0bd73566a1f5eb (tag: v0.4.021) -Author: eMariete.com -Date: Wed Dec 8 15:08:28 2021 +0100 - - Version bump - -commit 93e5754d3ae95e9a83748f69fe4fd76f7d70cf86 (tag: v0.4.020) -Author: eMariete.com -Date: Wed Dec 8 15:06:26 2021 +0100 - - New release2.yml V2 version - -commit e886c4d3ea0f61e4a527a897f35adddead48a993 -Author: eMariete.com -Date: Wed Dec 8 15:05:24 2021 +0100 - - v0.4.019 - -commit 7a7616723e949130496e578a9e810e3859b13dd5 (tag: v0.4.019) -Author: eMariete.com -Date: Wed Dec 8 15:04:46 2021 +0100 - - New release2.yml V2 version - -commit 846c6af0958042e40743efd4120b0789e91efe1d -Author: eMariete.com -Date: Wed Dec 8 15:04:04 2021 +0100 - - New release2.yml V2 version - -commit abfabf7588a309b763d66b35e911f96a9bd7eb8d (tag: v0.4.018) -Author: eMariete.com -Date: Wed Dec 8 13:51:10 2021 +0100 - - Version bump - -commit 9cec65b05a65f35f8cd91603bb4425c642bf7da4 -Author: eMariete.com -Date: Wed Dec 8 13:49:20 2021 +0100 - - Version bump - -commit 88e7331a566e679fc67e2da6438abf316f53d809 -Author: eMariete.com -Date: Wed Dec 8 13:21:17 2021 +0100 - - Fix release.yml - -commit 312b7e94d296300b5940061154fd80e8011b8f8a (tag: v0.4.15) -Author: eMariete.com -Date: Wed Dec 8 13:14:18 2021 +0100 - - Move web to SPIFFS file system - -commit 51b92d4b1aa05bb119cf22603e671d0a0c36dfca -Merge: 40604ab 3504bd3 -Author: eMariete.com -Date: Wed Dec 8 12:22:03 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 40604ab4ce34d345e320ed1d21aa3c89c87a95a7 -Author: eMariete.com -Date: Wed Dec 8 12:21:49 2021 +0100 - - Add CO2_Gadget_Partitions.csv - -commit 3504bd3c99f954e6167b44c0c9e70d27ab17fe95 -Author: A. Carlos Marrero <39680078+acmatl@users.noreply.github.com> -Date: Wed Dec 8 11:04:54 2021 +0000 - - Include dark or light theme switch with separate web files (#33) - - * smartphone styles - - * Update smartphone styles - - adjusts the graphics column to the full width of the screen - - * Review of view proportionality and labels - - * Improve label styling - - * Add forgotten files - - Co-authored-by: Mariete - -commit 00a990982dea329b68bb02b03c606e623fea8794 -Author: Antonio Vanegas -Date: Wed Dec 8 11:49:36 2021 +0100 - - Fix sensorlib 0 4 1 implementation (#32) - - * added GPIO pin enable for CanAirIO CO2 version - - * I2C enable and USB ports for Linux - - * fixed merge - - * disable some messages for testing - - * enable S8 sensor for testing - - * fixed and restore the default values from upstream - -commit fc16ea95e35fdebbc438d7d7f2986dfbf7bd82a6 -Author: eMariete.com -Date: Wed Dec 8 11:45:33 2021 +0100 - - Minor changes - -commit 7d7d3278eae5fbd4a52e01ef763f5c987c3fb0cb -Author: eMariete.com -Date: Sun Dec 5 00:08:55 2021 +0100 - - Change logo to save memory - -commit 3ebb9331a3d2fbe429b885f22714888de4778cab -Author: eMariete.com -Date: Sat Dec 4 22:35:48 2021 +0100 - - Renamed LONGCLICK_MS to LONGCLICK_TIME_MS to avoid redefinition warning - -commit 439a97ca7476cb178bdbc0419872c84e8e3b90c5 -Author: eMariete.com -Date: Sat Dec 4 22:32:07 2021 +0100 - - Remove web page SIMPLE_page - -commit faf9455258dd497ec361e480895c9f819a06e447 -Author: eMariete.com -Date: Sat Dec 4 20:30:14 2021 +0100 - - Improve BLE messages to console (tag) - -commit 91a622c1a1e829129ec3bf50f4006f1935ea62eb -Author: eMariete.com -Date: Sat Dec 4 11:14:33 2021 +0100 - - Fix typo in release.yml - -commit e9b0f2115a5480de0be1a54744e8166ad0f55e62 (tag: v0.4.011) -Author: eMariete.com -Date: Sat Dec 4 10:03:15 2021 +0100 - - Adjust enviroments for release CI build - -commit 00bde1a312d07d01215e8dfe15d563b9b240c434 -Author: eMariete.com -Date: Sat Dec 4 10:02:38 2021 +0100 - - Rename fonts - -commit 431f5f698a1648f69ba40ef3720de599ad29b1f0 -Author: Mariete -Date: Sat Dec 4 09:51:42 2021 +0100 - - Feature icons (#31) - - * Add icons (first version). Improvements in display values - - * Set sensors debug mode to false - - * Add icons and display improvements - - * Fonts memory optimizations and custom fonts - - * Bump version. New enviroments for TTGO T-Display - - * Display improvements (thanks @SergioCoscolin) - -commit 61c594e4297555a9f33a05d047b74987b5973f5c (tag: v0.4.002) -Author: eMariete.com -Date: Thu Dec 2 20:10:42 2021 +0100 - - Turn off debug options - -commit acf04b617b88b2f6e538787cfc1afc69e3a12d12 -Author: eMariete.com -Date: Thu Dec 2 20:08:47 2021 +0100 - - Fix manifest bin path for erase version - -commit b5d24579998442152da3af44a9a177be472dd48a (tag: v0.4.000) -Author: eMariete.com -Date: Thu Dec 2 07:22:38 2021 +0100 - - Edit readme no need to use development branch anymore - -commit 1e396cb3e4b7fbb1239440d104c0eac2a5b927b5 -Author: eMariete.com -Date: Thu Dec 2 07:20:37 2021 +0100 - - Version bump - -commit 1bb3e7ba411a93bd58da84493bd44cb978f67b96 -Author: eMariete.com -Date: Thu Dec 2 07:20:11 2021 +0100 - - Set back cpu frequency at 80Mhz - -commit 9e64da8883eea35ca97cc1c279d1cfb2e02b60ba -Author: eMariete.com -Date: Thu Dec 2 06:55:59 2021 +0100 - - Removed setTempOffset workaround - -commit 5c31b57ad62904bebdc304096dee7afbc7625e17 -Author: eMariete.com -Date: Thu Dec 2 06:55:25 2021 +0100 - - Removed setTempOffset workaround - -commit b9391c9523dc1aab4db35d508c9627b13ff74379 -Merge: 43f49fa f94610a -Author: eMariete.com -Date: Mon Nov 29 21:23:25 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 43f49fa636e3904631ce0d5208da02cfdedf1647 -Author: eMariete.com -Date: Mon Nov 29 21:23:18 2021 +0100 - - Fix issue at merge inMenu duplicate - -commit f94610a474cc5e3cb20f4f620690d3f5f8e86809 -Author: A. Carlos Marrero <39680078+acmatl@users.noreply.github.com> -Date: Mon Nov 29 20:02:46 2021 +0000 - - Review of view proportionality and labels (#29) - - * smartphone styles - - * Update smartphone styles - - adjusts the graphics column to the full width of the screen - - * Review of view proportionality and labels - - * Improve label styling - -commit 04a0965501031c3ecbcd67bc9f01f609c973376b -Merge: e028f89 510e05f -Author: eMariete.com -Date: Mon Nov 29 20:34:36 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 510e05f9f46becf66e9dad0a745ac2206349d3c2 -Author: Mariete -Date: Mon Nov 29 20:25:35 2021 +0100 - - Temporary fix to memory problems. Fixes and improvements. (#30) - - * Remove internal /main web page - - * Improve MQTT console messages - - * Improve console messages - - * Add inMenu status. Improve console messages - - * Fix typo in [WiFi] console messages - - * Improve console messages - - * Avoid printing to serial MQTT activity if in menu - - * Avoid printing to serial SENS activity if in menu - - * Add doSetHostName to menu - - * Add navigation instructions to menu_init - - * Data logger default interval 60 seconds - - * Convert logo array to static - - * Use setSampleIntervalMs melkati/arduino-ble-gadget branch of arduino-ble-gadget modified to avoid memory issues - - * Add tempOffset - - * Show battery voltaje on display - - * Fix temperature offset workaraound https://t.me/canairio/18464 - - * Add getBatteryPercentage - - * Add BLE info to menu - - * Add battery. temp and humidity to display - -commit e732d539a13ff05e12b34b2a883973eca051e0f1 -Author: Mariete -Date: Fri Nov 26 14:41:07 2021 +0100 - - Update README.md - -commit a1608c32bbebb71032d81d6ab716dc861a52c5b9 -Author: Mariete -Date: Fri Nov 26 14:40:00 2021 +0100 - - Update README.md - -commit 96650d6abd5b42bd639ea5d46a7863722aafc47a -Author: Mariete -Date: Fri Nov 26 14:38:23 2021 +0100 - - Update README.md - -commit 1c025f816c935f341fa4a51708c80e6036be3a7b -Author: Mariete -Date: Fri Nov 26 14:37:25 2021 +0100 - - Notice: please, use development branch - - 👉 Please, due to a issue with memory use development branch while problem gets sorted out. It uses a modified version of the Sensirion Gadget BLE Arduino Lib - -commit e028f89d9bb2b5292087826eec36894131c84750 -Author: eMariete.com -Date: Fri Nov 26 14:27:59 2021 +0100 - - Use setSampleIntervalMs melkati/arduino-ble-gadget branch of arduino-ble-gadget modified to avoid memory issues - -commit db18ca10e040e3ec4740839483766a4e4e5e6512 -Author: eMariete.com -Date: Fri Nov 26 14:24:25 2021 +0100 - - Convert logo array to static - -commit be408a73793c080ab061e9bcff2036227ea3e6a6 -Author: eMariete.com -Date: Fri Nov 26 14:23:58 2021 +0100 - - Data logger default interval 60 seconds - -commit df42b3fcfb3248bcb79ff9152283d8e794a8165c -Author: eMariete.com -Date: Fri Nov 26 13:56:13 2021 +0100 - - Add navigation instructions to menu_init - -commit cbadef9b4d4b851ad462041be640dd3bf50915b4 -Author: eMariete.com -Date: Fri Nov 26 13:55:24 2021 +0100 - - Add doSetHostName to menu - -commit 38937e3aad91f7a88d9b854261226061025700b5 -Author: eMariete.com -Date: Fri Nov 26 11:59:17 2021 +0100 - - Avoid printing to serial SENS activity if in menu - -commit 90dd8dc7f13b6d8c787846de7cef5681f4eef234 -Author: eMariete.com -Date: Fri Nov 26 09:56:27 2021 +0100 - - Avoid printing to serial MQTT activity if in menu - -commit a0a462960f8ab7bf426992e888e17869158a1ecd -Author: eMariete.com -Date: Fri Nov 26 09:44:14 2021 +0100 - - Improve console messages - -commit c017911f8778fb247b793627dac3b91d008b109d -Author: eMariete.com -Date: Wed Nov 24 12:20:36 2021 +0100 - - Fix typo in [WiFi] console messages - -commit 360e1abc88f032f535f31097aece28e5a9e1feb1 -Author: eMariete.com -Date: Wed Nov 24 12:18:06 2021 +0100 - - Add inMenu status. Improve console messages - -commit fb710f683d81c2a973bd3fa97802d05a59a6c114 -Author: eMariete.com -Date: Wed Nov 24 11:44:49 2021 +0100 - - Improve console messages - -commit 5465e5f59bb1fdfd009c59cfb654dafee18b9e32 -Author: eMariete.com -Date: Wed Nov 24 08:43:38 2021 +0100 - - Improve MQTT console messages - -commit 53e47313da3f55a5ca9658db7034d5a556b0a832 -Author: eMariete.com -Date: Tue Nov 23 23:28:40 2021 +0100 - - Remove internal /main web page - -commit 5d5474f1e0172b78a8ab88d73d78132437253897 -Author: A. Carlos Marrero <39680078+acmatl@users.noreply.github.com> -Date: Tue Nov 23 22:20:02 2021 +0000 - - smartphone styles (#27) - - * smartphone styles - adjusts the graphics column to the full width of the screen - -commit 15fc2a86cf84f3f436246cc849490d6ef71a7cfc -Author: eMariete.com -Date: Tue Nov 23 23:12:34 2021 +0100 - - Permits WiFi SSID and passwords containing spaces - -commit 6b5cb6876638f2f3fa515ecbbe49ff31b3e64059 -Author: eMariete.com -Date: Tue Nov 23 20:52:54 2021 +0100 - - Extended character set for SSID - -commit 07ab77c93230ae9df41fbdf3f7a4ab1395b7e188 -Author: eMariete.com -Date: Tue Nov 23 16:32:21 2021 +0100 - - Refactor initBLE() - -commit 7331d8542580ca51ccf50e7ea9b20b59ed1a50c1 -Author: eMariete.com -Date: Tue Nov 23 16:31:49 2021 +0100 - - Remove display of battery_voltage - -commit bc68b439c0e9b2d74dda5bb43d4dc0b1540c3613 -Author: eMariete.com -Date: Tue Nov 23 13:24:49 2021 +0100 - - Fix problems with web server (hopefully) - -commit 6d5a8fd47187c130ef15827987cc2f1f33c67f95 -Author: eMariete.com -Date: Mon Nov 22 08:39:57 2021 +0100 - - Add define SUPPORT_MQTT - -commit 0afcf5c2c7027c5ab0151231328530a5ec32bfed -Author: eMariete.com -Date: Sun Nov 21 23:11:54 2021 +0100 - - Add SUPPORT_MDNS and better status messages for WiFi - -commit cfed8e43fdd1e6e3108042a58a6ee4a313c90c97 (tag: v0.3.079) -Author: eMariete.com -Date: Sun Nov 21 10:23:45 2021 +0100 - - Fix temp arrays space padding. - -commit 9874b9a7266861087505748bd5c31de3ab137c5c (tag: v0.3.078) -Author: eMariete.com -Date: Sun Nov 21 08:51:30 2021 +0100 - - Version bump - -commit 33584b33eb896ffb1c3bfe10076a22a413cc0122 -Author: eMariete.com -Date: Sun Nov 21 08:39:12 2021 +0100 - - Fix rootTopic space padding - -commit 31c0b02d444b26b71274d3ec0179cf6bf44108d7 -Author: eMariete.com -Date: Sun Nov 21 08:38:09 2021 +0100 - - Add MQTT authentication - -commit 3c6f707c4626ad333686db9ca566e576be95039b (tag: v0.3.076) -Author: eMariete.com -Date: Sat Nov 20 23:00:23 2021 +0100 - - Add authentication (user/pass) to MQTT broker - -commit fdd5312cab05e2069272340985958658946891d5 -Author: eMariete.com -Date: Sat Nov 20 22:21:06 2021 +0100 - - Menu on enter Load Temp Arrays With Actual Values - -commit cc65f447a526545fa1f242f47331f0cc05b1a275 -Author: eMariete.com -Date: Sat Nov 20 21:49:47 2021 +0100 - - Version bump - -commit 7fe6ec6b62ca9718df191a934bf47a91cbf80bf2 (tag: v0.3.074) -Author: eMariete.com -Date: Sat Nov 20 21:18:54 2021 +0100 - - Version bump - -commit 07aace017fc426015d429c9b7ed15255570af5b7 -Author: eMariete.com -Date: Sat Nov 20 21:18:17 2021 +0100 - - Version bump - -commit c95c298e8de6ed35698133597225aeb84103ac29 (tag: v0.3.073) -Author: eMariete.com -Date: Sat Nov 20 21:17:01 2021 +0100 - - Permit more chars for WiFi password - -commit f8b69e55acdda315773af3610e85f79c5010a073 (tag: v0.3.072) -Author: eMariete.com -Date: Sat Nov 20 16:39:17 2021 +0100 - - Update release.yml - -commit f244650d47f2a5a0abc8839a09bf636b7945e9df (tag: v0.3.071) -Author: eMariete.com -Date: Sat Nov 20 16:11:02 2021 +0100 - - Update release.yml - -commit 90873d805247cad2ee077d374e68ece803015240 (tag: v0.3.070) -Merge: 74dfdaa 53b9087 -Author: eMariete.com -Date: Sat Nov 20 15:58:14 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 74dfdaaaccac3e383370ccedf7c7c8942b0d9784 -Author: eMariete.com -Date: Sat Nov 20 15:58:05 2021 +0100 - - Fix short temp arrays in menu - -commit 53b9087634aacd1ff1b60253413054eea03695dd -Author: Mariete -Date: Sat Nov 20 15:05:41 2021 +0100 - - Update release.yml - -commit 4cbb60b151288b98cb1188bcd626ccf6ed1cef7c -Merge: c6536a6 fb59747 -Author: eMariete.com -Date: Sat Nov 20 14:21:23 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit c6536a6f7a5c3ba70a78adc3fe5a2810c77cf750 -Author: eMariete.com -Date: Sat Nov 20 14:20:54 2021 +0100 - - Increase batterySecondsBetweenReads to 60 - -commit b637a3788edcbcee60fba95ca1674d988620f078 -Author: eMariete.com -Date: Sat Nov 20 14:19:11 2021 +0100 - - Version bump - -commit fb597474080305a844454967724adcebeee2fd49 -Author: Mariete -Date: Sat Nov 20 14:17:16 2021 +0100 - - Update release.yml - -commit 7d2cc9e72bf323ba625981eedf698e92749e6bb1 (tag: v0.3.068) -Author: eMariete.com -Date: Sat Nov 20 14:09:46 2021 +0100 - - Version bump - -commit 580c436f89da2aa69df96283e2c673f312958d64 -Merge: ff5399f f86fd11 -Author: eMariete.com -Date: Sat Nov 20 13:48:39 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit ff5399f2e5b6de0b8c5dcc243c243de96a3f22eb (tag: v0.3.067) -Author: eMariete.com -Date: Sat Nov 20 13:47:30 2021 +0100 - - Version bump - -commit f86fd11b572056c69dc97989b59b87e22c2cbd64 -Author: Mariete -Date: Sat Nov 20 13:46:31 2021 +0100 - - Update release.yml - -commit 35e64756029bbb1ff49bfc8db31b818f8b6f88ca -Author: eMariete.com -Date: Sat Nov 20 13:36:22 2021 +0100 - - Adjust vRef to 930 (due to a bug, probably) - -commit ac9d80108623da090d8075a6b419d983f0a50150 -Author: eMariete.com -Date: Sat Nov 20 12:47:32 2021 +0100 - - Update release.yml - -commit 1c290789e47c7a5d507cfc914cf7ac0f44ca47cb (tag: v0.3.066) -Author: eMariete.com -Date: Sat Nov 20 12:10:41 2021 +0100 - - Version bump - -commit 2831e58576d198f2466fb6b790931fb37b7d70f3 -Author: Mariete -Date: Sat Nov 20 12:08:44 2021 +0100 - - Update release.yml - -commit c20ff38a417422cd3b8e774852ea6bd72112d90c (tag: v0.3.065) -Author: eMariete.com -Date: Sat Nov 20 10:53:16 2021 +0100 - - Menu color changes to improve readability - -commit de5793984de647345f09f2aa453e47cc01dd0e22 (tag: v0.3.064) -Author: eMariete.com -Date: Sat Nov 20 09:53:10 2021 +0100 - - Add menu option to reboot CO2 Gadget - -commit a5dda2c2135412f6e21e533b028bc81d3d1d1c30 (tag: v0.3.063) -Author: eMariete.com -Date: Fri Nov 19 11:52:19 2021 +0100 - - Version bump - -commit d5302bded5fad7a07a6fd775d9b75225b43f89ae (tag: v0.3.062) -Author: eMariete.com -Date: Fri Nov 19 11:29:51 2021 +0100 - - Version bump - -commit e9565101686c6484728f43d32df033fce8dda136 -Merge: fe0258c 2cce0e5 -Author: eMariete.com -Date: Fri Nov 19 11:25:46 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit fe0258c144cf39bfab54087530e47e009cc92488 (tag: v0.3.061) -Author: eMariete.com -Date: Fri Nov 19 11:25:14 2021 +0100 - - Version bump - -commit 2cce0e5e8b90bab904224c53121585cdab8dc6da -Author: Mariete -Date: Fri Nov 19 11:21:14 2021 +0100 - - Fix release.yml - -commit 0be3c4b15921c59353d252932343c54bfb4bfb1c (tag: v0.3.060) -Author: eMariete.com -Date: Fri Nov 19 11:18:40 2021 +0100 - - Version bump - -commit 06694091397143df11d618bad35bb6d1e5816169 -Author: eMariete.com -Date: Fri Nov 19 11:18:12 2021 +0100 - - Add clean WP Rocket cache to CI Release - -commit b448f39084acc0fb87640850599501890d0aa111 (tag: v0.3.059) -Author: eMariete.com -Date: Fri Nov 19 10:51:02 2021 +0100 - - Version bump - -commit c656a3977116c30d7411853805727b934456e4f0 -Author: eMariete.com -Date: Fri Nov 19 10:50:39 2021 +0100 - - Fix ENABLE_PIN - -commit 020d59060351cd08aeb41c30620b76b8421e8174 (tag: v0.3.058) -Author: eMariete.com -Date: Fri Nov 19 10:03:31 2021 +0100 - - Fixes in WiFi and MQTT menu config - -commit 0738d96e85e03969c224fa1ad1dea0e186e6039c (tag: v0.3.057) -Author: eMariete.com -Date: Fri Nov 19 08:33:03 2021 +0100 - - Version bump - -commit 36e513121c21c234048c0d0fb7e2a50c92cb8bba (tag: v0.3.056) -Author: eMariete.com -Date: Fri Nov 19 07:06:15 2021 +0100 - - Version bump - -commit 093f338081771722797fd552c62566347b62c99e -Author: eMariete.com -Date: Fri Nov 19 07:05:51 2021 +0100 - - Removed setCpuFrequencyMhz(80); - -commit ef09564f42b50a0c629362810b684978a56c6642 (tag: v0.3.055) -Author: eMariete.com -Date: Fri Nov 19 06:30:07 2021 +0100 - - Change board_build.partitions = min_spiffs.csv - -commit 3285a1f540abf85c2130f78bc8652891ecaefc14 (tag: v0.3.054) -Author: eMariete.com -Date: Thu Nov 18 22:22:11 2021 +0100 - - Fix binaries path - -commit 5b5afec5a0333f12466b927bd56ebff6cba4c74a (tag: v0.3.053) -Author: eMariete.com -Date: Thu Nov 18 14:49:01 2021 +0100 - - Version bump - -commit 339dbf3b351a17dbab13f1d6625d9cff440c760f -Author: eMariete.com -Date: Thu Nov 18 14:48:43 2021 +0100 - - Fix memory erase manifest in release.yml - -commit ee0fab7727bbc7aaf3ddb1796a1688466c001503 (tag: v0.3.052) -Author: eMariete.com -Date: Thu Nov 18 14:39:57 2021 +0100 - - Version bump - -commit dde137aed28f8392338d0ea2d6169c48ce415bf7 -Author: eMariete.com -Date: Thu Nov 18 14:39:22 2021 +0100 - - Fix typo in release.yml - -commit bba1e9c8412d0127af47261f20a20a672efaafac (tag: v0.3.051) -Author: eMariete.com -Date: Thu Nov 18 14:31:26 2021 +0100 - - Version bump - -commit c4cb694f282034d1c7c562326f93da0ca357eb95 -Author: eMariete.com -Date: Thu Nov 18 14:31:04 2021 +0100 - - Disable turning OFF BLE to avoid restart of device - -commit df53720ace783352837035543cac306e5b8bc9f7 -Author: eMariete.com -Date: Thu Nov 18 14:30:25 2021 +0100 - - Update release.yml to create erase-manifest - -commit a99307b2243c3b3e906b08d9ba7c703f788963bc -Author: eMariete.com -Date: Thu Nov 18 13:28:57 2021 +0100 - - Fix typo in create release name - -commit e50d63ee147eae4c2dda2b6129e4637073bcf533 (tag: v0.3.050) -Author: eMariete.com -Date: Thu Nov 18 13:15:59 2021 +0100 - - Version bump - -commit 0f71176dced5ba144762ff206e0bd2e78d7f90a9 -Author: eMariete.com -Date: Thu Nov 18 13:15:30 2021 +0100 - - Modify: new_install_skip_erase: true - -commit 3d13ad7ea6f2c55a0562bb1f4e62365be7c10c2b (tag: v0.3.049) -Author: eMariete.com -Date: Thu Nov 18 12:52:17 2021 +0100 - - Update release.yml - -commit 457718ab000aaf6bae122c018087f220272990ec (tag: v0.3.048) -Author: eMariete.com -Date: Thu Nov 18 12:48:48 2021 +0100 - - Update release.yml - -commit e976abf7b3af592cb0c7248a84b5c3cd66175ba4 (tag: v0.3.047) -Author: eMariete.com -Date: Thu Nov 18 11:41:45 2021 +0100 - - Version bump - -commit b9050b1d0b55213ae2d238718d13c2b21fd82337 (tag: v0.3.046) -Author: eMariete.com -Date: Thu Nov 18 11:40:41 2021 +0100 - - Update release.yml - -commit 839c5566712e31bd33efe7269cd472a09642a455 (tag: v0.3.045) -Author: eMariete.com -Date: Thu Nov 18 10:55:28 2021 +0100 - - Update release.yml - -commit f4a8697c2b8c0a203a39e2fbec329a262b1960db -Author: eMariete.com -Date: Thu Nov 18 10:52:33 2021 +0100 - - Update release.yml - -commit 6c053b9082730c2045be8817e3b63c0fbba42bc5 (tag: v0.3.044) -Author: eMariete.com -Date: Thu Nov 18 10:45:37 2021 +0100 - - Update release.yml - -commit edcfa5c73cc9fd6fc6daa4f001dc98f7800782be (tag: v0.3.043) -Author: eMariete.com -Date: Thu Nov 18 10:39:55 2021 +0100 - - Update release.yml - -commit 0b60f0461f6aee439f7a80e0eae6730220a29deb (tag: v0.3.042) -Author: eMariete.com -Date: Thu Nov 18 10:28:46 2021 +0100 - - Update release.yml - -commit baedab0ae5ab2ead086515b59e1bf89dfd93453a (tag: v0.3.041) -Author: eMariete.com -Date: Thu Nov 18 10:18:39 2021 +0100 - - Update release.yml - -commit ded9f5c5fd3191e7526333bbe59da0dcc48aba60 (tag: v0.3.040) -Author: eMariete.com -Date: Thu Nov 18 10:13:34 2021 +0100 - - Update release.yml - -commit 735acbd8df2aa666dfd57e0cc49fd51f173a34c5 (tag: v0.3.39) -Author: eMariete.com -Date: Thu Nov 18 09:53:41 2021 +0100 - - Update release.yml - -commit 04ac94462ea8ffc980e0211b9a0483741ea2cbe6 (tag: v0.3.38) -Author: eMariete.com -Date: Thu Nov 18 09:48:48 2021 +0100 - - Update release.yml - -commit a567b3509ae1eb66c17499a39030a25b5f888489 (tag: v0.3.37) -Author: eMariete.com -Date: Thu Nov 18 09:43:00 2021 +0100 - - Version Bump - -commit 87dd6bc9ada5b0ce16d008e155440c613706b4a0 -Author: eMariete.com -Date: Thu Nov 18 09:42:29 2021 +0100 - - Update release.yml - -commit 4b70fa79e1a1a9a88177af56169c3d5f32ea2747 (tag: v0.3.036) -Author: eMariete.com -Date: Thu Nov 18 09:13:05 2021 +0100 - - Bump version - -commit 94dfd544fd03ce97ca466786eef56932c1609385 -Merge: 5f80035 20da3f6 -Author: eMariete.com -Date: Thu Nov 18 08:59:12 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 5f800354ba3a163a5809164eb848ece33db9538f (tag: v0.3.35) -Author: eMariete.com -Date: Thu Nov 18 08:58:48 2021 +0100 - - Version bump - -commit 20da3f6901c55ba76b3b12c7ea7ce95ec8740924 -Author: Mariete -Date: Thu Nov 18 08:53:26 2021 +0100 - - Update release.yml - -commit 0d1bd2f6f7238ccecb45e9d37d943ec3578d9adf -Merge: c6ebd80 32140b5 -Author: eMariete.com -Date: Thu Nov 18 08:44:42 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit c6ebd80e0c8a0f162e747eee60ae2acc921c9120 (tag: v0.3.34) -Author: eMariete.com -Date: Thu Nov 18 08:44:15 2021 +0100 - - Version bump - -commit 32140b5701f62eb481e3a5b1eef7a621a2e53c61 -Author: Mariete -Date: Thu Nov 18 08:39:04 2021 +0100 - - Update release.yml - -commit 007d6e34e492ec1fffc45163209514168bb7a1b6 (tag: v0.3.033) -Author: eMariete.com -Date: Thu Nov 18 08:31:01 2021 +0100 - - v0.3.032 - -commit cb9662d70c61ca4875e63344514d9360e27848bb -Author: Mariete -Date: Thu Nov 18 08:26:01 2021 +0100 - - Update release.yml - -commit 67f1f1c5497c49b7a230c39c1bd035537578663c -Author: Mariete -Date: Wed Nov 17 22:08:11 2021 +0100 - - Update release.yml - -commit 8613d0df03d5f24bddd6e1127a9eb711e891663a -Author: Mariete -Date: Wed Nov 17 21:38:45 2021 +0100 - - Update release.yml - -commit d3c211f5c7a598db5fce9af39ab3dbd89ccc9f8f (tag: v0.3.032, tag: v0.3.031) -Author: eMariete.com -Date: Wed Nov 17 21:23:51 2021 +0100 - - Version bump - -commit d3d37f5889fe561ae9189087836899d14001f7f3 -Author: eMariete.com -Date: Wed Nov 17 21:19:52 2021 +0100 - - Version bump - -commit 0d9b6e27200f5625dbdc2c2b2810c70733fd29d2 -Author: Mariete -Date: Wed Nov 17 21:18:38 2021 +0100 - - Update release.yml - -commit e776511723cce2d7547c812739e096f0f789f82e (tag: v0.3.030) -Author: eMariete.com -Date: Wed Nov 17 09:18:35 2021 +0100 - - Update release.yml - -commit e1912d7bb2c5b53c6eb7f0295fc2714f4ae7fd1b (tag: v0.3.029) -Author: eMariete.com -Date: Wed Nov 17 08:46:49 2021 +0100 - - Update release.yml - -commit aa6b53f1396cb2e387a339f12316d639f5a6fdd1 (tag: v0.3.028) -Author: eMariete.com -Date: Wed Nov 17 08:27:14 2021 +0100 - - Add [default_envs] to platformio.ini - -commit 38205d0e1d379d3d77fc0b5b5f1ab4ffb282135c (tag: v0.3.027) -Author: eMariete.com -Date: Wed Nov 17 08:08:09 2021 +0100 - - Update release.yml - -commit c3cc4a61c84c029d4479111cc36c7983b8654a3f (tag: v0.3.026) -Author: eMariete.com -Date: Wed Nov 17 08:05:53 2021 +0100 - - Update release.yml - -commit 078e755538b2e812ddbbb0f69b0f94a13bc1f9a1 -Merge: 3917afb dc19129 -Author: eMariete.com -Date: Wed Nov 17 08:03:50 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 3917afb6e48fd1aa98bae46795739f9755af9a89 (tag: v0.3.025) -Author: eMariete.com -Date: Wed Nov 17 08:03:21 2021 +0100 - - Update release.yml - -commit dc19129a75502ead84ff5b40c37b7000f66399a8 -Author: Mariete -Date: Wed Nov 17 07:58:57 2021 +0100 - - Update release.yml - -commit ae165c0c5dce3a132dfaea073e8ee4adfe5114bd -Author: Mariete -Date: Wed Nov 17 07:57:17 2021 +0100 - - Update release.yml - -commit ee006197e6b5bb720009f9da00169f5101cc82e8 (tag: v0.3.024) -Author: eMariete.com -Date: Mon Nov 15 22:56:38 2021 +0100 - - Version bump to v0.3.024 - -commit 5978d269ba08e4ab8fdd701513af3cd596bc5bd6 -Merge: 8d2fe95 93c2112 -Author: eMariete.com -Date: Mon Nov 15 22:54:42 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 8d2fe951f6b7c43ddc051063b82ef0563fdff38e (tag: v0.3.023) -Author: eMariete.com -Date: Mon Nov 15 22:54:08 2021 +0100 - - Version bump to v0.3.023 - -commit 93c21124ec344561a0c1302f90d9de9854ef3493 -Author: Mariete -Date: Mon Nov 15 22:53:18 2021 +0100 - - Create release.yml - -commit e1d7991c22f154c2a3241826f62243b7d6bd33f3 -Author: Mariete -Date: Mon Nov 15 21:33:39 2021 +0100 - - Update issue templates - -commit 9c079142255f1d17dc6886f4bd34f0ebc418574c -Merge: 0ace7cc a6868b5 -Author: eMariete.com -Date: Mon Nov 15 21:01:25 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 0ace7cc6e4ea058d9dadc57696eb35bfc13cfc6b -Author: eMariete.com -Date: Mon Nov 15 20:57:38 2021 +0100 - - Modify platformio.ini - -commit e4dd0625d039fde60712df91548ea81f4c9d3406 -Author: eMariete.com -Date: Mon Nov 15 20:28:40 2021 +0100 - - Fix typo - -commit 4be4f35a1bb8a27ca35a9eec79f1cefaf74bbe2a -Author: eMariete.com -Date: Mon Nov 15 20:28:19 2021 +0100 - - Add ENABLE_PIN for sensor - -commit 3869551921757b088c3ddcfc9b6bb20b97769e17 -Author: eMariete.com -Date: Mon Nov 15 20:27:34 2021 +0100 - - Increase long button press to 300ms (from 200ms) - -commit a6868b5a2641f9cd12c151c65d83c0a9da9e5519 -Author: Mariete -Date: Sun Nov 14 15:34:27 2021 +0100 - - Update platformio.yml - -commit 37567bc74076bd5893a75e3a5b71a4f345d5573d -Author: Mariete -Date: Sun Nov 14 14:00:27 2021 +0100 - - Version bump - -commit 0bd60a8b7603fffe8877a310f7f20c830e100fe1 -Author: eMariete.com -Date: Sun Nov 14 13:20:27 2021 +0100 - - Add ENABLE_PIN Reserv. for future to enable sensor - -commit 466e101ff0e6a8853db95fee7fbcad8e385c5c3d -Merge: 216ed00 a53c9c3 -Author: eMariete.com -Date: Sat Nov 13 21:46:23 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 216ed004fbe329f5a9beb3bff058b4a6ed3aecd7 -Author: eMariete.com -Date: Sat Nov 13 21:46:16 2021 +0100 - - Refactor e improvements hostName - -commit a6f5cdaff220f4f113c30d0cfe73838a781b2218 -Author: eMariete.com -Date: Sat Nov 13 21:14:38 2021 +0100 - - Fix BLE Enable menu - -commit a53c9c3614b162d838e6ada95458ee91762f63ad -Merge: 02048aa ae970b6 -Author: Mariete -Date: Sat Nov 13 16:36:15 2021 +0100 - - Merge pull request #23 from melkati/Feature-Webpage - - Feature webpage - -commit ae970b6904e756c1cf6a590e08001a3a98507bbf -Merge: ab95b12 1fa8c9b -Author: eMariete.com -Date: Sat Nov 13 15:49:54 2021 +0100 - - Merge branch 'master' into Feature-Webpage - -commit 1fa8c9b40b1b6e1355b7a05e9c96691432962acf -Author: eMariete.com -Date: Sat Nov 13 15:34:43 2021 +0100 - - Version bump - -commit 02048aa233d3f2dac07f7d07841f1909497706b3 -Author: eMariete.com -Date: Sat Nov 13 14:33:36 2021 +0100 - - Version bump - -commit 82d0c7923723fd2de0453554816cbf8de6c9a4a7 -Author: eMariete.com -Date: Sat Nov 13 14:32:50 2021 +0100 - - Add some power consumption optimizations - -commit f2aceaeb682adb5ad1eaa7f5ecd40115c0275f98 -Author: eMariete.com -Date: Sat Nov 13 13:05:15 2021 +0100 - - Minor BLE fix - -commit aa4021bb7e3295f75a24a34f1bae7905a0f26b0d -Author: eMariete.com -Date: Sat Nov 13 11:23:36 2021 +0100 - - Set sensors library debug mode to false - -commit e74e853fe6d514dabbc0ad7e82a445e7cf85a632 -Author: eMariete.com -Date: Sat Nov 13 11:22:57 2021 +0100 - - Fix reboot on BLE init - -commit c00c149660deb410552aa7bf2b4ff8e3a837361e -Author: eMariete.com -Date: Fri Nov 12 11:55:23 2021 +0100 - - Fix typo in menu - -commit 6352b8389f2d48d0705d849f9613af75a6880310 -Author: eMariete.com -Date: Fri Nov 12 08:25:18 2021 +0100 - - Version bump to v0.3.12 - -commit bb35bc5723d235a95b6845afa6d44ce02684dc5e -Author: eMariete.com -Date: Fri Nov 12 08:24:22 2021 +0100 - - Minor mod in Display Config Menu - -commit e12fbfec536fd62f0e50e4fb2fe8592f202b9c5b -Author: eMariete.com -Date: Fri Nov 12 08:19:19 2021 +0100 - - Add functionality displayOffOnExternalPower - -commit 1df15d44cdb64b014582247e95ebee978556b704 -Author: eMariete.com -Date: Fri Nov 12 07:35:40 2021 +0100 - - Add funcionality automatic display off - -commit 5fae5c80ebadfcaa82b6f91e28db0422afeb1d1a -Author: eMariete.com -Date: Fri Nov 12 05:59:40 2021 +0100 - - Fix merge - -commit 6dfb64e0a20b57b2191f6a9668a7606b816beaf4 -Merge: 2b2c636 b303de7 -Author: eMariete.com -Date: Fri Nov 12 05:38:30 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 2b2c6360b7aa0f858fb008e5aa0e605a302d028a -Author: eMariete.com -Date: Thu Nov 11 23:44:40 2021 +0100 - - Add timeToDisplayOff menu prefs (no functionality) - -commit b303de7cd059ddd1c2df224783ea97ef3e657973 -Merge: 898dc9c 1c39f91 -Author: Mariete -Date: Thu Nov 11 23:30:05 2021 +0100 - - Merge pull request #22 from melkati/WiFiCredentials-Menu - - Add WiFi credentials config to menu/preferences - -commit 1c39f91f1c89a45dcef1d2accdc6fd7e5f368682 -Author: eMariete.com -Date: Thu Nov 11 23:25:47 2021 +0100 - - Add WiFi credentials config to menu/preferences - -commit 898dc9cf05028e582da8c852206fc1812e31a0de -Author: Mariete -Date: Thu Nov 11 20:07:21 2021 +0100 - - Update README.md - -commit b3c6ae69f36bd078d8c067741859c6d804954e27 -Merge: af2e0aa 5876636 -Author: eMariete.com -Date: Thu Nov 11 19:57:21 2021 +0100 - - Merge branch 'master' - -commit 5876636e8b81fa662f2b81c61e72f48dfb568a67 -Author: Mariete -Date: Thu Nov 11 19:11:56 2021 +0100 - - Update README.md - -commit af2e0aa93baf42a36c1330efc0a5954612bc75f8 -Author: eMariete.com -Date: Thu Nov 11 18:49:00 2021 +0100 - - Adjust platformio.ini for local - -commit d05e3268e369027ffb3265dca8565ae6389acb98 -Author: Mariete -Date: Thu Nov 11 09:07:59 2021 +0100 - - Fix for BatterySense - - Add library https://github.com/rlogiacco/BatterySense.git to platformio.ini - -commit 2843561c435ffeb4aee590c54cc093610e9a64d0 -Author: eMariete.com -Date: Thu Nov 11 08:57:12 2021 +0100 - - Fix menu typos - -commit d1a2ffe28aaf886324fe330eca87d77bc50deb2b -Author: eMariete.com -Date: Wed Nov 10 21:59:41 2021 +0100 - - Clean up CO2_Gadget_Preferences.h - -commit 60ec7301072168818c1ddcc208c825014d2c36fb -Merge: 7935de7 13a77db -Author: eMariete.com -Date: Wed Nov 10 21:54:10 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 7935de7f6b93f8ac75fdb3d38790990ce36f86a7 -Author: eMariete.com -Date: Wed Nov 10 21:53:55 2021 +0100 - - Fixes to Batterysense and Menu - -commit 13a77db1fff14428093b4e01de8a0eb36df72e73 -Author: Mariete -Date: Wed Nov 10 21:27:23 2021 +0100 - - Update .gitignore - -commit 53dafe34feeb0f3a2d2062321c3008009cfadab9 -Merge: a4b553e 792f0a3 -Author: Mariete -Date: Wed Nov 10 20:48:43 2021 +0100 - - Merge pull request #21 from melkati/BatterySense - - Improve battery measurements (Battery sense) - -commit 792f0a3f777ac373abb4f56135aa19452d0b53b4 -Merge: e5781ff a4b553e -Author: Mariete -Date: Wed Nov 10 20:38:15 2021 +0100 - - Merge branch 'master' into BatterySense - -commit a4b553ee4060afdef36477b49501c6a91af026aa -Merge: f6f26dd 7ca6918 -Author: eMariete.com -Date: Wed Nov 10 20:25:38 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit f6f26dd4810ea626046244eee92ac0af7c5b1060 -Author: eMariete.com -Date: Wed Nov 10 20:25:27 2021 +0100 - - Add MQTT Credentials - -commit 7ca69187fe6aa2d1ddc47609d7b057dbbaedb1ef -Author: Mariete -Date: Mon Nov 8 21:00:41 2021 +0100 - - Bump version - -commit bb5124f1948018044f889841df6b239859d71997 -Merge: 8ea5788 ada1510 -Author: eMariete.com -Date: Mon Nov 8 20:58:42 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 8ea5788e32044a235093da9beca49941829edcb7 -Author: eMariete.com -Date: Mon Nov 8 20:53:00 2021 +0100 - - MQTT menu config, fixes and improvements to MQTT - -commit ada1510db8d5fbba2a2c3dba8e7f3afccefc211d -Author: Mariete -Date: Mon Nov 8 10:20:12 2021 +0100 - - Update platformio.ini - -commit f7640ea7d18803ab8f047863ad1f8b9ca343da5c -Merge: 3f228f6 219cfbb -Author: eMariete.com -Date: Mon Nov 8 10:17:18 2021 +0100 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget - -commit 3f228f6d16f4d7a1b5bb65081586dc0f13c1a012 -Author: eMariete.com -Date: Mon Nov 8 10:11:22 2021 +0100 - - Fix .gitignore - -commit 219cfbb69ac7aeebda2d4a19e57f255ad1945967 -Merge: 4299df1 6f2025c -Author: Mariete -Date: Mon Nov 8 09:56:20 2021 +0100 - - Merge pull request #20 from melkati/mqttReconnect - - Mqtt reconnect and update README.md - -commit 6f2025c503b738680c2c801e9e754d8ce9ae2aa8 -Author: eMariete.com -Date: Mon Nov 8 09:50:06 2021 +0100 - - Update README.md - -commit 694439c17abfa4817cc691ef318d9c360dcf3d11 -Author: eMariete.com -Date: Mon Nov 8 09:48:54 2021 +0100 - - Fix names in initWifi() - -commit 4299df164a59f7005e2e96c4a4ec9c88a8edc290 -Author: Mariete -Date: Mon Nov 8 09:38:24 2021 +0100 - - Update platformio.ini - -commit 9064ee8f3f2c1a15abee16313432f5d8d1ff54ce -Author: Mariete -Date: Mon Nov 8 09:35:54 2021 +0100 - - Update .gitignore - -commit d118f0a7f367bee30523f302814f7c478f5aab76 -Merge: 67df8cd 42bb02e -Author: Mariete -Date: Mon Nov 8 09:34:33 2021 +0100 - - Merge pull request #19 from melkati/mqttReconnect - - Improvements to mqttReconnect() - Closes #18 - -commit 42bb02eb7bbd4c318b616948d8180321976e19d4 -Author: eMariete.com -Date: Mon Nov 8 09:22:43 2021 +0100 - - Improvements to mqttReconnect() - -commit 67df8cda24075cd34c46c9e1320709b964427cd6 -Author: eMariete.com -Date: Mon Nov 8 07:47:38 2021 +0100 - - Connection to MQTT broker: Max one try each 5 secs - -commit 0372650fd87bff7f3d9fe92febe14f9eba832e55 -Author: eMariete.com -Date: Sun Nov 7 19:28:14 2021 +0100 - - Add platformio.ini to .gitignore - -commit 501683f6019a9e802e53a0be0b9b2eba9ff9401a -Merge: d4e3f37 58e77c9 -Author: Mariete -Date: Sun Nov 7 14:16:39 2021 +0100 - - Merge pull request #17 from hpsaturn/master - - Some minors project config improvements - -commit d4e3f373dccb4e739f02e2c1fd34bf2b9e8655ef -Author: eMariete.com -Date: Sun Nov 7 14:10:56 2021 +0100 - - Add .vscode to .gitignore - -commit 58e77c973eab11e93fad8169c74bc235f6521a97 -Author: Hpsaturn -Date: Sun Nov 7 13:43:36 2021 +0100 - - removed custom upload and monitor (better auto for other OS) - -commit f0bf9489bb991a20e12f3b5d68ba78411c8d2bd9 -Author: Hpsaturn -Date: Sun Nov 7 13:37:35 2021 +0100 - - removed unnecesary and conflictive directory, .vscode - -commit 3bf271340b5aac0c6a865f8ab34f412bcba976aa -Author: Hpsaturn -Date: Sun Nov 7 13:32:56 2021 +0100 - - resync with upstream - -commit ea3c2ace398c98b4ed69bf53402bfbde0cc85ba2 -Author: Hpsaturn -Date: Sun Nov 7 13:30:44 2021 +0100 - - removed file that on original repo dont exist (?) - -commit bc3186ce58bf9f98856d23d6644771016eb5e72f -Author: Hpsaturn -Date: Sun Nov 7 13:28:16 2021 +0100 - - unsaved file from merge - -commit e5781ff2c019b4d73e423ad399dc890eda8695d1 -Author: eMariete.com -Date: Sun Nov 7 13:27:09 2021 +0100 - - User can set battery full and empty values o menu - -commit 449a8a30fe61c0febce7e9145f16a3317065b0b8 -Author: eMariete.com -Date: Sun Nov 7 13:25:55 2021 +0100 - - Battery options save to NVR - -commit 1abb671baa0165d2aed965e336040c3f434579db -Merge: 14e95f3 130d1c8 -Author: Hpsaturn -Date: Sun Nov 7 13:25:40 2021 +0100 - - Merge remote-tracking branch 'upstream/master' - -commit 0951f676eba87606387cf32c81c0dce295b63c18 -Author: eMariete.com -Date: Sun Nov 7 12:41:02 2021 +0100 - - Add adjust vRef from menu calibrate battery - -commit 94ee498f920eebe2ebf626b9e8487c8b1efb7e0f -Author: eMariete.com -Date: Sun Nov 7 12:40:21 2021 +0100 - - Add library BatterySense - -commit ab95b12be784bed2fdcc73af4b50a6ffa1a33d66 -Author: eMariete.com -Date: Sun Nov 7 10:18:22 2021 +0100 - - Add new webpage (concept draft) with CSS gauges - -commit aec3393692c051d9998d0df680e621a214e5f535 -Author: eMariete.com -Date: Tue Nov 2 21:19:31 2021 +0100 - - First basic no reloading page - -commit 130d1c815c48a8ad2fcb1366e5fdcb74d08a435d -Author: eMariete.com -Date: Sun Oct 31 09:17:09 2021 +0100 - - Enable/disable BLE from menu - -commit 1512e4c4146a96d37be7d9b355812c4bd8daa600 -Author: eMariete.com -Date: Sat Oct 30 21:46:47 2021 +0200 - - Rev update - -commit 278b535799a8a8c8a834bcffbca546af3bac1714 -Author: eMariete.com -Date: Sat Oct 30 21:44:24 2021 +0200 - - Better IP info screen if disconnected/disabled - -commit 467e5ae7510cb4ac5438e38d5e32bf9558050626 -Author: eMariete.com -Date: Sat Oct 30 21:24:49 2021 +0200 - - Ability to enable and disable WiFi from menu - -commit c1b14c80f44cb8b3d4f571da14db09930a7e8f4c -Author: eMariete.com -Date: Sat Oct 30 21:08:40 2021 +0200 - - Ability to enable and disable MQTT from menu - -commit 32ca6c43f75161e1e60e5229dde110b58c36ccb7 -Author: eMariete.com -Date: Sat Oct 30 20:13:29 2021 +0200 - - Show IP address in information screen - -commit 8941609b1135611f9dfb2e617c84d03c3d1e7946 -Author: eMariete.com -Date: Sat Oct 30 20:07:19 2021 +0200 - - Save activeBLE activeWIFI activeMQTT in preferencs - -commit 930916c55a3f2eee45b13a6553dd714e4d582d5a -Author: eMariete.com -Date: Sat Oct 30 14:10:59 2021 +0200 - - Separate buttons funct. into CO2_Gadget_Buttons.h - -commit 8ecf93a0dd2be29850f51b746acee44e914510db -Author: eMariete.com -Date: Sat Oct 30 13:39:20 2021 +0200 - - Some code cleaning - -commit 197c44f5daf31a939da6107732f0bc674d9c7769 -Author: eMariete.com -Date: Sat Oct 30 09:50:07 2021 +0200 - - Move global variables to main file - -commit ee20c81f5226b9fd7746985aec03108f8b606dc0 -Author: eMariete.com -Date: Sat Oct 30 09:17:48 2021 +0200 - - Fixed hostName - -commit 35872bac29a68c0e99a489cdb6d766cce83bfb0b -Author: eMariete.com -Date: Sat Oct 30 09:14:48 2021 +0200 - - Renamed button_init() as buttonsInit() - -commit 6d9bd260009d4c22aae048dd3579ac150f216a32 -Author: eMariete.com -Date: Fri Oct 29 20:55:38 2021 +0200 - - Fix issue environment variables and credentials.h - -commit 6899494744c4c6262efa16ab83008145ed546052 -Author: eMariete.com -Date: Fri Oct 29 20:05:30 2021 +0200 - - Fix dupl. definition of const char *mqtt_server - -commit 5bdcbd99197793c5797710c5362600f6d7ddcc37 -Author: eMariete.com -Date: Fri Oct 29 16:54:36 2021 +0200 - - Version update to 0.2.001 - -commit 1fe5b8eeadb3e5dc005ab2ca69c20b5577fdc35b -Author: eMariete.com -Date: Fri Oct 29 16:45:10 2021 +0200 - - Revision update - -commit 012e9121debb13a5358b2ada8d4f15abe2fc24da -Author: eMariete.com -Date: Fri Oct 29 16:42:20 2021 +0200 - - Limit WiFi connection tries before disabling WiFi - -commit c8648f7514331fdc88a28b5e4cd307d3cfcd057f -Author: eMariete.com -Date: Fri Oct 29 16:26:25 2021 +0200 - - Refactoring sensors to => CO2_Gadget_Sensors.h - -commit 4db6ca6eb20857cc7f3ad4fe96430452572a42f5 -Author: eMariete.com -Date: Fri Oct 29 16:09:18 2021 +0200 - - Get rid of credentials.tpl.h - -commit c447828bce33e4546817eac892de30261c3495eb -Author: eMariete.com -Date: Fri Oct 29 15:29:22 2021 +0200 - - Refactor BLE - -commit 220d2d089170c265bcdfb75b15803f63a852a509 -Author: eMariete.com -Date: Fri Oct 29 15:15:50 2021 +0200 - - Get rid of SUPPORT_BLE, SUPPORT_WIFI, SUPPORT_MQTT - -commit c79b23b89bd13366cf4736a0c100e3713d5321dd -Author: eMariete.com -Date: Fri Oct 29 15:14:07 2021 +0200 - - Refactoring to enable BLE, WiFi and MQTT from menu - -commit 8b0417dd82cbac8437f54edd11ac957c731b0f89 -Author: eMariete.com -Date: Fri Oct 29 08:19:41 2021 +0200 - - WiFi credentials in system enviroment variables - -commit 96ce1ea47981046b482f999cbb63144a1287cb66 -Merge: bc3dfa5 a228e29 -Author: eMariete.com -Date: Thu Oct 28 21:11:12 2021 +0200 - - Merge master https://github.com/melkati/CO2-Gadget - -commit bc3dfa5e3db60e7125918342f6168d998821a4e1 -Author: eMariete.com -Date: Thu Oct 28 21:09:06 2021 +0200 - - Show IP adress at startup - -commit d67148883d02989a09d019c715e33493e15c612f -Author: eMariete.com -Date: Thu Oct 28 21:08:39 2021 +0200 - - Fix credentials file after last merge - -commit a228e2961d284d0e398c58eaca6d6df079a6badf -Author: Mariete -Date: Thu Oct 28 21:00:03 2021 +0200 - - Update README.md - -commit b86ee1914d49f04ba41b58bbce6bf8cb322123c9 -Author: Mariete -Date: Thu Oct 28 20:46:29 2021 +0200 - - Update README.md - -commit 19b8b71d734d72222f5ace5112a2547074f67604 -Author: Mariete -Date: Thu Oct 28 19:43:38 2021 +0200 - - Update credentials.tpl.h - -commit 8be979452a1ebd20044e1292f7e9483fc3bc76a9 -Merge: 3a899cc 7458631 -Author: Mariete -Date: Thu Oct 28 19:09:20 2021 +0200 - - Merge pull request #15 from melkati/Feature-wifi - - Feature wifi - -commit 74586313d06c82a140cf2e1f034cea876cb423ff -Author: Mariete -Date: Thu Oct 28 16:43:55 2021 +0200 - - Update README.md - -commit 3aa8effaa820cd36b63dc9fe0be006ec984165ff -Author: eMariete.com -Date: Thu Oct 28 11:11:39 2021 +0200 - - Improvements and fixes to MQTT - -commit 010f28524e8310ffcaa9968c3024a70396761890 -Author: eMariete.com -Date: Thu Oct 28 11:09:28 2021 +0200 - - Improvements and fixes to MQTT - -commit cf4e736c51650f12afe6101884482b28b4b380d9 -Author: eMariete.com -Date: Wed Oct 27 22:31:47 2021 +0200 - - Refactoring. WiFi & BLE fixes and improvements - -commit 12a99a31417477a4d5612f4b7ed37023da565523 -Author: eMariete.com -Date: Wed Oct 27 15:16:58 2021 +0200 - - Fix: BLE and WiFi working at same time (testing) - -commit babb72fe296be136cd506111ef8b3209f36a3095 -Author: eMariete.com -Date: Wed Oct 27 11:53:41 2021 +0200 - - Define SUPPORT_WIFI & SUPPORT_MQTT - -commit ab84895b5fa3a4beaf074a5129730da4b9dfc61d -Merge: 77c32cf 757f75f -Author: eMariete.com -Date: Wed Oct 27 11:52:03 2021 +0200 - - Merge branch 'Feature-wifi' of https://github.com/melkati/CO2-Gadget into Feature-wifi - -commit 77c32cfe77d144e547037536696e25514e776142 -Author: eMariete.com -Date: Wed Oct 27 11:51:12 2021 +0200 - - Fixes and improvements to WiFi and MQTT - -commit 757f75f83875abca86a42368672a1afb41f341f1 -Author: Mariete -Date: Tue Oct 26 15:06:11 2021 +0200 - - Update README.md - -commit 247c2bba26694d6cfd208efaaffb99279068c9ea -Author: Mariete -Date: Tue Oct 26 15:03:57 2021 +0200 - - Update readme BLE/WIFI - -commit 08efddb71769d0815aa0844c160e48eec200e243 -Author: eMariete.com -Date: Tue Oct 26 14:24:26 2021 +0200 - - WiFi & MQTT working alone (without BLE) choose one - -commit 29f376da5ed12a6f5e391a52b3ff7ccbea41e1c0 -Author: eMariete.com -Date: Tue Oct 26 07:53:49 2021 +0200 - - Remove MultiWifi - -commit 654ca3fab431eb97fc78dd18241de698384ee9e8 -Author: eMariete.com -Date: Tue Oct 26 07:52:51 2021 +0200 - - Remove MultiWifi - -commit 3a899cc0b2b14b9722b6b6181676173d091e4b8c -Author: Mariete -Date: Mon Oct 25 21:49:08 2021 +0200 - - Update README.md - -commit e7dc61fbd8282426ce5edb1844f2a539d7a4a47c -Author: Mariete -Date: Mon Oct 25 21:21:13 2021 +0200 - - Update README.md - -commit a664cd60d441d4b4f9dbd414f734f748ea5f2480 -Author: Mariete -Date: Mon Oct 25 21:17:29 2021 +0200 - - Update README.md - -commit 29906f6846770cbb6edbc71156050e17291aecad -Merge: 3b826de 3567517 -Author: Mariete -Date: Mon Oct 25 20:57:19 2021 +0200 - - Merge pull request #14 from melkati/Feature-wifi - - Clang-format protect comments (temporary fix) - -commit 3567517f4e3ee213a1c6108adb539b4d8cfec05b -Author: eMariete.com -Date: Mon Oct 25 20:39:31 2021 +0200 - - Clang-format protect comments - -commit 59f630b40c6b2b1daa4f6f43ab4bdf497a3a7860 -Author: eMariete.com -Date: Mon Oct 25 20:37:34 2021 +0200 - - Clang-format protect comments (temporary solution) - -commit 1d25055ed7e68a794852907f881ab82d8b7a2ab4 -Author: eMariete.com -Date: Mon Oct 25 20:16:55 2021 +0200 - - Fix CO2_Gadget_WIFI.h - -commit 3b826de327fbc3411570129463f7669bae88e2c8 -Merge: ee860dd 3de2ffe -Author: Mariete -Date: Sat Oct 23 19:38:09 2021 +0200 - - Merge pull request #13 from melkati/development - - Removed #define SUPPORT_ARDUINOMENU - -commit 3de2ffec2dad4af52c5af516c1b649d5d924cbb6 -Author: eMariete.com -Date: Sat Oct 23 19:28:29 2021 +0200 - - Removed #define SUPPORT_ARDUINOMENU - -commit 3ce42ef2b73739a90216940401924974b4fb1151 -Author: eMariete.com -Date: Sat Oct 23 16:37:29 2021 +0200 - - Add version + revision variables - -commit 6eb63a0cb983077819f0676069db588f64d56407 -Author: eMariete.com -Date: Sat Oct 23 13:23:48 2021 +0200 - - Update README.md - -commit ee860dd6c0c78ad17a72b88a3bfbfe6b9cf8cd6d -Merge: 8cbec59 4e606a5 -Author: Mariete -Date: Sat Oct 23 09:55:36 2021 +0200 - - Merge pull request #12 from melkati/development - - Fixed main screen overwrite menu - -commit 4e606a52ae6aaa54850f2f77b43f8feaf8b966d4 -Merge: 22e8c7e b895ac0 -Author: eMariete.com -Date: Sat Oct 23 09:52:11 2021 +0200 - - Merge branch development github.com development - -commit 22e8c7e88a8957838272a435dfaf72372e666dc4 -Author: eMariete.com -Date: Sat Oct 23 09:48:38 2021 +0200 - - Fixed platformio.ini - -commit b895ac010b983a4efd9509ab788d1f7ea40ebbc2 -Merge: 2f10dd0 8cbec59 -Author: Mariete -Date: Sat Oct 23 09:46:01 2021 +0200 - - Merge branch 'master' into development - -commit 2f10dd0a03d39ec14539b8e5e60485e6740e1c1c -Author: eMariete.com -Date: Sat Oct 23 09:04:31 2021 +0200 - - Fixed main screen overwrite menu - -commit a439501c85134a77c70d8306f60c901d289fc0b2 -Author: eMariete.com -Date: Fri Oct 22 22:25:48 2021 +0200 - - Organize defines for PlatformIO and Arduino - -commit 8cbec59d81329c3f27a0bfa15d4038a24e175c7c -Merge: da2a005 0ab6db6 -Author: Mariete -Date: Fri Oct 22 20:47:31 2021 +0200 - - Merge pull request #11 from melkati/development - - Menu improvements - -commit 3e364a793a85387313bd325760f5c14351988066 -Author: eMariete.com -Date: Fri Oct 22 20:45:34 2021 +0200 - - Battery field not selectable - -commit 0ab6db6d6f226d2fdcfb20cc6f3b3dcea8f5211d -Author: eMariete.com -Date: Fri Oct 22 20:37:51 2021 +0200 - - Menu improvements - -commit da2a005ef184b8a2c377e20f542bf48df41f524b -Author: eMariete.com -Date: Thu Oct 21 22:19:33 2021 +0200 - - Fixed #define ST7789_DRIVER in User_Setup.h - -commit a6ca50f0f4f4d4c5a168a17c7f17571b8d63f9d8 -Merge: 8cbfeab ee3804c -Author: Mariete -Date: Thu Oct 21 21:07:24 2021 +0200 - - Merge pull request #10 from melkati/Use-CanAirIO-Air-Quality-Sensors-sensorslib - - Use CanAirIO Air Quality Sensors Library (sensorslib) - -commit ee3804c071e4de826fa65d25e4bc9125884d08fb -Author: eMariete.com -Date: Thu Oct 21 20:57:00 2021 +0200 - - Set CORE_DEBUG_LEVEL=0 - -commit 743ca4554c37c4aae77d7afba154e24bb1e2684a -Author: eMariete.com -Date: Thu Oct 21 16:49:59 2021 +0200 - - Add TFT configuration in platformio - -commit 24ee5513b5bdb5d22cc18d394933c33aaf1f48c9 -Merge: 5968d25 345c1d9 -Author: eMariete.com -Date: Thu Oct 21 16:20:21 2021 +0200 - - Add TFTBrightness - -commit 5968d25659c536f910f0088180f12c2fe252ad05 -Author: eMariete.com -Date: Thu Oct 21 14:55:25 2021 +0200 - - Fixes for SCD4x - -commit 345c1d9f4ca7702778999ac29ae5136cbf8e9919 -Merge: d181604 8cbfeab -Author: Mariete -Date: Wed Oct 20 21:55:51 2021 +0200 - - Merge branch 'master' into Use-CanAirIO-Air-Quality-Sensors-sensorslib - -commit d181604e2d1875d314e07c4eadfd27cae1c3e02f -Author: eMariete.com -Date: Wed Oct 20 21:50:39 2021 +0200 - - Use https://github.com/melkati/TFT_eSPI.gig - -commit 8cbfeab2544d60e630ef7384d16eb550081d4d70 -Merge: 0fb8c5f f3010e5 -Author: Mariete -Date: Wed Oct 20 21:00:27 2021 +0200 - - Merge pull request #8 from hpsaturn/ci_badge_platformio - - build badge for CI with PlatformIO - -commit f3010e50e3a8d727bee207be456dc8b455d74b08 -Author: Antonio Vanegas -Date: Wed Oct 20 19:18:39 2021 +0200 - - added build badge for CI with PlatformIO - -commit 14e95f316fef89fbfde98843eeae16eae22a1cef -Merge: 3134357 c26633f -Author: Mariete -Date: Wed Oct 20 16:06:02 2021 +0200 - - Merge pull request #7 from hpsaturn/ci_workflow_build_upload - - CI workflow for firmware test and upload - -commit 0fb8c5f35c0c67a8e6835cbb72a5a792f3a62668 -Merge: aef4efa 00dd2d9 -Author: Mariete -Date: Wed Oct 20 16:06:02 2021 +0200 - - Merge pull request #7 from hpsaturn/ci_workflow_build_upload - - CI workflow for firmware test and upload - -commit c26633f0d05196382d534179edf789a1c86371f3 -Author: Antonio Vanegas -Date: Wed Oct 20 13:39:37 2021 +0200 - - testing new CI workflow for firmware test and upload - -commit 00dd2d98105b32eb0941bd227a6ab6cf93d7b960 -Author: Antonio Vanegas -Date: Wed Oct 20 13:39:37 2021 +0200 - - testing new CI workflow for firmware test and upload - -commit 3134357f372c470fb2215913ee1ef2d1b607348a -Merge: 1d05020 f56d59c -Author: eMariete.com -Date: Wed Oct 20 11:06:53 2021 +0200 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget into development - -commit aef4efa4ec3cc232d45f58b648c6f7dd8726d11c -Merge: 0e85668 60e8b3f -Author: eMariete.com -Date: Wed Oct 20 11:06:53 2021 +0200 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget into development - -commit 1d05020893fe9ca9e0c8e29001515d6050be8e8a -Author: eMariete.com -Date: Wed Oct 20 11:06:38 2021 +0200 - - Mod #include "CO2_Gadget_Menu.h" Arduino IDE comp. - -commit 0e856686e1bb47e6023157b58f90b9c4eeb95ef9 -Author: eMariete.com -Date: Wed Oct 20 11:06:38 2021 +0200 - - Mod #include "CO2_Gadget_Menu.h" Arduino IDE comp. - -commit f56d59cf783b94d2d12281d8e9f923ce935ab943 -Author: Mariete -Date: Tue Oct 19 22:46:11 2021 +0200 - - Delete Bootlogo directory - -commit 60e8b3f50b9e7b90818877aafcc1a1d69eea7703 -Author: Mariete -Date: Tue Oct 19 22:46:11 2021 +0200 - - Delete Bootlogo directory - -commit a8c11ad905b178701378cb97565a2d5971521bdc -Author: Mariete -Date: Tue Oct 19 22:37:22 2021 +0200 - - Update README.md - -commit 148696f9779d781375a438da1b12e0c730c7ba50 -Author: Mariete -Date: Tue Oct 19 22:37:22 2021 +0200 - - Update README.md - -commit 3e8ed2283126cc66d94763614ff1d8910f30f5c8 -Author: Mariete -Date: Tue Oct 19 22:35:18 2021 +0200 - - Update README.md - -commit fa834980dd7388053781c52830cce363ade1c50b -Author: Mariete -Date: Tue Oct 19 22:35:18 2021 +0200 - - Update README.md - -commit f5a13b7958913f60e0d7bf3322dbb49cc3d20be0 -Author: Mariete -Date: Tue Oct 19 22:34:40 2021 +0200 - - Update README.md - -commit fe4fc34725fb56e8a58cfa95de614b38596c9b02 -Author: Mariete -Date: Tue Oct 19 22:34:40 2021 +0200 - - Update README.md - -commit 7f3a57c11dffc3f492dbb0cafdb2ddf74552670e -Author: Mariete -Date: Tue Oct 19 22:19:11 2021 +0200 - - Update README.md - -commit ccc0343c7ab26cf37f4c7a91498f6ec0b294d6ef -Author: Mariete -Date: Tue Oct 19 22:19:11 2021 +0200 - - Update README.md - -commit 69526522ec5ed613a852f04e02c7abe1ce11b2cc -Author: Mariete -Date: Tue Oct 19 21:37:39 2021 +0200 - - Create first README version - - Heavily based on CanAirIO sensorlib - -commit 5dff63b3baf44fa3a1b7f7d285c112e4c0d01a5f -Author: Mariete -Date: Tue Oct 19 21:37:39 2021 +0200 - - Create first README version - - Heavily based on CanAirIO sensorlib - -commit 5700d83db1e2ca45747a4504c5a9221803c9460b -Author: eMariete.com -Date: Tue Oct 19 19:29:56 2021 +0200 - - Implement #ifdef DEBUG_ARDUINOMENU - -commit 0d8750bff9901a26ddc8611ae1dbcaa3f5964351 -Author: eMariete.com -Date: Tue Oct 19 19:29:56 2021 +0200 - - Implement #ifdef DEBUG_ARDUINOMENU - -commit c28ad13fd6b88f4859c526042863989be03f5f9a -Merge: 84c8cbc 415c5b4 -Author: eMariete.com -Date: Tue Oct 19 19:11:36 2021 +0200 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget into development - -commit 9ca618e067d65fbf36ebd4f843cbe31fb11b3cc6 -Merge: 31362cd ea9db65 -Author: eMariete.com -Date: Tue Oct 19 19:11:36 2021 +0200 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget into development - -commit 84c8cbc343f185a62dadddd840082e39c2c63d3a -Author: eMariete.com -Date: Tue Oct 19 19:11:26 2021 +0200 - - Use https://github.com/melkati/TFT_eSPI.git - -commit 31362cd5e253ad360e653f91ba1682b7ca30d054 -Author: eMariete.com -Date: Tue Oct 19 19:11:26 2021 +0200 - - Use https://github.com/melkati/TFT_eSPI.git - -commit 415c5b470510297d63c6be2b16555751b4f7600f -Merge: 1fdcb1a 5a0105e -Author: Mariete -Date: Tue Oct 19 18:24:37 2021 +0200 - - Merge pull request #6 from melkati/TFT-Brightness - - TFT-Brightness - -commit ea9db65b4ad59dfb3377874144e86a6060dd7359 -Merge: aeb985e dd47116 -Author: Mariete -Date: Tue Oct 19 18:24:37 2021 +0200 - - Merge pull request #6 from melkati/TFT-Brightness - - TFT-Brightness - -commit 5a0105e664c329d3aa16b211c95c95eaf228eef4 -Author: eMariete.com -Date: Tue Oct 19 18:18:29 2021 +0200 - - TFT-Brightness - -commit dd47116b3e6650e33f1d89ffd42a3db049ae19d9 -Author: eMariete.com -Date: Tue Oct 19 18:18:29 2021 +0200 - - TFT-Brightness - -commit 1fdcb1adf647b07606cb9eb4ba8a509e2df19614 -Merge: 72c9d9c 1597267 -Author: Mariete -Date: Tue Oct 19 15:46:33 2021 +0200 - - Merge pull request #5 from melkati/TFT-Brightness - - Implemented TFTBrightness - -commit aeb985e4df575314a2f896a1ee496f4400faae21 -Merge: 2e6adb5 064800b -Author: Mariete -Date: Tue Oct 19 15:46:33 2021 +0200 - - Merge pull request #5 from melkati/TFT-Brightness - - Implemented TFTBrightness - -commit 1597267844bfc2d9aae357567bf899ca8ae7e7d2 -Author: eMariete.com -Date: Tue Oct 19 15:44:52 2021 +0200 - - Implemented TFTBrightness - -commit 064800b2af0b6961a03b529ce3855690143d05b9 -Author: eMariete.com -Date: Tue Oct 19 15:44:52 2021 +0200 - - Implemented TFTBrightness - -commit 72c9d9cbba488d7d65e61f75a951bf5556894d7b -Merge: 562b686 eb3f115 -Author: Mariete -Date: Tue Oct 19 15:15:48 2021 +0200 - - Merge pull request #4 from melkati/add-license-1 - - Add license - -commit 2e6adb522a6fa57068266b81468cbeab177090f3 -Merge: 4d0915a 90fea66 -Author: Mariete -Date: Tue Oct 19 15:15:48 2021 +0200 - - Merge pull request #4 from melkati/add-license-1 - - Add license - -commit eb3f115541f72bbcc3eb1fe5e8f9b3bcc40de511 -Author: Mariete -Date: Tue Oct 19 15:15:31 2021 +0200 - - Add license - -commit 90fea66f24eb9fa6b97c9d59f09e6aef3b7d13f7 -Author: Mariete -Date: Tue Oct 19 15:15:31 2021 +0200 - - Add license - -commit 65073162889f10ad211b3a59ba19de1e3c1804a8 -Author: eMariete.com -Date: Tue Oct 19 13:50:37 2021 +0200 - - Fix conflicts. Merge master. - -commit 309efe34604da6066a77999152c8e44bdcb29aa5 -Merge: 0641833 4d0915a -Author: eMariete.com -Date: Tue Oct 19 12:07:49 2021 +0200 - - Merge branch 'development' into Use-CanAirIO-Air-Quality-Sensors-sensorslib - -commit 064183307e80779339a7ba6e26a42c2e8583f73a -Author: eMariete.com -Date: Tue Oct 19 11:19:05 2021 +0200 - - Modified .gitignore exclude Bootlogo folder - -commit 562b686b13e3ec85b11bf0010cc2f0d1499d0736 -Author: eMariete.com -Date: Tue Oct 19 11:09:32 2021 +0200 - - Implemented preferences - -commit 4d0915af013d1a872e4efd7a905f3392fe660adc -Author: eMariete.com -Date: Tue Oct 19 11:09:32 2021 +0200 - - Implemented preferences - -commit 176be691d37a7a43fad8a7ffb8734442d18295a3 -Author: eMariete.com -Date: Tue Oct 19 10:57:09 2021 +0200 - - Impemented save preferences to NVM - -commit 3c3f60a7e0d92a478dcc808b1a23672dc4b088d5 -Author: eMariete.com -Date: Tue Oct 19 10:57:09 2021 +0200 - - Impemented save preferences to NVM - -commit c3b806d32c22d3eb0bbc2e546d8af4ede1e51fa0 -Merge: 68310c0 3f19749 -Author: Mariete -Date: Mon Oct 18 20:44:48 2021 +0200 - - Merge pull request #3 from melkati/ArduinoMenu - - Calibration working. Battery display fixed. - -commit 667768db42e5fe2de3e169337c2ae869a37c43d1 -Merge: 93d7844 fa5bef1 -Author: Mariete -Date: Mon Oct 18 20:44:48 2021 +0200 - - Merge pull request #3 from melkati/ArduinoMenu - - Calibration working. Battery display fixed. - -commit 3f1974984dc79b1a4d86420402a7aaa3b97e433e -Author: eMariete.com -Date: Mon Oct 18 20:19:11 2021 +0200 - - Custom calibration functionality - -commit fa5bef16245b111f9a15d1f28a9d01cd8e81b13b -Author: eMariete.com -Date: Mon Oct 18 20:19:11 2021 +0200 - - Custom calibration functionality - -commit d042600e4eb3ac30097991334b8d3563caa04ba5 -Author: eMariete.com -Date: Mon Oct 18 19:16:12 2021 +0200 - - doCalibration400ppm working Fix readBatteryVoltage - -commit 26ff887a3c626d08d43d1a262916b0056c6baa25 -Author: eMariete.com -Date: Mon Oct 18 19:16:12 2021 +0200 - - doCalibration400ppm working Fix readBatteryVoltage - -commit ac956cf84c20e341d23914064b447978c2fe9603 -Author: eMariete.com -Date: Mon Oct 18 18:50:15 2021 +0200 - - Fix readBatteryVoltage() - -commit b2a3f9bdf13a0a316df492d3395103fa0fe04201 -Author: eMariete.com -Date: Mon Oct 18 18:50:15 2021 +0200 - - Fix readBatteryVoltage() - -commit 78be8c43bcfba50a2380004411ddebedddd5897a -Author: eMariete.com -Date: Mon Oct 18 11:24:44 2021 +0200 - - Fixed buttons changing num value reversed-Genfixes - -commit 8806faa480237ee75d7b744f98a5f40268bf64a2 -Author: eMariete.com -Date: Mon Oct 18 11:24:44 2021 +0200 - - Fixed buttons changing num value reversed-Genfixes - -commit 68310c010e28c7bb7c3b8874116948964bae3b21 -Author: eMariete.com -Date: Sun Oct 17 15:41:14 2021 +0200 - - Empty - -commit 93d78445d75f023ad1ad4e68389ebf309cc35abc -Author: eMariete.com -Date: Sun Oct 17 15:40:42 2021 +0200 - - Menu skeleton working - -commit d04d2ae2557b63855d793eb7f270c68c6d2b46a0 -Author: eMariete.com -Date: Sun Oct 17 15:40:42 2021 +0200 - - Menu skeleton working - -commit ba1ff430d41edef65c750af9ae3c845a18a3648d -Author: eMariete.com -Date: Sun Oct 17 12:17:49 2021 +0200 - - ArduinoMenu First Time Working - -commit 5b2ea79e0465c2ebfefe12f7c3db512fb42db54f -Author: eMariete.com -Date: Sun Oct 17 12:17:49 2021 +0200 - - ArduinoMenu First Time Working - -commit 7c261177724cc73de49dfef549ceb346d8d068b6 -Author: eMariete.com -Date: Sat Oct 16 23:19:11 2021 +0200 - - ArdinoMenu First Working - -commit 358e7a1db4b3a88257b64750f319a5979def2251 -Author: eMariete.com -Date: Sat Oct 16 23:19:11 2021 +0200 - - ArdinoMenu First Working - -commit d9bd76a57dfdf68909f71add10b7ae55adff2c63 -Merge: ab159b0 b1fbdec -Author: eMariete.com -Date: Sat Oct 16 23:18:46 2021 +0200 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget into ArduinoMenu - -commit a40f5a25b9eb2b0d05e7514041decb14d07bfdd2 -Merge: d5cbb6d e9cf17c -Author: eMariete.com -Date: Sat Oct 16 23:18:46 2021 +0200 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget into ArduinoMenu - -commit b1fbdec4c40925e5097c4bf73b45fae6285f48a9 -Merge: 209a650 f41f744 -Author: Mariete -Date: Sat Oct 16 12:04:57 2021 +0200 - - Merge pull request #2 from melkati/Battery-refactory - - Battery refactory - -commit e9cf17c364328fb57f25ccf3fe3119255e4616d0 -Merge: 081b45a 2719ba2 -Author: Mariete -Date: Sat Oct 16 12:04:57 2021 +0200 - - Merge pull request #2 from melkati/Battery-refactory - - Battery refactory - -commit f41f744c563df82c28a3d7f3d132372e828f538a -Author: eMariete.com -Date: Sat Oct 16 12:04:00 2021 +0200 - - Battery refactory - -commit 2719ba2c40a3c954e160d7ac3172cb1e88ad41c7 -Author: eMariete.com -Date: Sat Oct 16 12:04:00 2021 +0200 - - Battery refactory - -commit 209a650bf8e7a269fcfa8c786e12eb0361bada45 -Merge: 1086d8a 73c356c -Author: eMariete.com -Date: Sat Oct 16 11:23:22 2021 +0200 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget into development - -commit 081b45a9afdc595fb257976215700c467d466d26 -Merge: 1086d8a 1e9d0c2 -Author: eMariete.com -Date: Sat Oct 16 11:23:22 2021 +0200 - - Merge branch 'master' of https://github.com/melkati/CO2-Gadget into development - -commit ab159b04a95f6f7bdea1ba5e42e09a49dcce40f6 -Author: eMariete.com -Date: Sat Oct 16 11:22:44 2021 +0200 - - Halfway - -commit d5cbb6d99d03d04fccbd78715d00aa861ec97d19 -Author: eMariete.com -Date: Sat Oct 16 11:22:44 2021 +0200 - - Halfway - -commit 1086d8a9335a05c7e41826f55588d767644c2966 -Author: eMariete.com -Date: Sat Oct 16 09:58:51 2021 +0200 - - Recovering - -commit 26f2f2640ab98e876ed8ba3011679d31b730dc04 -Author: eMariete.com -Date: Sat Oct 16 09:53:27 2021 +0200 - - Renamed CO2 Gadget.ino to CO2_Gadget.ino (Arduino IDE doesn't like space in name) - -commit ed365ed1498b65e07001d9e88aabaff76ef6293f -Author: eMariete.com -Date: Sat Oct 16 09:26:34 2021 +0200 - - Halfway - -commit 3f20a18ec10ffcae96777266f73746c897b424f7 -Author: eMariete.com -Date: Sat Oct 16 09:26:34 2021 +0200 - - Halfway - -commit 1c34f56f61da74bb569ef796973c70cd59f8d755 -Author: eMariete.com -Date: Fri Oct 15 21:11:50 2021 +0200 - - a medias - -commit fc7713b8d4f09414427681a80fd705380741d2d8 -Author: eMariete.com -Date: Fri Oct 15 21:11:50 2021 +0200 - - a medias - -commit 73c356c52ce1077737fced6f2c34d49736e1ebc3 -Merge: 29c7d38 6ded558 -Author: Mariete -Date: Fri Oct 15 13:12:12 2021 +0200 - - Merge pull request #1 from melkati/logomenu - - added eMariete Logo - -commit 1e9d0c27089874b44a6907edf943d245814006d7 -Merge: 29c7d38 6ded558 -Author: Mariete -Date: Fri Oct 15 13:12:12 2021 +0200 - - Merge pull request #1 from melkati/logomenu - - added eMariete Logo - -commit 6ded55812cc69e7f6bcceb2aab85691a717d3bf8 -Author: eMariete.com -Date: Fri Oct 15 13:08:41 2021 +0200 - - added eMariete Logo - -commit 6a31300b6cd2635cc50ce8c461b9ddb25eec73c2 -Author: eMariete.com -Date: Thu Oct 14 15:19:07 2021 +0200 - - Set TTGO_TDISPLAY=1 Use melkati/canairio_sensorlib - -commit 7e3c747520712bb38cb560b9fcbc200a1e54ee75 -Author: eMariete.com -Date: Thu Oct 14 11:33:34 2021 +0200 - - sensorslib first implemented - -commit 24b97c98aba83058f7eb7987e35849cce8852a16 -Author: eMariete.com -Date: Thu Oct 14 10:08:14 2021 +0200 - - Remote OLED skeleton - -commit 29c7d380cc4183269a0456b3878b2acb1b5932bf -Author: eMariete.com -Date: Thu Oct 14 09:31:55 2021 +0200 - - create development branch - -commit fb79666ab2f4fffbf395ebfde96dbaa13e78c8dd -Author: eMariete.com -Date: Thu Oct 14 08:59:32 2021 +0200 - - Renamed CO2 Gadget.ino to CO2_Gadget.ino (Arduino IDE doesn't like space in name) - -commit 2d46aa31c10e1dc8ff1d00d40d0bddd0a15273ca -Author: eMariete.com -Date: Wed Oct 13 20:15:53 2021 +0200 - - first commit From 13bef42d8e865b3e64a616db907b736837013fdf Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Sun, 4 Feb 2024 10:33:07 +0100 Subject: [PATCH 30/83] Fix display main screen while waiting for Improv-WiFi Add timeToWaitForImprov variable to menuLoop() function --- CO2_Gadget_Menu.h | 6 +++++- platformio.ini | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CO2_Gadget_Menu.h b/CO2_Gadget_Menu.h index 60d4c519..8d97e5e0 100644 --- a/CO2_Gadget_Menu.h +++ b/CO2_Gadget_Menu.h @@ -1002,6 +1002,7 @@ result idle(menuOut &o, idleEvent e) { } void menuLoop() { + uint16_t timeToWaitForImprov = 10; // Time to wait for Improv-WiFi to connect on startup if (Serial.available() && Serial.peek() == 0x2A) { // 0x2A is the '*' character. inMenu = true; if (inMenu) { @@ -1009,7 +1010,10 @@ void menuLoop() { } } - if (millis() < timeInitializationCompleted + 5000) { // Wait 10 seconds before starting the menu to avoid issues with Improv-WiFi + if (millis() < timeInitializationCompleted + timeToWaitForImprov * 1000) { // Wait before starting the menu to avoid issues with Improv-WiFi +#if defined(SUPPORT_TFT) || defined(SUPPORT_OLED) + displayShowValues(); +#endif return; } diff --git a/platformio.ini b/platformio.ini index c1921dd7..af69bdd0 100644 --- a/platformio.ini +++ b/platformio.ini @@ -58,7 +58,7 @@ build_flags = -D MQTT_BROKER_SERVER="\"192.168.1.145"\" -D CO2_GADGET_VERSION="\"0.9."\" - -D CO2_GADGET_REV="\"010"\" + -D CO2_GADGET_REV="\"011"\" -D CORE_DEBUG_LEVEL=0 -DNEOPIXEL_PIN=26 ; Pinnumber for button for down/next and back / exit actions -DNEOPIXEL_COUNT=16 ; How many neopixels to control From 0c51be05a174665ea83c9406fd4c1a40b372bce6 Mon Sep 17 00:00:00 2001 From: Coscolin Date: Sun, 4 Feb 2024 12:19:45 +0100 Subject: [PATCH 31/83] Dar formato al documento con Shift + Alt + F --- CO2_Gadget_Buzzer.h | 55 ++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/CO2_Gadget_Buzzer.h b/CO2_Gadget_Buzzer.h index dcffaef3..4c1d52e9 100644 --- a/CO2_Gadget_Buzzer.h +++ b/CO2_Gadget_Buzzer.h @@ -25,30 +25,29 @@ void wakeUpDisplay() { return; } -void buzzerRedRange(){ - if(co2>co2RedRange){ +void buzzerRedRange() { + if (co2 > co2RedRange) { Serial.println("[BUZZ] Buzzer RED range"); - tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); - delay(durationBuzzerBeep*1.3); - tone(BUZZER_PIN, toneBuzzerBeep+250+co2 , durationBuzzerBeep); - delay(durationBuzzerBeep*1.3); - tone(BUZZER_PIN, toneBuzzerBeep+500+co2 , durationBuzzerBeep); + tone(BUZZER_PIN, toneBuzzerBeep + co2, durationBuzzerBeep); + delay(durationBuzzerBeep * 1.3); + tone(BUZZER_PIN, toneBuzzerBeep + 250 + co2, durationBuzzerBeep); + delay(durationBuzzerBeep * 1.3); + tone(BUZZER_PIN, toneBuzzerBeep + 500 + co2, durationBuzzerBeep); } } -void buzzerOrangeRange(){ - if(co2>co2OrangeRange){ +void buzzerOrangeRange() { + if (co2 > co2OrangeRange) { Serial.println("[BUZZ] Buzzer ORANGE range"); - tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); - delay(durationBuzzerBeep*1.3); - tone(BUZZER_PIN, toneBuzzerBeep+co2 , durationBuzzerBeep); + tone(BUZZER_PIN, toneBuzzerBeep + co2, durationBuzzerBeep); + delay(durationBuzzerBeep * 1.3); + tone(BUZZER_PIN, toneBuzzerBeep + co2, durationBuzzerBeep); } } -void buzzerLoop(){ - - if(!activeBuzzer || inMenu){ // Inside Menu OR activeBuzzer=OFF stop BEEPING - if(buzz_red.active() || buzz_orange.active()){ +void buzzerLoop() { + if (!activeBuzzer || inMenu) { // Inside Menu OR activeBuzzer=OFF stop BEEPING + if (buzz_red.active() || buzz_orange.active()) { noTone(BUZZER_PIN); buzz_red.detach(); buzz_orange.detach(); @@ -58,29 +57,33 @@ void buzzerLoop(){ return; } - if(co2>co2RedRange && belowRedRange){ + if (co2 > co2RedRange && belowRedRange) { wakeUpDisplay(); buzz_orange.detach(); belowOrangeRange = true; - if(repeatBuzzer) buzz_red.attach(timeBetweenBuzzerBeep, buzzerRedRange); - else buzz_red.once(0, buzzerRedRange); + if (repeatBuzzer) + buzz_red.attach(timeBetweenBuzzerBeep, buzzerRedRange); + else + buzz_red.once(0, buzzerRedRange); belowRedRange = false; return; - } else if(co2 < (co2RedRange - BUZZER_HYSTERESIS)){ + } else if (co2 < (co2RedRange - BUZZER_HYSTERESIS)) { buzz_red.detach(); belowRedRange = true; - } + } - if(co2co2OrangeRange && belowOrangeRange){ + if (co2 < co2RedRange && co2 > co2OrangeRange && belowOrangeRange) { wakeUpDisplay(); - if(repeatBuzzer) buzz_orange.attach(timeBetweenBuzzerBeep, buzzerOrangeRange); - else buzz_orange.once(0, buzzerOrangeRange); + if (repeatBuzzer) + buzz_orange.attach(timeBetweenBuzzerBeep, buzzerOrangeRange); + else + buzz_orange.once(0, buzzerOrangeRange); belowOrangeRange = false; return; - } else if(co2 < (co2OrangeRange - BUZZER_HYSTERESIS)){ + } else if (co2 < (co2OrangeRange - BUZZER_HYSTERESIS)) { buzz_orange.detach(); belowOrangeRange = true; - } + } return; } From 9ce8ba4d24d2ee81ec9c643530ddd02a5e0ba5d6 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Sun, 4 Feb 2024 12:38:42 +0100 Subject: [PATCH 32/83] Add popup to display a saving message in preferences.html --- CO2_Gadget_Menu.h | 2 +- data/preferences.html | 19 +++++++++++++++++++ data/style.css | 37 ++++++++++++++++++++++++++++++++++++- platformio.ini | 2 +- 4 files changed, 57 insertions(+), 3 deletions(-) diff --git a/CO2_Gadget_Menu.h b/CO2_Gadget_Menu.h index 8d97e5e0..3970b520 100644 --- a/CO2_Gadget_Menu.h +++ b/CO2_Gadget_Menu.h @@ -1002,7 +1002,7 @@ result idle(menuOut &o, idleEvent e) { } void menuLoop() { - uint16_t timeToWaitForImprov = 10; // Time to wait for Improv-WiFi to connect on startup + uint16_t timeToWaitForImprov = 5; // Time to wait for Improv-WiFi to connect on startup if (Serial.available() && Serial.peek() == 0x2A) { // 0x2A is the '*' character. inMenu = true; if (inMenu) { diff --git a/data/preferences.html b/data/preferences.html index 96205728..ef060097 100644 --- a/data/preferences.html +++ b/data/preferences.html @@ -314,6 +314,10 @@

CO2 Gadget Preferences

+ + From 07f052edeb232a9d2ea69329cd71bb34de169d31 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:37:58 +0100 Subject: [PATCH 51/83] Check sprite creation in showCO2() Uses smaller sprite Minor display adjustaments --- CO2_Gadget_Sensors.h | 3 ++ CO2_Gadget_TFT.h | 71 ++++++++++++++++++++++++++++++++++++++------ platformio.ini | 10 ++++--- 3 files changed, 71 insertions(+), 13 deletions(-) diff --git a/CO2_Gadget_Sensors.h b/CO2_Gadget_Sensors.h index 64adef54..3571892a 100644 --- a/CO2_Gadget_Sensors.h +++ b/CO2_Gadget_Sensors.h @@ -15,6 +15,7 @@ bool autoSelfCalibration = false; float tempOffset = 0.0f; volatile uint16_t co2 = 0; +volatile uint16_t previousCO2Value = 0; float temp, tempFahrenheit, hum = 0; String mainDeviceSelected = ""; @@ -38,6 +39,7 @@ void printSensorsDetected() { } void onSensorDataOk() { + previousCO2Value = co2; co2 = sensors.getCO2(); hum = sensors.getHumidity(); if (hum == 0.0) hum = sensors.getCO2humi(); @@ -48,6 +50,7 @@ void onSensorDataOk() { Serial.printf("-->[SENS] CO2: %d CO2humi: %.2f CO2temp: %.2f H: %.2f T: %.2f\n", co2, sensors.getCO2humi(), sensors.getCO2temp(), sensors.getHumidity(), sensors.getTemperature()); } newReadingsAvailable = true; + // Serial.printf("-->[SENS] Free heap: %d\n", ESP.getFreeHeap()); } void onSensorDataError(const char *msg) { Serial.println(msg); } diff --git a/CO2_Gadget_TFT.h b/CO2_Gadget_TFT.h index db668573..74b501f3 100644 --- a/CO2_Gadget_TFT.h +++ b/CO2_Gadget_TFT.h @@ -86,6 +86,7 @@ struct ElementLocations { int32_t co2X; int32_t co2Y; u_int16_t co2FontDigitsHeight; + u_int16_t pixelsToBaseline; int32_t co2UnitsX; int32_t co2UnitsY; int32_t tempX; @@ -113,8 +114,9 @@ ElementLocations elementPosition; void setElementLocations() { if (displayWidth == 240 && displayHeight == 135) { // TTGO T-Display and similar elementPosition.co2X = displayWidth - 32; - elementPosition.co2Y = displayHeight - 38; - elementPosition.co2FontDigitsHeight = 70; // Digits (0..9) height for the font used (not the same as whole font height) + elementPosition.co2Y = displayHeight - 33; + elementPosition.co2FontDigitsHeight = 70; // Digits (0..9) height for the font used (not the same as whole font height) + elementPosition.pixelsToBaseline = 18; // Pixels bellow baseline (p.ej "y" in "y" or "g" in "g" they draw bellow the baseline)) elementPosition.co2UnitsX = displayWidth - 33; elementPosition.co2UnitsY = displayHeight - 50; elementPosition.tempX = 1; @@ -137,8 +139,9 @@ void setElementLocations() { if (displayWidth == 320 && displayHeight == 170) { // T-Display-S3 and similar elementPosition.co2X = displayWidth - 33; - elementPosition.co2Y = displayHeight - 38; - elementPosition.co2FontDigitsHeight = 100; // Digits (0..9) height for the font used (not the same as whole font height) + elementPosition.co2Y = displayHeight - 33; + elementPosition.co2FontDigitsHeight = 100; + elementPosition.pixelsToBaseline = 20; elementPosition.co2UnitsX = displayWidth - 33; elementPosition.co2UnitsY = displayHeight - 50; elementPosition.tempX = 1; @@ -162,9 +165,10 @@ void setElementLocations() { if (displayWidth == 320 && displayHeight == 240) { // ST7789_240x320 and similar elementPosition.co2X = displayWidth - 33; elementPosition.co2Y = displayHeight - 108; - elementPosition.co2FontDigitsHeight = 100; // Digits (0..9) height for the font used (not the same as whole font height) + elementPosition.co2FontDigitsHeight = 100; + elementPosition.pixelsToBaseline = 20; elementPosition.co2UnitsX = displayWidth - 33; - elementPosition.co2UnitsY = displayHeight - 120; + elementPosition.co2UnitsY = displayHeight - 130; elementPosition.tempX = 1; elementPosition.tempY = displayHeight - 25; elementPosition.humidityX = displayWidth - 60; @@ -529,7 +533,7 @@ uint16_t getCO2Color(uint16_t co2) { return color; } -void showCO2(uint16_t co2, int32_t posX, int32_t posY) { +void OLDshowCO2(uint16_t co2, int32_t posX, int32_t posY, uint16_t pixelsToBaseline) { if (co2 > 9999) co2 = 9999; spr.loadFont(BIG_FONT); @@ -539,7 +543,12 @@ void showCO2(uint16_t co2, int32_t posX, int32_t posY) { uint16_t posSpriteY = posY - height; if (posSpriteX < 0) posSpriteX = 0; if (posSpriteY < 0) posSpriteY = 0; - spr.createSprite(width, height); + if (spr.createSprite(width, height) == nullptr) { + Serial.printf("-->[TFT ] Error: sprite not created, not enough free RAM! Free RAM: %d\n", ESP.getFreeHeap()); + spr.unloadFont(); + spr.deleteSprite(); + return; + } // spr.drawRect(0, 0, width, height, TFT_WHITE); spr.setTextColor(getCO2Color(co2), TFT_BLACK); spr.setTextDatum(TR_DATUM); @@ -549,6 +558,50 @@ void showCO2(uint16_t co2, int32_t posX, int32_t posY) { spr.deleteSprite(); } +void showCO2(uint16_t co2, int32_t posX, int32_t posY, uint16_t pixelsToBaseline) { + if ((co2 == previousCO2Value) || (co2 == 0) || (co2 > 9999)) return; + + spr.loadFont(BIG_FONT); + uint16_t digitWidth = spr.textWidth("0"); + uint16_t height = spr.fontHeight() - pixelsToBaseline; + uint16_t totalWidth = digitWidth * 4; // Four digits + uint16_t posSpriteY = posY - height; + uint16_t color = getCO2Color(co2); + if (posSpriteY < 0) posSpriteY = 0; + spr.createSprite(digitWidth, height); + if (spr.createSprite(digitWidth, height) == nullptr) { + Serial.printf("-->[TFT ] Error: sprite not created, not enough free RAM! Free RAM: %d\n", ESP.getFreeHeap()); + spr.unloadFont(); + spr.deleteSprite(); + return; + } + spr.setTextColor(color, TFT_BLACK); + spr.setTextDatum(TR_DATUM); + + // Store the last CO2 digits in an array + uint8_t lastCO2ValueDigits[4]; + uint16_t previousCO2Value = previousCO2Value; + for (int i = 0; i < 4; ++i) { + lastCO2ValueDigits[i] = previousCO2Value % 10; + previousCO2Value /= 10; + } + + for (int i = 0; i < 4; ++i) { + uint16_t digit = co2 % 10; // Get the rightmost digit + co2 /= 10; // Move to the next digit + + // if (digit == lastCO2ValueDigits[i]) continue; // Skip if the digit is equal to the corresponding digit of previousCO2Value + spr.fillSprite(TFT_BLACK); + spr.drawNumber(digit, digitWidth, 0); + uint16_t posSpriteX = posX - totalWidth + digitWidth * (3 - i); // Calculate X position for the sprite + if (posSpriteX < 0) posSpriteX = 0; + spr.pushSprite(posSpriteX, posSpriteY); + } + + spr.deleteSprite(); // Clear sprite memory + spr.unloadFont(); +} + void showCO2units(int32_t posX, int32_t posY) { spr.loadFont(MINI_FONT); spr.setTextColor(getCO2Color(co2), TFT_BLACK); @@ -559,7 +612,7 @@ void showCO2units(int32_t posX, int32_t posY) { void displayShowValues() { uint8_t currentDatum = tft.getTextDatum(); - showCO2(co2, elementPosition.co2X, elementPosition.co2Y); + showCO2(co2, elementPosition.co2X, elementPosition.co2Y, elementPosition.pixelsToBaseline); showCO2units(elementPosition.co2UnitsX, elementPosition.co2UnitsY); showTemperature(temp, elementPosition.tempX, elementPosition.tempY); showHumidity(hum, elementPosition.humidityX, elementPosition.humidityY); diff --git a/platformio.ini b/platformio.ini index 2185eb73..23c06997 100644 --- a/platformio.ini +++ b/platformio.ini @@ -25,7 +25,7 @@ monitor_speed = 115200 monitor_port = COM12 upload_port = COM12 monitor_filters = time, esp32_exception_decoder -board_build.partitions = CO2_Gadget_Partitions-no_ota.csv ; Others at Windows at C:\Users\%USER%\AppData\Local\Arduino15\packages\esp32\hardware\esp32\1.0.5\tools\partitions +board_build.partitions = CO2_Gadget_Partitions-no_ota.csv ; Others in Windows at C:\Users\%USER%\AppData\Local\Arduino15\packages\esp32\hardware\esp32\1.0.5\tools\partitions build_cache_dir = .pio/build extra_scripts = lib_ldf_mode = chain+ @@ -59,7 +59,7 @@ build_flags = -D MQTT_BROKER_SERVER="\"192.168.1.145"\" -D CO2_GADGET_VERSION="\"0.9."\" - -D CO2_GADGET_REV="\"021-development"\" + -D CO2_GADGET_REV="\"025-fix-issue-145"\" -D CORE_DEBUG_LEVEL=0 -DCACHE_DIR=".pio/build" -DNEOPIXEL_PIN=26 ; Pinnumber for button for down/next and back / exit actions @@ -323,8 +323,10 @@ lib_deps = ${common_env_data.lib_deps} build_flags = ${common_env_data.build_flags} - -DBTN_UP=15 + -DBTN_UP=2 -DBTN_DWN=0 + -DUART_RX_GPIO=15 ; Override default pin for PMS RX + -DUART_TX_GPIO=14 ; Override default pin for PMS TX -UDUPPORT_MDNS -UDUPPORT_MQTT -UDUPPORT_MQTT_DISCOVERY @@ -342,7 +344,7 @@ build_flags = -DTFT_MOSI=23 -DTFT_SCLK=18 -DTFT_CS=5 - -DTFT_DC=4 + -DTFT_DC=16 -DTFT_RST=-1 -DTFT_BL=17 -DLOAD_GLCD=1 From 2407f8d2490d5f676fcb353c89996483db7f2359 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Fri, 9 Feb 2024 13:42:23 +0100 Subject: [PATCH 52/83] Disable debug serial printing --- CO2_Gadget_TFT.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CO2_Gadget_TFT.h b/CO2_Gadget_TFT.h index 74b501f3..1b7291a5 100644 --- a/CO2_Gadget_TFT.h +++ b/CO2_Gadget_TFT.h @@ -570,7 +570,7 @@ void showCO2(uint16_t co2, int32_t posX, int32_t posY, uint16_t pixelsToBaseline if (posSpriteY < 0) posSpriteY = 0; spr.createSprite(digitWidth, height); if (spr.createSprite(digitWidth, height) == nullptr) { - Serial.printf("-->[TFT ] Error: sprite not created, not enough free RAM! Free RAM: %d\n", ESP.getFreeHeap()); + // Serial.printf("-->[TFT ] Error: sprite not created, not enough free RAM! Free RAM: %d\n", ESP.getFreeHeap()); spr.unloadFont(); spr.deleteSprite(); return; From 2a00b10b04af821e8604e273958f6b61daebc17c Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Fri, 9 Feb 2024 14:28:55 +0100 Subject: [PATCH 53/83] Add buzzer pin and buzzer hysteresis to platformio.ini --- platformio.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 98e67323..1cfc314a 100644 --- a/platformio.ini +++ b/platformio.ini @@ -62,6 +62,7 @@ build_flags = -D CO2_GADGET_REV="\"025-feature-buzzer"\" -D CORE_DEBUG_LEVEL=0 -DCACHE_DIR=".pio/build" + -DBUZZER_PIN=13 ; ESP32 pin GPIO13 connected to piezo buzzer -DNEOPIXEL_PIN=26 ; Pinnumber for button for down/next and back / exit actions -DNEOPIXEL_COUNT=16 ; How many neopixels to control ; -DENABLE_PIN=27 ; Reserved for the future to enable the sensor @@ -77,6 +78,7 @@ build_flags = -DGREEN_PIN_LOW=0 -DGREEN_PIN_HIGH=1 ; Should the GREEN_PIN_HIGH go high or low bellow orange threshold -DPIN_HYSTERESIS=100 ; Hysteresis PPM to avoid pins going ON and OFF continuously. TODO : Minimum time to switch + -DBUZZER_HYSTERESIS=50 ; Hysteresis PPM to avoid BUZZER ON and OFF -DWIFI_PRIVACY ; Comment to show WiFi password in serial and the menu (intended for debugging) -DSUPPORT_BLE ; Comment to dissable Bluetooth (makes more memory available) -DSUPPORT_BUZZER ; @@ -323,7 +325,7 @@ lib_deps = bodmer/TFT_eSPI @ ^2.5.34 ${common_env_data.lib_deps} build_flags = - ${common_env_data.build_flags} + ${common_env_data.build_flags} -DBTN_UP=2 -DBTN_DWN=0 -DUART_RX_GPIO=15 ; Override default pin for PMS RX From b6263096ca7e60356693d18648204be98ac12ec6 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:07:08 +0100 Subject: [PATCH 54/83] Improve debug information --- CO2_Gadget_Buzzer.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CO2_Gadget_Buzzer.h b/CO2_Gadget_Buzzer.h index b64de312..fb75be25 100644 --- a/CO2_Gadget_Buzzer.h +++ b/CO2_Gadget_Buzzer.h @@ -13,19 +13,19 @@ bool belowRedRange = true; void beepBuzzer() { static uint16_t numberOfBeepsLeft = 2; static uint64_t timeNextBeep = 0; -#ifdef BUZZER_DEBUG - Serial.println("[BUZZ] Buzzer beeping..."); -#endif if (millis() > timeNextBeep) { - Serial.printf("[BUZZ] Beep %d\n", numberOfBeepsLeft); if (numberOfBeepsLeft == 0) { - if (timeBetweenBuzzerBeep > 0) - timeNextBeep = millis() + timeBetweenBuzzerBeep * 1000; - else + if (timeBetweenBuzzerBeeps > 0) { + timeNextBeep = millis() + timeBetweenBuzzerBeeps * 1000; + } else { belowRedRange = false; + } numberOfBeepsLeft = 2; buzzerBeeping = false; } else { +#ifdef BUZZER_DEBUG + Serial.printf("[BUZZ] Beeps left: %d. Next beep in: %d sec. Beep duration: %d ms\n", numberOfBeepsLeft, timeBetweenBuzzerBeeps, durationBuzzerBeep); +#endif tone(BUZZER_PIN, toneBuzzerBeep, durationBuzzerBeep); timeNextBeep = millis() + durationBuzzerBeep + (durationBuzzerBeep * 1.3); --numberOfBeepsLeft; @@ -36,7 +36,7 @@ void beepBuzzer() { void buzzerLoop() { #ifdef SUPPORT_BUZZER - if (timeBetweenBuzzerBeep == -1 || inMenu) { // Inside Menu OR activeBuzzer=OFF stop BEEPING + if (timeBetweenBuzzerBeeps == -1 || inMenu) { // Inside Menu OR activeBuzzer=OFF stop BEEPING buzzerBeeping = false; belowRedRange = true; return; From 17fbd40bcd9e5417a9dd6be8ea2c22637e63fc7c Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:08:51 +0100 Subject: [PATCH 55/83] Modify repeat "Each x sec" to "Every x sec" for buzzer options --- CO2_Gadget_Menu.h | 16 ++++++++-------- data/preferences.html | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CO2_Gadget_Menu.h b/CO2_Gadget_Menu.h index fc14eb4c..6a61f0c5 100644 --- a/CO2_Gadget_Menu.h +++ b/CO2_Gadget_Menu.h @@ -744,16 +744,16 @@ MENU(outputsConfigMenu, "Outputs Config", doNothing, noEvent, wrapStyle ,EXIT("CO2 Gadget Preferences @@ -164,7 +164,7 @@

CO2 Gadget Preferences

- +
From 837b8a3e4740046f7cc2a18d48e706b27cb94822 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Fri, 9 Feb 2024 15:09:18 +0100 Subject: [PATCH 56/83] Rename timeBetweenBuzzerBeep variable name to timeBetweenBuzzerBeeps --- CO2_Gadget.ino | 2 +- CO2_Gadget_Preferences.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CO2_Gadget.ino b/CO2_Gadget.ino index f760a089..9b964d54 100644 --- a/CO2_Gadget.ino +++ b/CO2_Gadget.ino @@ -86,7 +86,7 @@ bool activeBuzzer = true; bool repeatBuzzer = true; uint16_t toneBuzzerBeep = BUZZER_TONE_MED; uint16_t durationBuzzerBeep = DURATION_BEEP_MEDIUM; -uint16_t timeBetweenBuzzerBeep = 10; +uint16_t timeBetweenBuzzerBeeps = 10; uint8_t channelESPNow = 1; uint16_t boardIdESPNow = 0; diff --git a/CO2_Gadget_Preferences.h b/CO2_Gadget_Preferences.h index 2acf3e55..99e4f494 100644 --- a/CO2_Gadget_Preferences.h +++ b/CO2_Gadget_Preferences.h @@ -63,7 +63,7 @@ void printPreferences() { // Buzzer preferences Serial.printf("-->[PREF] toneBuzzerBeep is:\t#%d#\n", toneBuzzerBeep); Serial.printf("-->[PREF] durationBuzzerBeep is:\t#%d#\n", durationBuzzerBeep); - Serial.printf("-->[PREF] timeBetweenBuzzerBeep is:\t#%d#\n", timeBetweenBuzzerBeep); + Serial.printf("-->[PREF] timeBetweenBuzzerBeeps is:\t#%d#\n", timeBetweenBuzzerBeeps); Serial.printf("-->[PREF] \n"); } @@ -154,7 +154,7 @@ void initPreferences() { // Retrieve buzzer preferences toneBuzzerBeep = preferences.getUInt("toneBzrBeep", BUZZER_TONE_MED); // Frequency of the buzzer beep durationBuzzerBeep = preferences.getUInt("durBzrBeep", DURATION_BEEP_MEDIUM); // Duration of the buzzer beep - timeBetweenBuzzerBeep = preferences.getInt("timeBtwnBzr", 10); // Time between consecutive beeps + timeBetweenBuzzerBeeps = preferences.getInt("timeBtwnBzr", 10); // Time between consecutive beeps rootTopic.trim(); mqttClientId.trim(); @@ -234,7 +234,7 @@ void putPreferences() { // Buzzer preferences preferences.putUInt("toneBzrBeep", toneBuzzerBeep); // Buzzer frequency preferences.putUInt("durBzrBeep", durationBuzzerBeep); // Buzzer duration - preferences.putInt("timeBtwnBzr", timeBetweenBuzzerBeep); // Time between beeps + preferences.putInt("timeBtwnBzr", timeBetweenBuzzerBeeps); // Time between beeps preferences.end(); } @@ -366,7 +366,7 @@ String getActualSettingsAsJson() { // Buzzer preferences doc["toneBzrBeep"] = toneBuzzerBeep; // Buzzer frequency doc["durBzrBeep"] = durationBuzzerBeep; // Buzzer duration - doc["timeBtwnBzr"] = timeBetweenBuzzerBeep; // Time between beeps + doc["timeBtwnBzr"] = timeBetweenBuzzerBeeps; // Time between beeps String preferencesJson; serializeJson(doc, preferencesJson); @@ -460,7 +460,7 @@ bool handleSavePreferencesfromJSON(String jsonPreferences) { // Buzzer preferences toneBuzzerBeep = JsonDocument["toneBzrBeep"]; // Buzzer frequency durationBuzzerBeep = JsonDocument["durBzrBeep"]; // Buzzer duration - timeBetweenBuzzerBeep = JsonDocument["timeBtwnBzr"]; // Time between beeps + timeBetweenBuzzerBeeps = JsonDocument["timeBtwnBzr"]; // Time between beeps // mqttPass = JsonDocument["mqttPass"].as().c_str(); // wifiPass = JsonDocument["wifiPass"].as().c_str(); From ca39c3d859797c139c141f71ea59be57d16c027f Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Fri, 9 Feb 2024 20:00:40 +0100 Subject: [PATCH 57/83] Rename timeBetweenBuzzerBeep variable name to timeBetweenBuzzerBeeps --- CO2_Gadget.ino | 2 +- CO2_Gadget_Preferences.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CO2_Gadget.ino b/CO2_Gadget.ino index f760a089..9b964d54 100644 --- a/CO2_Gadget.ino +++ b/CO2_Gadget.ino @@ -86,7 +86,7 @@ bool activeBuzzer = true; bool repeatBuzzer = true; uint16_t toneBuzzerBeep = BUZZER_TONE_MED; uint16_t durationBuzzerBeep = DURATION_BEEP_MEDIUM; -uint16_t timeBetweenBuzzerBeep = 10; +uint16_t timeBetweenBuzzerBeeps = 10; uint8_t channelESPNow = 1; uint16_t boardIdESPNow = 0; diff --git a/CO2_Gadget_Preferences.h b/CO2_Gadget_Preferences.h index 2acf3e55..58434609 100644 --- a/CO2_Gadget_Preferences.h +++ b/CO2_Gadget_Preferences.h @@ -63,7 +63,7 @@ void printPreferences() { // Buzzer preferences Serial.printf("-->[PREF] toneBuzzerBeep is:\t#%d#\n", toneBuzzerBeep); Serial.printf("-->[PREF] durationBuzzerBeep is:\t#%d#\n", durationBuzzerBeep); - Serial.printf("-->[PREF] timeBetweenBuzzerBeep is:\t#%d#\n", timeBetweenBuzzerBeep); + Serial.printf("-->[PREF] timeBetweenBuzzerBeeps is:\t#%d#\n", timeBetweenBuzzerBeeps); Serial.printf("-->[PREF] \n"); } @@ -154,7 +154,7 @@ void initPreferences() { // Retrieve buzzer preferences toneBuzzerBeep = preferences.getUInt("toneBzrBeep", BUZZER_TONE_MED); // Frequency of the buzzer beep durationBuzzerBeep = preferences.getUInt("durBzrBeep", DURATION_BEEP_MEDIUM); // Duration of the buzzer beep - timeBetweenBuzzerBeep = preferences.getInt("timeBtwnBzr", 10); // Time between consecutive beeps + timeBetweenBuzzerBeeps = preferences.getInt("timeBtwnBzr", 10); // Time between consecutive beeps rootTopic.trim(); mqttClientId.trim(); @@ -234,7 +234,7 @@ void putPreferences() { // Buzzer preferences preferences.putUInt("toneBzrBeep", toneBuzzerBeep); // Buzzer frequency preferences.putUInt("durBzrBeep", durationBuzzerBeep); // Buzzer duration - preferences.putInt("timeBtwnBzr", timeBetweenBuzzerBeep); // Time between beeps + preferences.putInt("timeBtwnBzr", timeBetweenBuzzerBeeps); // Time between beeps preferences.end(); } @@ -366,7 +366,7 @@ String getActualSettingsAsJson() { // Buzzer preferences doc["toneBzrBeep"] = toneBuzzerBeep; // Buzzer frequency doc["durBzrBeep"] = durationBuzzerBeep; // Buzzer duration - doc["timeBtwnBzr"] = timeBetweenBuzzerBeep; // Time between beeps + doc["timeBtwnBzr"] = timeBetweenBuzzerBeeps; // Time between beeps String preferencesJson; serializeJson(doc, preferencesJson); @@ -460,7 +460,7 @@ bool handleSavePreferencesfromJSON(String jsonPreferences) { // Buzzer preferences toneBuzzerBeep = JsonDocument["toneBzrBeep"]; // Buzzer frequency durationBuzzerBeep = JsonDocument["durBzrBeep"]; // Buzzer duration - timeBetweenBuzzerBeep = JsonDocument["timeBtwnBzr"]; // Time between beeps + timeBetweenBuzzerBeeps = JsonDocument["timeBtwnBzr"]; // Time between beeps // mqttPass = JsonDocument["mqttPass"].as().c_str(); // wifiPass = JsonDocument["wifiPass"].as().c_str(); From 08cfa02ff376a540ad28bb85efc150d2d7b53576 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Fri, 9 Feb 2024 20:02:32 +0100 Subject: [PATCH 58/83] Update buzzer beep duration options --- data/preferences.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/preferences.html b/data/preferences.html index 4ba44baf..cf40fcd0 100644 --- a/data/preferences.html +++ b/data/preferences.html @@ -155,8 +155,8 @@

CO2 Gadget Preferences

From 4dbd37ce61c876f4e4702c317a8a91ba41910a0f Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Fri, 9 Feb 2024 20:03:08 +0100 Subject: [PATCH 59/83] Move buzzer menu inside outputs menu --- CO2_Gadget_Menu.h | 28 ++++++++++++---------------- platformio.ini | 2 +- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/CO2_Gadget_Menu.h b/CO2_Gadget_Menu.h index 6a61f0c5..984d7aaa 100644 --- a/CO2_Gadget_Menu.h +++ b/CO2_Gadget_Menu.h @@ -68,7 +68,7 @@ result systemReboot() { // using the customized menu class // note that first parameter is the class name -altMENU(confirmReboot, subMenu, "Reboot?", doNothing, noEvent, wrapStyle, (Menu::_menuData | Menu::_canNav), OP("Yes", systemReboot, enterEvent), EXIT("Cancel")); +altMENU(confirmReboot, rebootMenu, "Reboot?", doNothing, noEvent, wrapStyle, (Menu::_menuData | Menu::_canNav), OP("Yes", systemReboot, enterEvent), EXIT("Cancel")); char tempIPAddress[16]; @@ -737,11 +737,6 @@ TOGGLE(outputsModeRelay, outputsModeMenu, "GPIO Outs: ", doNothing,noEvent, wrap ,VALUE("RGB LED", false, doSetOuputsRelayMode, anyEvent) ,VALUE("Relays", true, doSetOuputsRelayMode, anyEvent)); -MENU(outputsConfigMenu, "Outputs Config", doNothing, noEvent, wrapStyle - ,FIELD(neopixelBrightness, "Neopix Bright", "%", 0, 255, 5, 10, doSetNeopixelBrightness, anyEvent, noStyle) - ,SUBMENU(activeNeopixelTypeMenu) - ,SUBMENU(outputsModeMenu) - ,EXIT(" Date: Fri, 9 Feb 2024 20:14:39 +0100 Subject: [PATCH 60/83] Remove duplicate print statement in CO2_Gadget_Preferences.h --- CO2_Gadget_Preferences.h | 1 - 1 file changed, 1 deletion(-) diff --git a/CO2_Gadget_Preferences.h b/CO2_Gadget_Preferences.h index dcdf11dd..58434609 100644 --- a/CO2_Gadget_Preferences.h +++ b/CO2_Gadget_Preferences.h @@ -64,7 +64,6 @@ void printPreferences() { Serial.printf("-->[PREF] toneBuzzerBeep is:\t#%d#\n", toneBuzzerBeep); Serial.printf("-->[PREF] durationBuzzerBeep is:\t#%d#\n", durationBuzzerBeep); Serial.printf("-->[PREF] timeBetweenBuzzerBeeps is:\t#%d#\n", timeBetweenBuzzerBeeps); - Serial.printf("-->[PREF] timeBetweenBuzzerBeeps is:\t#%d#\n", timeBetweenBuzzerBeeps); Serial.printf("-->[PREF] \n"); } From 2deb671f750e05005c725942d847c8da1e4d8809 Mon Sep 17 00:00:00 2001 From: Mario Mariete <11509521+melkati@users.noreply.github.com> Date: Fri, 9 Feb 2024 20:35:05 +0100 Subject: [PATCH 61/83] Change timeBtwnBzr from -1 to 65535 for OFF state --- data/preferences.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/preferences.html b/data/preferences.html index cf40fcd0..e06a644d 100644 --- a/data/preferences.html +++ b/data/preferences.html @@ -134,7 +134,7 @@

CO2 Gadget Preferences