Small changes in news examples.

Author: rusboard

.travis.yml

@@ -15,9 +15,9 @@ env:
     - SCRIPT=platformioSingle EXAMPLE_NAME=FlashledBot EXAMPLE_FOLDER=/ BOARDTYPE=ESP8266 BOARD=d1_mini
     - SCRIPT=platformioSingle EXAMPLE_NAME=UsingWiFiManager EXAMPLE_FOLDER=/ BOARDTYPE=ESP8266 BOARD=d1_mini
     - SCRIPT=platformioSingle EXAMPLE_NAME=BulkMessages EXAMPLE_FOLDER=/ BOARDTYPE=ESP8266 BOARD=d1_mini
-    - SCRIPT=platformioSingle EXAMPLE_NAME=ImageFromSD EXAMPLE_FOLDER=/SendPhoto/ EXAMPLE_NAME=ImageFromSD BOARDTYPE=ESP8266 BOARD=d1_mini
-    - SCRIPT=platformioSingle EXAMPLE_NAME=ImageFromURL EXAMPLE_FOLDER=/SendPhoto/ BOARDTYPE=ESP8266 BOARD=d1_mini
-    - SCRIPT=platformioSingle EXAMPLE_NAME=ImageFromURL EXAMPLE_FOLDER=/SendPhoto/ BOARDTYPE=ESP8266 BOARD=d1_mini
+    - SCRIPT=platformioSingle EXAMPLE_NAME=PhotoFromSD EXAMPLE_FOLDER=/SendPhoto/ BOARDTYPE=ESP8266 BOARD=d1_mini
+    - SCRIPT=platformioSingle EXAMPLE_NAME=PhotoFromURL EXAMPLE_FOLDER=/SendPhoto/ BOARDTYPE=ESP8266 BOARD=d1_mini
+    - SCRIPT=platformioSingle EXAMPLE_NAME=PhotoFromFileID EXAMPLE_FOLDER=/SendPhoto/ BOARDTYPE=ESP8266 BOARD=d1_mini
 
 
 install:

examples/ESP8266/SendPhoto/ImageFromFileId/ImageFromFileId.ino renamed to examples/ESP8266/SendPhoto/PhotoFromFileID/PhotoFromFileID.ino

@@ -41,9 +41,8 @@ void handleNewMessages(int numNewMessages) {
 
     if (text == "/start") {
       String welcome = "Welcome to Universal Arduino Telegram Bot library, " + from_name + ".\n";
-      welcome += "This is Send Photo From File Id example.\n\n";
+      welcome += "This is Send Photo From File ID example.\n\n";
       welcome += "/get_test_photo : getting test photo\n";
-      //welcome += "You will receive photo from " + test_photo_url + "\n";
 
       bot.sendMessage(chat_id, welcome, "");
     }

examples/ESP8266/SendPhoto/ImageFromSD/ImageFromSD.ino renamed to examples/ESP8266/SendPhoto/PhotoFromSD/PhotoFromSD.ino

@@ -4,23 +4,16 @@
  *  written by Giacarlo Bacchio (Gianbacchio on Github)            *
  *  adapted by Brian Lough                                         *
  *******************************************************************/
-
 #include <ESP8266WiFi.h>
 #include <WiFiClientSecure.h>
 #include <UniversalTelegramBot.h>
 #include <ArduinoJson.h>
-
 #include <SPI.h>
 #include <SD.h>
 
-bool isMoreDataAvailable();
-byte getNextByte();
-
 // Initialize Wifi connection to the router
-char ssid[] = "xxxxxxxxxxxxxxxxxxxxxx";              // your network SSID (name)
-char password[] = "yyyyyyyy";                              // your network key
-
-File myFile;
+char ssid[] = "XXXXXX";     // your network SSID (name)
+char password[] = "YYYYYY"; // your network key
 
 // Initialize Telegram BOT
 #define BOTtoken "XXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"  // your Bot Token (Get from Botfather)
@@ -31,83 +24,87 @@ UniversalTelegramBot bot(BOTtoken, client);
 int Bot_mtbs = 1000; //mean time between scan messages
 long Bot_lasttime;   //last time messages' scan has been done
 
+File myFile;
+bool isMoreDataAvailable();
+byte getNextByte();
 
 void setup() {
-
   Serial.begin(115200);
 
-  Serial.print("Initializing SD card...");
+  Serial.print("Initializing SD card....");
 
   if (!SD.begin(D0)) {
-    Serial.println("initialization failed!");
+    Serial.println("failed!");
     return;
   }
-  Serial.println("initialization done.");
 
+  Serial.println("done.");
 
-  // Set WiFi to station mode and disconnect from an AP if it was Previously
-  // connected
+  // Set WiFi to station mode and disconnect from an AP if it was Previously connected
   WiFi.mode(WIFI_STA);
   WiFi.disconnect();
   delay(100);
 
-  // Attempt to connect to Wifi network:
+  // attempt to connect to Wifi network:
   Serial.print("Connecting Wifi: ");
   Serial.println(ssid);
   WiFi.begin(ssid, password);
+
   while (WiFi.status() != WL_CONNECTED) {
     Serial.print(".");
     delay(500);
   }
+
   Serial.println("");
   Serial.println("WiFi connected");
-  Serial.println("IP address: ");
-  IPAddress ip = WiFi.localIP();
-  Serial.println(ip);
-
-
-}
-
-bool isMoreDataAvailable(){
-  return myFile.available();
-}
-
-byte getNextByte(){
-  return myFile.read();
+  Serial.print("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");
 
-
       String chat_id = bot.messages[0].chat_id;
+      String file_name = "box.jpg";
+
+      myFile = SD.open(file_name);
 
-      myFile = SD.open("box.jpg");
       if (myFile) {
-        Serial.println("box.jpg:");
+        Serial.print(file_name);
+        Serial.print("....");
 
         //Content type for PNG image/png
         bool sent = bot.sendPhotoByBinary(chat_id, "image/jpeg", myFile.size(),
             isMoreDataAvailable,
             getNextByte);
 
-        if(sent){
-          Serial.println("Succesfully sent photo");
+        if (sent) {
+          Serial.println("was successfully sent");
         } else {
-          Serial.println("Error sending photo");
+          Serial.println("was not sent");
         }
 
         myFile.close();
-        } else {
-          // if the file didn't open, print an error:
-          Serial.println("error opening photo.jpg");
+      } else {
+        // if the file didn't open, print an error:
+        Serial.println("error opening photo");
       }
+
       numNewMessages = bot.getUpdates(bot.last_message_received + 1);
     }
+
     Bot_lasttime = millis();
   }
 }
+
+bool isMoreDataAvailable(){
+  return myFile.available();
+}
+
+byte getNextByte(){
+  return myFile.read();
+}

examples/ESP8266/SendPhoto/ImageFromURL/ImageFromURL.ino renamed to examples/ESP8266/SendPhoto/PhotoFromURL/PhotoFromURL.ino

@@ -42,7 +42,6 @@ void handleNewMessages(int numNewMessages) {
       String welcome = "Welcome to Universal Arduino Telegram Bot library, " + from_name + ".\n";
       welcome += "This is Send Image From URL example.\n\n";
       welcome += "/get_test_photo : getting test photo\n";
-      //welcome += "You will receive photo from " + test_photo_url + "\n";
 
       bot.sendMessage(chat_id, welcome, "");
     }