v2.4.9

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>

builder/data/etc/dhcpcd.conf

@@ -49,8 +49,10 @@ denyinterfaces wlan0
 
 interface eth0
 static domain_name_servers=8.8.8.8 1.1.1.1
+metric=202
 
 interface usb0
 static ip_address=10.0.0.2/24
 static routers=10.0.0.1
-static domain_name_servers=10.0.0.1 8.8.8.8 1.1.1.1
+static domain_name_servers=10.0.0.1 8.8.8.8 1.1.1.1
+metric=203

builder/data/etc/pwnagotchi/conf.d/age.toml

@@ -1,5 +0,0 @@
-main.plugins.age.enabled = false
-main.plugins.age.age_x_coord = 0
-main.plugins.age.age_y_coord = 32
-main.plugins.age.str_x_coord = 67
-main.plugins.age.str_y_coord = 32

builder/data/etc/pwnagotchi/conf.d/auto-update.toml

@@ -1,3 +0,0 @@
-main.plugins.auto-update.enabled = true
-main.plugins.auto-update.install = true
-main.plugins.auto-update.interval = 1

builder/data/etc/pwnagotchi/conf.d/bt-tether.toml

@@ -1,23 +0,0 @@
-main.plugins.bt-tether.enabled = false
-
-main.plugins.bt-tether.devices.android-phone.enabled = false
-main.plugins.bt-tether.devices.android-phone.search_order = 1
-main.plugins.bt-tether.devices.android-phone.mac = ""
-main.plugins.bt-tether.devices.android-phone.ip = "192.168.44.44"
-main.plugins.bt-tether.devices.android-phone.netmask = 24
-main.plugins.bt-tether.devices.android-phone.interval = 1
-main.plugins.bt-tether.devices.android-phone.scantime = 10
-main.plugins.bt-tether.devices.android-phone.max_tries = 10
-main.plugins.bt-tether.devices.android-phone.share_internet = false
-main.plugins.bt-tether.devices.android-phone.priority = 1
-
-main.plugins.bt-tether.devices.ios-phone.enabled = false
-main.plugins.bt-tether.devices.ios-phone.search_order = 2
-main.plugins.bt-tether.devices.ios-phone.mac = ""
-main.plugins.bt-tether.devices.ios-phone.ip = "172.20.10.6"
-main.plugins.bt-tether.devices.ios-phone.netmask = 24
-main.plugins.bt-tether.devices.ios-phone.interval = 5
-main.plugins.bt-tether.devices.ios-phone.scantime = 20
-main.plugins.bt-tether.devices.ios-phone.max_tries = 0
-main.plugins.bt-tether.devices.ios-phone.share_internet = false
-main.plugins.bt-tether.devices.ios-phone.priority = 999

builder/data/etc/pwnagotchi/conf.d/fix_services.toml

@@ -1 +0,0 @@
-main.plugins.fix_services.enabled = true

builder/data/etc/pwnagotchi/conf.d/gdrivesync.toml

@@ -1,4 +0,0 @@
-main.plugins.gdrivesync.enabled = false
-main.plugins.gdrivesync.backupfiles = ['']
-main.plugins.gdrivesync.backup_folder = "PwnagotchiBackups"
-main.plugin.gdrivesync.interval = 1

builder/data/etc/pwnagotchi/conf.d/gpio_buttons.toml

@@ -1 +0,0 @@
-main.plugins.gpio_buttons.enabled = false

builder/data/etc/pwnagotchi/conf.d/gps.toml

@@ -1,3 +0,0 @@
-main.plugins.gps.enabled = false
-main.plugins.gps.speed = 19200
-main.plugins.gps.device = "/dev/ttyUSB0"

builder/data/etc/pwnagotchi/conf.d/grid.toml

@@ -1,5 +0,0 @@
-main.plugins.grid.enabled = true
-main.plugins.grid.report = true
-main.plugins.grid.exclude = [
-    "YourHomeNetworkHere"
-]

builder/data/etc/pwnagotchi/conf.d/logtail.toml

@@ -1,2 +0,0 @@
-main.plugins.logtail.enabled = false
-main.plugins.logtail.max-lines = 10000

builder/data/etc/pwnagotchi/conf.d/memtemp.toml

@@ -1,3 +0,0 @@
-main.plugins.memtemp.enabled = false
-main.plugins.memtemp.scale = "celsius"
-main.plugins.memtemp.orientation = "horizontal"

builder/data/etc/pwnagotchi/conf.d/net-pos.toml

@@ -1,2 +0,0 @@
-main.plugins.net-pos.enabled = false
-main.plugins.net-pos.api_key = "test"

builder/data/etc/pwnagotchi/conf.d/onlinehascrack.toml

@@ -1,5 +0,0 @@
-main.plugins.onlinehashcrack.enabled = false
-main.plugins.onlinehashcrack.email = ""
-main.plugins.onlinehashcrack.dashboard = ""
-main.plugins.onlinehashcrack.single_files = false
-main.plugins.onlinehashcrack.whitelist = []

builder/data/etc/pwnagotchi/conf.d/paw-gps.toml

@@ -1,2 +0,0 @@
-main.plugins.paw-gps.enabled = false
-main.plugins.paw-gps.ip = "192.168.44.1:8080"

builder/data/etc/pwnagotchi/conf.d/pisugar2.toml

@@ -1,3 +0,0 @@
-main.plugins.pisugar2.enabled = false
-main.plugins.pisugar2.shutdown = 5
-main.plugins.pisugar2.sync_rtc_on_boot = false

builder/data/etc/pwnagotchi/conf.d/session-stats.toml

@@ -1,2 +0,0 @@
-main.plugins.session-stats.enabled = true
-main.plugins.session-stats.save_directory = "/var/tmp/pwnagotchi/sessions/"

builder/data/etc/pwnagotchi/conf.d/ups_hat_c.toml

@@ -1,5 +0,0 @@
-main.plugins.ups_hat_c.enabled = false
-main.plugins.ups_hat_c.label_on = true  # show BAT label or just percentage
-main.plugins.ups_hat_c.shutdown = 5  # battery percent at which the device will turn off
-main.plugins.ups_hat_c.bat_x_coord = 140
-main.plugins.ups_hat_c.bat_y_coord = 0

builder/data/etc/pwnagotchi/conf.d/ups_lite.toml

@@ -1,2 +0,0 @@
-main.plugins.ups_lite.enabled = false
-main.plugins.ups_lite.shutdown = 2

builder/data/etc/pwnagotchi/conf.d/webcfg.toml

@@ -1 +0,0 @@
-main.plugins.webcfg.enabled = true

builder/data/etc/pwnagotchi/conf.d/webgpsmap.toml

@@ -1 +0,0 @@
-main.plugins.webgpsmap.enabled = false

builder/data/etc/pwnagotchi/conf.d/wigle.toml

@@ -1,4 +0,0 @@
-main.plugins.wigle.enabled = false
-main.plugins.wigle.api_key = ""
-main.plugins.wigle.whitelist = []
-main.plugins.wigle.donate = true

builder/data/etc/pwnagotchi/conf.d/wpa-sec.toml

@@ -1,5 +0,0 @@
-main.plugins.wpa-sec.enabled = false
-main.plugins.wpa-sec.api_key = ""
-main.plugins.wpa-sec.api_url = "https://wpa-sec.stanev.org"
-main.plugins.wpa-sec.download_results = false
-main.plugins.wpa-sec.whitelist = []

pwnagotchi/__init__.py

@@ -92,7 +92,8 @@ def cpu_load(tag=None):
         parts0 = _cpu_stat()
         time.sleep(0.1)     # only need to sleep when no tag
     parts1 = _cpu_stat()
-    if tag: _cpu_stats[tag] = parts1
+    if tag:
+        _cpu_stats[tag] = parts1
 
     parts_diff = [p1 - p0 for (p0, p1) in zip(parts0, parts1)]
     user, nice, sys, idle, iowait, irq, softirq, steal, _guest, _guest_nice = parts_diff

pwnagotchi/_version.py

@@ -1 +1 @@
-__version__ = '2.4.8'
+__version__ = '2.4.9'

pwnagotchi/defaults.toml

@@ -10,6 +10,103 @@ main.custom_plugin_repos = [
 
 main.custom_plugins = "/usr/local/share/pwnagotchi/custom-plugins/"
 
+main.plugins.auto-update.enabled = true
+main.plugins.auto-update.install = true
+main.plugins.auto-update.interval = 1
+
+main.plugins.bt-tether.enabled = false
+
+main.plugins.bt-tether.devices.android-phone.enabled = false
+main.plugins.bt-tether.devices.android-phone.search_order = 1
+main.plugins.bt-tether.devices.android-phone.mac = ""
+main.plugins.bt-tether.devices.android-phone.ip = "192.168.44.44"
+main.plugins.bt-tether.devices.android-phone.netmask = 24
+main.plugins.bt-tether.devices.android-phone.interval = 1
+main.plugins.bt-tether.devices.android-phone.scantime = 10
+main.plugins.bt-tether.devices.android-phone.max_tries = 10
+main.plugins.bt-tether.devices.android-phone.share_internet = false
+main.plugins.bt-tether.devices.android-phone.priority = 1
+
+main.plugins.bt-tether.devices.ios-phone.enabled = false
+main.plugins.bt-tether.devices.ios-phone.search_order = 2
+main.plugins.bt-tether.devices.ios-phone.mac = ""
+main.plugins.bt-tether.devices.ios-phone.ip = "172.20.10.6"
+main.plugins.bt-tether.devices.ios-phone.netmask = 24
+main.plugins.bt-tether.devices.ios-phone.interval = 5
+main.plugins.bt-tether.devices.ios-phone.scantime = 20
+main.plugins.bt-tether.devices.ios-phone.max_tries = 0
+main.plugins.bt-tether.devices.ios-phone.share_internet = false
+main.plugins.bt-tether.devices.ios-phone.priority = 999
+
+main.plugins.fix_services.enabled = true
+
+main.plugins.gdrivesync.enabled = false
+main.plugins.gdrivesync.backupfiles = ['']
+main.plugins.gdrivesync.backup_folder = "PwnagotchiBackups"
+main.plugin.gdrivesync.interval = 1
+
+main.plugins.gpio_buttons.enabled = false
+
+main.plugins.gps.enabled = false
+main.plugins.gps.speed = 19200
+main.plugins.gps.device = "/dev/ttyUSB0"
+
+main.plugins.grid.enabled = true
+main.plugins.grid.report = true
+main.plugins.grid.exclude = [
+    "YourHomeNetworkHere"
+]
+
+main.plugins.logtail.enabled = false
+main.plugins.logtail.max-lines = 10000
+
+main.plugins.memtemp.enabled = false
+main.plugins.memtemp.scale = "celsius"
+main.plugins.memtemp.orientation = "horizontal"
+
+main.plugins.net-pos.enabled = false
+main.plugins.net-pos.api_key = "test"
+
+main.plugins.onlinehashcrack.enabled = false
+main.plugins.onlinehashcrack.email = ""
+main.plugins.onlinehashcrack.dashboard = ""
+main.plugins.onlinehashcrack.single_files = false
+main.plugins.onlinehashcrack.whitelist = []
+
+main.plugins.paw-gps.enabled = false
+main.plugins.paw-gps.ip = "192.168.44.1:8080"
+
+main.plugins.pisugar2.enabled = false
+main.plugins.pisugar2.shutdown = 5
+main.plugins.pisugar2.sync_rtc_on_boot = false
+
+main.plugins.session-stats.enabled = true
+main.plugins.session-stats.save_directory = "/var/tmp/pwnagotchi/sessions/"
+
+main.plugins.ups_hat_c.enabled = false
+main.plugins.ups_hat_c.label_on = true  # show BAT label or just percentage
+main.plugins.ups_hat_c.shutdown = 5  # battery percent at which the device will turn off
+main.plugins.ups_hat_c.bat_x_coord = 140
+main.plugins.ups_hat_c.bat_y_coord = 0
+
+main.plugins.ups_lite.enabled = false
+main.plugins.ups_lite.shutdown = 2
+
+main.plugins.webcfg.enabled = true
+
+main.plugins.webgpsmap.enabled = false
+
+main.plugins.wigle.enabled = false
+main.plugins.wigle.api_key = ""
+main.plugins.wigle.whitelist = []
+main.plugins.wigle.donate = true
+
+main.plugins.wpa-sec.enabled = false
+main.plugins.wpa-sec.api_key = ""
+main.plugins.wpa-sec.api_url = "https://wpa-sec.stanev.org"
+main.plugins.wpa-sec.download_results = false
+main.plugins.wpa-sec.whitelist = []
+
 main.iface = "wlan0mon"
 main.mon_start_cmd = "/usr/bin/monstart"
 main.mon_stop_cmd = "/usr/bin/monstop"

pwnagotchi/utils.py

@@ -223,13 +223,13 @@ def load_config(args):
         if user_config:
             config = merge_config(user_config, config)
     except Exception as ex:
-        logging.error("There was an error processing the configuration file:\n%s ",ex)
+        logging.error("There was an error processing the configuration file:\n%s ", ex)
         sys.exit(1)
 
     # dropins
     dropin = config['main']['confd']
     if dropin and os.path.isdir(dropin):
-        dropin += '*.toml' if dropin.endswith('/') else '/*.toml' # only toml here; yaml is no more
+        dropin += '*.toml' if dropin.endswith('/') else '/*.toml'  # only toml here; yaml is no more
         for conf in glob.glob(dropin):
             with open(conf) as toml_file:
                 additional_config = toml.load(toml_file)