diff --git a/src/app/app.ino b/src/app/app.ino index 1f5db2a..3620a9c 100644 --- a/src/app/app.ino +++ b/src/app/app.ino @@ -9,6 +9,7 @@ SAB sab; unsigned long currentMs = 0, batteryMs = 0, buttonMs = 0; View1Packet v1p = {sab.getRtcManager().getDateTime(), sab.getSdCardManager().getSize(GBYTE), sab.getPowerInfo(),0}; ViewAPPacket vap = {sab.getConnectivityManager().softAPmacAddress(), sab.getConnectivityManager().softAPSSID(), sab.getConnectivityManager().softAPIP(), sab.getConnectivityManager().softAPgetStationNum()}; +ViewSTAPacket vstap = {sab.getConnectivityManager().macAddress(), sab.getConnectivityManager().localIP()}; void setup() { @@ -17,7 +18,7 @@ void setup() pinMode(GPIO_0, INPUT); sab.getScreenManager().addView(&(view_1), &v1p, 0); sab.getScreenManager().addView(&(view_2), &vap, 1); - sab.getScreenManager().addView(&(view_3), NULL, 2); + sab.getScreenManager().addView(&(view_3), &vstap, 2); sab.getScreenManager().displayView(0); if(sab.getRtcManager().hasLostPower()) { @@ -38,13 +39,10 @@ void loop() vap.ipAddr = sab.getConnectivityManager().softAPIP(); vap.macAddr = sab.getConnectivityManager().softAPmacAddress(); vap.nbOfCon = sab.getConnectivityManager().softAPgetStationNum(); + vstap.macAddr = sab.getConnectivityManager().macAddress(); + vstap.ipAddr = sab.getConnectivityManager().localIP(); sab.getScreenManager().displayView(); - - CFGFileParser cfgFileParser(sab.getSdCardManager(), AP_CFG_FILE); - CFGDictionary *cfgDictionary = (CFGDictionary *) cfgFileParser.parseFile(); - - delete cfgDictionary; } if(millis() - batteryMs > 10000)