Fix Wireless Stick macro defitions

Author: Heltec-Aaron-Lee

examples/Factory_Test/Wireless_Stick_FactoryTest/Wireless_Stick_FactoryTest.ino

@@ -1,29 +1,28 @@
 /*
- * HelTec Automation(TM) Wireless_Stick factory test code, witch includ
+ * HelTec Automation(TM) Wireless_Stick factory test code, witch include
  * follow functions:
- * 
+ *
  * - Basic OLED function test;
- * 
+ *
  * - Basic serial port test(in baud rate 115200);
- * 
+ *
  * - LED blink test;
- * 
+ *
  * - WIFI join and scan test;
- * 
+ *
  * - LoRa Ping-Pong test(DIO0 -- GPIO26 interrup check the new incoming messages;
- * 
+ *
  * - Timer test and some other Arduino basic functions.
  *
  * by Aaron.Lee from HelTec AutoMation, ChengDu, China
- * 成都惠利特自动化科技有限格式
+ * 成都惠利特自动化科技有限公司
  * www.heltec.cn
  *
  * this project also realess in GitHub:
- * https://github.com/Heltec-Aaron-Lee/WiFi_Kit_series
+ * https://github.com/HelTecAutomation/Heltec_ESP32
 */
 #include "heltec.h"
 #include "WiFi.h"
-#include "images.h"
 
 String rssi = "RSSI --";
 String packSize = "--";
@@ -48,93 +47,76 @@ void WIFISetUp(void)
 	delay(100);
 	WiFi.mode(WIFI_STA);
 	WiFi.setAutoConnect(true);
-	WiFi.begin("HelTec_AutoMation","hunter_3120");//fill in "Your WiFi SSID","Your Password"
+	WiFi.begin("Your WiFi SSID","Your Password");//fill in "Your WiFi SSID","Your Password"
 	delay(100);
-  Heltec.display->clear();
+	Heltec.display->clear();
 
 	byte count = 0;
 	while(WiFi.status() != WL_CONNECTED && count < 10)
 	{
 		count ++;
 		delay(500);
-    Heltec.display->drawString(32, 35, "Connecting...");
-    Heltec.display->display();
+		Heltec.display->drawString(0, 0, "Connecting...");
+		Heltec.display->display();
 	}
   //Heltec.display->clear();
-  if(WiFi.status() == WL_CONNECTED)
-  {
-	  //Heltec.display->drawString(35, 38, "WIFI SETUP");
-    Heltec.display->drawString(57, 48, "OK");
-	  Heltec.display->display();
-  	delay(1000);
-    Heltec.display->clear();
-  }
-  else
-  {
-    //Heltec.display->clear();
-    Heltec.display->drawString(50, 48, "Failed");
-    Heltec.display->display();
-    delay(1000);
-    Heltec.display->clear();
-  }
+	if(WiFi.status() == WL_CONNECTED)
+	{
+		//Heltec.display->drawString(35, 38, "WIFI SETUP");
+		Heltec.display->drawString(0, 9, "OK");
+		Heltec.display->display();
+		delay(1000);
+		Heltec.display->clear();
+	}
+	else
+	{
+		//Heltec.display->clear();
+		Heltec.display->drawString(0, 9, "Failed");
+		Heltec.display->display();
+		delay(1000);
+		Heltec.display->clear();
+	}
 }
 
 void WIFIScan(unsigned int value)
 {
-  unsigned int i;
-  WiFi.mode(WIFI_MODE_NULL);
-  for(i=0;i<value;i++)
-  {
-    Heltec.display->drawString(32, 32, "Scan start...");
-    Heltec.display->display();
-
-    int n = WiFi.scanNetworks();
-    Heltec.display->drawString(32, 40, "Scan done");
-    Heltec.display->display();
-    delay(500);
-    Heltec.display->clear();
-
-     if (n == 0)
-    {
-     Heltec.display->clear();
-     Heltec.display->drawString(32, 32, "no network found");
-     Heltec.display->display();
-     while(1);
-    }
-    else
-    {
-	   Heltec.display->drawString(32, 40, (String)n + " nets found");
-	   Heltec.display->display();
-		 delay(2000);
-     Heltec.display->clear();
-    }
-  }
+	unsigned int i;
+	WiFi.mode(WIFI_MODE_NULL);
+	for(i=0;i<value;i++)
+	{
+		Heltec.display->drawString(0, 0, "Scan start...");
+		Heltec.display->display();
+
+		int n = WiFi.scanNetworks();
+		Heltec.display->drawString(0, 9, "Scan done");
+		Heltec.display->display();
+		delay(500);
+		Heltec.display->clear();
+
+		if (n == 0)
+		{
+			Heltec.display->clear();
+			Heltec.display->drawString(0, 18, "no network found");
+			Heltec.display->display();
+			while(1);
+		}
+		else
+		{
+			Heltec.display->drawString(0, 18, (String)n + " nets found");
+			Heltec.display->display();
+			delay(2000);
+			Heltec.display->clear();
+		}
+	}
 }
 
 void setup()
 {
 	pinMode(LED,OUTPUT);
-	 Heltec.begin(true /*DisplayEnable Enable*/, true /*LoRa Disable*/, true /*Serial Enable*/, true /*PABOOST Enable*/, 470E6 /**/);
-  
-	Heltec.display->init();
-	Heltec.display->flipScreenVertically();
-	Heltec.display->setFont(ArialMT_Plain_10);
-	Heltec.display->clear();
-
-  Heltec.display->drawString(48, 38, "TEST");
-  Heltec.display->drawString(36, 48, "STARTING");
-  Heltec.display->display();
-  //delay(500);
-  //Heltec.display->clear();
+	Heltec.begin(true /*DisplayEnable Enable*/, true /*LoRa Disable*/, true /*Serial Enable*/, true /*PABOOST Enable*/, 470E6 /**/);
 
 	WIFISetUp();
 	WIFIScan(1);
-	
-  //LoRa.setTxPower(10,RFOPIN);
-	Heltec.display->drawString(35, 40, "LoRa TEST");
-	Heltec.display->display();
-	delay(300);
-	Heltec.display->clear();
 
 	// register the receive callback
 	LoRa.onReceive(onReceive);
@@ -155,19 +137,19 @@ void loop()
 		LoRa.receive();
 
 		digitalWrite(LED,HIGH);
-		Heltec.display->drawString(32, 54, (String)(counter-1) + " sent done");
+		Heltec.display->drawString(0, 0, (String)(counter-1) + " sent done");
 		Heltec.display->display();
 
 		interval = random(1000) + 1000; //1~2 seconds
 		lastSendTime = millis();
 
-    Heltec.display->clear();
+		Heltec.display->clear();
 	}
 	if(receiveflag)
 	{
-		Heltec.display->drawString(32,29, "Received " + packSize);
-		Heltec.display->drawString(32,38, packet);
-		Heltec.display->drawString(32,47, rssi);
+		Heltec.display->drawString(0,9, "Received " + packSize);
+		Heltec.display->drawString(0,16, packet);
+		Heltec.display->drawString(0,24, rssi);
 		Heltec.display->display();
 
 		digitalWrite(LED,LOW);
@@ -193,4 +175,4 @@ void onReceive(int packetSize)//LoRa receiver interrupt service
     rssi = "RSSI: " + String(LoRa.packetRssi(), DEC);
 
     receiveflag = true;
-}
+}