Merge branch 'master' into dev

hacklabkyiv · Feb 14, 2024 · 6909ce8 · 6909ce8
2 parents 5640b86 + 6f22ff5
commit 6909ce8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/app/config_default.json b/app/config_default.json
@@ -21,7 +21,7 @@
             "slack_notifier": {
                 "SLACK_TOOL_CHANNEL": "#prismo-debug",
                 "SLACK_DOOR_CHANNEL": "#prismo-door-channel",
-		"SLACK_TOKEN": "xoxb-this-is-not-areal-slack-token"
+                "SLACK_TOKEN": "xoxb-this-is-not-areal-slack-token"
             }
         },
         "READER_FIRMWARE_FLASHING_SCRIPT_PATH": "/home/artsin/Dev/prismo-reader/src/flasher.sh",

diff --git a/app/templates/layout.html b/app/templates/layout.html
@@ -5,6 +5,7 @@
     <title>Prismo</title>
     <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/intro.js/2.7.0/intro.js"></script>
+
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/js/bootstrap5-toggle.ecmas.min.js"></script>
     <script src="static/js/rfid.js"></script>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">

diff --git a/app/utils/fimware_updater.py b/app/utils/fimware_updater.py
@@ -45,6 +45,7 @@ def update_firmware_full(socket, device_id, device_type):
         run_environment["HOST_WIFI_PASSWORD"] = app.config["PRISMO"]["WIFI_PASSWORD"]
         script_cwd = script_path.parent
         process = subprocess.Popen([script_path, device_id, device_type], cwd=script_cwd,
+
                                    stdout=subprocess.PIPE, env=run_environment)
     except FileNotFoundError:
         data["text"] = "Cannot find firmware update script"