V3.2
+
- added Email on (re-)start (at the moment this only works for ESP32). Although by a call to Restart_Email (as shown in the main program) also a (re-)start email for the ESP8266 can be send
- added warning MQTT message on (re-)start
- added username/password to MQTTconnection (may be left empty)
V3.1 of RFLink-ESP has the following new or improved features
+
- complete rebuild on the base of Sensors/Receivers-concept (more features with less effort)
- program can be completely build and controlled by WebSettings
- simultanuous support of serial and telnet debug and control
@@ -22,21 +24,108 @@ V3.1 of RFLink-ESP has the following new or improved features
- received and transmitted messages are stored in a file
- build flags extended, so the program can be used with a minimal set of libraries
- flag Home_Automation removed
-- command added: 19;PRINT; //lists the known devices
+- command added: 19;PRINT; //lists the known devices
- Learning_Mode=9 is made asynchronuous, so you can do other things including stopping LM-9
-- command added: 13; and 14; // shows/sets 2 commands for Learning_Mode 8/9
+- command added: 13; and 14; // shows/sets 2 commands for Learning_Mode 8/9
- programs added to upload files to the ESP by FTP
-# Schmurtz
+## Secrets
+
+To change settings and store private keys, create a `secrets.h` file under `src/`. Below is a sample of basic required secrets.
+
+```cpp
+// ***********************************************************************
+// PRIVATE GLOBALS
+// ***********************************************************************
+#define __SECRET_Wifi_Name "Home Network SSID"
+#define __SECRET_Wifi_PWD "Password"
+#define __SECRET_Broker_IP "192.168.22.23"
+
+#define __SECRET_SMTP_Server "smtp.gmail.com"
+#ifdef ESP32
+#define __SECRET_SMTP_Port 587
+#else
+#define __SECRET_SMTP_Port 465
+#endif
+#define __SECRET_SMTP_User "someone@gmail.com"
+#define __SECRET_SMTP_PWD "someones password"
+#define __SECRET_SMTP_MailTo "someone@gmail.com"
+```
+
+## Inclusion
+
+By commenting/uncommenting build parameters you can reduce RAM size requirement.
+To include for example the FTP server, uncomment in your main ino file:
+
+```cpp
+#define INCLUDE_FTPSERVER
+```
+
+### Common
+
+These build parameters are often used in most programs.
+
+| Name | Included by default |
+| ------------------- | ---------------------- |
+| SENSOR_ADS1115 | :x: no |
+| SENSOR_ADS1115_DIFF | :x: no |
+| SENSOR_BME280 | :x: no |
+| SENSOR_DHT22 | :x: no |
+| SENSOR_DS18B20 | :x: no |
+| SENSOR_MHZ14 | :x: no |
+| SENSOR_MPU9250 | :x: no |
+| SENSOR_PIR | :x: no |
+| SENSOR_SDS011 | :x: no |
+| RECEIVER_MQTT | :heavy_check_mark: yes |
+| RECEIVER_EMAIL | :heavy_check_mark: yes |
+| RECEIVER_SCRATCHPAD | :x: no |
+| RECEIVER_SDFAT | :x: no |
+| RECEIVER_SSD1306 | :x: no |
+| RECEIVER_TM1638 | :x: no |
+
+### Special Case
+
+These build parameters only used in special programs.
+
+| Name | Included by default |
+| ----------------------- | ---------------------- |
+| FTPSERVER | :x: no |
+| BLAUWE_ENGEL | :x: no |
+| FIJNSTOF_CONDITIONERING | :x: no |
+| SENSOR_RFLINK | :heavy_check_mark: yes |
+| SENSOR_BMP280 | :x: no |
+| SENSOR_MLX90614 | :x: no |
+| SENSOR_MLX90640 | :x: no |
+| SENSOR_MQTTBroker | :x: no |
+| SENSOR_NTP | :x: no |
+| SENSOR_OKE4 | :x: no |
+| SENSOR_RTC | :x: no |
+| RECEIVER_OTA | :heavy_check_mark: yes |
+| RECEIVER_TELNET | :heavy_check_mark: yes |
+| RECEIVER_WEBSERVER | :heavy_check_mark: yes |
+| RECEIVER_LUFTDATEN | :x: no |
+
+## Building
+
+Useful flags while building are
+
+```
+-Wno-deprecated-declarations -Wno-sign-compare -Wno-unused-variable
+```
+
+## Schmurtz
+
forked V2.1 and made it more compatible with other Bridge-libraries. https://github.com/schmurtzm/RFLink-ESP
-# RFLink-ESP V2.1
+## RFLink-ESP V2.1
+
Home Assistant / Domoticz tested with a RFLink, modified for ESP8266 and ESP32
This is a fork of RFLink, and because we couldn't get it working reliable, we ended up in a complete rewrite of RFLink.
Problem is that the latest version of RFLink is R48. We couldn't only find sources of version R29 and R35. Both sources didn't work correctly, R29 was the best. We tried to contact "the stuntteam" which owns the orginal sources but no response.
This version of RFLink-ESP has the following features
+
- just a few protocols are translated and tested
- Protocols are more generic, so you need less protocols
- Protocols are written as classes and all derived from a common class
@@ -45,13 +134,14 @@ This version of RFLink-ESP has the following features
- Removed a lot of redundancies
- Device must be registered before they will be recognized ( (almost) no more false postives)
- Dynamically determine long/short puls, by measuring Min,Max,Mean
-- Runs on ESP32 and even on a ESP8266
+- Runs on ESP32 and even on a ESP8266
- Fully open source
- Codesize is strongly reduced
- Can communicate over USB/RS232 or MQTT
Some ideas for the future
+
- Implementing rolling code SomFy / Own
- Cleanup global constants and variables
- Using SI4432 as Receiver / Transmitter (Transmitter can be used for all frequencies, Receiver might be able to fetch a complete sequence, so listening at more frequencies at the same time might even be possible)
-- Logging of false positives, including time (Neighbours ??) NTP: https://www.instructables.com/id/Arduino-Internet-Time-Client/
+- Logging of false positives, including time (Neighbours ??) NTP: https://www.instructables.com/id/Arduino-Internet-Time-Client/
diff --git a/RFLink_ESP/Email_Support.h b/RFLink_ESP/Email_Support.h
deleted file mode 100644
index ce600f8..0000000
--- a/RFLink_ESP/Email_Support.h
+++ /dev/null
@@ -1,249 +0,0 @@
-
-
-// Version 0.1 25-04-2020
-// - special for ESP8266, gmail works on port = 465
-
-
-#ifndef Email_Support_h
-#define Email_Support_h 0.1
-
-
-// ***********************************************************************************
-// Encode64 is based on the code from AlertMe
-// ***********************************************************************************
-const char PROGMEM b64_alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "abcdefghijklmnopqrstuvwxyz"
- "0123456789+/";
-
-
-// ***********************************************************************************
-inline void a3_to_a4(unsigned char * a4, unsigned char * a3) {
- a4[0] = (a3[0] & 0xfc) >> 2;
- a4[1] = ((a3[0] & 0x03) << 4) + ((a3[1] & 0xf0) >> 4);
- a4[2] = ((a3[1] & 0x0f) << 2) + ((a3[2] & 0xc0) >> 6);
- a4[3] = (a3[2] & 0x3f);
-}
-
-// ***********************************************************************************
-int base64_encode(char *output, char *input, int inputLen) {
- int i = 0, j = 0;
- int encLen = 0;
- unsigned char a3[3];
- unsigned char a4[4];
-
- while (inputLen--) {
- a3[i++] = *(input++);
- if (i == 3) {
- a3_to_a4(a4, a3);
-
- for (i = 0; i < 4; i++) {
- output[encLen++] = pgm_read_byte(&b64_alphabet[a4[i]]);
- }
-
- i = 0;
- }
- }
-
- if (i) {
- for (j = i; j < 3; j++) {
- a3[j] = '\0';
- }
-
- a3_to_a4(a4, a3);
-
- for (j = 0; j < i + 1; j++) {
- output[encLen++] = pgm_read_byte(&b64_alphabet[a4[j]]);
- }
-
- while ((i++ < 3)) {
- output[encLen++] = '=';
- }
- }
- output[encLen] = '\0';
- return encLen;
-}
-
-// ***********************************************************************************
-int base64_enc_length(int plainLen) {
- int n = plainLen;
- return (n + 2 - ((n + 2) % 3)) / 3 * 4;
-}
-
-// ***********************************************************************************
-const char* encode64_f ( char* Line , uint8_t len ) {
- int encodedLen = base64_enc_length(len);
- static char encoded[256];
- // note input is consumed in this step: it will be empty afterwards
- base64_encode ( encoded, Line, len );
- return encoded;
-}
-
-// ****************************************************************************
-// ****************************************************************************
-String Encode64 ( String Line ) {
- const int MaxLen = 100 ;
-
- char Copy[MaxLen] ;
- Line.toCharArray ( Copy, MaxLen );
-
- String Result = encode64_f ( Copy, Line.length() ) ;
- return Result ;
-}
-
-
-#ifndef ESP32
-#include Data Files (unordered) on ESP-chip
\n" ) ; - My_Webserver.sendContent ( "\n") ; - } - - // ************************************************** - // ************************************************** - int Get_File_Nr ( ) { - return _Last_File_Nr ; - } - - // ************************************************** - // ************************************************** - String Get_Next_Filename () { - if ( _Last_Filename.length() == 0 ) { - _Get_Last_Filename () ; - } - - _Last_File_Nr += 1 ; - if ( _Last_File_Pre.length() == 0 ) { - _Last_File_Pre = "/MLX_" ; - _Last_File_Post= ".bin" ; - } - - //if ( _Last_File_Nr < 10 ) _Last_Filename = _Last_File_Pre + "0" + String ( _Last_File_Nr ) + _Last_File_Post ; - //else _Last_Filename = _Last_File_Pre + String ( _Last_File_Nr ) + _Last_File_Post ; - _Last_Filename = _Last_File_Pre + String ( _Last_File_Nr ) + _Last_File_Post ; - - return _Last_Filename ; - } - - - - - // ************************************************** - // ene variant om de laatste MLX_xxx.bin file te bepalen - // ************************************************** - int Get_Last_File_Number () { - - int Last_FileNr = 0 ; - // ************************************************** - // ESP32 - // ************************************************** - #ifdef ESP32 - fs::File dir = SPIFFS.open ( "/" ) ; - fs::File file = dir.openNextFile () ; - while ( file ) { - String Filename = file.name() ; - int FileNr = Parse_FileNr ( Filename ) ; - if ( FileNr > Last_FileNr ) Last_FileNr = FileNr ; - file = dir.openNextFile () ; - } - // ************************************************** - // ESP8266 - // ************************************************** - #else - fs::Dir dir = SPIFFS.openDir ( "/" ) ; - while ( dir.next() ) { - String Filename = dir.fileName() ; - int FileNr = Parse_FileNr ( Filename ) ; - if ( FileNr > Last_FileNr ) Last_FileNr = FileNr ; - } - #endif - return Last_FileNr ; - } - - // ************************************************** - // ************************************************** - String _Get_Last_Filename () { - if ( _Last_Filename.length() > 0 ) { - return _Last_Filename ; - } - - // ************************************************** - // ESP32 - // ************************************************** - #ifdef ESP32 - fs::File dir = SPIFFS.open ( "/" ) ; - fs::File file = dir.openNextFile () ; - while ( file ) { - _Last_Filename = file.name() ; - file = dir.openNextFile () ; - } - // ************************************************** - // ESP8266 - // ************************************************** - #else - fs::Dir dir = SPIFFS.openDir ( "/" ) ; - while ( dir.next() ) { - //_Last_Filename = dir.Filename() ; - _Last_Filename = dir.fileName() ; - } - #endif - - // ************************************************** - // Parse the filename and store the parts - // ************************************************** - int x1 = _Last_Filename.indexOf ( '_' ) ; - int x2 = _Last_Filename.indexOf ( '.' ) ; - if ( x1 > 0 ) { - _Last_File_Pre = _Last_Filename.substring ( 0 , x1+1 ) ; - _Last_File_Nr = ( _Last_Filename.substring ( x1+1, x2 ) ).toInt () ; - _Last_File_Post = _Last_Filename.substring ( x2 ) ; - } - else { - _Last_File_Pre = _Last_Filename.substring ( 0 , x2 ) + "_" ; - _Last_File_Nr = 0 ; - _Last_File_Post = _Last_Filename.substring ( x2 ) ; - - } - return _Last_Filename ; - } - - - // ************************************************** - // ************************************************** - void Dump ( String Filename ) { - Serial.println ( "===== Dump " + Filename ) ; - fs::File file = SPIFFS.open ( Filename, "r" ) ; - if ( file ) { - while ( file.available() ){ - Serial.print ( file.readString() ) ; - } - file.close () ; - Serial.println ( "\n===============" ) ; - } - else { - Serial.println ( "ERROR: file not found" ) ; - } - } - // ************************************************** - // ************************************************** - String Read_File ( String Filename ) { - String Line ; - fs::File file = SPIFFS.open ( Filename, "r" ) ; - if ( file ) { - while ( file.available() ){ - Line += file.readString() ; - } - file.close () ; - } - return Line ; - } - - // ************************************************** - // ************************************************** - int Get_Time_In_File ( String Filename ) { - int Delta_T = 0 ; - fs::File file = SPIFFS.open ( Filename, "r" ) ; - String Line_0 ; - String Line_1 ; - String Line_2 ; - String Line_x ; - if ( !file ) { - return 0 ; - } - if ( ! file.available() ) { - return 0 ; - } - - Line_0 = file.readStringUntil ( '\n' ) ; - My_StringSplitter *Splitter = new My_StringSplitter ( Line_0, '\t' ) ; - int ItemCount = Splitter -> getItemCount () ; - int DT_i ; - for ( DT_i = 0; DT_i < ItemCount; DT_i++ ) { - String Item = Splitter -> getItemAtIndex ( DT_i ) ; - if ( Item == "Seconds" ) { - break ; - } - } - if ( DT_i >= ItemCount ) { - return 0 ; - } - if ( !file.available() ) { - return 0 ; - } - - Line_1 = file.readStringUntil ( '\n' ) ; - Splitter -> newString ( Line_1, '\t' ) ; - String Date1 = Splitter -> getItemAtIndex ( DT_i ) ; - int DT1 = Date1.toInt () ; - if ( !file.available() ) { - return 0 ; - } - - Line_2 = file.readStringUntil ( '\n' ) ; - Splitter -> newString ( Line_2, '\t' ) ; - String Date2 = Splitter -> getItemAtIndex ( DT_i ) ; - int DT2 = Date2.toInt () ; - if ( !file.available() ) { - return 0 ; - } - - Line_x = "###" ; - while ( file.available() && ( Line_x.length() > 1 ) ){ - Line_x = file.readStringUntil ( '\n' ) ; -//Serial.println ( Line_x ) ; - Splitter -> newString ( Line_x, '\t' ) ; - String Datex = Splitter -> getItemAtIndex ( DT_i ) ; - int DTx = Datex.toInt () ; - - - if ( DTx > DT2 ) { - Delta_T += DTx - DT2 ; - } - DT2 = DTx ; - } - file.close () ; - return Delta_T ; - } - - // ************************************************** - // ************************************************** -/* - int Get_Time_In_File_HANGT_TEVEEL_AF_VAN_NTP_SERVER ( String Filename ) { - File file = SPIFFS.open ( Filename, "r" ) ; - String Line_0 ; - String Line_1 ; - String Line_x ; - if ( file ) { - if ( file.available() ) { - Line_0 = file.readStringUntil ( '\n' ) ; - } - if ( file.available() ) { - Line_1 = file.readStringUntil ( '\n' ) ; - } - while ( file.available() ){ - Line_x = file.readStringUntil ( '\n' ) ; - } - file.close () ; - - My_StringSplitter *Splitter = new My_StringSplitter ( Line_0, '\t' ) ; - int ItemCount = Splitter -> getItemCount () ; - int DT_i ; - for ( DT_i = 0; DT_i < ItemCount; DT_i++ ) { - String Item = Splitter -> getItemAtIndex ( DT_i ) ; - if ( Item == "DateTime" ) { - break ; - } - } - - if ( DT_i < ItemCount ) { - Splitter -> newString ( Line_1, '\t' ) ; - String Date1 = Splitter -> getItemAtIndex ( DT_i ) ; - time_t DT1 = String_2_UnixTime ( Date1 ) ; - - Splitter -> newString ( Line_x, '\t' ) ; - String Date2 = Splitter -> getItemAtIndex ( DT_i ) ; - time_t DT2 = String_2_UnixTime ( Date2 ) ; - - Serial.print ( "Delta T in file = ") ; - Serial.println ( DT2-DT1 ) ; - return (int) (DT2-DT1) ; - } - else { - return 0 ; - } - } - else { - return 0 ; - } - } -*/ - // ************************************************** - // ************************************************** - bool Exists ( String Filename ) { - fs::File file = SPIFFS.open ( Filename, "r" ) ; - if ( file ) { - file.close () ; - return true ; - } - return false ; - } - - // ************************************************** - // ************************************************** - void DumpAll () { - // ************************************************** - // ESP32 - // ************************************************** - #ifdef ESP32 - fs::File dir = SPIFFS.open ( "" ) ; - fs::File file = dir.openNextFile () ; - while ( file ) { - String Filename = file.name () ; - Serial.println ( Filename ) ; - Serial.println ( file.size() ) ; - if ( file ) { - while ( file.available() ){ - Serial.print ( file.readString() ) ; - } - file.close () ; - //if ( Delete_Files ) { - // Delete ( Filename ) ; - //} - } - file = dir.openNextFile () ; - } - - // ************************************************** - // ESP8266 - // ************************************************** - #else - //String Result ; - fs::Dir dir = SPIFFS.openDir ( "" ) ; - while ( dir.next() ) { - //Result += dir.fileName() + "\n" ; - fs::File file = dir.openFile ( "r" ) ; - if ( file ) { - Serial.print ( "===== Contents of " ) ; - Serial.print ( dir.fileName() ) ; - Serial.print ( " " ) ; - Serial.println ( file.size() ) ; - while ( file.available() ){ - Serial.print ( file.readString() ) ; - } - file.close () ; - Serial.println ( "\n===============" ) ; - } - } - #endif - return ; - } - - // ************************************************** - // ************************************************** - bool Delete ( String Filename ) { - Serial.println ( "===== Delete " + Filename ) ; - bool Result = SPIFFS.remove ( Filename ) ; - if ( Result ) { - Serial.println ( "\n===============" ) ; - } - else { - Serial.println ( "ERROR: file not found" ) ; - } - } - - // ************************************************** - // ************************************************** - void Delete_All () { - Serial.println ( "===== Delete All Files" ) ; - String Filename ; - - #ifdef ESP32 - Serial.println ( "!!!!!!!! ToDo _FS_class.Delete_All" ) ; - #else - fs::Dir dir = SPIFFS.openDir ( "" ) ; - while ( dir.next() ) { - Filename = dir.fileName() ; - Serial.println ( "Delete : " + Filename ) ; - SPIFFS.remove ( Filename ) ; - } - #endif - } - - // ************************************************** - // ************************************************** - bool Store_File ( String Filename, String Line ) { - fs::File file = SPIFFS.open ( Filename, "w" ) ; - file.print ( Line ) ; - file.close () ; - return true; - } - - // ************************************************** - // ************************************************** - bool Append_File ( String Filename, String Line ) { - fs::File file = SPIFFS.open ( Filename, "a" ) ; - file.print ( Line ) ; - file.close () ; - return true; - } - - // ************************************************** - // ************************************************** - bool Create_CSV_File ( String Filename, String Header ) { - if ( not SPIFFS.exists ( Filename ) ) { - Append_File ( Filename, Header ) ; - } - } - - // ************************************************** - // ************************************************** - bool Create_CSV_File_Nr ( String Filename, String Header ) { - // ************************************************************ - // als ongeveer een dag opgenomen, ga over naar een nieuwe file - // ************************************************************ - bool NewFile = false ; - if ( _Max_FileSize > 0 ) { - fs::File file = SPIFFS.open ( Filename, "r" ) ; - if ( file.size() > _Max_FileSize ) { - NewFile = true ; - } - file.close() ; - } - else if ( _Max_FileTime > 0 ) { - // ************************************************************ - // After a reset check how many seconds are already in the file - // ************************************************************ - if ( !_Initialized ) { -//Serial.println ( "Before gettime" ) ; - _Offset_Seconds = millis()/1000 + 10 + Get_Time_In_File ( Filename ); -//Serial.println ( "Agter gettime" ) ; - if ( _Offset_Seconds > _Max_FileTime ) { - NewFile = true ; - } - _Initialized = true ; - } -/* -Serial.print ( "millis / Delta / maxfileTIME / Offset = "); -Serial.print ( millis() ) ; -Serial.print ( " / " ); -Serial.print ( _Max_FileTime - _Offset_Seconds ) ; -Serial.print ( " / " ) ; -Serial.print ( _Max_FileTime ) ; -Serial.print ( " / " ); -Serial.println ( _Offset_Seconds ) ; -//*/ - //if ( ( millis() - _File_Millis ) > ( _Max_FileTime - _Offset_Seconds ) ) { - if ( ( millis()/1000 + _Offset_Seconds ) > _Max_FileTime ) { - NewFile = true ; - } - } - - - - - //if ( ( millis() - _File_Millis ) > _Max_FileTime ) { - if ( NewFile ) { - //_File_Millis = millis() ; - if ( _Last_File_Nr > _Max_NFile ) { - String File_To_Remove = _Last_File_Pre + String ( _Last_File_Nr - _Max_NFile ) + _Last_File_Post ; - SPIFFS.remove ( File_To_Remove ) ; - Serial.println ( "rrrrrrrrrrrrrrrrrr " + File_To_Remove ) ; - } - SPIFFS.rename ( Filename, Get_Next_Filename() ) ; - Serial.println ( "???????????????????" + _Get_Last_Filename() ) ; - } - - //_Get_Last_Filename () ; - if ( not SPIFFS.exists ( Filename ) ) { - Append_File ( Filename, Header ) ; - _Offset_Seconds = - ( millis()/1000 ) ; - } - } - - // ************************************************* - private: - // ************************************************* - bool _Opened = false ; - String _Last_Filename = "" ; - String _Last_File_Pre = "" ; - String _Last_File_Post = "" ; - int _Last_File_Nr = 0 ; - - String _Temp_Last_File_Pre = "" ; - String _Temp_Last_File_Post = "" ; - int _Temp_Last_File_Nr = 0 ; - - //unsigned long _File_Millis = 0 ; - bool _Initialized = false ; - //int _Offset_Millis = 0 ; - - unsigned long _Max_FileTime ; - long _Max_FileSize ; - int _Max_NFile ; - - - // ************************************************** - // Parse the filename and store the parts - // ************************************************** - bool _Parse_Filename ( String Filename ) { - if ( Filename.length() == 0 ) { - return false ; - } - int x1 = Filename.indexOf ( '_' ) ; - int x2 = Filename.indexOf ( '.' ) ; - if ( x1 > 0 ) { - _Temp_Last_File_Pre = Filename.substring ( 0 , x1+1 ) ; - _Temp_Last_File_Nr = ( Filename.substring ( x1+1, x2 ) ).toInt () ; - _Temp_Last_File_Post = Filename.substring ( x2 ) ; - } - else { - _Temp_Last_File_Pre = Filename.substring ( 0 , x2 ) + "_" ; - _Temp_Last_File_Nr = 0 ; - _Temp_Last_File_Post = Filename.substring ( x2 ) ; - } - return true ; - } - - -}; - - -// *********************************************************************************** -// *********************************************************************************** -_FS_class File_System ; - - -#endif diff --git a/RFLink_ESP/LuftDaten.h b/RFLink_ESP/LuftDaten.h deleted file mode 100644 index 6745fb3..0000000 --- a/RFLink_ESP/LuftDaten.h +++ /dev/null @@ -1,240 +0,0 @@ - -// Version 0.2 - -#ifndef LuftDaten_h -#define LuftDaten_h 0.2 - -#define SOFTWARE_VERSION "NRZ-2017-100" - -#define SDS_API_PIN 1 - -String LuftDaten_First_Part = "{\"software_version\": \"" + String(SOFTWARE_VERSION) + "\", \"sensordatavalues\":["; -String JSON_LuftData ; - -const char TXT_CONTENT_TYPE_JSON[] PROGMEM = "application/json"; - -const char* host_dusti = "api.luftdaten.info"; -const char* url_dusti = "/v1/push-sensor-data/"; -int httpPort_dusti = 443; - -const char* host_madavi = "api-rrd.madavi.de"; -const char* url_madavi = "/data.php"; -const int httpPort_madavi = 443; - - -// *********************************************** -// espid is needed as login name for the web-api's -// *********************************************** -#ifdef ESP32 - String esp_chipid = String ( GetChipID() ) ; -#else - String esp_chipid = String ( ESP.getChipId() ) ; -#endif - -// ***************************************************************** -//LUFTDATTTT "15218064" ) ) ; -// ***************************************************************** -void Luftdaten_Setup ( String ChipID_2_Use ) { - Serial.println ( "V" + String ( LuftDaten_h ) + " LuftDSaten_h" ) ; - #ifdef ESP32 - Serial.println ( "Chip-ID = " + String ( GetChipID() ) ) ; - #else - Serial.println ( "Chip-ID = " + String ( ESP.getChipId() ) ) ; - #endif - if ( ChipID_2_Use != "" ) { - esp_chipid = ChipID_2_Use ; - Serial.println ( "Chip-ID used = " + esp_chipid ) ; - } -} - -/***************************************************************** -/* convert value to json string * -/*****************************************************************/ -String Value2Json(const String& type, const String& value) { - String s = F("{\"value_type\":\"{t}\",\"value\":\"{v}\"},"); - s.replace("{t}", type); s.replace("{v}", value); - return s; -} - -// *********************************************************************** -// ugly, but it works -// *********************************************************************** -void Complete_JSON_String ( signed long Loop_Sample_Count ) { - String data_sample_times ; - - int signal_strength = WiFi.RSSI(); - data_sample_times = Value2Json("samples", String( long ( Loop_Sample_Count ))); - data_sample_times += Value2Json ( "signal", String(signal_strength) ); - - JSON_LuftData += data_sample_times ; - - // ********************** - // remove the final comma - // ********************** - //if ( JSON_Data [ JSON_Data.length() - 1 ] == "," ) { //ERROR: ISO C++ forbids comparison between pointer and integer [-fpermissive] - if ( JSON_LuftData.lastIndexOf (',') == ( JSON_LuftData.length() - 1 ) ) { - JSON_LuftData.remove(JSON_LuftData.length() - 1); - } - - //JSON_LuftData += ",{\"value_type\":\"SSID\",\"value\":\"" ; - //JSON_LuftData += WiFi.SSID() ; - //JSON_LuftData += "\"}" ; - // - //JSON_LuftData += "]}"; - - JSON_LuftData += "],\"SSID\":\"" ; - JSON_LuftData += WiFi.SSID() ; - JSON_LuftData += "\"}" ; - - return ; -} - - -/***************************************************************** -/* send data to rest api * -/*****************************************************************/ -void sendData(const String& data, const int pin, const char* host, const int httpPort, const char* url, const char* basic_auth_string, const String& contentType) { -Debug ( String(host) + data ) ; -//return ; - - #if defined(ESP8266) - - //debug_out(F("Start connecting to "), DEBUG_MIN_INFO, 0); - //debug_out(host, DEBUG_MIN_INFO, 1); - - String request_head = F("POST "); request_head += String(url); request_head += F(" HTTP/1.1\r\n"); - request_head += F("Host: "); request_head += String(host) + "\r\n"; - request_head += F("Content-Type: "); request_head += contentType + "\r\n"; - if (basic_auth_string != "") { request_head += F("Authorization: Basic "); request_head += String(basic_auth_string) + "\r\n";} - request_head += F("X-PIN: "); request_head += String(pin) + "\r\n"; - request_head += F("X-Sensor: esp8266-"); request_head += esp_chipid + "\r\n"; - request_head += F("Content-Length: "); request_head += String(data.length(), DEC) + "\r\n"; - request_head += F("Connection: close\r\n\r\n"); - - // Use WiFiClient class to create TCP connections - - if (httpPort == 443) { - - WiFiClientSecure client_s; - - client_s.setNoDelay(true); - client_s.setTimeout(20000); - - if (!client_s.connect(host, httpPort)) { -// debug_out(F("connection 1 failed"), DEBUG_ERROR, 1); -Debug ( "connection 1 failed" ); - return; - } - - //debug_out(F("Requesting URL: "), DEBUG_MIN_INFO, 0); - //debug_out(url, DEBUG_MIN_INFO, 1); - //debug_out(esp_chipid, DEBUG_MIN_INFO, 1); - //debug_out(data, DEBUG_MIN_INFO, 1); - - // send request to the server - - client_s.print(request_head); - - client_s.println(data); - - delay(10); - - // Read reply from server and print them - String Line = "" ; - while(client_s.available()) { - char c = client_s.read(); - Line += String ( c ) ; -// debug_out(String(c), DEBUG_MAX_INFO, 0); -Debug ( Line ) ; - } - -// debug_out(F("\nclosing connection\n------\n\n"), DEBUG_MIN_INFO, 1); - - } else { - - WiFiClient client; - - client.setNoDelay(true); - client.setTimeout(20000); - - if (!client.connect(host, httpPort)) { -// debug_out(F("connection 2 failed"), DEBUG_ERROR, 1); -Debug ( "connection 2 failed" ) ; - return; - } - -// debug_out(F("Requesting URL: "), DEBUG_MIN_INFO, 0); -// debug_out(url, DEBUG_MIN_INFO, 1); -// debug_out(esp_chipid, DEBUG_MIN_INFO, 1); -// debug_out(data, DEBUG_MIN_INFO, 1); - - client.print(request_head); - - client.println(data); - - delay(10); - - // Read reply from server and print them - while(client.available()) { - char c = client.read(); -// debug_out(String(c), DEBUG_MAX_INFO, 0); - } - -// debug_out(F("\nclosing connection\n------\n\n"), DEBUG_MIN_INFO, 1); - - } - -// debug_out(F("End connecting to "), DEBUG_MIN_INFO, 0); -// debug_out(host, DEBUG_MIN_INFO, 1); - - wdt_reset(); // nodemcu is alive - yield(); - #endif -} - -// *********************************************************************** -// *********************************************************************** -bool _Send_LuftData () { - - if ( JSON_LuftData.indexOf ( "SDS_P1" ) < 0 ) { - Debug ( "NO DATA for Luftfaten available" ) ; - return false ; - } - - String Temp = JSON_LuftData ; - int x1 = Temp.indexOf ( '}' ) ; - int x2 = Temp.indexOf ( '}', x1+1 ) ; - Temp.remove ( x2+1 ); - Temp += "]}" ; - Temp.replace ( "SDS_", "" ); - - sendData ( Temp, SDS_API_PIN, host_dusti, httpPort_dusti, url_dusti, "", FPSTR(TXT_CONTENT_TYPE_JSON)) ; - return true ; -/* -{ "software_version": "NRZ-2017-100", - "sensordatavalues": [ {"value_type":"SDS_P1","value":"31.34"}, - {"value_type":"SDS_P2","value":"17.61"}, - {"value_type":"samples","value":"5112893"}, - {"value_type":"signal","value":"-64"}], - "SSID":"MiRa_Home_Router"} -*/ -} - - -// *********************************************************************** -// *********************************************************************** -bool _Send_MadaviData () { - - if ( JSON_LuftData.indexOf ( "SDS_P1" ) < 0 ) { - Debug ( "NO DATA for Madavi available" ) ; - return false ; - } - - sendData ( JSON_LuftData, 0, host_madavi, httpPort_madavi, url_madavi, "", FPSTR(TXT_CONTENT_TYPE_JSON)) ; - return true ; - -} - - - -#endif diff --git a/RFLink_ESP/MLX90640_API.h b/RFLink_ESP/MLX90640_API.h deleted file mode 100644 index c13a282..0000000 --- a/RFLink_ESP/MLX90640_API.h +++ /dev/null @@ -1,1260 +0,0 @@ -/** - * @copyright (C) 2017 Melexis N.V. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -#ifndef _MLX640_API_H_ -#define _MLX640_API_H_ - - - - -/** - * @copyright (C) 2017 Melexis N.V. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -#include "MLX90640_I2C_Driver.h" -//#include "MLX90640_API.h" -#include![](\"favicon.ico\")
MiRa Sensors
\n" ;
-// Line += "StartPage\n" ; -// Line += "\n\ -\n\ -