update version to 2.10

Richard3366 · Richard3366 · commit b3788525d2df · 2024-07-19T16:59:51.000+08:00
diff --git a/examples/Factory_Test/WIFI_Kit_32_FactoryTest/WIFI_Kit_32_FactoryTest.ino b/examples/Factory_Test/WIFI_Kit_32_FactoryTest/WIFI_Kit_32_FactoryTest.ino
@@ -42,7 +42,7 @@ void WIFISetUp(void)
 	WiFi.disconnect(true);
 	delay(100);
 	WiFi.mode(WIFI_STA);
-	WiFi.setAutoConnect(true);
+	WiFi.setAutoReconnect(true);
 	WiFi.begin("Your WiFi SSID","Your Password");//fill in "Your WiFi SSID","Your Password"
 	delay(100);
 
diff --git a/examples/Factory_Test/WIRELESS_MINI_SHELL_FactoryTest/WIRELESS_MINI_SHELL_FactoryTest.ino b/examples/Factory_Test/WIRELESS_MINI_SHELL_FactoryTest/WIRELESS_MINI_SHELL_FactoryTest.ino
@@ -253,7 +253,7 @@ void WIFISetUp(void)
 	WiFi.disconnect(true);
 	delay(100);
 	WiFi.mode(WIFI_STA);
-	WiFi.setAutoConnect(true);
+	WiFi.setAutoReconnect(true);
 	WiFi.begin(TEST_WIFI_SSID,TEST_WIFI_PWD);//fill in "Your WiFi SSID","Your Password"
 	delay(100);
 
diff --git a/examples/Factory_Test/WiFi_Kit_32_V3_FactoryTest/WiFi_Kit_32_V3_FactoryTest.ino b/examples/Factory_Test/WiFi_Kit_32_V3_FactoryTest/WiFi_Kit_32_V3_FactoryTest.ino
@@ -42,7 +42,7 @@ void WIFISetUp(void)
 	WiFi.disconnect(true);
 	delay(100);
 	WiFi.mode(WIFI_STA);
-	WiFi.setAutoConnect(true);
+	WiFi.setAutoReconnect(true);
 	WiFi.begin("Your WiFi SSID","Your Password");//fill in "Your WiFi SSID","Your Password"
 	delay(100);
 
diff --git a/examples/Factory_Test/WiFi_LoRa_32_V2_FactoryTest/WiFi_LoRa_32_V2_FactoryTest.ino b/examples/Factory_Test/WiFi_LoRa_32_V2_FactoryTest/WiFi_LoRa_32_V2_FactoryTest.ino
@@ -157,7 +157,7 @@ void WIFISetUp(void)
 	WiFi.disconnect(true);
 	delay(100);
 	WiFi.mode(WIFI_STA);
-	WiFi.setAutoConnect(true);
+	WiFi.setAutoReconnect(true);
 	WiFi.begin("Your WiFi SSID","Your Password");//fill in "Your WiFi SSID","Your Password"
 	delay(100);
 
diff --git a/examples/Factory_Test/WiFi_LoRa_32_V3/WiFi_LoRa_32_V3_FactoryTest_V1/WiFi_LoRa_32_V3_FactoryTest_V1.ino b/examples/Factory_Test/WiFi_LoRa_32_V3/WiFi_LoRa_32_V3_FactoryTest_V1/WiFi_LoRa_32_V3_FactoryTest_V1.ino
@@ -157,7 +157,7 @@ void WIFISetUp(void)
 	WiFi.disconnect(true);
 	delay(100);
 	WiFi.mode(WIFI_STA);
-	WiFi.setAutoConnect(true);
+	WiFi.setAutoReconnect(true);
 	WiFi.begin("Your WiFi SSID","Your Password");//fill in "Your WiFi SSID","Your Password"
 	delay(100);
 
diff --git a/examples/Factory_Test/WiFi_LoRa_32_V3/WiFi_LoRa_32_V3_FactoryTest_V2/WiFi_LoRa_32_V3_FactoryTest_V2.ino b/examples/Factory_Test/WiFi_LoRa_32_V3/WiFi_LoRa_32_V3_FactoryTest_V2/WiFi_LoRa_32_V3_FactoryTest_V2.ino
@@ -249,7 +249,7 @@ void WIFISetUp(void)
 	WiFi.disconnect(true);
 	delay(100);
 	WiFi.mode(WIFI_STA);
-	WiFi.setAutoConnect(true);
+	WiFi.setAutoReconnect(true);
 	WiFi.begin(TEST_WIFI_SSID,TEST_WIFI_PWD);//fill in "Your WiFi SSID","Your Password"
 	delay(100);
 
diff --git a/examples/Factory_Test/Wireless_Paper_V1.0_FactoryTest/Wireless_Paper_V1.0_FactoryTest.ino b/examples/Factory_Test/Wireless_Paper_V1.0_FactoryTest/Wireless_Paper_V1.0_FactoryTest.ino
@@ -39,6 +39,10 @@ QYEG0213RWS800_BWR   factory_display(6, 5, 4,7, 3,2,-1, 6000000);//rst,dc,cs,bus
 //  1: 250 kHz,
 //  2: 500 kHz,
 //  3: Reserved]
+#define LORA_BANDWIDTH                              0         // [0: 125 kHz,
+//  1: 250 kHz,
+//  2: 500 kHz,
+//  3: Reserved]
 #define LORA_SPREADING_FACTOR                       7         // [SF7..SF12]
 #define LORA_CODINGRATE                             1         // [1: 4/5,
 //  2: 4/6,
@@ -160,7 +164,7 @@ void WIFISetUp(void)
   WiFi.disconnect(true);
   delay(100);
   WiFi.mode(WIFI_STA);
-  WiFi.setAutoConnect(true);
+  WiFi.setAutoReconnect(true);
   WiFi.begin("Heltec-RD","hunter_3120");//fill in "Your WiFi SSID","Your Password"
   delay(100);
 
diff --git a/examples/Factory_Test/Wireless_Paper_V1.1_FactoryTest/Wireless_Paper_V1.1_FactoryTest.ino b/examples/Factory_Test/Wireless_Paper_V1.1_FactoryTest/Wireless_Paper_V1.1_FactoryTest.ino
@@ -194,7 +194,7 @@ void WIFISetUp(void)
   WiFi.disconnect(true);
   delay(100);
   WiFi.mode(WIFI_STA);
-  WiFi.setAutoConnect(true);
+  WiFi.setAutoReconnect(true);
   WiFi.begin("TP-LINK_B8BC", "heltec_test"); //fill in "Your WiFi SSID","Your Password"
   delay(100);
 
diff --git a/examples/Factory_Test/Wireless_Shell_FactoryTest/Wireless_Shell_FactoryTest.ino b/examples/Factory_Test/Wireless_Shell_FactoryTest/Wireless_Shell_FactoryTest.ino
@@ -149,7 +149,7 @@ void WIFISetUp(void)
 	WiFi.disconnect(true);
 	delay(100);
 	WiFi.mode(WIFI_STA);
-	WiFi.setAutoConnect(true);
+	WiFi.setAutoReconnect(true);
 	WiFi.begin("Your WiFi SSID","Your Password");//fill in "Your WiFi SSID","Your Password"
 	delay(100);
   Serial.print("Connecting...");
diff --git a/examples/Factory_Test/Wireless_Shell_V3_FactoryTest/Wireless_Shell_V3_FactoryTest.ino b/examples/Factory_Test/Wireless_Shell_V3_FactoryTest/Wireless_Shell_V3_FactoryTest.ino
@@ -149,7 +149,7 @@ void WIFISetUp(void)
 	WiFi.disconnect(true);
 	delay(100);
 	WiFi.mode(WIFI_STA);
-	WiFi.setAutoConnect(true);
+	WiFi.setAutoReconnect(true);
 	WiFi.begin("Your WiFi SSID","Your Password");//fill in "Your WiFi SSID","Your Password"
 	delay(100);
   Serial.print("Connecting...");
diff --git a/examples/Factory_Test/Wireless_Stick_Lite_FactoryTest/Wireless_Stick_Lite_FactoryTest.ino b/examples/Factory_Test/Wireless_Stick_Lite_FactoryTest/Wireless_Stick_Lite_FactoryTest.ino
@@ -149,7 +149,7 @@ void WIFISetUp(void)
 	WiFi.disconnect(true);
 	delay(100);
 	WiFi.mode(WIFI_STA);
-	WiFi.setAutoConnect(true);
+	WiFi.setAutoReconnect(true);
 	WiFi.begin("Your WiFi SSID","Your Password");//fill in "Your WiFi SSID","Your Password"
 	delay(100);
   Serial.print("Connecting...");
diff --git a/examples/Factory_Test/Wireless_Stick_Lite_V3_FactoryTest/Wireless_Stick_Lite_V3_FactoryTest.ino b/examples/Factory_Test/Wireless_Stick_Lite_V3_FactoryTest/Wireless_Stick_Lite_V3_FactoryTest.ino
@@ -149,7 +149,7 @@ void WIFISetUp(void)
 	WiFi.disconnect(true);
 	delay(100);
 	WiFi.mode(WIFI_STA);
-	WiFi.setAutoConnect(true);
+	WiFi.setAutoReconnect(true);
 	WiFi.begin("Your WiFi SSID","Your Password");//fill in "Your WiFi SSID","Your Password"
 	delay(100);
   Serial.print("Connecting...");
diff --git a/examples/Factory_Test/Wireless_Stick_V3_FactoryTest/Wireless_Stick_V3_FactoryTest.ino b/examples/Factory_Test/Wireless_Stick_V3_FactoryTest/Wireless_Stick_V3_FactoryTest.ino
@@ -164,7 +164,7 @@ void WIFISetUp(void)
 	WiFi.disconnect(true);
 	delay(100);
 	WiFi.mode(WIFI_STA);
-	WiFi.setAutoConnect(true);
+	WiFi.setAutoReconnect(true);
 	WiFi.begin("TP-LINK_B8BC","heltec_test");//fill in "Your WiFi SSID","Your Password"
 	delay(100);
 
diff --git a/examples/Factory_Test/Wireless_Tracker_V1.0_FactoryTest/Wireless_Tracker_V1.0_FactoryTest.ino b/examples/Factory_Test/Wireless_Tracker_V1.0_FactoryTest/Wireless_Tracker_V1.0_FactoryTest.ino
@@ -189,7 +189,7 @@ void wifi_connect_init(void)
 	WiFi.disconnect(true);
 	custom_delay(100);
 	WiFi.mode(WIFI_STA);
-	WiFi.setAutoConnect(true);
+	WiFi.setAutoReconnect(true);
 	WiFi.begin("Your WiFi SSID","Your Password");//fill in "Your WiFi SSID","Your Password"
 	st7735.st7735_write_str(0, 20, "WIFI Setup done");
 }
diff --git a/examples/Factory_Test/Wireless_Tracker_V1.1_FactoryTest/Wireless_Tracker_V1.1_FactoryTest.ino b/examples/Factory_Test/Wireless_Tracker_V1.1_FactoryTest/Wireless_Tracker_V1.1_FactoryTest.ino
@@ -189,7 +189,7 @@ void wifi_connect_init(void)
 	WiFi.disconnect(true);
 	custom_delay(100);
 	WiFi.mode(WIFI_STA);
-	WiFi.setAutoConnect(true);
+	WiFi.setAutoReconnect(true);
 	WiFi.begin("Your WiFi SSID","Your Password");//fill in "Your WiFi SSID","Your Password"
 	st7735.st7735_write_str(0, 20, "WIFI Setup done");
 }
diff --git a/examples/GPS/GPSDisplayOnTFT/GPSDisplayOnTFT.ino b/examples/GPS/GPSDisplayOnTFT/GPSDisplayOnTFT.ino
@@ -12,7 +12,7 @@ HT_st7735 st7735;
 void GPS_test(void)
 {
 	pinMode(VGNSS_CTRL,OUTPUT);
-	digitalWrite(VGNSS_CTRL,LOW);
+	digitalWrite(VGNSS_CTRL,HIGH);
 	Serial1.begin(115200,SERIAL_8N1,33,34);    
 	Serial.println("GPS_test");
 	st7735.st7735_fill_screen(ST7735_BLACK);
diff --git a/examples/GPS/GPSToUart/GPSToUart.ino b/examples/GPS/GPSToUart/GPSToUart.ino
@@ -4,13 +4,13 @@
 
 TinyGPSPlus GPS;
 
-#define VGNSS_CTRL 37
+#define VGNSS_CTRL 3
 
 
 void GPS_test(void)
 {
 	pinMode(VGNSS_CTRL,OUTPUT);
-	digitalWrite(VGNSS_CTRL,LOW);
+	digitalWrite(VGNSS_CTRL,HIGH);
 	Serial1.begin(115200,SERIAL_8N1,33,34);    
 	Serial.println("GPS_test");
 
@@ -46,7 +46,9 @@ void GPS_test(void)
 }
 
 void setup(){
-  delay(100);
+  Serial.begin(115200);    
+  Serial.println("GPS_test");
+  delay(1000);
   GPS_test();
 }
 
diff --git a/examples/LoRaWAN/LoRaWanGPSLocation/LoRaWanGPSLocation.ino b/examples/LoRaWAN/LoRaWanGPSLocation/LoRaWanGPSLocation.ino
@@ -173,7 +173,6 @@ void setup()
    Serial.begin(115200);
   pinMode(Vext, OUTPUT);
   digitalWrite(Vext, HIGH);
-  Mcu.setlicense(license);
  st7735.st7735_init();
  st7735.st7735_fill_screen(ST7735_BLACK);
   Mcu.begin(HELTEC_BOARD,SLOW_CLK_TPYE);
diff --git a/examples/LoRaWAN/LoRaWanGPSTime/LoRaWanGPSTime.ino b/examples/LoRaWAN/LoRaWanGPSTime/LoRaWanGPSTime.ino
@@ -177,7 +177,6 @@ void setup()
 
   pinMode(Vext, OUTPUT);
   digitalWrite(Vext, HIGH);
-  Mcu.setlicense(license);
   st7735.st7735_init();
   st7735.st7735_fill_screen(ST7735_BLACK);
 
diff --git a/examples/OLED/DrawingDemo/DrawingDemo.ino b/examples/OLED/DrawingDemo/DrawingDemo.ino
@@ -2,9 +2,9 @@
 #include "HT_SSD1306Wire.h"
 
 #ifdef WIRELESS_STICK_V3
-SSD1306Wire  display(0x3c, 500000, SDA_OLED, SCL_OLED, GEOMETRY_64_32, RST_OLED); // addr , freq , i2c group , resolution , rst
+static SSD1306Wire  display(0x3c, 500000, SDA_OLED, SCL_OLED, GEOMETRY_64_32, RST_OLED); // addr , freq , i2c group , resolution , rst
 #else
-SSD1306Wire  display(0x3c, 500000, SDA_OLED, SCL_OLED, GEOMETRY_128_64, RST_OLED); // addr , freq , i2c group , resolution , rst
+static SSD1306Wire  display(0x3c, 500000, SDA_OLED, SCL_OLED, GEOMETRY_128_64, RST_OLED); // addr , freq , i2c group , resolution , rst
 #endif
 
 void drawLines() {
diff --git a/examples/OLED/OTA_OLED/OTA_OLED.ino b/examples/OLED/OTA_OLED/OTA_OLED.ino
@@ -186,7 +186,7 @@ void setupWIFI()
 
   WiFi.mode(WIFI_STA);
   //WiFi.onEvent(WiFiEvent);
-  WiFi.setAutoConnect(true);
+  WiFi.setAutoReconnect(true);
 
   WiFi.setAutoReconnect(true);    //Automatically reconnect after disconnecting WiFi ESP32 is not available
 
diff --git a/examples/OLED/SimpleDemo/SimpleDemo.ino b/examples/OLED/SimpleDemo/SimpleDemo.ino
@@ -3,7 +3,7 @@
 #include "HT_SSD1306Wire.h"
 #include "images.h"
 
-SSD1306Wire  display(0x3c, 500000, SDA_OLED, SCL_OLED, GEOMETRY_128_64, RST_OLED); // addr , freq , i2c group , resolution , rst
+static SSD1306Wire  display(0x3c, 500000, SDA_OLED, SCL_OLED, GEOMETRY_128_64, RST_OLED); // addr , freq , i2c group , resolution , rst
 
 #define DEMO_DURATION 3000
 typedef void (*Demo)(void);
diff --git a/examples/VME213/Part_Simple/Part_Simple.ino b/examples/VME213/Part_Simple/Part_Simple.ino
@@ -6,6 +6,8 @@
  * Description:
  * 1.Using an external Lut waveform file to achieve partial refresh
  * 
+ * Note:
+ * This example is compatible with Wireless Paper and requires you to change the pin Settings in your code and change the order in which the VextCtrl pin HIGH and LOW.
  * Library url: https://github.com/HelTecAutomation/Heltec_ESP32
  * Support: support@heltec.cn
  *
diff --git a/examples/VME213/battery/battery.ino b/examples/VME213/battery/battery.ino
@@ -26,22 +26,10 @@ HT_ICMEN2R13EFC1 display(3, 2, 5, 1, 4, 6, -1, 6000000); // rst,dc,cs,busy,sck,m
  * ANGLE_270_DEGREE
  */
 #define DIRECTION ANGLE_0_DEGREE
-#define Resolution 0.000244140625 
-#define battary_in 3.3  
-#define coefficient 1.03 
 void setup()
 {
     Serial.begin(115200);
-    if (DIRECTION == ANGLE_0_DEGREE || DIRECTION == ANGLE_180_DEGREE)
-    {
-        width = display._width;
-        height = display._height;
-    }
-    else
-    {
-        width = display._height;
-        height = display._width;
-    }
+    
     VextON();
     delay(100);
     // Initialising the UI will init the display too.
@@ -52,40 +40,56 @@ void setup()
 void battery()
 {
     analogReadResolution(12);
-    int battery_levl = analogRead(7)* Resolution * battary_in * coefficient//battary/4096*3.3* coefficient
-    float battery_one = 0.4125;
-    Serial.printf("ADC analog value = %.2f\n", battery_levl );
-    if (battery_levl < battery_one)
+    float battery_levl = analogReadMilliVolts(7)* 0.001 * 5.09; //battary/4096*3.3* coefficient
+    float battery_one = 0.528;
+    uint8_t bl= battery_levl*100;
+    uint8_t bo= battery_one*100;
+
+    if (bl < bo)
     {
         display.drawString(230, 0, "N/A");
         display.drawXbm(215, 0, battery_w, battery_h, battery0);
     }
-    else if (battery_levl < 2 * battery_one && battery_levl > battery_one)
+    else if (bl < 2 * bo && bl > bo)
     {
+          Serial.printf("ADC analog value = %.2f\n", battery_levl );
+
         display.drawXbm(230, 0, battery_w, battery_h, battery1);
     }
-    else if (battery_levl < 3 * battery_one && battery_levl > 2 * battery_one)
+    else if (bl < 3 * bo && bl > 2 * bo)
     {
+          Serial.printf("ADC analog value = %.2f\n", battery_levl );
+
         display.drawXbm(230, 0, battery_w, battery_h, battery2);
     }
-    else if (battery_levl < 4 * battery_one && battery_levl > 3 * battery_one)
+    else if (bl < 4 * bo && bl > 3 * bo)
     {
+          Serial.printf("ADC analog value = %.2f\n", battery_levl );
+
         display.drawXbm(230, 0, battery_w, battery_h, battery3);
     }
-    else if (battery_levl < 5 * battery_one && battery_levl > 4 * battery_one)
+    else if (bl < 5 * bo && bl > 4 * bo)
     {
+          Serial.printf("ADC analog value = %.2f\n", battery_levl );
+
         display.drawXbm(230, 0, battery_w, battery_h, battery4);
     }
-    else if (battery_levl < 6 * battery_one && battery_levl > 5 * battery_one)
+    else if (bl < 6 * bo && bl > 5 * bo)
     {
+          Serial.printf("ADC analog value = %.2f\n", battery_levl );
+
         display.drawXbm(230, 0, battery_w, battery_h, battery5);
     }
-    else if (battery_levl < 7 * battery_one && battery_levl > 6 * battery_one)
+    else if (bl < 7 * bo && bl > 6 * bo)
     {
+          Serial.printf("ADC analog value = %.2f\n", battery_levl );
+
         display.drawXbm(230, 0, battery_w, battery_h, battery6);
     }
-    else if (battery_levl < 7 * battery_one && battery_levl > 6 * battery_one)
+    else if (bl < 7 * bo && bl > 6 * bo)
     {
+          Serial.printf("ADC analog value = %.2f\n", battery_levl );
+
         display.drawXbm(230, 0, battery_w, battery_h, batteryfull);
     }
 }
@@ -111,4 +115,5 @@ void loop()
     battery();
     display.update(COLOR_BUFFER);
     display.display();
+    delay(10000);
 }
diff --git a/examples/VME290/battery/battery.ino b/examples/VME290/battery/battery.ino
@@ -52,7 +52,7 @@ void setup()
 void battery()
 {
     analogReadResolution(12);
-    int battery_levl = analogRead(7)* Resolution * battary_in * coefficient//battary/4096*3.3* coefficient
+    int battery_levl = analogRead(7)* Resolution * battary_in * coefficient;//battary/4096*3.3* coefficient
     float battery_one = 0.4125;
     Serial.printf("ADC analog value = %.2f\n", battery_levl );
     if (battery_levl < battery_one)
diff --git a/examples/Wireless_paper/Wireless_Paper_V1.0/Wireless_Paper_V1.0.ino b/examples/Wireless_paper/Wireless_Paper_V1.0/Wireless_Paper_V1.0.ino
@@ -18,6 +18,8 @@
 #include "HT_QYEG0213RWS800_BWR.h"
 #include "images.h"
 #include "html.h"
+#include <WiFi.h>
+
 QYEG0213RWS800_BWR display(6, 5, 4, 7, 3, 2, -1, 6000000); // rst,dc,cs,busy,sck,mosi,miso,frequency
 
 uint8_t width, height;
diff --git a/examples/Wireless_paper/Wireless_Paper_V1.1/Wireless_Paper_V1.1.ino b/examples/Wireless_paper/Wireless_Paper_V1.1/Wireless_Paper_V1.1.ino
@@ -18,6 +18,8 @@
 #include "HT_lCMEN2R13EFC1.h"
 #include "images.h"
 #include "html.h"
+#include <WiFi.h>
+
 HT_ICMEN2R13EFC1 display(6, 5, 4, 7, 3, 2, -1, 6000000); // rst,dc,cs,busy,sck,mosi,miso,frequency
 
 int width, height;
@@ -99,14 +101,14 @@ void drawImageDemo()
 }
 void VextON(void)
 {
-  pinMode(45, OUTPUT);
-  digitalWrite(45, LOW);
+  pinMode(45, OUTPUT);                      //For HT-VME213,choose "18, OUTPUT"
+  digitalWrite(45, LOW);                    //For HT-VME213,choose "18, HIGH"
 }
 
 void VextOFF(void) // Vext default OFF
 {
-  pinMode(45, OUTPUT);
-  digitalWrite(45, HIGH);
+  pinMode(45, OUTPUT);                     //For HT-VME213,choose "18, OUTPUT"
+  digitalWrite(45, HIGH);                  //For HT-VME213,choose "18, LOW"
 }
 void loop()
 {
