Send data or alerts to Telegram Messenger chat #442
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ | |
| #include <Arduino.h> | ||
| #include <WiFiClientSecure.h> | ||
| #include <HTTPClient.h> | ||
| #include <UniversalTelegramBot.h> | ||
|
|
||
| #include "log.h" | ||
| #include "display.h" | ||
|
|
@@ -41,7 +42,8 @@ typedef struct https_client { | |
| HTTPClient *hc; | ||
| } HttpsClient; | ||
|
|
||
| static HttpsClient c_madavi, c_sensorc, c_customsrv, c_telegram; | ||
| UniversalTelegramBot *telegram_bot; | ||
|
|
||
| void setup_transmission(const char *version, char *ssid, bool loraHardware) { | ||
| chipID = String(ssid); | ||
|
|
@@ -69,9 +71,22 @@ void setup_transmission(const char *version, char *ssid, bool loraHardware) { | |
| c_customsrv.wc->setCACert(ca_certs); | ||
| c_customsrv.hc = new HTTPClient; | ||
|
|
||
| if ((strlen(telegramBotToken) < 40) || (strlen(telegramChatId) < 7)) | ||
| sendDataToMessengerEvery = -1; | ||
|
There was a problem hiding this comment. maybe "Interval" instead of "Every"? |
||
|
|
||
| c_telegram.wc = new WiFiClientSecure; | ||
| c_telegram.wc->setCACert(TELEGRAM_CERTIFICATE_ROOT); | ||
| c_telegram.hc = new HTTPClient; | ||
|
|
||
| if (sendDataToMessengerEvery >= 0) { | ||
| log(DEBUG, "Starting Telegram Bot..."); | ||
| telegram_bot = new UniversalTelegramBot(telegramBotToken, *(c_telegram.wc)); | ||
| } | ||
|
|
||
| set_status(STATUS_SCOMM, sendToCommunity ? ST_SCOMM_INIT : ST_SCOMM_OFF); | ||
| set_status(STATUS_MADAVI, sendToMadavi ? ST_MADAVI_INIT : ST_MADAVI_OFF); | ||
| set_status(STATUS_TTN, sendToLora ? ST_TTN_INIT : ST_TTN_OFF); | ||
| set_status(STATUS_TELEGRAM, (sendDataToMessengerEvery >= 0) ? ST_TELEGRAM_INIT : ST_TELEGRAM_OFF); | ||
| } | ||
|
|
||
| void poll_transmission() { | ||
|
|
@@ -142,7 +157,7 @@ int send_http_geiger(HttpsClient *client, const char *host, unsigned int timedif | |
| int send_http_thp(HttpsClient *client, const char *host, float temperature, float humidity, float pressure, int xpin) { | ||
| char body[1000]; | ||
| prepare_http(client, host); | ||
| if (xpin != XPIN_NO_XPIN) { | ||
| client->hc->addHeader("X-PIN", String(xpin)); | ||
| } | ||
| const char *json_format = R"=====( | ||
|
|
@@ -257,7 +272,7 @@ void transmit_data(String tube_type, int tube_nbr, unsigned int dt, unsigned int | |
| log(INFO, "Sent to CUSTOMSRV, status: %s, http: %d %d", customsrv_ok ? "ok" : "error", rc1, rc2); | ||
| #endif | ||
|
|
||
| if (sendToMadavi && (wifi_status == ST_WIFI_CONNECTED)) { | ||
| bool madavi_ok; | ||
| log(INFO, "Sending to Madavi ..."); | ||
| set_status(STATUS_MADAVI, ST_MADAVI_SENDING); | ||
|
|
@@ -271,7 +286,7 @@ void transmit_data(String tube_type, int tube_nbr, unsigned int dt, unsigned int | |
| display_status(); | ||
| } | ||
|
|
||
| if (sendToCommunity && (wifi_status == ST_WIFI_CONNECTED)) { | ||
| bool scomm_ok; | ||
| log(INFO, "Sending to sensor.community ..."); | ||
| set_status(STATUS_SCOMM, ST_SCOMM_SENDING); | ||
|
|
@@ -285,7 +300,7 @@ void transmit_data(String tube_type, int tube_nbr, unsigned int dt, unsigned int | |
| display_status(); | ||
| } | ||
|
|
||
| if (isLoraBoard && sendToLora && (strcmp(appeui, "") != 0)) { // send only, if we have LoRa credentials | ||
| bool ttn_ok; | ||
| log(INFO, "Sending to TTN ..."); | ||
| set_status(STATUS_TTN, ST_TTN_SENDING); | ||
|
|
@@ -296,5 +311,59 @@ void transmit_data(String tube_type, int tube_nbr, unsigned int dt, unsigned int | |
| set_status(STATUS_TTN, ttn_ok ? ST_TTN_IDLE : ST_TTN_ERROR); | ||
| display_status(); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| void transmit_userinfo(String tube_type, int tube_nbr, float tube_factor, unsigned int cpm, unsigned int accu_cpm, float accu_rate, | ||
| int have_thp, float temperature, float humidity, float pressure, int wifi_status, bool alarm_status) { | ||
|
Comment on lines
+317
to
+318
There was a problem hiding this comment. indenting seems not adjusted. int directly below String? |
||
|
|
||
| if (wifi_status != ST_WIFI_CONNECTED) | ||
| return; | ||
|
|
||
| // if we don't have a valid Messenger config, do not send to Messenger | ||
| if (sendDataToMessengerEvery < 0) | ||
| return; | ||
|
Comment on lines
+323
to
+325
There was a problem hiding this comment. either remove the empty line 322 or add another empty line after 325 to get consistent? |
||
| // in case the config has been changed in the meantime | ||
| if ((strlen(telegramBotToken) < 40) || (strlen(telegramChatId) < 7)) { | ||
| sendDataToMessengerEvery = -1; | ||
| return; | ||
| } | ||
|
|
||
| static unsigned int transmitCounter = 0; | ||
| transmitCounter++; | ||
| if (transmitCounter == 27720) transmitCounter = 0; // 27720 % 1..12 == 0 | ||
|
There was a problem hiding this comment. not sure i understand... There was a problem hiding this comment. Aim was for the first numbers (i.e. 1 to 12) to avoid an hiccup (i.e. change in interval length) when the counter rolls over. As the actual time the sending is happening is slowly shifting anyway, it probably doesn't matter... There was a problem hiding this comment. i still don't understand. and you need to add the comment to the source code, not here on github or in a year nobody will remember why we have that. There was a problem hiding this comment. will adapt to fixed interval after #444 |
||
|
|
||
| char localEspId[16]; | ||
| char thp_text[60]; | ||
|
|
||
| chipID.toCharArray(localEspId, sizeof(localEspId)); | ||
| if (have_thp) { | ||
| sprintf(thp_text, "\nBME data: %.1fC %.1f%% %.1fhPa", temperature, humidity, pressure/100); | ||
| } | ||
|
|
||
| if (((sendDataToMessengerEvery > 0) && (transmitCounter % sendDataToMessengerEvery == 0)) | ||
| || ((sendDataToMessengerEvery >= 0) && alarm_status)) { | ||
|
Comment on lines
+344
to
+345
There was a problem hiding this comment. this seems to be a triple use variable / in band signalling and that's bad:
can we have different variables to make it better readable / configurable? e.g. could be one for the interval and another one for the mode (disabled, always, only on alarm). There was a problem hiding this comment. that would maybe also solve the use case "send in intervals of N" but "only when alarm is on". |
||
| bool telegram_ok; | ||
| char message[120]; | ||
| log(INFO, "Sending to Telegram messenger ..."); | ||
| set_status(STATUS_TELEGRAM, ST_TELEGRAM_SENDING); | ||
| display_status(); | ||
| if (alarm_status) { | ||
| if (tube_nbr > 0) | ||
| sprintf(message, "<b>--- MULTIGEIGER ALERT ! ---</b>\n<code>%s</code> rate too high:\n%.2f nSv/h (accumulated: %.2f nSv/h)", localEspId, cpm*tube_factor*1000/60, accu_rate*1000); | ||
| else | ||
| sprintf(message, "<b>--- MULTIGEIGER ALERT ! ---</b>\n<code>%s</code> rate too high:\n%d (accumulated: %d)", localEspId, cpm, accu_cpm); | ||
|
Comment on lines
+353
to
+355
There was a problem hiding this comment. no blank before the exclamation mark. There was a problem hiding this comment. still todo. also: the unit of measurement is missing for the lower case. "GM counts"? |
||
| } else { | ||
| if (tube_nbr > 0) | ||
| sprintf(message, "MultiGeiger <code>%s</code> rates:\n%.2f nSv/h (accumulated: %.2f nSv/h)%s", localEspId, cpm*tube_factor*1000/60, accu_rate*1000, have_thp ? thp_text : ""); | ||
| else | ||
| sprintf(message, "MultiGeiger <code>%s</code> CPM:\n%d (accumulated: %d)%s", localEspId, cpm, accu_cpm, have_thp ? thp_text : ""); | ||
|
|
||
| } | ||
| telegram_ok = telegram_bot->sendMessage(telegramChatId, message, "HTML"); | ||
| log(INFO, "Sent to Telegram messenger, status: %s", telegram_ok ? "ok" : "error"); | ||
| set_status(STATUS_TELEGRAM, telegram_ok ? ST_TELEGRAM_IDLE : ST_TELEGRAM_ERROR); | ||
| display_status(); | ||
ThomasWaldmann marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is a bit dirty considering i just got rid of most of the global variables mess.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed. But it would be equally bad style to redo the whole dose calculation with local storage of the previous state from "publish" again in "transmit". I think it might be time to merge all the activities with dose & count stuff in a single function...? Maybe we should indeed meet e.g. at ShackSpace and refactor first on the whiteboard and then directly in code?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s. #444