Merge pull request #17 from jiribrejcha/dev

Added Server mode to FPMS

Author: wifinigel

BakeBit/Software/Python/bakebit_nanohat_oled.py

@@ -114,7 +114,7 @@
 # check our current operating mode
 #####################################
 
-valid_modes = ['classic', 'wconsole', 'hotspot', 'wiperf']
+valid_modes = ['classic', 'wconsole', 'hotspot', 'wiperf', 'server']
 
 # check mode file exists and read mode...create with classic mode if not
 if os.path.isfile(MODE_FILE):
@@ -142,6 +142,15 @@
         key_map = f.readline()
         g_vars['key_map'] = key_map
 
+#######################################################################
+# Server mode non-persistence
+# If the Pi is in Server schedule mode switch to Classic for next boot
+#######################################################################
+
+if g_vars['current_mode'] == "server":
+    schedule_server_to_classic = "/etc/wlanpiserver/scripts/schedule-switch-to-classic"
+    subprocess.Popen([schedule_server_to_classic])
+
 ##################################
 # Static info we want to get once
 ##################################
@@ -243,7 +252,11 @@ def hotspot_switcher():
 def wiperf_switcher():
     mode_obj = Mode(g_vars)
     mode_obj.wiperf_switcher(g_vars)
-    
+
+def server_switcher():
+    mode_obj = Mode(g_vars)
+    mode_obj.server_switcher(g_vars)
+
 ###########################
 # Apps area
 ###########################
@@ -439,6 +452,11 @@ def buttons_symbol():
             {"name": "Confirm", "action": wiperf_switcher},
         ]
         },
+        {"name": "Server",   "action": [
+            {"name": "Cancel", "action": go_up},
+            {"name": "Confirm", "action": server_switcher},
+        ]
+        },
     ]
     },
     {"name": "Apps", "action": [
@@ -490,6 +508,10 @@ def buttons_symbol():
     switcher_dispatcher = wiperf_switcher
     g_vars['home_page_name'] = "Wiperf"
 
+if g_vars['current_mode'] == "server":
+    switcher_dispatcher = server_switcher
+    g_vars['home_page_name'] = "Server"
+
 if g_vars['current_mode'] != "classic":
     menu[2] = {"name": "Mode", "action": [
         {"name": "Classic Mode",   "action": [

BakeBit/Software/Python/modules/constants.py

@@ -50,6 +50,7 @@
 WCONSOLE_SWITCHER_FILE ='/usr/bin/wconsole_switcher'
 HOTSPOT_SWITCHER_FILE = '/usr/bin/hotspot_switcher'
 WIPERF_SWITCHER_FILE = '/usr/bin/wiperf_switcher'
+SERVER_SWITCHER_FILE = '/usr/bin/server_switcher'
 
 #### Paths below here are relative to script dir or /tmp fixed paths ###
 

BakeBit/Software/Python/modules/modes.py

@@ -8,6 +8,7 @@
     WCONSOLE_SWITCHER_FILE,
     HOTSPOT_SWITCHER_FILE,
     WIPERF_SWITCHER_FILE,
+    SERVER_SWITCHER_FILE,
 )
 
 class Mode(object):
@@ -109,4 +110,16 @@ def wiperf_switcher(self, g_vars):
         resource_switcher_file = wiperf_switcher_file
 
         self.switcher(g_vars, resource_title, resource_switcher_file, mode_name)
-        return True
+        return True
+
+
+    def server_switcher(self, g_vars):
+
+        server_switcher_file = SERVER_SWITCHER_FILE
+
+        resource_title = "Server"
+        mode_name = "server"
+        resource_switcher_file = server_switcher_file
+
+        self.switcher(g_vars, resource_title, resource_switcher_file, mode_name)
+        return True

BakeBit/Software/Python/modules/pages/homepage.py

@@ -89,6 +89,11 @@ def home_page(self, g_vars, menu):
             if_name = "wlan0"
             mode_name = "Wiperf" + self.check_wiperf_status()
 
+        elif g_vars['current_mode'] == "server":
+            # get eth0 IP
+            if_name = "eth0"
+            mode_name = "DHCP Server Enabled!"
+
         else:
             # get eth0 IP
             if_name = "eth0"
@@ -146,4 +151,4 @@ def home_page(self, g_vars, menu):
         oled.drawImage(g_vars['image'])
 
         g_vars['drawing_in_progress'] = False
-        return
+        return