From abbe6296eaf8c86f5979182793bfab8eed9f8058 Mon Sep 17 00:00:00 2001 From: proddy Date: Fri, 17 Jul 2020 20:25:59 +0200 Subject: [PATCH] removed --- TODO.md | 3 - lib/rtcvars/LICENSE | 21 ----- lib/rtcvars/RTCVars.cpp | 193 ---------------------------------------- lib/rtcvars/RTCVars.h | 51 ----------- 4 files changed, 268 deletions(-) delete mode 100644 TODO.md delete mode 100644 lib/rtcvars/LICENSE delete mode 100644 lib/rtcvars/RTCVars.cpp delete mode 100644 lib/rtcvars/RTCVars.h diff --git a/TODO.md b/TODO.md deleted file mode 100644 index 4b1701163..000000000 --- a/TODO.md +++ /dev/null @@ -1,3 +0,0 @@ -- change EMS Devices Web page to use web sockets to show specific Devices data underneath table -- check if we need to disabled UART during OTA on an ESP8266 - need to tie into the service -- fix Makefile for standalone diff --git a/lib/rtcvars/LICENSE b/lib/rtcvars/LICENSE deleted file mode 100644 index 88d63d1dc..000000000 --- a/lib/rtcvars/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2019 highno - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/lib/rtcvars/RTCVars.cpp b/lib/rtcvars/RTCVars.cpp deleted file mode 100644 index 4a6831998..000000000 --- a/lib/rtcvars/RTCVars.cpp +++ /dev/null @@ -1,193 +0,0 @@ -// https://github.com/highno/rtcvars - -#if defined(ESP8266) - -#include "Arduino.h" -#include "RTCVars.h" - -#define RTC_BASE 28 // this is a known good offset for unused RTC memory -#define RTC_STATE_HEADER_SIZE 6 // 3 bytes signature, 1 byte state_id, 2 byte -#define RTC_MAX_SIZE (511 - RTC_BASE) // 512 - RTC_BASE - 1 for checksum - -#define RTC_STATE_TYPE_NONE 0 -#define RTC_STATE_TYPE_INT 1 -#define RTC_STATE_TYPE_LONG 2 -#define RTC_STATE_TYPE_FLOAT 3 -#define RTC_STATE_TYPE_BYTE 4 -#define RTC_STATE_TYPE_CHAR 5 -#define RTC_STATE_TYPE_BOOL 6 - -RTCVars::RTCVars() { - _state_size = RTC_STATE_HEADER_SIZE; - _state_variables_counter = 0; - _state_id = 0; - _last_read_state_id = RTC_STATE_ID_INVALID; - _last_read_status = RTC_OK; -} - -bool RTCVars::registerVar(char * v) { - return _checkAndReserve((uintptr_t)v, RTC_STATE_TYPE_CHAR); -} - -bool RTCVars::registerVar(byte * v) { - return _checkAndReserve((uintptr_t)v, RTC_STATE_TYPE_BYTE); -} - -bool RTCVars::registerVar(int * v) { - return _checkAndReserve((uintptr_t)v, RTC_STATE_TYPE_INT); -} - -bool RTCVars::registerVar(long * v) { - return _checkAndReserve((uintptr_t)v, RTC_STATE_TYPE_LONG); -} - -bool RTCVars::registerVar(float * v) { - return _checkAndReserve((uintptr_t)v, RTC_STATE_TYPE_FLOAT); -} - -bool RTCVars::registerVar(bool * v) { - return _checkAndReserve((uintptr_t)v, RTC_STATE_TYPE_BOOL); -} - -bool RTCVars::_checkAndReserve(uintptr_t v, byte type_of_var) { - // check if there is enough room for this var - if ((_state_variables_counter >= RTC_MAX_VARIABLES) || (_state_variable_size[type_of_var] + _state_size >= RTC_MAX_SIZE)) - return false; - // keep the pointer to the var - _state_variables_ptr[_state_variables_counter] = v; - // keep the type of var so we copy the correct number of bytes - _state_variables_type[_state_variables_counter] = type_of_var; - // remove these bytes from the free mem counter - _state_size += _state_variable_size[type_of_var]; - // up to the next one - _state_variables_counter++; - return true; -} - -bool RTCVars::saveToRTC() { - unsigned char buf[_state_size + 1]; - int p = RTC_STATE_HEADER_SIZE; - int s = 0; - - // migic bytes signature - buf[0] = 'M'; - buf[1] = 'G'; - buf[2] = 'C'; - buf[3] = _state_id; - buf[4] = (unsigned char)((_state_size >> 8) & 0xff); - buf[5] = (unsigned char)(_state_size & 0xff); - - // copy the values from the local variables' memory places into buffer - for (int i = 0; i < _state_variables_counter; i++) { - s = _state_variable_size[_state_variables_type[i]]; - memcpy(&buf[p], reinterpret_cast(_state_variables_ptr[i]), s); - p += s; - } - - buf[_state_size] = 0; - for (int j = 0; j < _state_size; j++) { - buf[_state_size] += buf[j]; // simple checksum - } - return ESP.rtcUserMemoryWrite(RTC_BASE, (uint32_t *)&buf, _state_size + 1); -} - -bool RTCVars::loadFromRTC() { - if (!_checkValidRTCData()) - return false; - _last_read_status = RTC_ERROR_READING_FAILED; - unsigned char buf[_state_size + 1]; - if (!ESP.rtcUserMemoryRead(RTC_BASE, (uint32_t *)&buf, _state_size + 1)) - return false; - - // check if state id is ok - _last_read_status = RTC_ERROR_STATE_ID; - if (_last_read_state_id != _state_id) - return false; - // finally check if state sizes are equal - _last_read_status = RTC_ERROR_SIZE; - int size_in_rtc = (int)(buf[4] * 256 + buf[5]); - if (size_in_rtc != _state_size) - return false; - - // copy the values into the local variables' memory places - _last_read_status = RTC_ERROR_OTHER; - int p = RTC_STATE_HEADER_SIZE; - int s = 0; - for (int i = 0; i < _state_variables_counter; i++) { - s = _state_variable_size[_state_variables_type[i]]; - memcpy(reinterpret_cast(_state_variables_ptr[i]), &buf[p], s); - p += s; - } - _last_read_status = RTC_OK; - return true; -} - -bool RTCVars::_checkValidRTCData() { - // load header only from RTC - _last_read_status = RTC_ERROR_READING_FAILED; - unsigned char buf_head[RTC_STATE_HEADER_SIZE]; - if (!ESP.rtcUserMemoryRead(RTC_BASE, (uint32_t *)&buf_head, RTC_STATE_HEADER_SIZE)) - return false; - - _last_read_status = RTC_ERROR_MAGIC_BYTES; - // check if magic bytes are ok - if (buf_head[0] != 'M') - return false; - if (buf_head[1] != 'G') - return false; - if (buf_head[2] != 'C') - return false; - - _last_read_status = RTC_ERROR_SIZE; - // check for valid size - int size_in_rtc = (int)(buf_head[4] * 256 + buf_head[5]); - if (size_in_rtc > RTC_MAX_SIZE) - return false; - - _last_read_status = RTC_ERROR_READING_FAILED; - // load the full state from RTC - unsigned char buf[size_in_rtc + 1]; - if (!ESP.rtcUserMemoryRead(RTC_BASE, (uint32_t *)&buf, size_in_rtc + 1)) - return false; - - _last_read_status = RTC_ERROR_CHECKSUM; - // check for checksum - unsigned char temp = 0; - for (int j = 0; j < size_in_rtc; j++) - temp += buf[j]; //checksum - if (temp != buf[size_in_rtc]) - return false; - - _last_read_status = RTC_OK; - _last_read_state_id = buf[3]; - return true; -} - -int RTCVars::getFreeRTCMem() { - return RTC_MAX_SIZE - _state_size; -} - -int RTCVars::getFreeRTCVars() { - return RTC_MAX_VARIABLES - _state_variables_counter; -} - -byte RTCVars::getStateID() { - return _state_id; -} - -byte RTCVars::getStateIDFromRTC() { - if (!_checkValidRTCData()) - return RTC_STATE_ID_INVALID; - return _last_read_state_id; -} - -void RTCVars::setStateID(byte new_state_id) { - if (new_state_id != RTC_STATE_ID_INVALID) - _state_id = new_state_id; -} - -byte RTCVars::getReadError() { - return _last_read_status; -} - -#endif \ No newline at end of file diff --git a/lib/rtcvars/RTCVars.h b/lib/rtcvars/RTCVars.h deleted file mode 100644 index c46e13abb..000000000 --- a/lib/rtcvars/RTCVars.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef RTCVARS_H -#define RTCVARS_H - -#include "Arduino.h" - -#ifndef RTC_MAX_VARIABLES -#define RTC_MAX_VARIABLES 32 -#endif - -const static byte RTC_OK = 0; -const static byte RTC_ERROR_MAGIC_BYTES = 1; -const static byte RTC_ERROR_SIZE = 2; -const static byte RTC_ERROR_READING_FAILED = 3; -const static byte RTC_ERROR_CHECKSUM = 4; -const static byte RTC_ERROR_STATE_ID = 5; -const static byte RTC_ERROR_OTHER = 99; -const static byte RTC_STATE_ID_INVALID = 255; - -class RTCVars { - public: - RTCVars(); - bool registerVar(char * v); - bool registerVar(byte * v); - bool registerVar(bool * v); - bool registerVar(int * v); - bool registerVar(long * v); - bool registerVar(float * v); - void debugOutputRTCVars(); - bool saveToRTC(); - bool loadFromRTC(); - int getFreeRTCMem(); - int getFreeRTCVars(); - byte getStateID(); - byte getStateIDFromRTC(); - void setStateID(byte new_state_id); - byte getReadError(); - - private: - byte _state_id; - byte _last_read_state_id; - byte _last_read_status; - int _state_size; - int _state_variables_counter; - uintptr_t _state_variables_ptr[RTC_MAX_VARIABLES]; - byte _state_variables_type[RTC_MAX_VARIABLES]; - const byte _state_variable_size[7] = {0, sizeof(int), sizeof(long), sizeof(float), sizeof(byte), sizeof(char), sizeof(bool)}; - bool _checkAndReserve(uintptr_t v, byte type_of_var); - bool _checkValidRTCData(); -}; - -#endif