From 8c2b3500d6b5dd21af25167c12fdb8b92ca311a2 Mon Sep 17 00:00:00 2001 From: Maik Hofmann Date: Sat, 6 Mar 2021 18:04:49 +0100 Subject: [PATCH] cleanup repository --- HCPBridge/.gitignore | 5 - HCPBridge/include/README | 39 -- HCPBridge/lib/README | 46 -- HCPBridge/platformio.ini | 17 - HCPBridge/src/hciemulator.cpp | 425 ------------------ HCPBridge/src/hciemulator.h | 130 ------ HCPBridge/src/main.cpp | 172 ------- HCPBridge/test/README | 11 - HCPBridgeCombo/ESP/src/index_html.h | 1 - HCPBridgeCombo/ESP/src/main.cpp | 2 +- HCPBridgeCombo/ESP/src/webpage/buildindex.cmd | 1 - HCPBridgeCombo/ESP/src/webpage/command | 0 HCPBridgeCombo/ESP/src/webpage/compress.py | 35 -- HCPBridgeCombo/ESP/src/webpage/index.html | 159 ------- .../ESP/src/webpage/runtestserver.cmd | 1 - HCPBridgeCombo/ESP/src/webpage/status | 9 - HCPBridgeESP32/src/index_html.h | 1 - HCPBridgeESP32/src/main.cpp | 1 + HCPBridgeESP32/src/webpage/buildindex.cmd | 1 - HCPBridgeESP32/src/webpage/command | 0 HCPBridgeESP32/src/webpage/compress.py | 35 -- HCPBridgeESP32/src/webpage/index.html | 159 ------- HCPBridgeESP32/src/webpage/runtestserver.cmd | 1 - HCPBridgeESP32/src/webpage/status | 9 - HCPBridgeISR/src/index_html.h | 1 - HCPBridgeISR/src/main.cpp | 2 +- HCPBridgeISR/src/webpage/buildindex.cmd | 1 - HCPBridgeISR/src/webpage/command | 0 HCPBridgeISR/src/webpage/compress.py | 35 -- HCPBridgeISR/src/webpage/index.html | 159 ------- HCPBridgeISR/src/webpage/runtestserver.cmd | 1 - HCPBridgeISR/src/webpage/status | 9 - {HCPBridge/src => WebUI}/index_html.h | 0 .../src => WebUI}/webpage/buildindex.cmd | 0 {HCPBridge/src => WebUI}/webpage/command | 0 {HCPBridge/src => WebUI}/webpage/compress.py | 0 WebUI/webpage/favicon.png | Bin 0 -> 8289 bytes {HCPBridge/src => WebUI}/webpage/index.html | 0 .../src => WebUI}/webpage/runtestserver.cmd | 0 {HCPBridge/src => WebUI}/webpage/status | 0 {HCPBridgeISR => tools}/simulator/hcisim.py | 0 41 files changed, 3 insertions(+), 1465 deletions(-) delete mode 100644 HCPBridge/.gitignore delete mode 100644 HCPBridge/include/README delete mode 100644 HCPBridge/lib/README delete mode 100644 HCPBridge/platformio.ini delete mode 100644 HCPBridge/src/hciemulator.cpp delete mode 100644 HCPBridge/src/hciemulator.h delete mode 100644 HCPBridge/src/main.cpp delete mode 100644 HCPBridge/test/README delete mode 100644 HCPBridgeCombo/ESP/src/index_html.h delete mode 100644 HCPBridgeCombo/ESP/src/webpage/buildindex.cmd delete mode 100644 HCPBridgeCombo/ESP/src/webpage/command delete mode 100644 HCPBridgeCombo/ESP/src/webpage/compress.py delete mode 100644 HCPBridgeCombo/ESP/src/webpage/index.html delete mode 100644 HCPBridgeCombo/ESP/src/webpage/runtestserver.cmd delete mode 100644 HCPBridgeCombo/ESP/src/webpage/status delete mode 100644 HCPBridgeESP32/src/index_html.h delete mode 100644 HCPBridgeESP32/src/webpage/buildindex.cmd delete mode 100644 HCPBridgeESP32/src/webpage/command delete mode 100644 HCPBridgeESP32/src/webpage/compress.py delete mode 100644 HCPBridgeESP32/src/webpage/index.html delete mode 100644 HCPBridgeESP32/src/webpage/runtestserver.cmd delete mode 100644 HCPBridgeESP32/src/webpage/status delete mode 100644 HCPBridgeISR/src/index_html.h delete mode 100644 HCPBridgeISR/src/webpage/buildindex.cmd delete mode 100644 HCPBridgeISR/src/webpage/command delete mode 100644 HCPBridgeISR/src/webpage/compress.py delete mode 100644 HCPBridgeISR/src/webpage/index.html delete mode 100644 HCPBridgeISR/src/webpage/runtestserver.cmd delete mode 100644 HCPBridgeISR/src/webpage/status rename {HCPBridge/src => WebUI}/index_html.h (100%) rename {HCPBridge/src => WebUI}/webpage/buildindex.cmd (100%) rename {HCPBridge/src => WebUI}/webpage/command (100%) rename {HCPBridge/src => WebUI}/webpage/compress.py (100%) create mode 100644 WebUI/webpage/favicon.png rename {HCPBridge/src => WebUI}/webpage/index.html (100%) rename {HCPBridge/src => WebUI}/webpage/runtestserver.cmd (100%) rename {HCPBridge/src => WebUI}/webpage/status (100%) rename {HCPBridgeISR => tools}/simulator/hcisim.py (100%) diff --git a/HCPBridge/.gitignore b/HCPBridge/.gitignore deleted file mode 100644 index d3e0c0c..0000000 --- a/HCPBridge/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/.pio -.vscode/.browse.c_cpp.db* -.vscode/c_cpp_properties.json -.vscode/launch.json -.vscode/ipch diff --git a/HCPBridge/include/README b/HCPBridge/include/README deleted file mode 100644 index 194dcd4..0000000 --- a/HCPBridge/include/README +++ /dev/null @@ -1,39 +0,0 @@ - -This directory is intended for project header files. - -A header file is a file containing C declarations and macro definitions -to be shared between several project source files. You request the use of a -header file in your project source file (C, C++, etc) located in `src` folder -by including it, with the C preprocessing directive `#include'. - -```src/main.c - -#include "header.h" - -int main (void) -{ - ... -} -``` - -Including a header file produces the same results as copying the header file -into each source file that needs it. Such copying would be time-consuming -and error-prone. With a header file, the related declarations appear -in only one place. If they need to be changed, they can be changed in one -place, and programs that include the header file will automatically use the -new version when next recompiled. The header file eliminates the labor of -finding and changing all the copies as well as the risk that a failure to -find one copy will result in inconsistencies within a program. - -In C, the usual convention is to give header files names that end with `.h'. -It is most portable to use only letters, digits, dashes, and underscores in -header file names, and at most one dot. - -Read more about using header files in official GCC documentation: - -* Include Syntax -* Include Operation -* Once-Only Headers -* Computed Includes - -https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/HCPBridge/lib/README b/HCPBridge/lib/README deleted file mode 100644 index 6debab1..0000000 --- a/HCPBridge/lib/README +++ /dev/null @@ -1,46 +0,0 @@ - -This directory is intended for project specific (private) libraries. -PlatformIO will compile them to static libraries and link into executable file. - -The source code of each library should be placed in a an own separate directory -("lib/your_library_name/[here are source files]"). - -For example, see a structure of the following two libraries `Foo` and `Bar`: - -|--lib -| | -| |--Bar -| | |--docs -| | |--examples -| | |--src -| | |- Bar.c -| | |- Bar.h -| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html -| | -| |--Foo -| | |- Foo.c -| | |- Foo.h -| | -| |- README --> THIS FILE -| -|- platformio.ini -|--src - |- main.c - -and a contents of `src/main.c`: -``` -#include -#include - -int main (void) -{ - ... -} - -``` - -PlatformIO Library Dependency Finder will find automatically dependent -libraries scanning project source files. - -More information about PlatformIO Library Dependency Finder -- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/HCPBridge/platformio.ini b/HCPBridge/platformio.ini deleted file mode 100644 index e4d26de..0000000 --- a/HCPBridge/platformio.ini +++ /dev/null @@ -1,17 +0,0 @@ -; PlatformIO Project Configuration File -; -; Build options: build flags, source filter -; Upload options: custom upload port, speed and extra flags -; Library options: dependencies, extra library storages -; Advanced options: extra scripting -; -; Please visit documentation for the other options and examples -; https://docs.platformio.org/page/projectconf.html - -[env:esp12e] -platform = espressif8266 -board = esp12e -framework = arduino -lib_deps = - ottowinter/ESPAsyncWebServer-esphome@^1.2.7 - bblanchon/ArduinoJson@^6.17.2 diff --git a/HCPBridge/src/hciemulator.cpp b/HCPBridge/src/hciemulator.cpp deleted file mode 100644 index eb015d9..0000000 --- a/HCPBridge/src/hciemulator.cpp +++ /dev/null @@ -1,425 +0,0 @@ -#include "hciemulator.h" -#define CHECKCHANGEDSET(Target,Value,Flag) if((Target)!=(Value)){Target=Value;Flag=true;} -int hciloglevel = DEFAULTLOGLEVEL; - -#ifdef SOFTSERIAL -#define Log(Level,Message) LogCore(Level,Message) -#define Log3(Level,Message,Buffer, Len) LogCore(Level,Message,Buffer,Len) -//LOGLEVEL -void LogCore(int Level, const char* msg, const unsigned char * data=NULL, size_t datalen=0){ - if(Level>hciloglevel){ - return; - } - if(data!=NULL && datalen>0){ - String newmsg(msg); - char str[4]; - for (size_t i = 0; i < datalen; i++){ - snprintf(str,sizeof(str),"%02x ", data[i]); - newmsg+=str; - } - Serial.println(newmsg); - }else{ - Serial.println(msg); - } -} -#else - #define Log(Level,Message) - #define Log3(Level,Message,Buffer, Len) -#endif - - -int HCIEmulator::getLogLevel(){ - return hciloglevel; - -} -void HCIEmulator::setLogLevel(int level){ - hciloglevel=level; -} - -//modbus crc calculation borrowed from: -//https://github.com/yaacov/ArduinoModbusSlave -#define MODBUS_CRC_LENGTH 2 -#define readCRC(arr, length) word(arr[(length - MODBUS_CRC_LENGTH) + 1], arr[length - MODBUS_CRC_LENGTH]) -#define readUInt16(arr, index) word(arr[index], arr[index + 1]) -/** - * Calculate the CRC of the passed byte array from zero up to the passed length. - * - * @param buffer The byte array containing the data. - * @param length The length of the byte array. - * - * @return The calculated CRC as an unsigned 16 bit integer. - * - * Calculate and add the CRC. - * uint16_t crc = Modbus::calculateCRC(_responseBuffer, _responseBufferLength - MODBUS_CRC_LENGTH); - * _responseBuffer[_responseBufferLength - MODBUS_CRC_LENGTH] = crc & 0xFF; - * _responseBuffer[(_responseBufferLength - MODBUS_CRC_LENGTH) + 1] = crc >> 8; - * - * - * #define MODBUS_FRAME_SIZE 4 - * #define MODBUS_CRC_LENGTH 2 - * uint16_t crc = readCRC(_requestBuffer, _requestBufferLength); - * #define readUInt16(arr, index) word(arr[index], arr[index + 1]) - * #define readCRC(arr, length) word(arr[(length - MODBUS_CRC_LENGTH) + 1], arr[length - MODBUS_CRC_LENGTH]) - */ -uint16_t calculateCRC(uint8_t *buffer, int length) -{ - int i, j; - uint16_t crc = 0xFFFF; - uint16_t tmp; - - // Calculate the CRC. - for (i = 0; i < length; i++) - { - crc = crc ^ buffer[i]; - for (j = 0; j < 8; j++) - { - tmp = crc & 0x0001; - crc = crc >> 1; - if (tmp) - { - crc = crc ^ 0xA001; - } - } - } - return crc; -} - -HCIEmulator::HCIEmulator(Stream * port) { - m_state.valid = false; - m_statemachine=WAITING; - m_rxlen = m_txlen = 0; - m_recvTime=m_lastStateTime=0; - m_skipFrame=false; - m_port = port; - m_statusCallback = NULL; - setLogLevel(DEFAULTLOGLEVEL); -}; - -void HCIEmulator::poll(){ - - if(m_port==NULL) return; - - // receive Data - if(m_port->available() >0) - { - m_rxlen+= m_port->readBytes((char*)(m_rxbuffer+m_rxlen), _min((int)(255-m_rxlen),m_port->available())); - if(m_rxlen > 254) - { - Log(LL_ERROR,"RX Bufferoverflow, skip next Frame"); - Log3(LL_DEBUG,"Buffer Data: ", m_rxbuffer, m_rxlen); - m_rxlen=0; - m_skipFrame = true; - } - m_recvTime = micros(); - } - - - // check frame, process frame - if(m_rxlen>0 && (micros()-m_recvTime > T3_5)) - { - // check last action timeout -> reset > then 2sec - if(m_statemachine!= WAITING && m_lastStateTime+2000 0){ - - // fix crc - uint16_t crc = calculateCRC(m_txbuffer, m_txlen - MODBUS_CRC_LENGTH); - m_txbuffer[m_txlen - MODBUS_CRC_LENGTH] = crc & 0xFF; - m_txbuffer[(m_txlen - MODBUS_CRC_LENGTH) + 1] = crc >> 8; - - // send data - m_lastSendTime = micros()-m_recvTime; - - //Log(LL_DEBUG, ("ST:"+String(m_lastSendTime)).c_str()); - - m_port->write(m_txbuffer, m_txlen); - Log3(LL_DEBUG,"Response: ", m_txbuffer, m_txlen); - m_txlen = 0; - } - } - - m_skipFrame = false; - m_rxlen=0; - } -} - -void HCIEmulator::processFrame(){ - m_txlen = 0; // clear send buffer - - if(m_rxlen<5) { - Log(LL_ERROR,"Frame skipped, invalid frame len"); - Log3(LL_ERROR,"Data:", m_rxbuffer,m_rxlen); - return; - } - - // check device id, pass only device id 2 and 0 (broadcast) - if(m_rxbuffer[0] != BROADCASTID && m_rxbuffer[0] != DEVICEID){ - Log(LL_DEBUG,"Frame skipped, unsupported device id"); - Log3(LL_DEBUG,"Data:", m_rxbuffer,m_rxlen); - return; - } - - // check crc - uint16_t crc = readCRC(m_rxbuffer, m_rxlen); - if(crc != calculateCRC(m_rxbuffer,m_rxlen-MODBUS_CRC_LENGTH)){ - Log3(LL_ERROR,"Frame skipped, wrong crc", m_rxbuffer,m_rxlen); - return; - } - - Log3(LL_DEBUG,"Incomming Data: ", m_rxbuffer, m_rxlen); - - // dispatch modbus function - switch(m_rxbuffer[1]){ - case 0x10:{ // Write Multiple registers - if(m_rxlen == 0x1b && m_rxbuffer[0] == BROADCASTID) - { - processBroadcastStatusFrame(); - return; - } - break; - } - - case 0x17:{ // Read/Write Multiple registers - if(m_rxbuffer[0] == DEVICEID){ - switch(m_rxlen){ - case 0x11:{ - processDeviceStatusFrame(); - return; - } - - case 0x13: - processDeviceBusScanFrame(); - return;; - } - } - break; - } - } - Log3(LL_ERROR,"Frame skipped, unexpected data: ", m_rxbuffer, m_rxlen); -} - -const unsigned char ResponseTemplate_Fcn17_Cmd03_L08 []= {0x02,0x17,0x10,0x3E,0x00,0x03,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x74,0x1B}; -const unsigned char ResponseTemplate_Fcn17_Cmd04_L02 []= {0x02,0x17,0x04,0x0F,0x00,0x04,0xFD,0x0A,0x72}; -void HCIEmulator::processDeviceStatusFrame(){ - if(m_rxlen==0x11){ - unsigned char counter = m_rxbuffer[11]; - unsigned char cmd = m_rxbuffer[12]; - if(m_rxbuffer[5] == 0x08){ - // expose internal state - // 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 - //0011: 02 17 9C B9 00 08 9C 41 00 02 04 3E 03 00 00 EB CC - //res=> 02 17 10 3E 00 03 01 00 00 00 00 00 00 00 00 00 00 00 00 74 1B - memcpy_P(m_txbuffer, ResponseTemplate_Fcn17_Cmd03_L08, sizeof(ResponseTemplate_Fcn17_Cmd03_L08)); - m_txbuffer[0] = m_rxbuffer[0]; - m_txbuffer[3] = counter; - m_txbuffer[5] = cmd; - m_txlen = sizeof(ResponseTemplate_Fcn17_Cmd03_L08); - - - switch(m_statemachine) - { - // open Door - case STARTOPENDOOR: - m_txbuffer[7]= 0x02; - m_txbuffer[8]= 0x10; - m_statemachine = STARTOPENDOOR_RELEASE; - m_lastStateTime = millis(); - break; - case STARTOPENDOOR_RELEASE: - if(m_lastStateTime+SIMULATEKEYPRESSDELAYMS 02 17 04 0F 00 04 FD 0A 72 - memcpy_P(m_txbuffer, ResponseTemplate_Fcn17_Cmd04_L02, sizeof(ResponseTemplate_Fcn17_Cmd04_L02)); - m_txbuffer[0] = m_rxbuffer[0]; - m_txbuffer[3] = counter; - m_txbuffer[5] = cmd; - m_txlen = sizeof(ResponseTemplate_Fcn17_Cmd04_L02); - return; - } - } - - Log3(LL_ERROR,"Frame skipped, unexpected data: ", m_rxbuffer, m_rxlen); -} - -const unsigned char ResponseTemplate_Fcn17_Cmd02_L05 []= {0x02,0x17,0x0a,0x00,0x00,0x02,0x05,0x04,0x30,0x10,0xff,0xa8,0x45,0x0e,0xdf}; -void HCIEmulator::processDeviceBusScanFrame(){ - // 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 - //0013: 02 17 9C B9 00 05 9C 41 00 03 06 00 02 00 00 01 02 f8 35 - //res=> 02 17 0a 00 00 02 05 04 30 10 ff a8 45 0e df - unsigned char counter = m_rxbuffer[11]; - unsigned char cmd = m_rxbuffer[12]; - memcpy_P(m_txbuffer, ResponseTemplate_Fcn17_Cmd02_L05, sizeof(ResponseTemplate_Fcn17_Cmd02_L05)); - m_txbuffer[0] = m_rxbuffer[0]; - m_txbuffer[3] = counter; - m_txbuffer[5] = cmd; - m_txlen = sizeof(ResponseTemplate_Fcn17_Cmd02_L05); - - Log(LL_INFO,"Busscan received"); -} - -void HCIEmulator::processBroadcastStatusFrame(){ - //001B: 00 10 9D 31 00 09 12 64 00 00 00 40 60 00 00 00 00 00 00 00 00 00 01 00 00 CA 22 - bool hasChanged = false; - CHECKCHANGEDSET(m_state.lampOn,m_rxbuffer[20] == 0x14,hasChanged); - CHECKCHANGEDSET(m_state.doorCurrentPosition,m_rxbuffer[10],hasChanged); - CHECKCHANGEDSET(m_state.doorTargetPosition, m_rxbuffer[9],hasChanged); - CHECKCHANGEDSET(m_state.doorState, m_rxbuffer[11],hasChanged); - CHECKCHANGEDSET(m_state.reserved, m_rxbuffer[17],hasChanged); - CHECKCHANGEDSET(m_state.valid, true,hasChanged); - - if(hasChanged){ - Log3(LL_INFO,"New State: ",m_rxbuffer,m_rxlen); - if(m_statusCallback != NULL){ - m_statusCallback(m_state); - } - } -} - -void HCIEmulator::openDoor(){ - if(m_statemachine != WAITING){ - return; - } - m_lastStateTime = millis(); - m_statemachine = STARTOPENDOOR; -} - -void HCIEmulator::openDoorHalf(){ - if(m_statemachine != WAITING){ - return; - } - m_lastStateTime = millis(); - m_statemachine = STARTOPENDOORHALF; -} - -void HCIEmulator::closeDoor(){ - if(m_statemachine != WAITING){ - return; - } - m_lastStateTime = millis(); - m_statemachine = STARTCLOSEDOOR; -} - -void HCIEmulator::stopDoor(){ - if(m_statemachine != WAITING){ - return; - } - m_lastStateTime = millis(); - m_statemachine = STARTSTOPDOOR; -} - -void HCIEmulator::toggleLamp(){ - if(m_statemachine != WAITING){ - return; - } - m_lastStateTime = millis(); - m_statemachine = STARTTOGGLELAMP; -} - -void HCIEmulator::ventilationPosition(){ - if(m_statemachine != WAITING){ - return; - } - m_lastStateTime = millis(); - m_statemachine = STARTVENTPOSITION; -} - -void HCIEmulator::onStatusChanged(callback_function_t handler) { - m_statusCallback = handler; -} \ No newline at end of file diff --git a/HCPBridge/src/hciemulator.h b/HCPBridge/src/hciemulator.h deleted file mode 100644 index f496025..0000000 --- a/HCPBridge/src/hciemulator.h +++ /dev/null @@ -1,130 +0,0 @@ -#ifndef __hciemulator_h -#define __hciemulator_h - -#include -#include "SoftwareSerial.h" - -#define LL_OFF 0 -#define LL_ERROR 1 -#define LL_WARN 2 -#define LL_INFO 3 -#define LL_DEBUG 4 - -#define DEFAULTLOGLEVEL LL_WARN - -#define DEVICEID 0x02 -#define BROADCASTID 0x00 -#define SIMULATEKEYPRESSDELAYMS 100 - - -// Modbus states that a baud rate higher than 19200 must use a fixed 750 us -// for inter character time out and 1.75 ms for a frame delay. -// For baud rates below 19200 the timeing is more critical and has to be calculated. -// E.g. 9600 baud in a 10 bit packet is 960 characters per second -// In milliseconds this will be 960characters per 1000ms. So for 1 character -// 1000ms/960characters is 1.04167ms per character and finaly modbus states an -// intercharacter must be 1.5T or 1.5 times longer than a normal character and thus -// 1.5T = 1.04167ms * 1.5 = 1.5625ms. A frame delay is 3.5T. -#define T1_5 750 -#define T3_5 4800 //1750 - - -enum DoorState : uint8_t { - DOOR_OPEN_POSITION = 0x20, - DOOR_CLOSE_POSITION = 0x40, - DOOR_HALF_POSITION = 0x80, - DOOR_MOVE_CLOSEPOSITION = 0x02, - DOOR_MOVE_OPENPOSITION = 0x01, - -}; - -struct SHCIState{ - bool valid; - bool lampOn; - uint8_t doorState; // see DoorState - uint8_t doorCurrentPosition; - uint8_t doorTargetPosition; - uint8_t reserved; -}; - -enum StateMachine: uint8_t{ - WAITING, - - STARTOPENDOOR, - STARTOPENDOOR_RELEASE, - - STARTOPENDOORHALF, - STARTOPENDOORHALF_RELEASE, - - STARTCLOSEDOOR, - STARTCLOSEDOOR_RELEASE, - - STARTSTOPDOOR, - STARTSTOPDOOR_RELEASE, - - STARTTOGGLELAMP, - STARTTOGGLELAMP_RELEASE, - - STARTVENTPOSITION, - STARTVENTPOSITION_RELEASE -}; - -class HCIEmulator { -public: - typedef std::function callback_function_t; - - HCIEmulator(Stream * port); - - void poll(); - - void openDoor(); - void openDoorHalf(); - void closeDoor(); - void stopDoor(); - void toggleLamp(); - void ventilationPosition(); - - const SHCIState& getState() { - if(micros()-m_recvTime > 2000000){ - // 2 sec without statusmessage - m_state.valid = false; - } - return m_state; - }; - - unsigned long getMessageAge(){ - return micros()-m_recvTime; - } - - int getLogLevel(); - void setLogLevel(int level); - - void onStatusChanged(callback_function_t handler); - -protected: - void processFrame(); - void processDeviceStatusFrame(); - void processDeviceBusScanFrame(); - void processBroadcastStatusFrame(); - -private: - callback_function_t m_statusCallback; - Stream *m_port; - SHCIState m_state; - StateMachine m_statemachine; - - unsigned long m_recvTime; - unsigned long m_lastStateTime; - unsigned long m_lastSendTime; - - size_t m_rxlen; - size_t m_txlen; - - unsigned char m_rxbuffer[255]; - unsigned char m_txbuffer[255]; - - bool m_skipFrame; -}; - - -#endif \ No newline at end of file diff --git a/HCPBridge/src/main.cpp b/HCPBridge/src/main.cpp deleted file mode 100644 index 0bf13b6..0000000 --- a/HCPBridge/src/main.cpp +++ /dev/null @@ -1,172 +0,0 @@ -#include -#include -#include "AsyncJson.h" -#include "ArduinoJson.h" -#include "hciemulator.h" -#include "index_html.h" - -!!! DONT USE THIS, BECAUSE OF TIMING PROBLEMS !!! -!!! USE THE ISR VERSION OR SWITCH TO ESP32 !!! - - -/* create this file and add your wlan credentials - const char* ssid = "MyWLANSID"; - const char* password = "MYPASSWORD"; -*/ -#include "../../../private/credentials.h" - - -// switch relay sync to the lamp -// e.g. the Wifi Relay Board U4648 -#define USERELAY - -// use alternative uart pins -//#define SWAPUART - -#define RS485 Serial - -// Relay Board parameters -#define ESP8266_GPIO2 2 // Blue LED. -#define ESP8266_GPIO4 4 // Relay control. -#define ESP8266_GPIO5 5 // Optocoupler input. -#define LED_PIN ESP8266_GPIO2 - - -// Hörmann HCP2 based on modbus rtu @57.6kB 8E1 -HCIEmulator emulator(&RS485); - -// webserver on port 80 -AsyncWebServer server(80); - -// called by ESPAsyncTCP-esphome:SyncClient.cpp (see patch) instead of delay to avoid connection breaks -void DelayHandler(void){ - emulator.poll(); -} - -// switch GPIO4 und GPIO2 sync to the lamp -void onStatusChanged(const SHCIState& state){ - //see https://ucexperiment.wordpress.com/2016/12/18/yunshan-esp8266-250v-15a-acdc-network-wifi-relay-module/ - //Setting GPIO4 high, causes the relay to close the NO contact with - if(state.valid){ - digitalWrite( ESP8266_GPIO4, state.lampOn ); - digitalWrite(LED_PIN, state.lampOn); - }else - { - digitalWrite( ESP8266_GPIO4, false ); - digitalWrite(LED_PIN, false); - } -} - -// toggle lamp to expected state -void switchLamp(bool on){ - bool toggle = (on && !emulator.getState().lampOn) || (!on && emulator.getState().lampOn); - if(toggle){ - emulator.toggleLamp(); - } -} - -// setup mcu -void setup(){ - - //setup modbus - RS485.begin(57600,SERIAL_8E1); - #ifdef SWAPUART - RS485.swap(); - #endif - - - //setup wifi - WiFi.mode(WIFI_STA); - WiFi.begin(ssid, password); - WiFi.setAutoReconnect(true); - while (WiFi.status() != WL_CONNECTED) { - emulator.poll(); - } - - // setup http server - server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){ - AsyncWebServerResponse *response = request->beginResponse_P( 200, "text/html", index_html,sizeof(index_html)); - response->addHeader("Content-Encoding","deflate"); - request->send(response); - }); - - server.on("/status", HTTP_GET, [](AsyncWebServerRequest *request){ - const SHCIState& doorstate = emulator.getState(); - AsyncResponseStream *response = request->beginResponseStream("application/json"); - DynamicJsonDocument root(1024); - root["valid"] = doorstate.valid; - root["doorstate"] = doorstate.doorState; - root["doorposition"] = doorstate.doorCurrentPosition; - root["doortarget"] = doorstate.doorTargetPosition; - root["lamp"] = doorstate.lampOn; - root["debug"] = doorstate.reserved; - root["lastresponse"] = emulator.getMessageAge()/1000; - serializeJson(root,*response); - request->send(response); - }); - - server.on("/command", HTTP_GET, [] (AsyncWebServerRequest *request) { - if (request->hasParam("action")) { - int actionid = request->getParam("action")->value().toInt(); - switch (actionid){ - case 0: - emulator.closeDoor(); - break; - case 1: - emulator.openDoor(); - break; - case 2: - emulator.stopDoor(); - break; - case 3: - emulator.ventilationPosition(); - break; - case 4: - emulator.openDoorHalf(); - break; - case 5: - emulator.toggleLamp(); - break; - default: - break; - } - } - request->send(200, "text/plain", "OK"); - }); - - server.on("/update", HTTP_GET, [] (AsyncWebServerRequest *request) { - if (request->hasParam("channel") && request->hasParam("state")) { - String channel = request->getParam("channel")->value(); - String state = request->getParam("state")->value(); - if(channel.equals("door")){ - if(state=="1"){ - emulator.openDoor(); - }else{ - emulator.closeDoor(); - } - } - if(channel.equals("light")){ - switchLamp(state=="1"); - } - } - request->send(200, "text/plain", "OK"); - }); - - server.begin(); - - //setup relay board -#ifdef USERELAY - pinMode( ESP8266_GPIO4, OUTPUT ); // Relay control pin. - pinMode( ESP8266_GPIO5, INPUT_PULLUP ); // Input pin. - pinMode( LED_PIN, OUTPUT ); // ESP8266 module blue L - digitalWrite( ESP8266_GPIO4, 0 ); - digitalWrite(LED_PIN,0); - emulator.onStatusChanged(onStatusChanged); -#endif - -} - -// mainloop -void loop(){ - emulator.poll(); -} \ No newline at end of file diff --git a/HCPBridge/test/README b/HCPBridge/test/README deleted file mode 100644 index b94d089..0000000 --- a/HCPBridge/test/README +++ /dev/null @@ -1,11 +0,0 @@ - -This directory is intended for PlatformIO Unit Testing and project tests. - -Unit Testing is a software testing method by which individual units of -source code, sets of one or more MCU program modules together with associated -control data, usage procedures, and operating procedures, are tested to -determine whether they are fit for use. Unit testing finds problems early -in the development cycle. - -More information about PlatformIO Unit Testing: -- https://docs.platformio.org/page/plus/unit-testing.html diff --git a/HCPBridgeCombo/ESP/src/index_html.h b/HCPBridgeCombo/ESP/src/index_html.h deleted file mode 100644 index bb80e1c..0000000 --- a/HCPBridgeCombo/ESP/src/index_html.h +++ /dev/null @@ -1 +0,0 @@ -const uint8_t index_html[] PROGMEM = {0x78,0xDA,0xA5,0x57,0xFD,0x6E,0xE3,0x36,0x12,0xFF,0x7B,0xFD,0x14,0xAC,0x0E,0x08,0xA4,0x8D,0xED,0x48,0xB2,0xB3,0xEB,0x5A,0x96,0x8B,0xED,0x66,0xAF,0xDB,0x62,0x7B,0x2D,0x9A,0x5C,0xD1,0x5E,0xB1,0x7F,0xD0,0xD4,0xC8,0x26,0x42,0x7D,0x1C,0x45,0xC5,0xF6,0x1A,0x7E,0x96,0xBE,0xC5,0xBD,0x40,0x5F,0xEC,0x86,0xA4,0x64,0xCB,0x89,0xB3,0x2D,0xD0,0xC0,0x8A,0x48,0xCE,0xCC,0x6F,0x3E,0x38,0x33,0xA4,0x66,0x5F,0xDC,0xFC,0xF0,0xF6,0xEE,0xD7,0x1F,0xDF,0x91,0xF7,0x77,0xDF,0x7F,0x98,0xCF,0x56,0x2A,0x13,0xF8,0x1F,0x68,0x32,0x9F,0x29,0xAE,0x04,0xCC,0xBF,0xA1,0x92,0x2E,0x21,0x57,0x85,0x24,0xB7,0x0A,0x6A,0x90,0x75,0xBE,0x9C,0x5D,0x59,0xDA,0x2C,0x03,0x45,0x49,0x4E,0x33,0x88,0x1F,0x38,0xAC,0xCB,0x42,0x2A,0xC2,0x8A,0x5C,0x21,0x7B,0xEC,0xAC,0x79,0xA2,0x56,0x71,0x02,0x0F,0x9C,0xC1,0xC0,0x4C,0xFA,0x84,0xE7,0x5C,0x71,0x2A,0x06,0x15,0xA3,0x02,0xE2,0xC0,0x69,0x10,0xD8,0x8A,0xCA,0x0A,0x54,0xFC,0xEF,0xBB,0x7F,0x0E,0x26,0xF3,0x99,0xE0,0xF9,0x3D,0x91,0x20,0x62,0x8E,0x60,0x64,0x25,0x21,0x8D,0x13,0xAA,0xE8,0xB4,0x3F,0x9F,0x55,0x6A,0x8B,0x7A,0x7B,0x04,0xFF,0xB4,0xA9,0x64,0x97,0xA2,0xBA,0x41,0x4A,0x33,0x2E,0xB6,0x53,0xF2,0x46,0x22,0x78,0x44,0x12,0x5E,0x95,0x82,0xE2,0x9C,0xE7,0x08,0x05,0x83,0x85,0x28,0xD8,0x7D,0x44,0x14,0x6C,0xD4,0x80,0x0A,0xBE,0xCC,0xA7,0x84,0xA1,0x89,0x20,0xA3,0xBD,0x45,0x0A,0x1B,0x9C,0x8A,0x7F,0x82,0x29,0x19,0x0D,0x7D,0x09,0x59,0x43,0x2B,0x9F,0x27,0x2D,0x8A,0x64,0x4B,0x76,0x19,0xDD,0x58,0xEF,0xA6,0xE4,0x95,0xEF,0x97,0x9B,0x88,0x64,0x54,0x2E,0x79,0x3E,0xC5,0x31,0xA1,0xB5,0x2A,0x22,0x52,0xD2,0x24,0xE1,0xF9,0x72,0xB0,0x28,0x94,0x2A,0xB2,0x29,0x09,0xAF,0x91,0xCD,0x62,0x0C,0xAB,0x35,0x57,0x6C,0x45,0x76,0x65,0x51,0x61,0x68,0x0A,0x34,0x0D,0x1D,0xA7,0x8A,0x3F,0xC0,0xB3,0x7E,0x34,0xDA,0x26,0x46,0xD9,0x0A,0xF8,0x72,0xA5,0xA6,0x64,0x3C,0x29,0x37,0x7B,0x72,0x82,0xC9,0xF3,0xB2,0x56,0x64,0x77,0x40,0xC9,0x8B,0x1C,0x5A,0xAD,0x82,0x27,0x20,0xBB,0x5A,0xE9,0xA2,0x2A,0x44,0xAD,0x50,0xAB,0x2A,0xCA,0x29,0xF1,0x23,0x22,0x20,0x55,0x66,0x20,0xAD,0x06,0x1C,0xB5,0x0E,0xE8,0x21,0x65,0xF7,0x4B,0x59,0xD4,0x79,0x32,0x60,0x85,0x28,0xE4,0x94,0xFC,0x83,0x31,0xA6,0x59,0x24,0x22,0x0F,0x24,0x4D,0x78,0x5D,0x61,0x48,0xD0,0xAA,0xAE,0xCA,0xE9,0x02,0xD2,0x42,0xC2,0x79,0xCD,0x4D,0xEA,0x4C,0x89,0xE3,0x1C,0x1D,0x1B,0x85,0xDA,0xCD,0xC6,0x67,0x3B,0xB1,0x96,0x4D,0xF4,0xB0,0xB5,0xC8,0x4E,0x9E,0xDA,0x94,0xA6,0x69,0x44,0x06,0x6B,0x58,0xDC,0x73,0x35,0x50,0x92,0xE6,0xAD,0xD6,0xE1,0xB8,0x42,0x57,0x1F,0x2F,0x3C,0xB2,0x7E,0xD4,0x5A,0x6F,0x42,0x39,0x65,0x2B,0x60,0xF7,0x90,0x5C,0x1E,0xC2,0x77,0x46,0xE1,0x62,0xE4,0xE3,0xDF,0x67,0xA4,0x0E,0x11,0x38,0xB1,0x0A,0x97,0xD0,0x0B,0x33,0xC4,0xDD,0x87,0x5F,0x5C,0xED,0xA9,0x87,0xA6,0x67,0xD5,0xE7,0x19,0x3E,0x43,0xDC,0xF7,0x5E,0xF4,0x5E,0x0C,0x17,0x35,0x46,0x28,0x27,0xBB,0xDE,0x8B,0x17,0xD6,0x3B,0xCC,0x15,0x0C,0xD6,0x61,0x3A,0x30,0x25,0x35,0x25,0xB8,0x09,0x3C,0xD1,0xCB,0x8D,0x27,0x0B,0x81,0xCE,0xE9,0x79,0x13,0xFA,0xC0,0x24,0x37,0xCE,0xDB,0x8D,0x39,0x2C,0x9C,0xA9,0x2B,0x5C,0x7D,0x94,0xBC,0x07,0xC6,0x04,0x58,0x21,0xA9,0x8D,0xB9,0xCE,0xC8,0x33,0xBC,0x4D,0xA2,0x23,0xC1,0x94,0xDE,0xBA,0x51,0xB8,0x28,0x44,0x72,0x58,0xB4,0xF5,0x18,0x36,0x26,0x34,0x25,0xA7,0x3D,0x23,0xA1,0x5D,0x62,0xB5,0xAC,0xB4,0x1F,0x65,0xC1,0x5B,0x93,0x1E,0xED,0xEE,0xB5,0x15,0xDE,0x1F,0x82,0x24,0x21,0xC1,0x3D,0xB5,0x4C,0xED,0x7E,0xBE,0xBB,0xB9,0xFE,0xF2,0x55,0x10,0x1D,0x99,0xB6,0x20,0x44,0xB1,0x7E,0xC2,0x97,0x32,0x46,0x7D,0xBF,0xC3,0xB7,0x94,0x00,0xF9,0x13,0xB6,0xF1,0x64,0x91,0x4C,0x10,0x8E,0xE8,0x52,0x9D,0x5D,0xD9,0x76,0x36,0xBB,0xB2,0x0D,0x57,0x37,0x14,0x6C,0xBE,0x61,0xA7,0xE7,0x22,0x29,0x9C,0xCF,0x18,0xCD,0x1F,0x68,0x65,0x8B,0x20,0x0E,0xB5,0xDD,0x4D,0x79,0x34,0x13,0x9E,0xC4,0x09,0x43,0x18,0xCB,0x87,0x10,0x23,0xBD,0x54,0x29,0xAA,0xEA,0x6A,0xBE,0xA6,0x52,0x01,0x76,0xA2,0x94,0xFC,0x0C,0x72,0xC1,0xF3,0x04,0x1B,0xF8,0x10,0x71,0x47,0xC8,0x27,0x51,0xA9,0xCD,0x0F,0x26,0x68,0x55,0xC5,0x4E,0x33,0x3B,0xC4,0xC3,0x21,0x45,0xCE,0x04,0x67,0xF7,0x71,0x52,0xBC,0x2D,0xB2,0x8C,0xE6,0x89,0x1B,0x78,0xF3,0x37,0x75,0x3A,0xBB,0xB2,0x4C,0x9F,0x45,0xB0,0xC1,0x3A,0x07,0x12,0x7A,0xF3,0x5B,0xEC,0x34,0x7F,0x09,0xC5,0x84,0xF2,0x1C,0x88,0xEF,0xCD,0xFF,0x53,0x1F,0x21,0xB4,0x3B,0xAB,0xF1,0xFC,0x03,0x67,0x2B,0x85,0x0E,0x8E,0xF1,0x24,0xA1,0x0B,0x10,0x0D,0xA6,0xED,0x8A,0xF3,0x99,0x6D,0x8B,0x6A,0x5B,0x42,0x6C,0x4A,0x73,0x51,0x6C,0x34,0xF4,0x8A,0xE6,0x4B,0xE8,0x60,0x5F,0x7B,0x3A,0x86,0x42,0x47,0x19,0x8F,0x9D,0x92,0xB6,0xA6,0xD9,0x2A,0xC6,0x60,0xEB,0x35,0x7C,0x19,0x15,0x56,0x77,0xC5,0x24,0x2F,0xD5,0x3C,0x29,0x0A,0x89,0xED,0x2D,0x0E,0xFC,0x28,0xE1,0x32,0x1E,0x04,0x11,0xAF,0xB0,0xB5,0xE5,0xC0,0x14,0x24,0x71,0x4A,0x45,0x05,0xD1,0x03,0x95,0x84,0xE6,0x3C,0x33,0x85,0x10,0xA5,0x75,0xCE,0xF4,0x80,0xE0,0x96,0x49,0x75,0x83,0xF2,0x6F,0x5A,0x9A,0xEB,0xED,0x78,0xEA,0x7E,0x71,0xE0,0xF5,0x76,0x87,0x61,0x8C,0x47,0xE6,0xB7,0x3A,0xB7,0x1F,0xA8,0x70,0x6F,0x24,0x5D,0xF7,0x43,0xDF,0xF7,0xA2,0xFD,0xBE,0xD7,0xC1,0x2B,0xCA,0x33,0x70,0x1D,0x34,0x26,0x80,0xCA,0x03,0xCA,0x91,0x80,0x99,0x7C,0x54,0x94,0xD7,0x42,0x44,0x1D,0x58,0xAD,0x0C,0x91,0xB4,0x13,0xD5,0xC3,0x12,0x83,0xC6,0xEA,0x0C,0xD3,0x75,0xB8,0x04,0xF5,0x4E,0x80,0x1E,0x7E,0xBD,0xFD,0x36,0x71,0x1D,0x24,0x3A,0x9E,0xF1,0x35,0x61,0xCF,0x73,0x25,0xAC,0x61,0x62,0x6A,0x83,0x79,0xAC,0xE9,0x6F,0xF5,0x49,0xB0,0x51,0xAE,0x13,0x26,0x48,0x6B,0x6E,0x12,0x6C,0x68,0x06,0x51,0x93,0xFA,0x38,0xB7,0xA3,0x08,0xE5,0x86,0xC6,0x8F,0x9F,0x30,0xC4,0xAE,0xDF,0xF7,0xFB,0xF6,0xBA,0x61,0xC9,0x5E,0xB4,0xA1,0xF1,0x6F,0xC1,0xA4,0xAF,0x7F,0x7E,0x7F,0xD4,0x0F,0x5E,0x8F,0xFB,0xA3,0xF1,0x6B,0x7C,0x70,0x36,0x0A,0xCD,0x13,0x7E,0xF9,0xDA,0x3C,0xD7,0xA1,0xFE,0x05,0x93,0x8F,0xD1,0x16,0x85,0x46,0xE1,0xEB,0x7E,0x10,0x8C,0xF1,0xC1,0xB7,0xEF,0xF7,0xC3,0xD0,0xBC,0xCC,0x14,0x97,0x35,0xD9,0xB2,0x84,0xE6,0x69,0xE6,0x1F,0x8D,0x41,0x29,0x17,0xE2,0x56,0x97,0x37,0x26,0xB3,0x6E,0xA5,0x8E,0x59,0x5D,0x00,0xF6,0xA9,0x1F,0xA9,0x5A,0xB9,0x5E,0x84,0x5D,0xDB,0xE5,0xB1,0x1F,0xF1,0xD9,0x86,0x0E,0x05,0xE4,0x4B,0xF4,0x8D,0x5F,0x5E,0x9A,0x1D,0xE2,0x71,0xEC,0xE3,0xE6,0xA0,0x44,0x56,0x3C,0xC0,0x5D,0xE1,0xBA,0x1B,0xFA,0x1B,0xFF,0x78,0x35,0xBA,0xF6,0xBD,0x97,0xD6,0x3B,0x77,0xFB,0x68,0x05,0xF7,0x0C,0x30,0xB7,0x8C,0x94,0x6E,0xA3,0x7F,0x59,0x6A,0xDF,0x6B,0x0D,0x3E,0xB1,0xAA,0xC9,0x63,0x6B,0x53,0xCB,0x61,0x42,0xEC,0xBE,0x0A,0x4F,0x30,0xDD,0x20,0xF4,0x2F,0xC3,0xE0,0x25,0xF7,0x4E,0x96,0xC3,0xF0,0xFA,0x64,0x1E,0x4C,0x4E,0xF5,0xF6,0x1A,0x0D,0x97,0x31,0xD6,0x49,0x84,0x5E,0xE3,0x6B,0xE6,0x5F,0x5C,0x34,0xCB,0x33,0x1D,0x02,0x5D,0x41,0xF8,0xBC,0x1C,0xE8,0x1E,0x6C,0x59,0xE6,0x47,0x96,0x39,0x16,0xD9,0x29,0x4F,0x27,0x4B,0x8F,0xB5,0x4C,0x99,0x4D,0x76,0x5D,0x49,0x9D,0x5A,0xF4,0x76,0x12,0x54,0x2D,0x73,0x44,0xD6,0xE9,0xB7,0x59,0xC9,0x38,0x87,0x35,0xF9,0xE5,0xFB,0x0F,0xEF,0x95,0x2A,0x7F,0x82,0xFF,0xD6,0x50,0x29,0x0C,0x09,0x12,0x86,0x45,0x09,0xB9,0xEB,0x7C,0xF3,0xEE,0xCE,0xE9,0x3B,0x57,0xCC,0xE2,0x7E,0x65,0x71,0x63,0xE7,0xD2,0x0E,0xFA,0x4A,0xD6,0x60,0xD9,0x2B,0x40,0xB5,0x5E,0xB7,0x66,0xB0,0x58,0x75,0x25,0xDE,0x62,0x53,0x06,0x57,0xB7,0x66,0xF0,0x76,0x67,0xCA,0x53,0x87,0xC1,0x50,0x4D,0x02,0x3C,0x69,0x25,0xFB,0x0E,0x3D,0x38,0xD2,0x2D,0xF9,0x84,0x1A,0x1E,0xA9,0xD7,0x2D,0xD5,0xD6,0x6D,0x87,0x69,0xE4,0x9D,0xEB,0x38,0x5D,0xB3,0xB1,0x18,0x6F,0xCD,0x39,0x72,0xA7,0xEB,0x91,0x9B,0x98,0x55,0xB5,0xC0,0xFB,0xFD,0x0D,0x9E,0x48,0x77,0xF8,0x55,0xE0,0xF4,0x6C,0x67,0xD5,0xC4,0xDE,0x8E,0xD1,0x0A,0x88,0xBF,0x09,0xFD,0xE9,0x89,0xC3,0x81,0x17,0xD9,0x58,0x13,0x2B,0x7E,0xE9,0xF0,0x4A,0x21,0xF8,0x1F,0xFF,0x4B,0xD3,0x1C,0xD4,0x10,0xAB,0xC3,0x0A,0x8E,0x1F,0x09,0xFA,0xCF,0x08,0x56,0x6C,0x25,0x8A,0x0A,0xC3,0x7C,0x14,0x9D,0x3C,0x12,0x0D,0xCF,0x8A,0x2A,0xE0,0xE2,0x8C,0x5E,0xFF,0x6F,0x09,0x87,0xA7,0xC2,0xA3,0x27,0xC2,0xDA,0x5C,0x0E,0x7F,0xFC,0xDE,0x15,0x0A,0xFE,0x4C,0xE8,0x54,0xCF,0x20,0x78,0x26,0x32,0xCE,0x3D,0x60,0xB5,0x77,0x4E,0x77,0xF2,0xA9,0xCE,0xF4,0xD6,0xA0,0x60,0x02,0x29,0x45,0xAC,0x69,0xC3,0x59,0xE7,0x0B,0xB8,0xA7,0xBA,0xDB,0x13,0xBB,0xAB,0x78,0xD7,0xBE,0xC4,0x6B,0x5F,0xB7,0x6C,0xEA,0x12,0x3F,0xB6,0xE0,0x06,0x3F,0xB8,0x9A,0x16,0xBF,0xC9,0xC4,0x0A,0xEB,0xE1,0x99,0xDA,0xB0,0xC4,0xA1,0xBE,0x2D,0xD0,0x64,0x6B,0xF2,0xAA,0x39,0x4B,0x5B,0x44,0x7B,0xE6,0xA8,0x15,0xAF,0x86,0x86,0xE7,0xD6,0xE6,0xDE,0xF8,0xE2,0xC2,0xAC,0xD9,0x6B,0x0A,0x26,0x2C,0x1E,0x5E,0xF6,0x48,0xB1,0x0B,0xDF,0xDD,0xFE,0xF0,0xAF,0x61,0xA9,0x3F,0x0C,0x5B,0xD9,0xAA,0x2C,0xF2,0x0A,0x74,0x22,0x7A,0x27,0x47,0xAA,0x15,0x18,0xE2,0x01,0x86,0xAE,0x3C,0x7F,0x18,0x19,0x2E,0xC7,0x1B,0x72,0x94,0x93,0xFA,0x73,0x37,0x3E,0x4D,0xEE,0x2E,0xCC,0x57,0xCD,0x44,0x97,0x90,0xF1,0x69,0x3A,0xC0,0x14,0x7E,0x16,0xDB,0x5C,0x13,0x10,0xBA,0xB9,0xEB,0xB7,0x16,0x09,0x9A,0x95,0x17,0x27,0xD6,0x1D,0x1A,0xCE,0xD3,0x2B,0xC1,0xFE,0x18,0xCB,0x6E,0xAF,0x69,0xCC,0x6E,0x7B,0x4B,0xC3,0x72,0xE8,0x2F,0x4D,0x49,0x77,0x37,0x2D,0xEA,0xDE,0x0B,0x8E,0x84,0xBE,0xFE,0x32,0xF1,0x22,0xBC,0xB8,0xD8,0x6B,0x0A,0xDE,0x9B,0xCC,0x7D,0xF3,0xCA,0x7C,0xF3,0xFF,0x1F,0xA6,0x8A,0x84,0xF0}; \ No newline at end of file diff --git a/HCPBridgeCombo/ESP/src/main.cpp b/HCPBridgeCombo/ESP/src/main.cpp index 270c877..dc648db 100644 --- a/HCPBridgeCombo/ESP/src/main.cpp +++ b/HCPBridgeCombo/ESP/src/main.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "index_html.h" +#include "../../../WebUI/index_html.h" #include "../../Arduino/src/i2cshare.h" diff --git a/HCPBridgeCombo/ESP/src/webpage/buildindex.cmd b/HCPBridgeCombo/ESP/src/webpage/buildindex.cmd deleted file mode 100644 index 6ed0ebd..0000000 --- a/HCPBridgeCombo/ESP/src/webpage/buildindex.cmd +++ /dev/null @@ -1 +0,0 @@ -python compress.py diff --git a/HCPBridgeCombo/ESP/src/webpage/command b/HCPBridgeCombo/ESP/src/webpage/command deleted file mode 100644 index e69de29..0000000 diff --git a/HCPBridgeCombo/ESP/src/webpage/compress.py b/HCPBridgeCombo/ESP/src/webpage/compress.py deleted file mode 100644 index 5e9faa8..0000000 --- a/HCPBridgeCombo/ESP/src/webpage/compress.py +++ /dev/null @@ -1,35 +0,0 @@ -#pip install htmlmin -#or python -m pip install htmlmin -#pip install jsmin -#or python -m pip install jsmin - -import gzip -import zlib -import htmlmin -from jsmin import jsmin - - - -content = "" -with open('index.html','rt',encoding="utf-8") as f: - content=f.read() - - -content = htmlmin.minify(content, remove_comments=True, remove_empty_space=True, remove_all_empty_space=True, reduce_empty_attributes=True, reduce_boolean_attributes=False, remove_optional_attribute_quotes=True, convert_charrefs=True, keep_pre=False) - - -import re -regex = r"" ,content, 0, re.DOTALL) - -result ="" -for c in zlib.compress(content.encode("UTF-8"),9): - result= result + ("0x%02X" %c) - if len(result)> 0: - result=result + "," - - -with open('../index_html.h',"wt") as f: - f.write("const uint8_t index_html[] PROGMEM = {"); - f.write(result.strip(",")) - f.write("};"); \ No newline at end of file diff --git a/HCPBridgeCombo/ESP/src/webpage/index.html b/HCPBridgeCombo/ESP/src/webpage/index.html deleted file mode 100644 index 303cbef..0000000 --- a/HCPBridgeCombo/ESP/src/webpage/index.html +++ /dev/null @@ -1,159 +0,0 @@ - - - Garagentor Steuerung - - - - - - -

Garagentor

- -

warte auf Verbindung.

- -
- -
-

Licht

-
- - - - \ No newline at end of file diff --git a/HCPBridgeCombo/ESP/src/webpage/runtestserver.cmd b/HCPBridgeCombo/ESP/src/webpage/runtestserver.cmd deleted file mode 100644 index 092262b..0000000 --- a/HCPBridgeCombo/ESP/src/webpage/runtestserver.cmd +++ /dev/null @@ -1 +0,0 @@ -python -m http.server diff --git a/HCPBridgeCombo/ESP/src/webpage/status b/HCPBridgeCombo/ESP/src/webpage/status deleted file mode 100644 index c050664..0000000 --- a/HCPBridgeCombo/ESP/src/webpage/status +++ /dev/null @@ -1,9 +0,0 @@ -{ - "valid" : true, - "doorstate" : 1, - "doorposition" : 0, - "doortarget" : 0, - "lamp" : true, - "debug" : 0, - "lastresponse" : 0 -} \ No newline at end of file diff --git a/HCPBridgeESP32/src/index_html.h b/HCPBridgeESP32/src/index_html.h deleted file mode 100644 index bb80e1c..0000000 --- a/HCPBridgeESP32/src/index_html.h +++ /dev/null @@ -1 +0,0 @@ -const uint8_t index_html[] PROGMEM = {0x78,0xDA,0xA5,0x57,0xFD,0x6E,0xE3,0x36,0x12,0xFF,0x7B,0xFD,0x14,0xAC,0x0E,0x08,0xA4,0x8D,0xED,0x48,0xB2,0xB3,0xEB,0x5A,0x96,0x8B,0xED,0x66,0xAF,0xDB,0x62,0x7B,0x2D,0x9A,0x5C,0xD1,0x5E,0xB1,0x7F,0xD0,0xD4,0xC8,0x26,0x42,0x7D,0x1C,0x45,0xC5,0xF6,0x1A,0x7E,0x96,0xBE,0xC5,0xBD,0x40,0x5F,0xEC,0x86,0xA4,0x64,0xCB,0x89,0xB3,0x2D,0xD0,0xC0,0x8A,0x48,0xCE,0xCC,0x6F,0x3E,0x38,0x33,0xA4,0x66,0x5F,0xDC,0xFC,0xF0,0xF6,0xEE,0xD7,0x1F,0xDF,0x91,0xF7,0x77,0xDF,0x7F,0x98,0xCF,0x56,0x2A,0x13,0xF8,0x1F,0x68,0x32,0x9F,0x29,0xAE,0x04,0xCC,0xBF,0xA1,0x92,0x2E,0x21,0x57,0x85,0x24,0xB7,0x0A,0x6A,0x90,0x75,0xBE,0x9C,0x5D,0x59,0xDA,0x2C,0x03,0x45,0x49,0x4E,0x33,0x88,0x1F,0x38,0xAC,0xCB,0x42,0x2A,0xC2,0x8A,0x5C,0x21,0x7B,0xEC,0xAC,0x79,0xA2,0x56,0x71,0x02,0x0F,0x9C,0xC1,0xC0,0x4C,0xFA,0x84,0xE7,0x5C,0x71,0x2A,0x06,0x15,0xA3,0x02,0xE2,0xC0,0x69,0x10,0xD8,0x8A,0xCA,0x0A,0x54,0xFC,0xEF,0xBB,0x7F,0x0E,0x26,0xF3,0x99,0xE0,0xF9,0x3D,0x91,0x20,0x62,0x8E,0x60,0x64,0x25,0x21,0x8D,0x13,0xAA,0xE8,0xB4,0x3F,0x9F,0x55,0x6A,0x8B,0x7A,0x7B,0x04,0xFF,0xB4,0xA9,0x64,0x97,0xA2,0xBA,0x41,0x4A,0x33,0x2E,0xB6,0x53,0xF2,0x46,0x22,0x78,0x44,0x12,0x5E,0x95,0x82,0xE2,0x9C,0xE7,0x08,0x05,0x83,0x85,0x28,0xD8,0x7D,0x44,0x14,0x6C,0xD4,0x80,0x0A,0xBE,0xCC,0xA7,0x84,0xA1,0x89,0x20,0xA3,0xBD,0x45,0x0A,0x1B,0x9C,0x8A,0x7F,0x82,0x29,0x19,0x0D,0x7D,0x09,0x59,0x43,0x2B,0x9F,0x27,0x2D,0x8A,0x64,0x4B,0x76,0x19,0xDD,0x58,0xEF,0xA6,0xE4,0x95,0xEF,0x97,0x9B,0x88,0x64,0x54,0x2E,0x79,0x3E,0xC5,0x31,0xA1,0xB5,0x2A,0x22,0x52,0xD2,0x24,0xE1,0xF9,0x72,0xB0,0x28,0x94,0x2A,0xB2,0x29,0x09,0xAF,0x91,0xCD,0x62,0x0C,0xAB,0x35,0x57,0x6C,0x45,0x76,0x65,0x51,0x61,0x68,0x0A,0x34,0x0D,0x1D,0xA7,0x8A,0x3F,0xC0,0xB3,0x7E,0x34,0xDA,0x26,0x46,0xD9,0x0A,0xF8,0x72,0xA5,0xA6,0x64,0x3C,0x29,0x37,0x7B,0x72,0x82,0xC9,0xF3,0xB2,0x56,0x64,0x77,0x40,0xC9,0x8B,0x1C,0x5A,0xAD,0x82,0x27,0x20,0xBB,0x5A,0xE9,0xA2,0x2A,0x44,0xAD,0x50,0xAB,0x2A,0xCA,0x29,0xF1,0x23,0x22,0x20,0x55,0x66,0x20,0xAD,0x06,0x1C,0xB5,0x0E,0xE8,0x21,0x65,0xF7,0x4B,0x59,0xD4,0x79,0x32,0x60,0x85,0x28,0xE4,0x94,0xFC,0x83,0x31,0xA6,0x59,0x24,0x22,0x0F,0x24,0x4D,0x78,0x5D,0x61,0x48,0xD0,0xAA,0xAE,0xCA,0xE9,0x02,0xD2,0x42,0xC2,0x79,0xCD,0x4D,0xEA,0x4C,0x89,0xE3,0x1C,0x1D,0x1B,0x85,0xDA,0xCD,0xC6,0x67,0x3B,0xB1,0x96,0x4D,0xF4,0xB0,0xB5,0xC8,0x4E,0x9E,0xDA,0x94,0xA6,0x69,0x44,0x06,0x6B,0x58,0xDC,0x73,0x35,0x50,0x92,0xE6,0xAD,0xD6,0xE1,0xB8,0x42,0x57,0x1F,0x2F,0x3C,0xB2,0x7E,0xD4,0x5A,0x6F,0x42,0x39,0x65,0x2B,0x60,0xF7,0x90,0x5C,0x1E,0xC2,0x77,0x46,0xE1,0x62,0xE4,0xE3,0xDF,0x67,0xA4,0x0E,0x11,0x38,0xB1,0x0A,0x97,0xD0,0x0B,0x33,0xC4,0xDD,0x87,0x5F,0x5C,0xED,0xA9,0x87,0xA6,0x67,0xD5,0xE7,0x19,0x3E,0x43,0xDC,0xF7,0x5E,0xF4,0x5E,0x0C,0x17,0x35,0x46,0x28,0x27,0xBB,0xDE,0x8B,0x17,0xD6,0x3B,0xCC,0x15,0x0C,0xD6,0x61,0x3A,0x30,0x25,0x35,0x25,0xB8,0x09,0x3C,0xD1,0xCB,0x8D,0x27,0x0B,0x81,0xCE,0xE9,0x79,0x13,0xFA,0xC0,0x24,0x37,0xCE,0xDB,0x8D,0x39,0x2C,0x9C,0xA9,0x2B,0x5C,0x7D,0x94,0xBC,0x07,0xC6,0x04,0x58,0x21,0xA9,0x8D,0xB9,0xCE,0xC8,0x33,0xBC,0x4D,0xA2,0x23,0xC1,0x94,0xDE,0xBA,0x51,0xB8,0x28,0x44,0x72,0x58,0xB4,0xF5,0x18,0x36,0x26,0x34,0x25,0xA7,0x3D,0x23,0xA1,0x5D,0x62,0xB5,0xAC,0xB4,0x1F,0x65,0xC1,0x5B,0x93,0x1E,0xED,0xEE,0xB5,0x15,0xDE,0x1F,0x82,0x24,0x21,0xC1,0x3D,0xB5,0x4C,0xED,0x7E,0xBE,0xBB,0xB9,0xFE,0xF2,0x55,0x10,0x1D,0x99,0xB6,0x20,0x44,0xB1,0x7E,0xC2,0x97,0x32,0x46,0x7D,0xBF,0xC3,0xB7,0x94,0x00,0xF9,0x13,0xB6,0xF1,0x64,0x91,0x4C,0x10,0x8E,0xE8,0x52,0x9D,0x5D,0xD9,0x76,0x36,0xBB,0xB2,0x0D,0x57,0x37,0x14,0x6C,0xBE,0x61,0xA7,0xE7,0x22,0x29,0x9C,0xCF,0x18,0xCD,0x1F,0x68,0x65,0x8B,0x20,0x0E,0xB5,0xDD,0x4D,0x79,0x34,0x13,0x9E,0xC4,0x09,0x43,0x18,0xCB,0x87,0x10,0x23,0xBD,0x54,0x29,0xAA,0xEA,0x6A,0xBE,0xA6,0x52,0x01,0x76,0xA2,0x94,0xFC,0x0C,0x72,0xC1,0xF3,0x04,0x1B,0xF8,0x10,0x71,0x47,0xC8,0x27,0x51,0xA9,0xCD,0x0F,0x26,0x68,0x55,0xC5,0x4E,0x33,0x3B,0xC4,0xC3,0x21,0x45,0xCE,0x04,0x67,0xF7,0x71,0x52,0xBC,0x2D,0xB2,0x8C,0xE6,0x89,0x1B,0x78,0xF3,0x37,0x75,0x3A,0xBB,0xB2,0x4C,0x9F,0x45,0xB0,0xC1,0x3A,0x07,0x12,0x7A,0xF3,0x5B,0xEC,0x34,0x7F,0x09,0xC5,0x84,0xF2,0x1C,0x88,0xEF,0xCD,0xFF,0x53,0x1F,0x21,0xB4,0x3B,0xAB,0xF1,0xFC,0x03,0x67,0x2B,0x85,0x0E,0x8E,0xF1,0x24,0xA1,0x0B,0x10,0x0D,0xA6,0xED,0x8A,0xF3,0x99,0x6D,0x8B,0x6A,0x5B,0x42,0x6C,0x4A,0x73,0x51,0x6C,0x34,0xF4,0x8A,0xE6,0x4B,0xE8,0x60,0x5F,0x7B,0x3A,0x86,0x42,0x47,0x19,0x8F,0x9D,0x92,0xB6,0xA6,0xD9,0x2A,0xC6,0x60,0xEB,0x35,0x7C,0x19,0x15,0x56,0x77,0xC5,0x24,0x2F,0xD5,0x3C,0x29,0x0A,0x89,0xED,0x2D,0x0E,0xFC,0x28,0xE1,0x32,0x1E,0x04,0x11,0xAF,0xB0,0xB5,0xE5,0xC0,0x14,0x24,0x71,0x4A,0x45,0x05,0xD1,0x03,0x95,0x84,0xE6,0x3C,0x33,0x85,0x10,0xA5,0x75,0xCE,0xF4,0x80,0xE0,0x96,0x49,0x75,0x83,0xF2,0x6F,0x5A,0x9A,0xEB,0xED,0x78,0xEA,0x7E,0x71,0xE0,0xF5,0x76,0x87,0x61,0x8C,0x47,0xE6,0xB7,0x3A,0xB7,0x1F,0xA8,0x70,0x6F,0x24,0x5D,0xF7,0x43,0xDF,0xF7,0xA2,0xFD,0xBE,0xD7,0xC1,0x2B,0xCA,0x33,0x70,0x1D,0x34,0x26,0x80,0xCA,0x03,0xCA,0x91,0x80,0x99,0x7C,0x54,0x94,0xD7,0x42,0x44,0x1D,0x58,0xAD,0x0C,0x91,0xB4,0x13,0xD5,0xC3,0x12,0x83,0xC6,0xEA,0x0C,0xD3,0x75,0xB8,0x04,0xF5,0x4E,0x80,0x1E,0x7E,0xBD,0xFD,0x36,0x71,0x1D,0x24,0x3A,0x9E,0xF1,0x35,0x61,0xCF,0x73,0x25,0xAC,0x61,0x62,0x6A,0x83,0x79,0xAC,0xE9,0x6F,0xF5,0x49,0xB0,0x51,0xAE,0x13,0x26,0x48,0x6B,0x6E,0x12,0x6C,0x68,0x06,0x51,0x93,0xFA,0x38,0xB7,0xA3,0x08,0xE5,0x86,0xC6,0x8F,0x9F,0x30,0xC4,0xAE,0xDF,0xF7,0xFB,0xF6,0xBA,0x61,0xC9,0x5E,0xB4,0xA1,0xF1,0x6F,0xC1,0xA4,0xAF,0x7F,0x7E,0x7F,0xD4,0x0F,0x5E,0x8F,0xFB,0xA3,0xF1,0x6B,0x7C,0x70,0x36,0x0A,0xCD,0x13,0x7E,0xF9,0xDA,0x3C,0xD7,0xA1,0xFE,0x05,0x93,0x8F,0xD1,0x16,0x85,0x46,0xE1,0xEB,0x7E,0x10,0x8C,0xF1,0xC1,0xB7,0xEF,0xF7,0xC3,0xD0,0xBC,0xCC,0x14,0x97,0x35,0xD9,0xB2,0x84,0xE6,0x69,0xE6,0x1F,0x8D,0x41,0x29,0x17,0xE2,0x56,0x97,0x37,0x26,0xB3,0x6E,0xA5,0x8E,0x59,0x5D,0x00,0xF6,0xA9,0x1F,0xA9,0x5A,0xB9,0x5E,0x84,0x5D,0xDB,0xE5,0xB1,0x1F,0xF1,0xD9,0x86,0x0E,0x05,0xE4,0x4B,0xF4,0x8D,0x5F,0x5E,0x9A,0x1D,0xE2,0x71,0xEC,0xE3,0xE6,0xA0,0x44,0x56,0x3C,0xC0,0x5D,0xE1,0xBA,0x1B,0xFA,0x1B,0xFF,0x78,0x35,0xBA,0xF6,0xBD,0x97,0xD6,0x3B,0x77,0xFB,0x68,0x05,0xF7,0x0C,0x30,0xB7,0x8C,0x94,0x6E,0xA3,0x7F,0x59,0x6A,0xDF,0x6B,0x0D,0x3E,0xB1,0xAA,0xC9,0x63,0x6B,0x53,0xCB,0x61,0x42,0xEC,0xBE,0x0A,0x4F,0x30,0xDD,0x20,0xF4,0x2F,0xC3,0xE0,0x25,0xF7,0x4E,0x96,0xC3,0xF0,0xFA,0x64,0x1E,0x4C,0x4E,0xF5,0xF6,0x1A,0x0D,0x97,0x31,0xD6,0x49,0x84,0x5E,0xE3,0x6B,0xE6,0x5F,0x5C,0x34,0xCB,0x33,0x1D,0x02,0x5D,0x41,0xF8,0xBC,0x1C,0xE8,0x1E,0x6C,0x59,0xE6,0x47,0x96,0x39,0x16,0xD9,0x29,0x4F,0x27,0x4B,0x8F,0xB5,0x4C,0x99,0x4D,0x76,0x5D,0x49,0x9D,0x5A,0xF4,0x76,0x12,0x54,0x2D,0x73,0x44,0xD6,0xE9,0xB7,0x59,0xC9,0x38,0x87,0x35,0xF9,0xE5,0xFB,0x0F,0xEF,0x95,0x2A,0x7F,0x82,0xFF,0xD6,0x50,0x29,0x0C,0x09,0x12,0x86,0x45,0x09,0xB9,0xEB,0x7C,0xF3,0xEE,0xCE,0xE9,0x3B,0x57,0xCC,0xE2,0x7E,0x65,0x71,0x63,0xE7,0xD2,0x0E,0xFA,0x4A,0xD6,0x60,0xD9,0x2B,0x40,0xB5,0x5E,0xB7,0x66,0xB0,0x58,0x75,0x25,0xDE,0x62,0x53,0x06,0x57,0xB7,0x66,0xF0,0x76,0x67,0xCA,0x53,0x87,0xC1,0x50,0x4D,0x02,0x3C,0x69,0x25,0xFB,0x0E,0x3D,0x38,0xD2,0x2D,0xF9,0x84,0x1A,0x1E,0xA9,0xD7,0x2D,0xD5,0xD6,0x6D,0x87,0x69,0xE4,0x9D,0xEB,0x38,0x5D,0xB3,0xB1,0x18,0x6F,0xCD,0x39,0x72,0xA7,0xEB,0x91,0x9B,0x98,0x55,0xB5,0xC0,0xFB,0xFD,0x0D,0x9E,0x48,0x77,0xF8,0x55,0xE0,0xF4,0x6C,0x67,0xD5,0xC4,0xDE,0x8E,0xD1,0x0A,0x88,0xBF,0x09,0xFD,0xE9,0x89,0xC3,0x81,0x17,0xD9,0x58,0x13,0x2B,0x7E,0xE9,0xF0,0x4A,0x21,0xF8,0x1F,0xFF,0x4B,0xD3,0x1C,0xD4,0x10,0xAB,0xC3,0x0A,0x8E,0x1F,0x09,0xFA,0xCF,0x08,0x56,0x6C,0x25,0x8A,0x0A,0xC3,0x7C,0x14,0x9D,0x3C,0x12,0x0D,0xCF,0x8A,0x2A,0xE0,0xE2,0x8C,0x5E,0xFF,0x6F,0x09,0x87,0xA7,0xC2,0xA3,0x27,0xC2,0xDA,0x5C,0x0E,0x7F,0xFC,0xDE,0x15,0x0A,0xFE,0x4C,0xE8,0x54,0xCF,0x20,0x78,0x26,0x32,0xCE,0x3D,0x60,0xB5,0x77,0x4E,0x77,0xF2,0xA9,0xCE,0xF4,0xD6,0xA0,0x60,0x02,0x29,0x45,0xAC,0x69,0xC3,0x59,0xE7,0x0B,0xB8,0xA7,0xBA,0xDB,0x13,0xBB,0xAB,0x78,0xD7,0xBE,0xC4,0x6B,0x5F,0xB7,0x6C,0xEA,0x12,0x3F,0xB6,0xE0,0x06,0x3F,0xB8,0x9A,0x16,0xBF,0xC9,0xC4,0x0A,0xEB,0xE1,0x99,0xDA,0xB0,0xC4,0xA1,0xBE,0x2D,0xD0,0x64,0x6B,0xF2,0xAA,0x39,0x4B,0x5B,0x44,0x7B,0xE6,0xA8,0x15,0xAF,0x86,0x86,0xE7,0xD6,0xE6,0xDE,0xF8,0xE2,0xC2,0xAC,0xD9,0x6B,0x0A,0x26,0x2C,0x1E,0x5E,0xF6,0x48,0xB1,0x0B,0xDF,0xDD,0xFE,0xF0,0xAF,0x61,0xA9,0x3F,0x0C,0x5B,0xD9,0xAA,0x2C,0xF2,0x0A,0x74,0x22,0x7A,0x27,0x47,0xAA,0x15,0x18,0xE2,0x01,0x86,0xAE,0x3C,0x7F,0x18,0x19,0x2E,0xC7,0x1B,0x72,0x94,0x93,0xFA,0x73,0x37,0x3E,0x4D,0xEE,0x2E,0xCC,0x57,0xCD,0x44,0x97,0x90,0xF1,0x69,0x3A,0xC0,0x14,0x7E,0x16,0xDB,0x5C,0x13,0x10,0xBA,0xB9,0xEB,0xB7,0x16,0x09,0x9A,0x95,0x17,0x27,0xD6,0x1D,0x1A,0xCE,0xD3,0x2B,0xC1,0xFE,0x18,0xCB,0x6E,0xAF,0x69,0xCC,0x6E,0x7B,0x4B,0xC3,0x72,0xE8,0x2F,0x4D,0x49,0x77,0x37,0x2D,0xEA,0xDE,0x0B,0x8E,0x84,0xBE,0xFE,0x32,0xF1,0x22,0xBC,0xB8,0xD8,0x6B,0x0A,0xDE,0x9B,0xCC,0x7D,0xF3,0xCA,0x7C,0xF3,0xFF,0x1F,0xA6,0x8A,0x84,0xF0}; \ No newline at end of file diff --git a/HCPBridgeESP32/src/main.cpp b/HCPBridgeESP32/src/main.cpp index 17914a7..7333ac2 100644 --- a/HCPBridgeESP32/src/main.cpp +++ b/HCPBridgeESP32/src/main.cpp @@ -5,6 +5,7 @@ #include "ArduinoJson.h" #include "hciemulator.h" #include "index_html.h" +#include "../../WebUI/index_html.h" /* create this file and add your wlan credentials const char* ssid = "MyWLANSID"; diff --git a/HCPBridgeESP32/src/webpage/buildindex.cmd b/HCPBridgeESP32/src/webpage/buildindex.cmd deleted file mode 100644 index 6ed0ebd..0000000 --- a/HCPBridgeESP32/src/webpage/buildindex.cmd +++ /dev/null @@ -1 +0,0 @@ -python compress.py diff --git a/HCPBridgeESP32/src/webpage/command b/HCPBridgeESP32/src/webpage/command deleted file mode 100644 index e69de29..0000000 diff --git a/HCPBridgeESP32/src/webpage/compress.py b/HCPBridgeESP32/src/webpage/compress.py deleted file mode 100644 index 5e9faa8..0000000 --- a/HCPBridgeESP32/src/webpage/compress.py +++ /dev/null @@ -1,35 +0,0 @@ -#pip install htmlmin -#or python -m pip install htmlmin -#pip install jsmin -#or python -m pip install jsmin - -import gzip -import zlib -import htmlmin -from jsmin import jsmin - - - -content = "" -with open('index.html','rt',encoding="utf-8") as f: - content=f.read() - - -content = htmlmin.minify(content, remove_comments=True, remove_empty_space=True, remove_all_empty_space=True, reduce_empty_attributes=True, reduce_boolean_attributes=False, remove_optional_attribute_quotes=True, convert_charrefs=True, keep_pre=False) - - -import re -regex = r"" ,content, 0, re.DOTALL) - -result ="" -for c in zlib.compress(content.encode("UTF-8"),9): - result= result + ("0x%02X" %c) - if len(result)> 0: - result=result + "," - - -with open('../index_html.h',"wt") as f: - f.write("const uint8_t index_html[] PROGMEM = {"); - f.write(result.strip(",")) - f.write("};"); \ No newline at end of file diff --git a/HCPBridgeESP32/src/webpage/index.html b/HCPBridgeESP32/src/webpage/index.html deleted file mode 100644 index 303cbef..0000000 --- a/HCPBridgeESP32/src/webpage/index.html +++ /dev/null @@ -1,159 +0,0 @@ - - - Garagentor Steuerung - - - - - - -

Garagentor

- -

warte auf Verbindung.

- -
- -
-

Licht

-
- - - - \ No newline at end of file diff --git a/HCPBridgeESP32/src/webpage/runtestserver.cmd b/HCPBridgeESP32/src/webpage/runtestserver.cmd deleted file mode 100644 index 092262b..0000000 --- a/HCPBridgeESP32/src/webpage/runtestserver.cmd +++ /dev/null @@ -1 +0,0 @@ -python -m http.server diff --git a/HCPBridgeESP32/src/webpage/status b/HCPBridgeESP32/src/webpage/status deleted file mode 100644 index c050664..0000000 --- a/HCPBridgeESP32/src/webpage/status +++ /dev/null @@ -1,9 +0,0 @@ -{ - "valid" : true, - "doorstate" : 1, - "doorposition" : 0, - "doortarget" : 0, - "lamp" : true, - "debug" : 0, - "lastresponse" : 0 -} \ No newline at end of file diff --git a/HCPBridgeISR/src/index_html.h b/HCPBridgeISR/src/index_html.h deleted file mode 100644 index bb80e1c..0000000 --- a/HCPBridgeISR/src/index_html.h +++ /dev/null @@ -1 +0,0 @@ -const uint8_t index_html[] PROGMEM = {0x78,0xDA,0xA5,0x57,0xFD,0x6E,0xE3,0x36,0x12,0xFF,0x7B,0xFD,0x14,0xAC,0x0E,0x08,0xA4,0x8D,0xED,0x48,0xB2,0xB3,0xEB,0x5A,0x96,0x8B,0xED,0x66,0xAF,0xDB,0x62,0x7B,0x2D,0x9A,0x5C,0xD1,0x5E,0xB1,0x7F,0xD0,0xD4,0xC8,0x26,0x42,0x7D,0x1C,0x45,0xC5,0xF6,0x1A,0x7E,0x96,0xBE,0xC5,0xBD,0x40,0x5F,0xEC,0x86,0xA4,0x64,0xCB,0x89,0xB3,0x2D,0xD0,0xC0,0x8A,0x48,0xCE,0xCC,0x6F,0x3E,0x38,0x33,0xA4,0x66,0x5F,0xDC,0xFC,0xF0,0xF6,0xEE,0xD7,0x1F,0xDF,0x91,0xF7,0x77,0xDF,0x7F,0x98,0xCF,0x56,0x2A,0x13,0xF8,0x1F,0x68,0x32,0x9F,0x29,0xAE,0x04,0xCC,0xBF,0xA1,0x92,0x2E,0x21,0x57,0x85,0x24,0xB7,0x0A,0x6A,0x90,0x75,0xBE,0x9C,0x5D,0x59,0xDA,0x2C,0x03,0x45,0x49,0x4E,0x33,0x88,0x1F,0x38,0xAC,0xCB,0x42,0x2A,0xC2,0x8A,0x5C,0x21,0x7B,0xEC,0xAC,0x79,0xA2,0x56,0x71,0x02,0x0F,0x9C,0xC1,0xC0,0x4C,0xFA,0x84,0xE7,0x5C,0x71,0x2A,0x06,0x15,0xA3,0x02,0xE2,0xC0,0x69,0x10,0xD8,0x8A,0xCA,0x0A,0x54,0xFC,0xEF,0xBB,0x7F,0x0E,0x26,0xF3,0x99,0xE0,0xF9,0x3D,0x91,0x20,0x62,0x8E,0x60,0x64,0x25,0x21,0x8D,0x13,0xAA,0xE8,0xB4,0x3F,0x9F,0x55,0x6A,0x8B,0x7A,0x7B,0x04,0xFF,0xB4,0xA9,0x64,0x97,0xA2,0xBA,0x41,0x4A,0x33,0x2E,0xB6,0x53,0xF2,0x46,0x22,0x78,0x44,0x12,0x5E,0x95,0x82,0xE2,0x9C,0xE7,0x08,0x05,0x83,0x85,0x28,0xD8,0x7D,0x44,0x14,0x6C,0xD4,0x80,0x0A,0xBE,0xCC,0xA7,0x84,0xA1,0x89,0x20,0xA3,0xBD,0x45,0x0A,0x1B,0x9C,0x8A,0x7F,0x82,0x29,0x19,0x0D,0x7D,0x09,0x59,0x43,0x2B,0x9F,0x27,0x2D,0x8A,0x64,0x4B,0x76,0x19,0xDD,0x58,0xEF,0xA6,0xE4,0x95,0xEF,0x97,0x9B,0x88,0x64,0x54,0x2E,0x79,0x3E,0xC5,0x31,0xA1,0xB5,0x2A,0x22,0x52,0xD2,0x24,0xE1,0xF9,0x72,0xB0,0x28,0x94,0x2A,0xB2,0x29,0x09,0xAF,0x91,0xCD,0x62,0x0C,0xAB,0x35,0x57,0x6C,0x45,0x76,0x65,0x51,0x61,0x68,0x0A,0x34,0x0D,0x1D,0xA7,0x8A,0x3F,0xC0,0xB3,0x7E,0x34,0xDA,0x26,0x46,0xD9,0x0A,0xF8,0x72,0xA5,0xA6,0x64,0x3C,0x29,0x37,0x7B,0x72,0x82,0xC9,0xF3,0xB2,0x56,0x64,0x77,0x40,0xC9,0x8B,0x1C,0x5A,0xAD,0x82,0x27,0x20,0xBB,0x5A,0xE9,0xA2,0x2A,0x44,0xAD,0x50,0xAB,0x2A,0xCA,0x29,0xF1,0x23,0x22,0x20,0x55,0x66,0x20,0xAD,0x06,0x1C,0xB5,0x0E,0xE8,0x21,0x65,0xF7,0x4B,0x59,0xD4,0x79,0x32,0x60,0x85,0x28,0xE4,0x94,0xFC,0x83,0x31,0xA6,0x59,0x24,0x22,0x0F,0x24,0x4D,0x78,0x5D,0x61,0x48,0xD0,0xAA,0xAE,0xCA,0xE9,0x02,0xD2,0x42,0xC2,0x79,0xCD,0x4D,0xEA,0x4C,0x89,0xE3,0x1C,0x1D,0x1B,0x85,0xDA,0xCD,0xC6,0x67,0x3B,0xB1,0x96,0x4D,0xF4,0xB0,0xB5,0xC8,0x4E,0x9E,0xDA,0x94,0xA6,0x69,0x44,0x06,0x6B,0x58,0xDC,0x73,0x35,0x50,0x92,0xE6,0xAD,0xD6,0xE1,0xB8,0x42,0x57,0x1F,0x2F,0x3C,0xB2,0x7E,0xD4,0x5A,0x6F,0x42,0x39,0x65,0x2B,0x60,0xF7,0x90,0x5C,0x1E,0xC2,0x77,0x46,0xE1,0x62,0xE4,0xE3,0xDF,0x67,0xA4,0x0E,0x11,0x38,0xB1,0x0A,0x97,0xD0,0x0B,0x33,0xC4,0xDD,0x87,0x5F,0x5C,0xED,0xA9,0x87,0xA6,0x67,0xD5,0xE7,0x19,0x3E,0x43,0xDC,0xF7,0x5E,0xF4,0x5E,0x0C,0x17,0x35,0x46,0x28,0x27,0xBB,0xDE,0x8B,0x17,0xD6,0x3B,0xCC,0x15,0x0C,0xD6,0x61,0x3A,0x30,0x25,0x35,0x25,0xB8,0x09,0x3C,0xD1,0xCB,0x8D,0x27,0x0B,0x81,0xCE,0xE9,0x79,0x13,0xFA,0xC0,0x24,0x37,0xCE,0xDB,0x8D,0x39,0x2C,0x9C,0xA9,0x2B,0x5C,0x7D,0x94,0xBC,0x07,0xC6,0x04,0x58,0x21,0xA9,0x8D,0xB9,0xCE,0xC8,0x33,0xBC,0x4D,0xA2,0x23,0xC1,0x94,0xDE,0xBA,0x51,0xB8,0x28,0x44,0x72,0x58,0xB4,0xF5,0x18,0x36,0x26,0x34,0x25,0xA7,0x3D,0x23,0xA1,0x5D,0x62,0xB5,0xAC,0xB4,0x1F,0x65,0xC1,0x5B,0x93,0x1E,0xED,0xEE,0xB5,0x15,0xDE,0x1F,0x82,0x24,0x21,0xC1,0x3D,0xB5,0x4C,0xED,0x7E,0xBE,0xBB,0xB9,0xFE,0xF2,0x55,0x10,0x1D,0x99,0xB6,0x20,0x44,0xB1,0x7E,0xC2,0x97,0x32,0x46,0x7D,0xBF,0xC3,0xB7,0x94,0x00,0xF9,0x13,0xB6,0xF1,0x64,0x91,0x4C,0x10,0x8E,0xE8,0x52,0x9D,0x5D,0xD9,0x76,0x36,0xBB,0xB2,0x0D,0x57,0x37,0x14,0x6C,0xBE,0x61,0xA7,0xE7,0x22,0x29,0x9C,0xCF,0x18,0xCD,0x1F,0x68,0x65,0x8B,0x20,0x0E,0xB5,0xDD,0x4D,0x79,0x34,0x13,0x9E,0xC4,0x09,0x43,0x18,0xCB,0x87,0x10,0x23,0xBD,0x54,0x29,0xAA,0xEA,0x6A,0xBE,0xA6,0x52,0x01,0x76,0xA2,0x94,0xFC,0x0C,0x72,0xC1,0xF3,0x04,0x1B,0xF8,0x10,0x71,0x47,0xC8,0x27,0x51,0xA9,0xCD,0x0F,0x26,0x68,0x55,0xC5,0x4E,0x33,0x3B,0xC4,0xC3,0x21,0x45,0xCE,0x04,0x67,0xF7,0x71,0x52,0xBC,0x2D,0xB2,0x8C,0xE6,0x89,0x1B,0x78,0xF3,0x37,0x75,0x3A,0xBB,0xB2,0x4C,0x9F,0x45,0xB0,0xC1,0x3A,0x07,0x12,0x7A,0xF3,0x5B,0xEC,0x34,0x7F,0x09,0xC5,0x84,0xF2,0x1C,0x88,0xEF,0xCD,0xFF,0x53,0x1F,0x21,0xB4,0x3B,0xAB,0xF1,0xFC,0x03,0x67,0x2B,0x85,0x0E,0x8E,0xF1,0x24,0xA1,0x0B,0x10,0x0D,0xA6,0xED,0x8A,0xF3,0x99,0x6D,0x8B,0x6A,0x5B,0x42,0x6C,0x4A,0x73,0x51,0x6C,0x34,0xF4,0x8A,0xE6,0x4B,0xE8,0x60,0x5F,0x7B,0x3A,0x86,0x42,0x47,0x19,0x8F,0x9D,0x92,0xB6,0xA6,0xD9,0x2A,0xC6,0x60,0xEB,0x35,0x7C,0x19,0x15,0x56,0x77,0xC5,0x24,0x2F,0xD5,0x3C,0x29,0x0A,0x89,0xED,0x2D,0x0E,0xFC,0x28,0xE1,0x32,0x1E,0x04,0x11,0xAF,0xB0,0xB5,0xE5,0xC0,0x14,0x24,0x71,0x4A,0x45,0x05,0xD1,0x03,0x95,0x84,0xE6,0x3C,0x33,0x85,0x10,0xA5,0x75,0xCE,0xF4,0x80,0xE0,0x96,0x49,0x75,0x83,0xF2,0x6F,0x5A,0x9A,0xEB,0xED,0x78,0xEA,0x7E,0x71,0xE0,0xF5,0x76,0x87,0x61,0x8C,0x47,0xE6,0xB7,0x3A,0xB7,0x1F,0xA8,0x70,0x6F,0x24,0x5D,0xF7,0x43,0xDF,0xF7,0xA2,0xFD,0xBE,0xD7,0xC1,0x2B,0xCA,0x33,0x70,0x1D,0x34,0x26,0x80,0xCA,0x03,0xCA,0x91,0x80,0x99,0x7C,0x54,0x94,0xD7,0x42,0x44,0x1D,0x58,0xAD,0x0C,0x91,0xB4,0x13,0xD5,0xC3,0x12,0x83,0xC6,0xEA,0x0C,0xD3,0x75,0xB8,0x04,0xF5,0x4E,0x80,0x1E,0x7E,0xBD,0xFD,0x36,0x71,0x1D,0x24,0x3A,0x9E,0xF1,0x35,0x61,0xCF,0x73,0x25,0xAC,0x61,0x62,0x6A,0x83,0x79,0xAC,0xE9,0x6F,0xF5,0x49,0xB0,0x51,0xAE,0x13,0x26,0x48,0x6B,0x6E,0x12,0x6C,0x68,0x06,0x51,0x93,0xFA,0x38,0xB7,0xA3,0x08,0xE5,0x86,0xC6,0x8F,0x9F,0x30,0xC4,0xAE,0xDF,0xF7,0xFB,0xF6,0xBA,0x61,0xC9,0x5E,0xB4,0xA1,0xF1,0x6F,0xC1,0xA4,0xAF,0x7F,0x7E,0x7F,0xD4,0x0F,0x5E,0x8F,0xFB,0xA3,0xF1,0x6B,0x7C,0x70,0x36,0x0A,0xCD,0x13,0x7E,0xF9,0xDA,0x3C,0xD7,0xA1,0xFE,0x05,0x93,0x8F,0xD1,0x16,0x85,0x46,0xE1,0xEB,0x7E,0x10,0x8C,0xF1,0xC1,0xB7,0xEF,0xF7,0xC3,0xD0,0xBC,0xCC,0x14,0x97,0x35,0xD9,0xB2,0x84,0xE6,0x69,0xE6,0x1F,0x8D,0x41,0x29,0x17,0xE2,0x56,0x97,0x37,0x26,0xB3,0x6E,0xA5,0x8E,0x59,0x5D,0x00,0xF6,0xA9,0x1F,0xA9,0x5A,0xB9,0x5E,0x84,0x5D,0xDB,0xE5,0xB1,0x1F,0xF1,0xD9,0x86,0x0E,0x05,0xE4,0x4B,0xF4,0x8D,0x5F,0x5E,0x9A,0x1D,0xE2,0x71,0xEC,0xE3,0xE6,0xA0,0x44,0x56,0x3C,0xC0,0x5D,0xE1,0xBA,0x1B,0xFA,0x1B,0xFF,0x78,0x35,0xBA,0xF6,0xBD,0x97,0xD6,0x3B,0x77,0xFB,0x68,0x05,0xF7,0x0C,0x30,0xB7,0x8C,0x94,0x6E,0xA3,0x7F,0x59,0x6A,0xDF,0x6B,0x0D,0x3E,0xB1,0xAA,0xC9,0x63,0x6B,0x53,0xCB,0x61,0x42,0xEC,0xBE,0x0A,0x4F,0x30,0xDD,0x20,0xF4,0x2F,0xC3,0xE0,0x25,0xF7,0x4E,0x96,0xC3,0xF0,0xFA,0x64,0x1E,0x4C,0x4E,0xF5,0xF6,0x1A,0x0D,0x97,0x31,0xD6,0x49,0x84,0x5E,0xE3,0x6B,0xE6,0x5F,0x5C,0x34,0xCB,0x33,0x1D,0x02,0x5D,0x41,0xF8,0xBC,0x1C,0xE8,0x1E,0x6C,0x59,0xE6,0x47,0x96,0x39,0x16,0xD9,0x29,0x4F,0x27,0x4B,0x8F,0xB5,0x4C,0x99,0x4D,0x76,0x5D,0x49,0x9D,0x5A,0xF4,0x76,0x12,0x54,0x2D,0x73,0x44,0xD6,0xE9,0xB7,0x59,0xC9,0x38,0x87,0x35,0xF9,0xE5,0xFB,0x0F,0xEF,0x95,0x2A,0x7F,0x82,0xFF,0xD6,0x50,0x29,0x0C,0x09,0x12,0x86,0x45,0x09,0xB9,0xEB,0x7C,0xF3,0xEE,0xCE,0xE9,0x3B,0x57,0xCC,0xE2,0x7E,0x65,0x71,0x63,0xE7,0xD2,0x0E,0xFA,0x4A,0xD6,0x60,0xD9,0x2B,0x40,0xB5,0x5E,0xB7,0x66,0xB0,0x58,0x75,0x25,0xDE,0x62,0x53,0x06,0x57,0xB7,0x66,0xF0,0x76,0x67,0xCA,0x53,0x87,0xC1,0x50,0x4D,0x02,0x3C,0x69,0x25,0xFB,0x0E,0x3D,0x38,0xD2,0x2D,0xF9,0x84,0x1A,0x1E,0xA9,0xD7,0x2D,0xD5,0xD6,0x6D,0x87,0x69,0xE4,0x9D,0xEB,0x38,0x5D,0xB3,0xB1,0x18,0x6F,0xCD,0x39,0x72,0xA7,0xEB,0x91,0x9B,0x98,0x55,0xB5,0xC0,0xFB,0xFD,0x0D,0x9E,0x48,0x77,0xF8,0x55,0xE0,0xF4,0x6C,0x67,0xD5,0xC4,0xDE,0x8E,0xD1,0x0A,0x88,0xBF,0x09,0xFD,0xE9,0x89,0xC3,0x81,0x17,0xD9,0x58,0x13,0x2B,0x7E,0xE9,0xF0,0x4A,0x21,0xF8,0x1F,0xFF,0x4B,0xD3,0x1C,0xD4,0x10,0xAB,0xC3,0x0A,0x8E,0x1F,0x09,0xFA,0xCF,0x08,0x56,0x6C,0x25,0x8A,0x0A,0xC3,0x7C,0x14,0x9D,0x3C,0x12,0x0D,0xCF,0x8A,0x2A,0xE0,0xE2,0x8C,0x5E,0xFF,0x6F,0x09,0x87,0xA7,0xC2,0xA3,0x27,0xC2,0xDA,0x5C,0x0E,0x7F,0xFC,0xDE,0x15,0x0A,0xFE,0x4C,0xE8,0x54,0xCF,0x20,0x78,0x26,0x32,0xCE,0x3D,0x60,0xB5,0x77,0x4E,0x77,0xF2,0xA9,0xCE,0xF4,0xD6,0xA0,0x60,0x02,0x29,0x45,0xAC,0x69,0xC3,0x59,0xE7,0x0B,0xB8,0xA7,0xBA,0xDB,0x13,0xBB,0xAB,0x78,0xD7,0xBE,0xC4,0x6B,0x5F,0xB7,0x6C,0xEA,0x12,0x3F,0xB6,0xE0,0x06,0x3F,0xB8,0x9A,0x16,0xBF,0xC9,0xC4,0x0A,0xEB,0xE1,0x99,0xDA,0xB0,0xC4,0xA1,0xBE,0x2D,0xD0,0x64,0x6B,0xF2,0xAA,0x39,0x4B,0x5B,0x44,0x7B,0xE6,0xA8,0x15,0xAF,0x86,0x86,0xE7,0xD6,0xE6,0xDE,0xF8,0xE2,0xC2,0xAC,0xD9,0x6B,0x0A,0x26,0x2C,0x1E,0x5E,0xF6,0x48,0xB1,0x0B,0xDF,0xDD,0xFE,0xF0,0xAF,0x61,0xA9,0x3F,0x0C,0x5B,0xD9,0xAA,0x2C,0xF2,0x0A,0x74,0x22,0x7A,0x27,0x47,0xAA,0x15,0x18,0xE2,0x01,0x86,0xAE,0x3C,0x7F,0x18,0x19,0x2E,0xC7,0x1B,0x72,0x94,0x93,0xFA,0x73,0x37,0x3E,0x4D,0xEE,0x2E,0xCC,0x57,0xCD,0x44,0x97,0x90,0xF1,0x69,0x3A,0xC0,0x14,0x7E,0x16,0xDB,0x5C,0x13,0x10,0xBA,0xB9,0xEB,0xB7,0x16,0x09,0x9A,0x95,0x17,0x27,0xD6,0x1D,0x1A,0xCE,0xD3,0x2B,0xC1,0xFE,0x18,0xCB,0x6E,0xAF,0x69,0xCC,0x6E,0x7B,0x4B,0xC3,0x72,0xE8,0x2F,0x4D,0x49,0x77,0x37,0x2D,0xEA,0xDE,0x0B,0x8E,0x84,0xBE,0xFE,0x32,0xF1,0x22,0xBC,0xB8,0xD8,0x6B,0x0A,0xDE,0x9B,0xCC,0x7D,0xF3,0xCA,0x7C,0xF3,0xFF,0x1F,0xA6,0x8A,0x84,0xF0}; \ No newline at end of file diff --git a/HCPBridgeISR/src/main.cpp b/HCPBridgeISR/src/main.cpp index 81ec3d9..ebad1e8 100644 --- a/HCPBridgeISR/src/main.cpp +++ b/HCPBridgeISR/src/main.cpp @@ -5,7 +5,7 @@ #include #include #include "hciemulator.h" -#include "index_html.h" +#include "../../WebUI/index_html.h" /* create this file and add your wlan credentials diff --git a/HCPBridgeISR/src/webpage/buildindex.cmd b/HCPBridgeISR/src/webpage/buildindex.cmd deleted file mode 100644 index 6ed0ebd..0000000 --- a/HCPBridgeISR/src/webpage/buildindex.cmd +++ /dev/null @@ -1 +0,0 @@ -python compress.py diff --git a/HCPBridgeISR/src/webpage/command b/HCPBridgeISR/src/webpage/command deleted file mode 100644 index e69de29..0000000 diff --git a/HCPBridgeISR/src/webpage/compress.py b/HCPBridgeISR/src/webpage/compress.py deleted file mode 100644 index 5e9faa8..0000000 --- a/HCPBridgeISR/src/webpage/compress.py +++ /dev/null @@ -1,35 +0,0 @@ -#pip install htmlmin -#or python -m pip install htmlmin -#pip install jsmin -#or python -m pip install jsmin - -import gzip -import zlib -import htmlmin -from jsmin import jsmin - - - -content = "" -with open('index.html','rt',encoding="utf-8") as f: - content=f.read() - - -content = htmlmin.minify(content, remove_comments=True, remove_empty_space=True, remove_all_empty_space=True, reduce_empty_attributes=True, reduce_boolean_attributes=False, remove_optional_attribute_quotes=True, convert_charrefs=True, keep_pre=False) - - -import re -regex = r"" ,content, 0, re.DOTALL) - -result ="" -for c in zlib.compress(content.encode("UTF-8"),9): - result= result + ("0x%02X" %c) - if len(result)> 0: - result=result + "," - - -with open('../index_html.h',"wt") as f: - f.write("const uint8_t index_html[] PROGMEM = {"); - f.write(result.strip(",")) - f.write("};"); \ No newline at end of file diff --git a/HCPBridgeISR/src/webpage/index.html b/HCPBridgeISR/src/webpage/index.html deleted file mode 100644 index 303cbef..0000000 --- a/HCPBridgeISR/src/webpage/index.html +++ /dev/null @@ -1,159 +0,0 @@ - - - Garagentor Steuerung - - - - - - -

Garagentor

- -

warte auf Verbindung.

- -
- -
-

Licht

-
- - - - \ No newline at end of file diff --git a/HCPBridgeISR/src/webpage/runtestserver.cmd b/HCPBridgeISR/src/webpage/runtestserver.cmd deleted file mode 100644 index 092262b..0000000 --- a/HCPBridgeISR/src/webpage/runtestserver.cmd +++ /dev/null @@ -1 +0,0 @@ -python -m http.server diff --git a/HCPBridgeISR/src/webpage/status b/HCPBridgeISR/src/webpage/status deleted file mode 100644 index c050664..0000000 --- a/HCPBridgeISR/src/webpage/status +++ /dev/null @@ -1,9 +0,0 @@ -{ - "valid" : true, - "doorstate" : 1, - "doorposition" : 0, - "doortarget" : 0, - "lamp" : true, - "debug" : 0, - "lastresponse" : 0 -} \ No newline at end of file diff --git a/HCPBridge/src/index_html.h b/WebUI/index_html.h similarity index 100% rename from HCPBridge/src/index_html.h rename to WebUI/index_html.h diff --git a/HCPBridge/src/webpage/buildindex.cmd b/WebUI/webpage/buildindex.cmd similarity index 100% rename from HCPBridge/src/webpage/buildindex.cmd rename to WebUI/webpage/buildindex.cmd diff --git a/HCPBridge/src/webpage/command b/WebUI/webpage/command similarity index 100% rename from HCPBridge/src/webpage/command rename to WebUI/webpage/command diff --git a/HCPBridge/src/webpage/compress.py b/WebUI/webpage/compress.py similarity index 100% rename from HCPBridge/src/webpage/compress.py rename to WebUI/webpage/compress.py diff --git a/WebUI/webpage/favicon.png b/WebUI/webpage/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..5e045c9135fca2566672475ec136b9f34501a9fe GIT binary patch literal 8289 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 Viu=ei`fC9In5Kb7rP|%c{{brfyxRZ( literal 0 HcmV?d00001 diff --git a/HCPBridge/src/webpage/index.html b/WebUI/webpage/index.html similarity index 100% rename from HCPBridge/src/webpage/index.html rename to WebUI/webpage/index.html diff --git a/HCPBridge/src/webpage/runtestserver.cmd b/WebUI/webpage/runtestserver.cmd similarity index 100% rename from HCPBridge/src/webpage/runtestserver.cmd rename to WebUI/webpage/runtestserver.cmd diff --git a/HCPBridge/src/webpage/status b/WebUI/webpage/status similarity index 100% rename from HCPBridge/src/webpage/status rename to WebUI/webpage/status diff --git a/HCPBridgeISR/simulator/hcisim.py b/tools/simulator/hcisim.py similarity index 100% rename from HCPBridgeISR/simulator/hcisim.py rename to tools/simulator/hcisim.py