Diff: main.h

Revision:

1:a2f7adf6db3d

Parent:

0:16bcf70d262e

Child:

2:1a5565ee8219

--- a/main.h	Sat Jan 21 23:05:11 2017 +0000
+++ b/main.h	Tue Jan 24 00:23:30 2017 +0000
@@ -10,19 +10,10 @@
 #include "Socket/TCPSocketConnection.h"
 #include "TS_DISCO_F746NG.h"
 #include "LCD_DISCO_F746NG.h"
+
 #include "ping.h"
 
-EthernetInterface Eth;
-LCD_DISCO_F746NG display;
-TS_DISCO_F746NG Touch;
-TCPSocketConnection myTCP;
-
-uint32_t ul_ResetDisplay();
-uint32_t ul_CheckDHCP( struct Network DynNetwork );
-uint32_t ul_CheckInternet();
-uint32_t ul_CreateMenu();
-uint32_t ul_ShowDynamicMenu( struct Network DynNetwork );
-uint32_t ul_ShowStaticMenu( );
+/*-----------------------------------------------------------*/
 
 struct Network
 {
@@ -32,7 +23,26 @@
     char c_MACAddress[16];
 };
 
-static bool b_Dynamic = true;
+
+EthernetInterface Eth;
+LCD_DISCO_F746NG display;
+TS_DISCO_F746NG Touch;
+TCPSocketConnection myTCP;
+
+MemoryPool<Network, 16> mpool;
+Queue<Network, 16> queue;
 
 
+/*-----------------------------------------------------------*/
+
+uint32_t ul_ResetDisplay( void );
+uint32_t ul_CheckDHCP( void );
+uint32_t ul_CheckInternet( void );
+uint32_t ul_CreateMenu( void );
+uint32_t ul_ShowSettings( void );
+uint32_t ul_ShowDevices( void );
+void v_TouchThread( void const *args );
+
+/*-----------------------------------------------------------*/
+
 #endif
\ No newline at end of file