From f03d072805349e5c3f47e695152227a0473ebed4 Mon Sep 17 00:00:00 2001 From: Alex Terrell Date: Fri, 15 Dec 2023 09:55:10 -0700 Subject: [PATCH 1/5] Update Mobile_Site_Survey.py --- Mobile_Site_Survey/Mobile_Site_Survey.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Mobile_Site_Survey/Mobile_Site_Survey.py b/Mobile_Site_Survey/Mobile_Site_Survey.py index 4610e1f6..d74576a7 100644 --- a/Mobile_Site_Survey/Mobile_Site_Survey.py +++ b/Mobile_Site_Survey/Mobile_Site_Survey.py @@ -1,6 +1,6 @@ """Mobile Site Survey - Drive testing application for cellular diagnostics with speedtests. -Access web interface on port 8000. Results CSV files can be accessed on port 8001. +Access web interface on port 8000. Collects GPS, interface diagnostics, and speedtests and writes results to csv file. Also supports https://5g-ready.io for data aggregation and export. Results are also put in the description field for easy viewing in NCM devices grid. @@ -55,6 +55,7 @@ def get(self): """Return app config in JSON for web UI.""" config = get_config('Mobile_Site_Survey') config["results"] = dispatcher.results + config["version"] = dispatcher.version self.write(json.dumps(config)) return @@ -171,6 +172,8 @@ def __init__(self): patch = package.get('Mobile_Site_Survey', 'version_patch') self.version = f'{major}.{minor}.{patch}' cp.log(f'Version: {self.version}') + if self.config["dead_reckoning"]: + enable_GPS_send_to_server() def loop(self): last_location = None @@ -178,8 +181,6 @@ def loop(self): self.router_id = cp.get('status/ecm/client_id') or 0 while True: try: - if self.config["dead_reckoning"]: - enable_GPS_send_to_server() self.modems = get_connected_wans() # Run pings: if self.config["packet_loss"]: From a1bf97755a4b8ceffa5419982a375093dc38236d Mon Sep 17 00:00:00 2001 From: Alex Terrell Date: Fri, 15 Dec 2023 09:55:28 -0700 Subject: [PATCH 2/5] Update index.html --- Mobile_Site_Survey/index.html | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Mobile_Site_Survey/index.html b/Mobile_Site_Survey/index.html index ea86275b..51508c24 100644 --- a/Mobile_Site_Survey/index.html +++ b/Mobile_Site_Survey/index.html @@ -45,7 +45,7 @@
-

Mobile Site Survey v2.5

+

Mobile Site Survey

@@ -73,17 +73,16 @@

Configuration:



+ +


Send to Server - Powered by 5g-ready.io

- Send to Server will send results via HTTP POST
- to the Server URL with optional bearer token.
+ HTTP POST results to the Server URL.

- -

Server URL:
From f5ce43f46e0854824f3008139a273cf1a5132aa5 Mon Sep 17 00:00:00 2001 From: Alex Terrell Date: Fri, 15 Dec 2023 09:55:55 -0700 Subject: [PATCH 3/5] Update script.js --- Mobile_Site_Survey/script.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Mobile_Site_Survey/script.js b/Mobile_Site_Survey/script.js index c67e88b8..fb052f2b 100644 --- a/Mobile_Site_Survey/script.js +++ b/Mobile_Site_Survey/script.js @@ -32,6 +32,7 @@ function loadForm(config) { $('#enable_surveyors').prop('checked', config.enable_surveyors); $('#surveyors').attr('value', config.surveyors); $('#debug').attr('checked', config.debug); + $('#version').text('Mobile Site Survey v' + config.version); if (config.results) { $('#results').val(config.results); } From 89d4d9d176b39d9e15057fc950a6c57ea5947460 Mon Sep 17 00:00:00 2001 From: Alex Terrell Date: Fri, 15 Dec 2023 09:56:19 -0700 Subject: [PATCH 4/5] Update package.ini --- Mobile_Site_Survey/package.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mobile_Site_Survey/package.ini b/Mobile_Site_Survey/package.ini index 18e81ddb..94abb47a 100644 --- a/Mobile_Site_Survey/package.ini +++ b/Mobile_Site_Survey/package.ini @@ -9,5 +9,5 @@ firmware_major = 7 firmware_minor = 23 version_major = 2 version_minor = 5 -version_patch = 4 +version_patch = 5 uuid = 98b31c39-f649-43f3-b9f4-276a5d8824bf From 4455b703008629f283248a2309257171a84138e6 Mon Sep 17 00:00:00 2001 From: Alex Terrell Date: Fri, 15 Dec 2023 10:10:37 -0700 Subject: [PATCH 5/5] Update Mobile_Site_Survey.py --- Mobile_Site_Survey/Mobile_Site_Survey.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Mobile_Site_Survey/Mobile_Site_Survey.py b/Mobile_Site_Survey/Mobile_Site_Survey.py index d74576a7..21b6cdc5 100644 --- a/Mobile_Site_Survey/Mobile_Site_Survey.py +++ b/Mobile_Site_Survey/Mobile_Site_Survey.py @@ -402,6 +402,9 @@ def get_appdata(name): def get_config(name): config = get_appdata(name) + if config.get('dead_reckoning') is None: + config['dead_reckoning'] = False + save_config(config) if not config: config = settings cp.post('config/system/sdk/appdata', {"name": name, "value": json.dumps(config)})