Просмотр исходного кода

Version with localIP() displayed for 4 seconds

platenspeler 5 лет назад
Родитель
Сommit
a6ff9e4235
3 измененных файлов с 21 добавлено и 14 удалено
  1. 1 0
      CHANGELOG.md
  2. 10 10
      ESP-sc-gway/ESP-sc-gway.ino
  3. 10 4
      ESP-sc-gway/_oLED.ino

+ 1 - 0
CHANGELOG.md

@@ -19,6 +19,7 @@ Maintained by Maarten Westenberg (mw12554@hotmail.com)
 Make ready for Publishing (October 20, 2019)
 - Edit all files and make ready for publising to Github
 - Change the country/region setting of the Gateway (As a result you probably have to update most of the package).
+- Upon connecting over WiFi, display the address for 4 seconds before starting the Gateway function.
 
 New features in version 5.3.4 (March 25, 2019)
 - Make use of the latest Arduino IDE available version 1.8.21

+ 10 - 10
ESP-sc-gway/ESP-sc-gway.ino

@@ -220,12 +220,12 @@ static void printIP(IPAddress ipa, const char sep, String& response);	// _wwwSer
 
 void SerialTime();											// _utils.ino forward
 void SerialStat(uint8_t intr);								// _utils.ino
-void printHexDigit(uint8_t digit);							// XXX utils.ino
-int inDecodes(char * id);									// XXX
+void printHexDigit(uint8_t digit);							// _utils.ino
+int inDecodes(char * id);									// _utils.ino
 
 void init_oLED();											// oLED.ino
-void acti_oLED();
-void addr_oLED();
+void acti_oLED();											// oLED.ino
+void addr_oLED();											// oLED.ino
 
 void setupOta(char *hostname);								// _otaServer.ino
 
@@ -237,10 +237,10 @@ void cadScanner();											// _loraModem.ino
 void stateMachine();										// _stateMachine.ino
 
 bool connectUdp();											// _udpSemtech.ino
-int readUdp(int packetSize);								// XXX
-int sendUdp(IPAddress server, int port, uint8_t *msg, int length);
-void sendstat();											// XXX
-void pullData();											// XXX
+int readUdp(int packetSize);								// _udpSemtech.ino
+int sendUdp(IPAddress server, int port, uint8_t *msg, int length);	// _udpSemtech.ino
+void sendstat();											// _udpSemtech.ino
+void pullData();											// _udpSemtech.ino
 
 #if MUTEX==1
 // Forward declarations
@@ -483,7 +483,7 @@ void setup() {
 #endif
 
 #if OLED>=1
-	init_oLED();											// Display "STARTING" on OLED
+	init_oLED();											// When done display "STARTING" on OLED
 #endif
 
 	delay(500);
@@ -542,8 +542,8 @@ void setup() {
 	Serial.print(F(" on IP="));
 	Serial.print(WiFi.localIP());
 	Serial.println();
-	delay(200);
 	
+	delay(500);
 	// If we are here we are connected to WLAN
 	
 #if defined(_UDPROUTER)

+ 10 - 4
ESP-sc-gway/_oLED.ino

@@ -60,15 +60,21 @@ void acti_oLED()
 	
 #if OLED==1
 	display.setFont(ArialMT_Plain_16);
-	display.drawString(0, 16, "READY,  SSID=");
-	display.drawString(0, 32, WiFi.SSID());
+	display.drawString(0, 0, "READY,  SSID=");
+	display.drawString(0, 16, WiFi.SSID());
+	display.drawString(0, 32, "WiFi=");
+	display.drawString(0, 48, WiFi.localIP().toString().c_str() );
 #elif OLED==2
 	display.setFont(ArialMT_Plain_16);
-	display.drawString(0, 16, "READY,  SSID=");
-	display.drawString(0, 32, WiFi.SSID());
+	display.drawString(0, 0, "READY,  SSID=");
+	display.drawString(0, 16, WiFi.SSID());
+	display.drawString(0, 32, "WiFi=");
+	display.drawString(0, 48, WiFi.localIP().toString().c_str() );
 #endif
 
 	display.display();
+	
+	delay(4000);
 }
 
 // --------------------------------------------------------------------