Fix error in initial network setting (ExpressLRS#1933)

pkendall64 · web-flow · commit 4f061448f778 · 2022-11-07T06:40:34.000+13:00
* Fix error in initial network setting

* bloody stupid python!
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,9 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10' 
 
     - name: Cache pip
       uses: actions/cache@v2
@@ -45,7 +47,9 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
     - name: Validate target files
       run: |
         cd src
@@ -77,7 +81,9 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
 
     - name: Cache pip
       uses: actions/cache@v2
@@ -172,7 +178,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: 3.7
 
diff --git a/src/html/scan.js b/src/html/scan.js
@@ -351,14 +351,15 @@ _('upload_form').addEventListener('submit', (e) => {
 
 // =========================================================
 
-function callback(title, msg, url, getdata) {
+function callback(title, msg, url, getdata, success) {
   return function(e) {
     e.stopPropagation();
     e.preventDefault();
     xmlhttp = new XMLHttpRequest();
     xmlhttp.onreadystatechange = function() {
       if (this.readyState == 4) {
         if (this.status == 200) {
+          if (success) success();
           cuteAlert({
             type: 'info',
             title: title,
@@ -384,6 +385,9 @@ function setupNetwork(event) {
   if (_('nt0').checked) {
     callback('Set Home Network', 'An error occurred setting the home network', '/sethome?save', function() {
       return new FormData(_('sethome'));
+    }, function() {
+      _('wifi-ssid').value = _('network').value;
+      _('wifi-password').value = _('password').value;
     })(event);
   }
   if (_('nt1').checked) {
diff --git a/src/python/serve_html.py b/src/python/serve_html.py
@@ -22,7 +22,6 @@
 config = {
         "options": {
             'uid': [1,2,3,4,5,6],
-            'wifi-on-interval': 60,
             "tlm-interval": 240,
             "fan-runtime": 30,
             "no-sync-on-arm": False,
@@ -31,10 +30,13 @@
             "rcvr-uart-baud": 400000,
             "rcvr-invert-tx": False,
             "lock-on-first-connection": True,
-            "domain": 1
+            "domain": 1,
+            "wifi-on-interval": 60,
+            "wifi-password": "w1f1-pAssw0rd",
+            "wifi-ssid": "network-ssid"
         },
         "config": {
-            "ssid":"ConnectedNetwork",
+            "ssid":"network-ssid",
             "mode":"STA",
             "modelid":255,
             "pwm":[512,1536,2048,3584,4608],
@@ -136,6 +138,11 @@ def update_config():
     if (request.json['button-actions'] is not None):
         config['config']['button-actions'] = request.json['button-actions']
 
+@route('/sethome', method='POST')
+def options():
+    response.content_type = 'application/json; charset=latin9'
+    return "Connecting to network '" + request.forms.get('network') + "', connect to http://elrs_tx.local from a browser on that network"
+
 @route('/networks.json')
 def mode():
     global net_counter
