various on-camp adjustments

copy.sh

@@ -15,6 +15,7 @@ cp life.py /pyboard
 cp qr.py /pyboard
 cp camp_pico.py /pyboard
 cp scroll.py /pyboard
+cp telegram.py /pyboard
 cp qr_tmp.py /pyboard
 cp img_tmp.py /pyboard
 cp $1 /pyboard/main.py
@@ -35,6 +36,7 @@ cp life.py /pyboard
 cp qr.py /pyboard
 cp camp_pico.py /pyboard
 cp scroll.py /pyboard
+cp telegram.py /pyboard
 cp qr_tmp.py /pyboard
 cp img_tmp.py /pyboard
 EOF

games.py

@@ -21,6 +21,7 @@ from snake import Snake
 from gamepad import InputWrapper
 from manager import Manager
 from tetris import Tetris
+from breakout import Breakout
 import util
 
 url_uba = "http://ubabot.frubar.net"
@@ -41,6 +42,8 @@ t.loop_end()
 
 # Main "Menu"
 m = Manager(t, i)
+m.add(Breakout(t, i))
+m.add(Solid(t, 1.0))
 m.add(GameOfLife(t, 20, (0, 255, 0), (0, 0, 0), None, 2.0))
 m.add(Solid(t, 1.0))
 m.add(Tetris(t, i,))

net.py

@@ -18,7 +18,7 @@ class CheckHTTP:
         self.successScreen = None
         self.failScreen = None
         self.response = None
-        self.get = util.getRequests()
+        self.get, post = util.getRequests()
 
         self.restart()
 

pico_ota.py

@@ -49,6 +49,59 @@ class PicoOTA:
         self.gui = g
         self.text = t
 
+
+        if (self.gui == None) or (self.text == None):
+            return
+
+        for i in range(0, 5):
+            self.gui.loop_start()
+
+            self.text.fg = (255, 255, 0)
+            self.text.setText("WiFi", "bitmap6")
+            self.text.draw(0, 6 * 0, False)
+
+            self.text.fg = (255, 0, 255)
+            self.text.setText("???", "bitmap6")
+            self.text.draw(0, 6 * 1, False)
+
+            self.text.fg = (255, 0, 0)
+            self.text.setText(str(i + 1) + " / 5", "bitmap6")
+            self.text.draw(0, 6 * 2, False)
+
+            self.text.fg = (0, 255, 0)
+            self.text.setText("", "bitmap6")
+            self.text.draw(0, 6 * 3, False)
+
+            self.text.setText("Conn...", "bitmap6")
+            self.text.draw(0, 6 * 4, False)
+
+            self.gui.loop_end()
+
+            util.connectToWiFi()
+
+            self.gui.loop_start()
+
+            self.text.fg = (255, 255, 0)
+            self.text.setText("WiFi", "bitmap6")
+            self.text.draw(0, 6 * 0, False)
+
+            self.text.fg = (255, 0, 255)
+            self.text.setText("$NAME", "bitmap6")
+            self.text.draw(0, 6 * 1, False)
+
+            self.text.fg = (255, 0, 0)
+            self.text.setText(str(i + 1) + " / 5", "bitmap6")
+            self.text.draw(0, 6 * 2, False)
+
+            self.text.fg = (0, 255, 0)
+            self.text.setText("Status:", "bitmap6")
+            self.text.draw(0, 6 * 3, False)
+
+            self.text.setText("$val", "bitmap6")
+            self.text.draw(0, 6 * 4, False)
+
+            self.gui.loop_end()
+
     def path(self, p):
         self.update_path = p
 
@@ -62,7 +115,7 @@ class PicoOTA:
     def fetch(self, url):
         # lazily initialize WiFi
         if self.get == None:
-            self.get = util.getRequests()
+            self.get, post = util.getRequests()
             if self.get == None:
                 return None
 
@@ -84,6 +137,7 @@ class PicoOTA:
             return r
         except Exception as e:
             print()
+            print(url)
             if hasattr(sys, "print_exception"):
                 sys.print_exception(e)
             else:

snake.py

@@ -78,7 +78,7 @@ class Snake:
 
     def placeDot(self):
         d = (random.randrange(0, self.gui.width), random.randrange(0, self.gui.height))
-        while self.data[d[0]][d[1]] != 0: # TODO don't place dots below score text
+        while (self.data[d[0]][d[1]] != 0) or (d[0] < 15) or (d[1] < 8):
             d = (random.randrange(0, self.gui.width), random.randrange(0, self.gui.height))
         self.data[d[0]][d[1]] = 2
 

util.py

@@ -136,11 +136,26 @@ def connectToWiFi():
     # Look for known networks
     visible = wlan.scan()
     ssid = None
+    user = None
     password = None
+
+    print(visible)
+    if len(visible) == 0:
+        print("No networks visible at all")
+        wifiConnected = False
+        return False
+
     for name, a, b, c, d, e in visible:
-        for t_ssid, t_password in Config.networks:
+        for net in Config.networks:
+            if len(net) == 2:
+                t_ssid, t_password = net
+            elif len(net) == 3:
+                t_ssid, t_user, t_password = net
+
             if name.decode("utf-8") == t_ssid:
                 ssid = t_ssid
+                if len(net) == 3:
+                    user = t_user
                 password = t_password
                 break
     if (ssid == None) or (password == None):
@@ -149,7 +164,11 @@ def connectToWiFi():
         return False
 
     # Start connection
-    wlan.connect(ssid, password)
+    if user != None:
+        wlan.seteap(user, password)
+        wlan.connect(ssid)
+    else:
+        wlan.connect(ssid, password)
 
     # Wait for connect success or failure
     max_wait = 40
@@ -186,7 +205,7 @@ def getRequests():
     try:
         # try to get normal python lib
         import requests
-        return requests.get
+        return requests.get, requests.post
     except Exception as e:
         print()
         if hasattr(sys, "print_exception"):
@@ -201,11 +220,11 @@ def getRequests():
         # in this case we also need to connect to WiFi first
         if not wifiConnected:
             if not connectToWiFi():
-                return None
+                return None, None
 
-        return requests.get
+        return requests.get, requests.post
 
-    return None
+    return None, None
 
 def getTextDrawer():
     try: