added gps provider to menu and fixed log output text

sixt0o · Jan 28, 2022 · 488c1a7 · 488c1a7
1 parent f37c801
commit 488c1a7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/f0xtr0t.html b/f0xtr0t.html
@@ -233,6 +233,17 @@
  </dd>
  </div>
  </dl>
+ <dl class="mt-5 grid grid-cols-1 gap-2">
+ <div class="border-2 border-slate-900 border-b-slate-800 overflow-hidden py-2">
+ <dt class="text-md font-medium text-slate-600 truncate">
+ GPS Provider
+ </dt>
+ <dd id="current_gps_provider_menu"
+ class="mt-1 text-3xl font-semibold text-indigo-200">
+ --
+ </dd>
+ </div>
+ </dl>
  <dl class="mt-5 grid grid-cols-1 gap-2">
  <div class="border-2 border-slate-900 border-b-slate-800 overflow-hidden py-2">
  <dt class="text-md font-medium text-slate-600 truncate">
@@ -415,6 +426,16 @@
  </dd>
  </div>
  </dl>
+ <dl class="mt-5 grid grid-cols-1 gap-5">
+ <div class="px-4 py-5 border-2 border-slate-900 border-b-slate-800 overflow-hidden sm:p-6">
+ <dt class="text-md font-medium text-slate-600 truncate">
+ GPS Provider
+ </dt>
+ <dd id="current_gps_provider" class="mt-1 text-3xl font-semibold text-indigo-200">
+ --
+ </dd>
+ </div>
+ </dl>
  <dl class="mt-5 grid grid-cols-1 gap-5">
  <div class="px-4 py-5 border-2 border-slate-900 border-b-slate-800 overflow-hidden sm:p-6">
  <dt class="text-md font-medium text-slate-600 truncate">
@@ -627,9 +648,11 @@
 
  const updateMap = (coords) => {
  latlong = new L.LatLng(coords.Latitude, coords.Longitude);
+ document.getElementById("current_gps_provider").innerHTML = gpsProvider;
  document.getElementById("current_latitude").innerHTML = coords.Latitude;
  document.getElementById("current_longitude").innerHTML = coords.Longitude;
  document.getElementById("current_altitude").innerHTML = coords.Altitude;
+ document.getElementById("current_gps_provider_menu").innerHTML = gpsProvider;
  document.getElementById("current_latitude_menu").innerHTML = coords.Latitude;
  document.getElementById("current_longitude_menu").innerHTML = coords.Longitude;
  document.getElementById("current_altitude_menu").innerHTML = coords.Altitude;

diff --git a/f0xtr0t.py b/f0xtr0t.py
@@ -39,14 +39,14 @@ def update_gps(self):
 
 class f0xtr0t(plugins.Plugin):
  __author__ = 'https:/sixt0o'
- __version__ = '1.3.5-alpha'
+ __version__ = '1.3.6-alpha'
  __name__ = 'f0xtr0t'
  __license__ = 'GPL3'
  __description__ = 'a plugin for pwnagotchi that shows a openstreetmap with positions of ap-handshakes in your webbrowser. Based on the origional webgpsmaps'
 
  ALREADY_SENT = list()
  SKIP = list()
- CURRENT_VERSION = 'v1.3.5-alpha'
+ CURRENT_VERSION = 'v1.3.6-alpha'
 
  def __init__(self):
  self.ready = False
@@ -122,7 +122,7 @@ def on_webhook(self, path, request):
  logging.error(f"[f0xtr0t] Error checking for update: {error}")
  return
  elif path.startswith('hostname'):
- logging.info(f"[f0xtr0t] GPS COORDS: {socket.gethostname()}")
+ logging.info(f"[f0xtr0t] Hostname: {socket.gethostname()}")
  response_data = json.dumps(socket.gethostname())
  response_status = 200
  response_mimetype = "application/json"