From 38b2ef8c2e3bb40bed4c1b5b0c09717f8767c617 Mon Sep 17 00:00:00 2001
From: anschrammh <bugreport@laposte.net>
Date: Sun, 10 Mar 2019 23:22:33 +0100
Subject: [PATCH] Added a new view

---
 src/app/views.cpp | 25 ++++++++++++++++++++-----
 src/app/views.h   | 23 +++++++++++++++++++++--
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/app/views.cpp b/src/app/views.cpp
index 86c0934..88abd13 100644
--- a/src/app/views.cpp
+++ b/src/app/views.cpp
@@ -2,8 +2,8 @@
 
 boolean view_1(Adafruit_SSD1306 &display, void *pData)
 {
-  char time_str[300] = "", power_str[50] = "";
-  DateTimePacket *p = (DateTimePacket *) pData;
+  char time_str[150] = "", power_str[15] = "";
+  View1Packet *p = (View1Packet *) pData;
 
   switch(p->powerInfo.powerType)
   {
@@ -24,12 +24,27 @@ boolean view_1(Adafruit_SSD1306 &display, void *pData)
 
 boolean view_2(Adafruit_SSD1306 &display, void *pData)
 {
-  char conn_str[300];
-  sprintf(conn_str,"Ip addr :");
+  char conn_str[150];
+
+  ViewAPPacket *p = (ViewAPPacket *) pData;
+  
+  sprintf(conn_str,"Ip addr : %u.%u.%u.%u\nMac addr : \n%s\nConns : %u\nSSID : %s\n", p->ipAddr[0], p->ipAddr[1], p->ipAddr[2], p->ipAddr[3], p->macAddr.c_str(), p->nbOfCon, p->ssid.c_str());
   display.println(conn_str);
   
   display.setCursor(0,56);
-  display.println("CONNECTION INFO");
+  display.println("AP INFO");
+
+  return true;
+}
+
+boolean view_3(Adafruit_SSD1306 &display, void *pData)
+{
+  char conn_str[150];
+  sprintf(conn_str,"Ip addr :");
+  display.println(conn_str);
+  
+  display.setCursor(0,56);
+  display.println("STA INFO");
 
   return true;
 }
diff --git a/src/app/views.h b/src/app/views.h
index a3ae00c..d76ff6c 100644
--- a/src/app/views.h
+++ b/src/app/views.h
@@ -3,15 +3,34 @@
 
 #include "SAB.h"
 
-typedef struct dateTimePacket
+typedef struct view1Packet
 {
   DateTime dateTime;
   float sdCardSize;
   PowerInfo powerInfo;
-} DateTimePacket;
+} View1Packet;
 
+//Global info
 boolean view_1(Adafruit_SSD1306 &display, void *pData);
 
+typedef struct viewAPPacket
+{
+  String macAddr;
+  String ssid;
+  IPAddress ipAddr;
+  uint8_t nbOfCon;
+} ViewAPPacket;
+
+//AP info
 boolean view_2(Adafruit_SSD1306 &display, void *pData);
 
+typedef struct viewSTAPacket
+{
+  String macAddr;
+  IPAddress ipAddr;
+} ViewSTAPacket;
+
+//STA info
+boolean view_3(Adafruit_SSD1306 &display, void *pData);
+
 #endif //VIEWS_H