Update 101 examples

Author: Bolukan

examples/UntestedSinceUpgrade/101/CustomKeyboard/CustomKeyboard.ino renamed to examples/Untested/101/CustomKeyboard/CustomKeyboard.ino

@@ -8,55 +8,61 @@
 #include <WiFiSSLClient.h>
 #include <WiFi101.h>
 #include <UniversalTelegramBot.h>
+#include <SPI.h>
 
-
-// Initialize Wifi connection to the router
-char ssid[] = "xxxxxxxxxxxxxxxxxxxxxx";              // your network SSID (name)
-char password[] = "yyyyyyyy";                              // your network key
-
-
+// Wifi network station credentials
+#define WIFI_SSID "YOUR_SSID"
+#define WIFI_PASSWORD "YOUR_PASSWORD"
+// Telegram BOT Token (Get from Botfather)
+#define BOT_TOKEN "XXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
 
 const int ledPin = 13;
-
-// Initialize Telegram BOT
-#define BOTtoken "XXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"  // your Bot Token (Get from Botfather)
+const unsigned long BOT_MTBS = 1000; // mean time between scan messages
 
 WiFiSSLClient client;
-UniversalTelegramBot bot(BOTtoken, client);
-
-int Bot_mtbs = 1000; //mean time between scan messages
-long Bot_lasttime;   //last time messages' scan has been done
+UniversalTelegramBot bot(BOT_TOKEN, client);
+unsigned long bot_lasttime; // last time messages' scan has been done
 int ledStatus = 0;
 
-void handleNewMessages(int numNewMessages) {
+void handleNewMessages(int numNewMessages)
+{
   Serial.println("handleNewMessages");
   Serial.println(String(numNewMessages));
-  for(int i=0; i<numNewMessages; i++) {
-    String chat_id = String(bot.messages[i].chat_id);
+  for (int i = 0; i < numNewMessages; i++)
+  {
+    String chat_id = bot.messages[i].chat_id;
     String text = bot.messages[i].text;
-    if (text == "/ledon") {
-      digitalWrite(ledPin, HIGH);   // turn the LED on (HIGH is the voltage level)
+    if (text == "/ledon")
+    {
+      digitalWrite(ledPin, HIGH); // turn the LED on (HIGH is the voltage level)
       ledStatus = 1;
       bot.sendMessage(chat_id, "Led is ON", "");
     }
-    if (text == "/ledoff") {
+    if (text == "/ledoff")
+    {
       ledStatus = 0;
-      digitalWrite(ledPin, LOW);    // turn the LED off (LOW is the voltage level)
+      digitalWrite(ledPin, LOW); // turn the LED off (LOW is the voltage level)
       bot.sendMessage(chat_id, "Led is OFF", "");
     }
-    if (text == "/status") {
-      if(ledStatus){
+    if (text == "/status")
+    {
+      if (ledStatus)
+      {
         bot.sendMessage(chat_id, "Led is ON", "");
-      } else {
+      }
+      else
+      {
         bot.sendMessage(chat_id, "Led is OFF", "");
       }
     }
-    if (text == "/options") {
+    if (text == "/options")
+    {
       String keyboardJson = "[[\"/ledon\", \"/ledoff\"],[\"/status\"]]";
       bot.sendMessageWithReplyKeyboard(chat_id, "Choose from one of the following options", "", keyboardJson, true);
     }
 
-    if (text == "/start") {
+    if (text == "/start")
+    {
       String welcome = "Welcome from FlashLedBot, your personal Bot on Arduino 101\n";
       welcome = welcome + "/ledon : to switch the Led ON \n";
       welcome = welcome + "/ledoff : to switch the Led OFF \n";
@@ -67,41 +73,40 @@ void handleNewMessages(int numNewMessages) {
   }
 }
 
-
-void setup() {
+void setup()
+{
   Serial.begin(115200);
+  Serial.println();
 
-  delay(100);
   // attempt to connect to Wifi network:
-  Serial.print("Connecting Wifi: ");
-  Serial.println(ssid);
-  while (WiFi.begin(ssid, password) != WL_CONNECTED) {
+  Serial.print("Connecting to Wifi SSID ");
+  Serial.print(WIFI_SSID);
+  while (WiFi.begin(WIFI_SSID, WIFI_PASSWORD) != WL_CONNECTED)
+  {
     Serial.print(".");
     delay(500);
   }
-  Serial.println("");
-  Serial.println("WiFi connected");
-  Serial.println("IP address: ");
-  IPAddress ip = WiFi.localIP();
-  Serial.println(ip);
+  Serial.print("\nWiFi connected. IP address: ");
+  Serial.println(WiFi.localIP());
 
   pinMode(ledPin, OUTPUT); // initialize digital ledPin as an output.
   delay(10);
   digitalWrite(ledPin, HIGH); // initialize pin as off
-
 }
 
-
-
-void loop() {
-
-  if (millis() > Bot_lasttime + Bot_mtbs)  {
+void loop()
+{
+  if (millis() - bot_lasttime > BOT_MTBS)
+  {
     int numNewMessages = bot.getUpdates(bot.last_message_received + 1);
-    while(numNewMessages) {
+
+    while (numNewMessages)
+    {
       Serial.println("got response");
       handleNewMessages(numNewMessages);
       numNewMessages = bot.getUpdates(bot.last_message_received + 1);
     }
-    Bot_lasttime = millis();
+
+    bot_lasttime = millis();
   }
 }

examples/UntestedSinceUpgrade/101/CustomKeyboard/README.md renamed to examples/Untested/101/CustomKeyboard/README.md

@@ -0,0 +1,66 @@
+/*******************************************************************
+ *  An example of bot that echos back any messages received        *
+ *  using A101TelegramBot.                                          *
+ *                                                                 *
+ *  written by Giacarlo Bacchio (Gianbacchio on Github)            *
+ *  adapted by Brian Lough                                         *
+ *******************************************************************/
+
+#include <WiFiSSLClient.h>
+#include <WiFi101.h>
+#include <UniversalTelegramBot.h>
+#include <SPI.h>
+
+// Wifi network station credentials
+#define WIFI_SSID "YOUR_SSID"
+#define WIFI_PASSWORD "YOUR_PASSWORD"
+// Telegram BOT Token (Get from Botfather)
+#define BOT_TOKEN "XXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+
+const unsigned long BOT_MTBS = 1000; // mean time between scan messages
+
+WiFiSSLClient client;
+UniversalTelegramBot bot(BOT_TOKEN, client);
+unsigned long bot_lasttime; // last time messages' scan has been done
+
+void handleNewMessages(int numNewMessages)
+{
+  for (int i = 0; i < numNewMessages; i++)
+  {
+    bot.sendMessage(bot.messages[i].chat_id, bot.messages[i].text, "");
+  }
+}
+
+void setup()
+{
+  Serial.begin(115200);
+  Serial.println();
+
+  // attempt to connect to Wifi network:
+  Serial.print("Connecting to Wifi SSID ");
+  Serial.print(WIFI_SSID);
+  while (WiFi.begin(WIFI_SSID, WIFI_PASSWORD) != WL_CONNECTED)
+  {
+    Serial.print(".");
+    delay(500);
+  }
+  Serial.print("\nWiFi connected. IP address: ");
+  Serial.println(WiFi.localIP());
+}
+
+void loop()
+{
+  if (millis() - bot_lasttime > BOT_MTBS)
+  {
+    int numNewMessages = bot.getUpdates(bot.last_message_received + 1);
+
+    while (numNewMessages)
+    {
+      Serial.println("got response");
+      handleNewMessages(numNewMessages);
+      numNewMessages = bot.getUpdates(bot.last_message_received + 1);
+    }
+
+    bot_lasttime = millis();
+  }
+}

examples/Untested/101/EchoBot/EchoBot.ino

@@ -6,56 +6,61 @@
  *  adapted by Brian Lough                                         *
  *******************************************************************/
 
- #include <WiFiSSLClient.h>
- #include <WiFi101.h>
- #include <UniversalTelegramBot.h>
+#include <WiFiSSLClient.h>
+#include <WiFi101.h>
+#include <UniversalTelegramBot.h>
+#include <SPI.h>
 
+// Wifi network station credentials
+#define WIFI_SSID "YOUR_SSID"
+#define WIFI_PASSWORD "YOUR_PASSWORD"
+// Telegram BOT Token (Get from Botfather)
+#define BOT_TOKEN "XXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
 
-// Initialize Wifi connection to the router
-char ssid[] = "xxxxxxxxxxxxxxxxxxxxxx";              // your network SSID (name)
-char password[] = "yyyyyyyy";                              // your network key
-
-
-
-const int ledPin = 13;
-
-// Initialize Telegram BOT
-#define BOTtoken "XXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"  // your Bot Token (Get from Botfather)
+const unsigned long BOT_MTBS = 1000; // mean time between scan messages
 
 WiFiSSLClient client;
-UniversalTelegramBot bot(BOTtoken, client);
+UniversalTelegramBot bot(BOT_TOKEN, client);
+unsigned long bot_lasttime; // last time messages' scan has been done
 
-int Bot_mtbs = 1000; //mean time between scan messages
-long Bot_lasttime;   //last time messages' scan has been done
+const int ledPin = 13;
 bool Start = false;
 int ledStatus = 0;
 
-void handleNewMessages(int numNewMessages) {
-  Serial.println("handleNewMessages");
-  Serial.println(String(numNewMessages));
-  for(int i=0; i<numNewMessages; i++) {
-    String chat_id = String(bot.messages[i].chat_id);
+void handleNewMessages(int numNewMessages)
+{
+  for (int i = 0; i < numNewMessages; i++)
+  {
+    String chat_id = bot.messages[i].chat_id;
     String text = bot.messages[i].text;
-    if (text == "/ledon") {
-      digitalWrite(ledPin, HIGH);   // turn the LED on (HIGH is the voltage level)
+    if (text == "/ledon")
+    {
+      digitalWrite(ledPin, HIGH); // turn the LED on (HIGH is the voltage level)
       ledStatus = 1;
       bot.sendMessage(chat_id, "Led is ON", "");
     }
-    if (text == "/ledoff") {
+    if (text == "/ledoff")
+    {
       ledStatus = 0;
-      digitalWrite(ledPin, LOW);    // turn the LED off (LOW is the voltage level)
+      digitalWrite(ledPin, LOW); // turn the LED off (LOW is the voltage level)
       bot.sendMessage(chat_id, "Led is OFF", "");
     }
-    if (text == "/status") {
-      if(ledStatus){
+    if (text == "/status")
+    {
+      if (ledStatus)
+      {
         bot.sendMessage(chat_id, "Led is ON", "");
-      } else {
+      }
+      else
+      {
         bot.sendMessage(chat_id, "Led is OFF", "");
       }
     }
-    if (text == "/start") {
+    if (text == "/start")
+    {
       String from_name = bot.messages[i].from_name;
-      if (from_name == "") from_name = "Anonymous";
+      if (from_name == "")
+        from_name = "Anonymous";
 
       String welcome = "Welcome, " + from_name + ", from FlashLedBot, your personal Bot on Arduino 101\n";
       welcome = welcome + "/ledon : to switch the Led ON \n";
@@ -66,40 +71,40 @@ void handleNewMessages(int numNewMessages) {
   }
 }
 
-
-void setup() {
+void setup()
+{
   Serial.begin(115200);
-
-  delay(100);
+  Serial.println();
 
   // attempt to connect to Wifi network:
-  Serial.print("Connecting Wifi: ");
-  Serial.println(ssid);
-  while (WiFi.begin(ssid, password) != WL_CONNECTED) {
+  Serial.print("Connecting to Wifi SSID ");
+  Serial.print(WIFI_SSID);
+  while (WiFi.begin(WIFI_SSID, WIFI_PASSWORD) != WL_CONNECTED)
+  {
     Serial.print(".");
     delay(500);
   }
-  Serial.println("");
-  Serial.println("WiFi connected");
-  Serial.println("IP address: ");
-  IPAddress ip = WiFi.localIP();
-  Serial.println(ip);
+  Serial.print("\nWiFi connected. IP address: ");
+  Serial.println(WiFi.localIP());
 
   pinMode(ledPin, OUTPUT); // initialize digital ledPin as an output.
   delay(10);
   digitalWrite(ledPin, LOW); //initialize pin as off
-
 }
 
-void loop() {
-
-  if (millis() > Bot_lasttime + Bot_mtbs)  {
+void loop()
+{
+  if (millis() - bot_lasttime > BOT_MTBS)
+  {
     int numNewMessages = bot.getUpdates(bot.last_message_received + 1);
-    while(numNewMessages) {
+
+    while (numNewMessages)
+    {
       Serial.println("got response");
       handleNewMessages(numNewMessages);
       numNewMessages = bot.getUpdates(bot.last_message_received + 1);
     }
-    Bot_lasttime = millis();
+
+    bot_lasttime = millis();
   }
 }