Linux/RPi edgent update

Author: vshymanskyy

examples/Edgent_Linux_RPi/BlynkEdgent.py

@@ -1,26 +1,3 @@
-"""
- [x] WiFi AP
-   [x] HTTP server
-   [x] HTTP handlers
-   [x] Get own MAC (BSSID)
-   [ ] OTA update (from app)
- [x] WiFi Scanner
- [x] WiFi STA
-   [x] Set hostname
-   [ ] Static IP support
-   [ ] Detect auth failure (wrong password?)
- [ ] Save/Load config
- [ ] Reset button -> Config mode
- [ ] Indicator
- [ ] Enter config mode on invalid auth
- [ ] Report last error
-
-PolKit configuration (if necessary)
-https://askubuntu.com/questions/668411/failed-to-add-activate-connection-32-insufficient-privileges/752168#752168
-
-Manual wifi config:
-https://unix.stackexchange.com/questions/145366/how-to-connect-to-an-802-1x-wireless-network-via-nmcli
-"""
 
 from http.server import BaseHTTPRequestHandler, HTTPServer
 from urllib.parse import urlparse, parse_qsl
@@ -30,9 +7,6 @@
 import json
 import binascii
 
-import os
-os.system('sudo iptables -A PREROUTING -t nat -p tcp --dport 80 -j REDIRECT --to-ports 11080')
-
 def log(*args, **kwargs):
     print(*args, file=sys.stderr, **kwargs)
 
@@ -121,29 +95,25 @@ def do_GET(self):
         elif o.path == "/wifi_scan.json":
             self._reply_json(self.server.wifi_networks)
         elif o.path == "/config":
-            q["auth"] = q.pop("blynk")
+            q["auth"]   = q.pop("blynk")
             q["server"] = q.pop("host")
+            q["port"]   = int(q.pop("port"))
+            q["port_ssl"] = int(q.pop("port_ssl"))
             if "save" in q:
                 self._reply_json({"status":"ok","msg":"Configuration saved"})
             else:
                 self._reply_json({"status":"ok","msg":"Trying to connect..."})
             self.server.blynk_config = q
-        elif o.path == "/reset":
-            self._reply_json({"status":"ok","msg":"Configuration reset"})
-            self.server.blynk_config = { "cmd": "reset" }
-        elif o.path == "/reboot":
-            self._reply_json({"status":"ok"})
-            self.server.blynk_config = { "cmd": "reboot" }
         else:
             self.send_error(404)
 
-def provision(board, tmpl_id, fw_ver):
+def provision(board, tmpl_id, fw_ver, prefix = "Blynk"):
     wifi = WiFi()
 
     wifi_networks = wifi.scan()
 
     suffix = format(binascii.crc32(wifi.mac_address().encode() * 4) & 0xFFFFF, 'X')
-    my_ssid = "Blynk " + board + "-" + suffix
+    my_ssid = prefix + " " + board + "-" + suffix
 
     config = None
     try:
@@ -161,6 +131,8 @@ def provision(board, tmpl_id, fw_ver):
             }
             httpd.wifi_networks = wifi_networks
             httpd.blynk_config = None
+
+            log("Waiting for Blynk App connection...")
             while httpd.blynk_config is None:
                 httpd.handle_request()
             config = httpd.blynk_config

examples/Edgent_Linux_RPi/README.md

@@ -1,10 +1,12 @@
 
+**Warning:** Do not use SSH/remote desktop for these commands, as your network connection can become unavailable.
+Connect screen and keyboard to your RPi, or use a serial adapter to access console.
+
+
 ## Install NetworkManager
 
 NetworkManager provides detection and configuration for systems to automatically connect to different wired and wireless networks.
 
-**Note:** Do not use SSH/remote desktop for these commands, as your network connection can become unavailable.
-
 ```sh
 sudo apt-get install network-manager
 sudo systemctl disable dhcpcd
@@ -26,14 +28,27 @@ With `nmcli`, you can also easily connect to a wifi network (if needed):
 sudo nmcli device wifi con "my-ssid" password "my-pass"
 ```
 
-## Install BlynkEdgent
+## Troubleshooting
+1. Make sure that your `wlan` interface is not configured via `/etc/network/interfaces`. NetworkManager ignores such interfaces.
+2. Check if your WiFi is blocked using `rfkill list`. Run `rfkill unblock wifi` to unblock it.
+
 
+## Install Edgent prerequisites
 
 ```sh
 pip3 install --upgrade https://github.com/vshymanskyy/nmcli/archive/master.zip
+pip3 install --upgrade RPi.GPIO
 ```
 
-## Troubleshooting
-1. Make sure that your `wlan` interface is not configured via `/etc/network/interfaces`. NetworkManager ignores such interfaces.
-2. Check if your WiFi is blocked using `rfkill list`. Run `rfkill unblock wifi` to unblock it.
+## Attach config reset button
+
+Connect button between gpio16 and GND.
+Hold the button for 10 seconds to reset config.
+
+## Run script manually
+
+```
+pyhton3 beemate.py
+```
 
+Alternatively, you can configure RPi to auto-run `main.py` on boot.

examples/Edgent_Linux_RPi/main.py

@@ -21,7 +21,7 @@
         config = json.load(jsonFile)
     needToSave = False
 except:
-    config = BlynkEdgent.provision(BLYNK_DEVICE_NAME, BLYNK_TEMPLATE_ID, BLYNK_FIRMWARE_VERSION, prefix="Beemate")
+    config = BlynkEdgent.provision(BLYNK_DEVICE_NAME, BLYNK_TEMPLATE_ID, BLYNK_FIRMWARE_VERSION)
     needToSave = True
 
 def reset_config():