From dccef2181edcda3ff46d729af7248724c38b52a3 Mon Sep 17 00:00:00 2001 From: Federico Adreani Date: Sun, 3 Jun 2018 12:02:59 +0200 Subject: [PATCH 1/5] Update Nodemcu-Web-Telegram-relay-controller.ino --- Nodemcu-Web-Telegram-relay-controller.ino | 55 ++++++++++++++++------- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/Nodemcu-Web-Telegram-relay-controller.ino b/Nodemcu-Web-Telegram-relay-controller.ino index 953b5c0..fd2b915 100644 --- a/Nodemcu-Web-Telegram-relay-controller.ino +++ b/Nodemcu-Web-Telegram-relay-controller.ino @@ -1,4 +1,11 @@ /******************************************************************* + this is a basic example how to program a Telegram Bot + using TelegramBOT library on ESP8266 + * * + Open a conversation with the bot, you can command via Telegram + a led from ESP8266 GPIO + https://web.telegram.org/#/im?p=@PattoonlineBot + * * written by Federico Adreani *******************************************************************/ @@ -28,7 +35,7 @@ int outputQuantity = 10; //should not exceed 10 boolean outputInverted = true; //true or false // Write the text description of the output channel -String buttonText[10] = {"22. Settore 1", "24. Settore 2", "26. Settore 3", "28. Settore 4", "30. Luci esterne", "32. na", "34. na", "36. na", "38. na", "40. na"}; +String buttonText[10] = {"22. Settore 1", "24. Settore 2", "26. Settore 3", "28. Settore 4", "30. Settore 5", "32. Luci Esterne", "34. na", "36. na", "38. na", "40. na"}; int outp = 0; boolean printLastCommandOnce = false; boolean printButtonMenuOnce = false; @@ -55,17 +62,20 @@ float tempOutDeg = 0.0; float umid_aria = 0.0; -const char* ssid = "ssid"; -const char* password = "password"; +const char* ssid = "wifi_3"; +const char* password = "adreaniWifi"; // Initialize Telegram BOT -#define BOTtoken "aaaaaa:bbbbbbb" //"aaaa:bbbbb" //token of FlashledBOT -#define BOTname "BOTname" //"" -#define BOTusername "BOTusername"//"" +#define BOTtoken "398215908:AAFzqHU8zwpp2zuj1iMcPCLWsY0CLGLEsfw" //"425354869:AAFc9Z6HVVm3EJHonQoEqscSNLwMBQTSvyY" //token of FlashledBOT +#define BOTname "AdreaniSpruzziniController" //"AdreaniSpruzziniController" +#define BOTusername "AdreaniSpruzziniControllerBot"//"AdreaniSpruzziniControllerBot" + +const String id_proprietario = "404952185"; + +String id_scrittore_messaggio = "404952185"; -String id_proprietario = "0123456789"; TelegramBOT bot(BOTtoken, BOTname, BOTusername); @@ -74,12 +84,13 @@ long Bot_lasttime; //last time messages' scan has been done bool Start = false; String message_read; -String wellcome = "Bentornato"; +String wellcome = "Bentornato Fede"; String help_msg = "Comandi: /start per avviare il sistema /Hn per accendere il pin n /Ln per spegnere il led n /cicloXX per avviare un ciclo intero di XX minuti (per stazione) /stato per sapere lo stato generale dei pin /Hall per accendere tutto e /Lall per spegnere tutto"; String ip_esterno; + bool web = false; bool isCiclo = false; @@ -89,7 +100,17 @@ bool isCiclo = false; void Bot_ExecMessages() { for (int i = 1; i < bot.message[0][0].toInt() + 1; i++) { message_read = bot.message[i][5].substring(1, bot.message[i][5].length()); - id_proprietario = bot.message[i][4]; + + id_scrittore_messaggio = bot.message[i][4]; + + + if (id_proprietario != id_scrittore_messaggio) { + + bot.sendMessage(id_proprietario, "!!! ATTENZIONE FEDERICO !!!", ""); + bot.sendMessage(id_proprietario, "Accesso sospetto da parte di una persona sconosciuta", ""); + bot.sendMessage(id_proprietario, id_scrittore_messaggio, ""); + + } WiFiClient client = server.available(); @@ -165,6 +186,7 @@ void Bot_ExecMessages() { writer("ciclo per i seq minuti ---> "); writer(String(minuti)); + bot.message[0][0] = ""; WiFiClient client = server.available(); cicloSpruzzini(client, minuti); @@ -238,7 +260,7 @@ void setup() { // Mac address should be different for each device in your LAN byte arduino_mac[] = { 0xDE, 0xED, 0xBA, 0xFE, 0xFE, 0xED }; - IPAddress arduino_ip ( 192, 168, 1, 177); + IPAddress arduino_ip ( 192, 168, 1, 170); IPAddress gateway_ip ( 192, 168, 1, 1); IPAddress subnet_mask(255, 255, 255, 0); @@ -708,7 +730,7 @@ void printHtmlFooter(WiFiClient client) { allOff = ""; //printing last part of the html - client.println("\n

© Author - Adreani Federico
" + ip_esterno + " - 09-09-2017 - "); + client.println("\n

© Author - Adreani Federico
" + ip_esterno + " - 01/06/2018 - "); client.println(rev); client.println("

\n\n\n"); //client.println(""); @@ -974,7 +996,7 @@ void cicloSpruzzini(WiFiClient client, int durata) { - for ( unsigned int a = 0; a < 4; a++ ) + for ( unsigned int a = 0; a < 5; a++ ) { writer("Inizio settore " + String(a)); @@ -1000,6 +1022,8 @@ void cicloSpruzzini(WiFiClient client, int durata) { void aspetta(int durata) { for (int i = 0; i < 600; i++) { for (int b = 0; b < durata; b++) { + + delay(100); } } @@ -1015,7 +1039,7 @@ void writer(String stringa) { Serial.println(stringa); - bot.sendMessage(id_proprietario, stringa, ""); + bot.sendMessage(id_scrittore_messaggio, stringa, ""); Serial.println("nessuna chat su telegram"); @@ -1025,8 +1049,9 @@ void writer(String stringa) { void get_ip_esterno() { HTTPClient http; - http.begin("http://ipServer"); - http.addHeader("Content-Type", "application/x-www-form-urlencoded"); + http.begin("http://www.pattoonline.com/arduino/arduino.php"); +// http.addHeader("Content-Type", "application/x-www-form-urlencoded"); + // http.POST("title=foo&body=bar&userId=1"); ip_esterno = http.getString(); http.end(); } From 23d19049652bc25cebd6731ac7042429b199f44a Mon Sep 17 00:00:00 2001 From: Federico Adreani Date: Sun, 3 Jun 2018 12:04:32 +0200 Subject: [PATCH 2/5] Update Nodemcu-Web-Telegram-relay-controller.ino --- Nodemcu-Web-Telegram-relay-controller.ino | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/Nodemcu-Web-Telegram-relay-controller.ino b/Nodemcu-Web-Telegram-relay-controller.ino index fd2b915..e5dfa8a 100644 --- a/Nodemcu-Web-Telegram-relay-controller.ino +++ b/Nodemcu-Web-Telegram-relay-controller.ino @@ -1,11 +1,4 @@ /******************************************************************* - this is a basic example how to program a Telegram Bot - using TelegramBOT library on ESP8266 - * * - Open a conversation with the bot, you can command via Telegram - a led from ESP8266 GPIO - https://web.telegram.org/#/im?p=@PattoonlineBot - * * written by Federico Adreani *******************************************************************/ @@ -68,13 +61,13 @@ const char* password = "adreaniWifi"; // Initialize Telegram BOT -#define BOTtoken "398215908:AAFzqHU8zwpp2zuj1iMcPCLWsY0CLGLEsfw" //"425354869:AAFc9Z6HVVm3EJHonQoEqscSNLwMBQTSvyY" //token of FlashledBOT -#define BOTname "AdreaniSpruzziniController" //"AdreaniSpruzziniController" -#define BOTusername "AdreaniSpruzziniControllerBot"//"AdreaniSpruzziniControllerBot" +#define BOTtoken "xx:xx" +#define BOTname "xxxx" +#define BOTusername "xxxx" -const String id_proprietario = "404952185"; +const String id_proprietario = "xx"; -String id_scrittore_messaggio = "404952185"; +String id_scrittore_messaggio = "xx"; TelegramBOT bot(BOTtoken, BOTname, BOTusername); @@ -84,7 +77,7 @@ long Bot_lasttime; //last time messages' scan has been done bool Start = false; String message_read; -String wellcome = "Bentornato Fede"; +String wellcome = "Bentornato X"; String help_msg = "Comandi: /start per avviare il sistema /Hn per accendere il pin n /Ln per spegnere il led n /cicloXX per avviare un ciclo intero di XX minuti (per stazione) /stato per sapere lo stato generale dei pin /Hall per accendere tutto e /Lall per spegnere tutto"; String ip_esterno; From 051521dc73f365c31342f7b3edd60288d1f00128 Mon Sep 17 00:00:00 2001 From: Federico Adreani Date: Sun, 3 Jun 2018 12:05:11 +0200 Subject: [PATCH 3/5] Update Nodemcu-Web-Telegram-relay-controller.ino --- Nodemcu-Web-Telegram-relay-controller.ino | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Nodemcu-Web-Telegram-relay-controller.ino b/Nodemcu-Web-Telegram-relay-controller.ino index e5dfa8a..76129e7 100644 --- a/Nodemcu-Web-Telegram-relay-controller.ino +++ b/Nodemcu-Web-Telegram-relay-controller.ino @@ -55,8 +55,8 @@ float tempOutDeg = 0.0; float umid_aria = 0.0; -const char* ssid = "wifi_3"; -const char* password = "adreaniWifi"; +const char* ssid = "x"; +const char* password = "xx"; // Initialize Telegram BOT @@ -1042,7 +1042,7 @@ void writer(String stringa) { void get_ip_esterno() { HTTPClient http; - http.begin("http://www.pattoonline.com/arduino/arduino.php"); + http.begin("http://www.xxxxxxxx.com/arduino/arduino.php"); // http.addHeader("Content-Type", "application/x-www-form-urlencoded"); // http.POST("title=foo&body=bar&userId=1"); ip_esterno = http.getString(); From d153be6fb1b6fd2ffa88fbe1407b79dfd79a0280 Mon Sep 17 00:00:00 2001 From: Federico Adreani Date: Sun, 3 Jun 2018 12:09:31 +0200 Subject: [PATCH 4/5] Update Nodemcu-Web-Telegram-relay-controller.ino --- Nodemcu-Web-Telegram-relay-controller.ino | 29 +++++++++++++---------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/Nodemcu-Web-Telegram-relay-controller.ino b/Nodemcu-Web-Telegram-relay-controller.ino index 76129e7..504c7f8 100644 --- a/Nodemcu-Web-Telegram-relay-controller.ino +++ b/Nodemcu-Web-Telegram-relay-controller.ino @@ -1,4 +1,11 @@ /******************************************************************* + this is a basic example how to program a Telegram Bot + using TelegramBOT library on ESP8266 + * * + Open a conversation with the bot, you can command via Telegram + a led from ESP8266 GPIO + https://web.telegram.org/#/im?p=@PattoonlineBot + * * written by Federico Adreani *******************************************************************/ @@ -55,19 +62,19 @@ float tempOutDeg = 0.0; float umid_aria = 0.0; -const char* ssid = "x"; -const char* password = "xx"; +const char* ssid = "wifi_3"; +const char* password = "adreaniWifi"; // Initialize Telegram BOT -#define BOTtoken "xx:xx" -#define BOTname "xxxx" -#define BOTusername "xxxx" +#define BOTtoken "398215908:AAFzqHU8zwpp2zuj1iMcPCLWsY0CLGLEsfw" //"425354869:AAFc9Z6HVVm3EJHonQoEqscSNLwMBQTSvyY" //token of FlashledBOT +#define BOTname "AdreaniSpruzziniController" //"AdreaniSpruzziniController" +#define BOTusername "AdreaniSpruzziniControllerBot"//"AdreaniSpruzziniControllerBot" -const String id_proprietario = "xx"; +const String id_proprietario = "404952185"; -String id_scrittore_messaggio = "xx"; +String id_scrittore_messaggio = "404952185"; TelegramBOT bot(BOTtoken, BOTname, BOTusername); @@ -77,7 +84,7 @@ long Bot_lasttime; //last time messages' scan has been done bool Start = false; String message_read; -String wellcome = "Bentornato X"; +String wellcome = "Bentornato Fede"; String help_msg = "Comandi: /start per avviare il sistema /Hn per accendere il pin n /Ln per spegnere il led n /cicloXX per avviare un ciclo intero di XX minuti (per stazione) /stato per sapere lo stato generale dei pin /Hall per accendere tutto e /Lall per spegnere tutto"; String ip_esterno; @@ -179,7 +186,6 @@ void Bot_ExecMessages() { writer("ciclo per i seq minuti ---> "); writer(String(minuti)); - bot.message[0][0] = ""; WiFiClient client = server.available(); cicloSpruzzini(client, minuti); @@ -726,7 +732,7 @@ void printHtmlFooter(WiFiClient client) { client.println("\n

© Author - Adreani Federico
" + ip_esterno + " - 01/06/2018 - "); client.println(rev); client.println("

\n\n\n"); - //client.println(""); + //client.println(""); delay(1); // give the web browser time to receive the data @@ -983,7 +989,6 @@ void checkForClient() { // void cicloSpruzzini(WiFiClient client, int durata) { - bot.message[0][0] = ""; writer("inizio ciclo spruzzini --> " + String(durata)); @@ -1042,7 +1047,7 @@ void writer(String stringa) { void get_ip_esterno() { HTTPClient http; - http.begin("http://www.xxxxxxxx.com/arduino/arduino.php"); + http.begin("http://www.pattoonline.com/arduino/arduino.php"); // http.addHeader("Content-Type", "application/x-www-form-urlencoded"); // http.POST("title=foo&body=bar&userId=1"); ip_esterno = http.getString(); From bccf3c73b3c032d1651f9bd00dbbd14640a090a7 Mon Sep 17 00:00:00 2001 From: Federico Adreani Date: Sun, 3 Jun 2018 12:10:35 +0200 Subject: [PATCH 5/5] Update Nodemcu-Web-Telegram-relay-controller.ino --- Nodemcu-Web-Telegram-relay-controller.ino | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/Nodemcu-Web-Telegram-relay-controller.ino b/Nodemcu-Web-Telegram-relay-controller.ino index 504c7f8..272a54a 100644 --- a/Nodemcu-Web-Telegram-relay-controller.ino +++ b/Nodemcu-Web-Telegram-relay-controller.ino @@ -1,11 +1,4 @@ /******************************************************************* - this is a basic example how to program a Telegram Bot - using TelegramBOT library on ESP8266 - * * - Open a conversation with the bot, you can command via Telegram - a led from ESP8266 GPIO - https://web.telegram.org/#/im?p=@PattoonlineBot - * * written by Federico Adreani *******************************************************************/ @@ -62,19 +55,19 @@ float tempOutDeg = 0.0; float umid_aria = 0.0; -const char* ssid = "wifi_3"; -const char* password = "adreaniWifi"; +const char* ssid = "xxx"; +const char* password = "xxx"; // Initialize Telegram BOT -#define BOTtoken "398215908:AAFzqHU8zwpp2zuj1iMcPCLWsY0CLGLEsfw" //"425354869:AAFc9Z6HVVm3EJHonQoEqscSNLwMBQTSvyY" //token of FlashledBOT -#define BOTname "AdreaniSpruzziniController" //"AdreaniSpruzziniController" -#define BOTusername "AdreaniSpruzziniControllerBot"//"AdreaniSpruzziniControllerBot" +#define BOTtoken "xx:xxx" //"425354869:AAFc9Z6HVVm3EJHonQoEqscSNLwMBQTSvyY" //token of FlashledBOT +#define BOTname "xxx" //"AdreaniSpruzziniController" +#define BOTusername "xx"//"AdreaniSpruzziniControllerBot" -const String id_proprietario = "404952185"; +const String id_proprietario = "xx"; -String id_scrittore_messaggio = "404952185"; +String id_scrittore_messaggio = "xx"; TelegramBOT bot(BOTtoken, BOTname, BOTusername); @@ -1047,7 +1040,7 @@ void writer(String stringa) { void get_ip_esterno() { HTTPClient http; - http.begin("http://www.pattoonline.com/arduino/arduino.php"); + http.begin("http://www.xxxx.com/arduino/arduino.php"); // http.addHeader("Content-Type", "application/x-www-form-urlencoded"); // http.POST("title=foo&body=bar&userId=1"); ip_esterno = http.getString();