Merge branch 'master' into master

pwnagotchi/__init__.py

@@ -2,13 +2,48 @@ import subprocess
 import os
 import logging
 import time
+import re
 import pwnagotchi.ui.view as view
+import pwnagotchi
 
-version = '1.1.0b'
+version = '1.1.1'
 
 _name = None
 
 
+def set_name(new_name):
+    if new_name is None:
+        return
+
+    new_name = new_name.strip()
+    if new_name == '':
+        return
+
+    if not re.match(r'^[a-zA-Z0-9\-]{2,25}$', new_name):
+        logging.warning("name '%s' is invalid: min length is 2, max length 25, only a-zA-Z0-9- allowed", new_name)
+        return
+
+    current = name()
+    if new_name != current:
+        global _name
+
+        logging.info("setting unit hostname '%s' -> '%s'" % (current, new_name))
+        with open('/etc/hostname', 'wt') as fp:
+            fp.write(new_name)
+
+        with open('/etc/hosts', 'rt') as fp:
+            prev = fp.read()
+            logging.debug("old hosts:\n%s\n" % prev)
+
+        with open('/etc/hosts', 'wt') as fp:
+            patched = prev.replace(current, new_name, -1)
+            logging.debug("new hosts:\n%s\n" % patched)
+            fp.write(patched)
+
+        os.system("hostname '%s'" % new_name)
+        pwnagotchi.reboot()
+
+
 def name():
     global _name
     if _name is None:
@@ -23,15 +58,21 @@ def uptime():
 
 
 def mem_usage():
-    out = subprocess.getoutput("free -m")
-    for line in out.split("\n"):
-        line = line.strip()
-        if line.startswith("Mem:"):
-            parts = list(map(int, line.split()[1:]))
-            tot = parts[0]
-            used = parts[1]
-            free = parts[2]
-            return used / tot
+    with open('/proc/meminfo') as fp:
+        for line in fp:
+            line = line.strip()
+            if line.startswith("MemTotal:"):
+                kb_mem_total = int(line.split()[1])
+            if line.startswith("MemFree:"):
+                kb_mem_free = int(line.split()[1])
+            if line.startswith("MemAvailable:"):
+                kb_mem_available = int(line.split()[1])
+            if line.startswith("Buffers:"):
+                kb_main_buffers = int(line.split()[1])
+            if line.startswith("Cached:"):
+                kb_main_cached = int(line.split()[1])
+        kb_mem_used = kb_mem_total - kb_mem_free - kb_main_cached - kb_main_buffers
+        return round(kb_mem_used / kb_mem_total, 1)
 
     return 0
 
@@ -62,7 +103,7 @@ def shutdown():
     if view.ROOT:
         view.ROOT.on_shutdown()
         # give it some time to refresh the ui
-        time.sleep(5)
+        time.sleep(10)
     os.system("sync")
     os.system("halt")
 

pwnagotchi/agent.py

@@ -8,6 +8,7 @@ import _thread
 import pwnagotchi
 import pwnagotchi.utils as utils
 import pwnagotchi.plugins as plugins
+from pwnagotchi.automata import Automata
 from pwnagotchi.log import LastSession
 from pwnagotchi.bettercap import Client
 from pwnagotchi.mesh.utils import AsyncAdvertiser
@@ -16,13 +17,14 @@ from pwnagotchi.ai.train import AsyncTrainer
 RECOVERY_DATA_FILE = '/root/.pwnagotchi-recovery'
 
 
-class Agent(Client, AsyncAdvertiser, AsyncTrainer):
+class Agent(Client, Automata, AsyncAdvertiser, AsyncTrainer):
     def __init__(self, view, config, keypair):
         Client.__init__(self, config['bettercap']['hostname'],
                         config['bettercap']['scheme'],
                         config['bettercap']['port'],
                         config['bettercap']['username'],
                         config['bettercap']['password'])
+        Automata.__init__(self, config, view)
         AsyncAdvertiser.__init__(self, config, view, keypair)
         AsyncTrainer.__init__(self, config)
 
@@ -31,6 +33,7 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
         self._current_channel = 0
         self._supported_channels = utils.iface_channels(config['main']['iface'])
         self._view = view
+        self._view.set_agent(self)
         self._access_points = []
         self._last_pwnd = None
         self._history = {}
@@ -49,36 +52,6 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
     def supported_channels(self):
         return self._supported_channels
 
-    def set_starting(self):
-        self._view.on_starting()
-
-    def set_ready(self):
-        plugins.on('ready', self)
-
-    def set_free_channel(self, channel):
-        self._view.on_free_channel(channel)
-        plugins.on('free_channel', self, channel)
-
-    def set_bored(self):
-        self._view.on_bored()
-        plugins.on('bored', self)
-
-    def set_sad(self):
-        self._view.on_sad()
-        plugins.on('sad', self)
-
-    def set_excited(self):
-        self._view.on_excited()
-        plugins.on('excited', self)
-
-    def set_lonely(self):
-        self._view.on_lonely()
-        plugins.on('lonely', self)
-
-    def set_rebooting(self):
-        self._view.on_rebooting()
-        plugins.on('rebooting', self)
-
     def setup_events(self):
         logging.info("connecting to %s ..." % self.url)
 
@@ -155,11 +128,6 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
         self.next_epoch()
         self.set_ready()
 
-    def wait_for(self, t, sleeping=True):
-        plugins.on('sleep' if sleeping else 'wait', self, t)
-        self._view.wait(t, sleeping)
-        self._epoch.track(sleep=True, inc=t)
-
     def recon(self):
         recon_time = self._config['personality']['recon_time']
         max_inactive = self._config['personality']['max_inactive_scale']
@@ -202,7 +170,9 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
             s = self.session()
             plugins.on("unfiltered_ap_list", self, s['wifi']['aps'])
             for ap in s['wifi']['aps']:
-                if ap['hostname'] not in whitelist:
+                if ap['encryption'] == '' or ap['encryption'] == 'OPEN':
+                    continue
+                elif ap['hostname'] not in whitelist:
                     if self._filter_included(ap):
                         aps.append(ap)
         except Exception as e:
@@ -277,6 +247,11 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
     def _update_peers(self):
         self._view.set_closest_peer(self._closest_peer, len(self._peers))
 
+    def _reboot(self):
+        self.set_rebooting()
+        self._save_recovery_data()
+        pwnagotchi.reboot()
+
     def _save_recovery_data(self):
         logging.warning("writing recovery data to %s ..." % RECOVERY_DATA_FILE)
         with open(RECOVERY_DATA_FILE, 'w') as fp:
@@ -312,12 +287,13 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
 
         self.run('events.clear')
 
-        logging.debug("event polling started ...")
         while True:
             time.sleep(1)
 
             new_shakes = 0
 
+            logging.debug("polling events ...")
+
             try:
                 s = self.session()
                 self._update_uptime(s)
@@ -391,21 +367,6 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
 
         return self._history[who] < self._config['personality']['max_interactions']
 
-    def _on_miss(self, who):
-        logging.info("it looks like %s is not in range anymore :/" % who)
-        self._epoch.track(miss=True)
-        self._view.on_miss(who)
-
-    def _on_error(self, who, e):
-        error = "%s" % e
-        # when we're trying to associate or deauth something that is not in range anymore
-        # (if we are moving), we get the following error from bettercap:
-        # error 400: 50:c7:bf:2e:d3:37 is an unknown BSSID or it is in the association skip list.
-        if 'is an unknown BSSID' in error:
-            self._on_miss(who)
-        else:
-            logging.error("%s" % e)
-
     def associate(self, ap, throttle=0):
         if self.is_stale():
             logging.debug("recon is stale, skipping assoc(%s)" % ap['mac'])
@@ -482,44 +443,3 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
 
             except Exception as e:
                 logging.error("error: %s" % e)
-
-    def is_stale(self):
-        return self._epoch.num_missed > self._config['personality']['max_misses_for_recon']
-
-    def any_activity(self):
-        return self._epoch.any_activity
-
-    def _reboot(self):
-        self.set_rebooting()
-        self._save_recovery_data()
-        pwnagotchi.reboot()
-
-    def next_epoch(self):
-        was_stale = self.is_stale()
-        did_miss = self._epoch.num_missed
-
-        self._epoch.next()
-
-        # after X misses during an epoch, set the status to lonely
-        if was_stale:
-            logging.warning("agent missed %d interactions -> lonely" % did_miss)
-            self.set_lonely()
-        # after X times being bored, the status is set to sad
-        elif self._epoch.inactive_for >= self._config['personality']['sad_num_epochs']:
-            logging.warning("%d epochs with no activity -> sad" % self._epoch.inactive_for)
-            self.set_sad()
-        # after X times being inactive, the status is set to bored
-        elif self._epoch.inactive_for >= self._config['personality']['bored_num_epochs']:
-            logging.warning("%d epochs with no activity -> bored" % self._epoch.inactive_for)
-            self.set_bored()
-        # after X times being active, the status is set to happy / excited
-        elif self._epoch.active_for >= self._config['personality']['excited_num_epochs']:
-            logging.warning("%d epochs with activity -> excited" % self._epoch.active_for)
-            self.set_excited()
-
-        plugins.on('epoch', self, self._epoch.epoch - 1, self._epoch.data())
-
-        if self._epoch.blind_for >= self._config['main']['mon_max_blind_epochs']:
-            logging.critical("%d epochs without visible access points -> rebooting ..." % self._epoch.blind_for)
-            self._reboot()
-            self._epoch.blind_for = 0

pwnagotchi/ai/__init__.py

@@ -1,14 +1,13 @@
 import os
+import time
+import warnings
+import logging
 
 # https://stackoverflow.com/questions/40426502/is-there-a-way-to-suppress-the-messages-tensorflow-prints/40426709
 os.environ['TF_CPP_MIN_LOG_LEVEL'] = '3'  # or any {'0', '1', '2'}
-import warnings
-
 # https://stackoverflow.com/questions/15777951/how-to-suppress-pandas-future-warning
 warnings.simplefilter(action='ignore', category=FutureWarning)
 
-import logging
-
 
 def load(config, agent, epoch, from_disk=True):
     config = config['ai']
@@ -16,27 +15,51 @@ def load(config, agent, epoch, from_disk=True):
         logging.info("ai disabled")
         return False
 
-    logging.info("[ai] bootstrapping dependencies ...")
+    try:
+        begin = time.time()
 
-    from stable_baselines import A2C
-    from stable_baselines.common.policies import MlpLstmPolicy
-    from stable_baselines.common.vec_env import DummyVecEnv
+        logging.info("[ai] bootstrapping dependencies ...")
 
-    import pwnagotchi.ai.gym as wrappers
+        start = time.time()
+        from stable_baselines import A2C
+        logging.debug("[ai] A2C imported in %.2fs" % (time.time() - start))
 
-    env = wrappers.Environment(agent, epoch)
-    env = DummyVecEnv([lambda: env])
+        start = time.time()
+        from stable_baselines.common.policies import MlpLstmPolicy
+        logging.debug("[ai] MlpLstmPolicy imported in %.2fs" % (time.time() - start))
 
-    logging.info("[ai] bootstrapping model ...")
+        start = time.time()
+        from stable_baselines.common.vec_env import DummyVecEnv
+        logging.debug("[ai] DummyVecEnv imported in %.2fs" % (time.time() - start))
 
-    a2c = A2C(MlpLstmPolicy, env, **config['params'])
+        start = time.time()
+        import pwnagotchi.ai.gym as wrappers
+        logging.debug("[ai] gym wrapper imported in %.2fs" % (time.time() - start))
 
-    if from_disk and os.path.exists(config['path']):
-        logging.info("[ai] loading %s ..." % config['path'])
-        a2c.load(config['path'], env)
-    else:
-        logging.info("[ai] model created:")
-        for key, value in config['params'].items():
-            logging.info("      %s: %s" % (key, value))
+        env = wrappers.Environment(agent, epoch)
+        env = DummyVecEnv([lambda: env])
 
-    return a2c
+        logging.info("[ai] creating model ...")
+
+        start = time.time()
+        a2c = A2C(MlpLstmPolicy, env, **config['params'])
+        logging.debug("[ai] A2C created in %.2fs" % (time.time() - start))
+
+        if from_disk and os.path.exists(config['path']):
+            logging.info("[ai] loading %s ..." % config['path'])
+            start = time.time()
+            a2c.load(config['path'], env)
+            logging.debug("[ai] A2C loaded in %.2fs" % (time.time() - start))
+        else:
+            logging.info("[ai] model created:")
+            for key, value in config['params'].items():
+                logging.info("      %s: %s" % (key, value))
+
+        logging.debug("[ai] total loading time is %.2fs" % (time.time() - begin))
+
+        return a2c
+    except Exception as e:
+        logging.exception("error while starting AI")
+
+    logging.warning("[ai] AI not loaded!")
+    return False

pwnagotchi/ai/epoch.py

@@ -37,6 +37,12 @@ class Epoch(object):
         self.num_hops = 0
         # number of seconds sleeping
         self.num_slept = 0
+        # number of peers seen during this epoch
+        self.num_peers = 0
+        # cumulative bond factor
+        self.tot_bond_factor = 0.0  # cum_bond_factor sounded really bad ...
+        # average bond factor
+        self.avg_bond_factor = 0.0
         # any activity at all during this epoch?
         self.any_activity = False
         # when the current epoch started
@@ -74,10 +80,16 @@ class Epoch(object):
         else:
             self.blind_for = 0
 
+        bond_unit_scale = self.config['personality']['bond_encounters_factor']
+
+        self.num_peers = len(peers)
+        num_peers = self.num_peers + 1e-10  # avoid division by 0
+
+        self.tot_bond_factor = sum((peer.encounters for peer in peers)) / bond_unit_scale
+        self.avg_bond_factor = self.tot_bond_factor / num_peers
+
         num_aps = len(aps) + 1e-10
         num_sta = sum(len(ap['clients']) for ap in aps) + 1e-10
-        num_peers = len(peers) + 1e-10
-
         aps_per_chan = [0.0] * wifi.NumChannels
         sta_per_chan = [0.0] * wifi.NumChannels
         peers_per_chan = [0.0] * wifi.NumChannels
@@ -162,6 +174,9 @@ class Epoch(object):
             'active_for_epochs': self.active_for,
             'missed_interactions': self.num_missed,
             'num_hops': self.num_hops,
+            'num_peers': self.num_peers,
+            'tot_bond': self.tot_bond_factor,
+            'avg_bond': self.avg_bond_factor,
             'num_deauths': self.num_deauths,
             'num_associations': self.num_assocs,
             'num_handshakes': self.num_shakes,
@@ -173,14 +188,18 @@ class Epoch(object):
         self._epoch_data['reward'] = self._reward(self.epoch + 1, self._epoch_data)
         self._epoch_data_ready.set()
 
-        logging.info("[epoch %d] duration=%s slept_for=%s blind=%d inactive=%d active=%d hops=%d missed=%d "
-                     "deauths=%d assocs=%d handshakes=%d cpu=%d%% mem=%d%% temperature=%dC reward=%s" % (
+        logging.info("[epoch %d] duration=%s slept_for=%s blind=%d inactive=%d active=%d peers=%d tot_bond=%.2f "
+                     "avg_bond=%.2f hops=%d missed=%d deauths=%d assocs=%d handshakes=%d cpu=%d%% mem=%d%% "
+                     "temperature=%dC reward=%s" % (
                          self.epoch,
                          utils.secs_to_hhmmss(self.epoch_duration),
                          utils.secs_to_hhmmss(self.num_slept),
                          self.blind_for,
                          self.inactive_for,
                          self.active_for,
+                         self.num_peers,
+                         self.tot_bond_factor,
+                         self.avg_bond_factor,
                          self.num_hops,
                          self.num_missed,
                          self.num_deauths,
@@ -195,6 +214,9 @@ class Epoch(object):
         self.epoch_started = now
         self.did_deauth = False
         self.num_deauths = 0
+        self.num_peers = 0
+        self.tot_bond_factor = 0.0
+        self.avg_bond_factor = 0.0
         self.did_associate = False
         self.num_assocs = 0
         self.num_missed = 0

pwnagotchi/ai/train.py

@@ -8,7 +8,6 @@ import logging
 
 import pwnagotchi.plugins as plugins
 import pwnagotchi.ai as ai
-from pwnagotchi.ai.epoch import Epoch
 
 
 class Stats(object):
@@ -88,7 +87,6 @@ class AsyncTrainer(object):
     def __init__(self, config):
         self._config = config
         self._model = None
-        self._epoch = Epoch(config)
         self._is_training = False
         self._training_epochs = 0
         self._nn_path = self._config['ai']['path']

pwnagotchi/automata.py

@@ -0,0 +1,144 @@
+import logging
+
+import pwnagotchi.plugins as plugins
+from pwnagotchi.ai.epoch import Epoch
+
+
+# basic mood system
+class Automata(object):
+    def __init__(self, config, view):
+        self._config = config
+        self._view = view
+        self._epoch = Epoch(config)
+
+    def _on_miss(self, who):
+        logging.info("it looks like %s is not in range anymore :/" % who)
+        self._epoch.track(miss=True)
+        self._view.on_miss(who)
+
+    def _on_error(self, who, e):
+        error = "%s" % e
+        # when we're trying to associate or deauth something that is not in range anymore
+        # (if we are moving), we get the following error from bettercap:
+        # error 400: 50:c7:bf:2e:d3:37 is an unknown BSSID or it is in the association skip list.
+        if 'is an unknown BSSID' in error:
+            self._on_miss(who)
+        else:
+            logging.error("%s" % e)
+
+    def set_starting(self):
+        self._view.on_starting()
+
+    def set_ready(self):
+        plugins.on('ready', self)
+
+    def in_good_mood(self):
+        return self._has_support_network_for(1.0)
+
+    def _has_support_network_for(self, factor):
+        bond_factor = self._config['personality']['bond_encounters_factor']
+        total_encounters = sum(peer.encounters for _, peer in self._peers.items())
+        support_factor = total_encounters / bond_factor
+        return support_factor >= factor
+
+    # triggered when it's a sad/bad day but you have good friends around ^_^
+    def set_grateful(self):
+        self._view.on_grateful()
+        plugins.on('grateful', self)
+
+    def set_lonely(self):
+        if not self._has_support_network_for(1.0):
+            logging.info("unit is lonely")
+            self._view.on_lonely()
+            plugins.on('lonely', self)
+        else:
+            logging.info("unit is grateful instead of lonely")
+            self.set_grateful()
+
+    def set_bored(self):
+        factor = self._epoch.inactive_for / self._config['personality']['bored_num_epochs']
+        if not self._has_support_network_for(factor):
+            logging.warning("%d epochs with no activity -> bored" % self._epoch.inactive_for)
+            self._view.on_bored()
+            plugins.on('bored', self)
+        else:
+            logging.info("unit is grateful instead of bored")
+            self.set_grateful()
+
+    def set_sad(self):
+        factor = self._epoch.inactive_for / self._config['personality']['sad_num_epochs']
+        if not self._has_support_network_for(factor):
+            logging.warning("%d epochs with no activity -> sad" % self._epoch.inactive_for)
+            self._view.on_sad()
+            plugins.on('sad', self)
+        else:
+            logging.info("unit is grateful instead of sad")
+            self.set_grateful()
+
+    def set_angry(self, factor):
+        if not self._has_support_network_for(factor):
+            logging.warning("%d epochs with no activity -> angry" % self._epoch.inactive_for)
+            self._view.on_angry()
+            plugins.on('angry', self)
+        else:
+            logging.info("unit is grateful instead of angry")
+            self.set_grateful()
+
+    def set_excited(self):
+        logging.warning("%d epochs with activity -> excited" % self._epoch.active_for)
+        self._view.on_excited()
+        plugins.on('excited', self)
+
+    def set_rebooting(self):
+        self._view.on_rebooting()
+        plugins.on('rebooting', self)
+
+    def wait_for(self, t, sleeping=True):
+        plugins.on('sleep' if sleeping else 'wait', self, t)
+        self._view.wait(t, sleeping)
+        self._epoch.track(sleep=True, inc=t)
+
+    def is_stale(self):
+        return self._epoch.num_missed > self._config['personality']['max_misses_for_recon']
+
+    def any_activity(self):
+        return self._epoch.any_activity
+
+    def next_epoch(self):
+        logging.debug("agent.next_epoch()")
+
+        was_stale = self.is_stale()
+        did_miss = self._epoch.num_missed
+
+        self._epoch.next()
+
+        # after X misses during an epoch, set the status to lonely or angry
+        if was_stale:
+            factor = did_miss / self._config['personality']['max_misses_for_recon']
+            if factor >= 2.0:
+                self.set_angry(factor)
+            else:
+                logging.warning("agent missed %d interactions -> lonely" % did_miss)
+                self.set_lonely()
+        # after X times being bored, the status is set to sad or angry
+        elif self._epoch.inactive_for >= self._config['personality']['sad_num_epochs']:
+            factor = self._epoch.inactive_for / self._config['personality']['sad_num_epochs']
+            if factor >= 2.0:
+                self.set_angry(factor)
+            else:
+                self.set_sad()
+        # after X times being inactive, the status is set to bored
+        elif self._epoch.inactive_for >= self._config['personality']['bored_num_epochs']:
+            self.set_bored()
+        # after X times being active, the status is set to happy / excited
+        elif self._epoch.active_for >= self._config['personality']['excited_num_epochs']:
+            self.set_excited()
+        elif self._epoch.active_for >= 5 and self._has_support_network_for(5.0):
+            self.set_grateful()
+
+        plugins.on('epoch', self, self._epoch.epoch - 1, self._epoch.data())
+
+        if self._epoch.blind_for >= self._config['main']['mon_max_blind_epochs']:
+            logging.critical("%d epochs without visible access points -> rebooting ..." % self._epoch.blind_for)
+            self._reboot()
+            self._epoch.blind_for = 0

pwnagotchi/bettercap.py

@@ -3,6 +3,20 @@ import requests
 from requests.auth import HTTPBasicAuth
 
 
+def decode(r, verbose_errors=True):
+    try:
+        return r.json()
+    except Exception as e:
+        if r.status_code == 200:
+            logging.error("error while decoding json: error='%s' resp='%s'" % (e, r.text))
+        else:
+            err = "error %d: %s" % (r.status_code, r.text.strip())
+            if verbose_errors:
+                logging.info(err)
+            raise Exception(err)
+        return r.text
+
+
 class Client(object):
     def __init__(self, hostname='localhost', scheme='http', port=8081, username='user', password='pass'):
         self.hostname = hostname
@@ -13,27 +27,14 @@ class Client(object):
         self.url = "%s://%s:%d/api" % (scheme, hostname, port)
         self.auth = HTTPBasicAuth(username, password)
 
-    def _decode(self, r, verbose_errors=True):
-        try:
-            return r.json()
-        except Exception as e:
-            if r.status_code == 200:
-                logging.error("error while decoding json: error='%s' resp='%s'" % (e, r.text))
-            else:
-                err = "error %d: %s" % (r.status_code, r.text.strip())
-                if verbose_errors:
-                    logging.info(err)
-                raise Exception(err)
-            return r.text
-
     def session(self):
         r = requests.get("%s/session" % self.url, auth=self.auth)
-        return self._decode(r)
+        return decode(r)
 
     def events(self):
         r = requests.get("%s/events" % self.url, auth=self.auth)
-        return self._decode(r)
+        return decode(r)
 
     def run(self, command, verbose_errors=True):
         r = requests.post("%s/session" % self.url, auth=self.auth, json={'cmd': command})
-        return self._decode(r, verbose_errors=verbose_errors)
+        return decode(r, verbose_errors=verbose_errors)

pwnagotchi/defaults.yml

@@ -6,6 +6,8 @@
 #
 # main algorithm configuration
 main:
+    # if set this will set the hostname of the unit. min length is 2, max length 25, only a-zA-Z0-9- allowed
+    name: ''
     # currently implemented: en (default), de, el, fr, it, mk, nl, ru, se, pt-BR, es, pt
     lang: en
     # custom plugins path, if null only default plugins with be loaded
@@ -19,9 +21,9 @@ main:
                 - YourHomeNetworkHere
 
         auto-update:
-            enabled: false
-            interval: 12 # every 12 hours
+            enabled: true
             install: true # if false, it will only warn that updates are available, if true it will install them
+            interval: 1 # every 1 hour
 
         auto-backup:
             enabled: false
@@ -31,6 +33,7 @@ main:
                 - /root/brain.json
                 - /root/.api-report.json
                 - /root/handshakes/
+                - /root/peers/
                 - /etc/pwnagotchi/
                 - /var/log/pwnagotchi.log
             commands:
@@ -68,14 +71,42 @@ main:
             enabled: false
         bt-tether:
             enabled: false # if you want to use this, set ui.display.video.address to 0.0.0.0
-            mac: ~ # mac of your bluetooth device
-            ip: '192.168.44.44' # ip from which your pwnagotchi should be reachable
-            netmask: 24
-            interval: 1 # check every x minutes for device
-            share_internet: false
+            devices:
+              android-phone:
+                enabled: false
+                search_order: 1 # search for this first
+                mac: ~ # mac of your bluetooth device
+                ip: '192.168.44.44' # ip from which your pwnagotchi should be reachable
+                netmask: 24
+                interval: 1 # check every minute for device
+                scantime: 10 # search for 10 seconds
+                max_tries: 10 # after 10 tries of "not found"; don't try anymore
+                share_internet: false
+                priority: 1 # low routing priority; ios (prio: 999) would win here
+              ios-phone:
+                enabled: false
+                search_order: 2 # search for this second
+                mac: ~ # mac of your bluetooth device
+                ip: '172.20.10.6' # ip from which your pwnagotchi should be reachable
+                netmask: 24
+                interval: 5 # check every 5 minutes for device
+                scantime: 20
+                max_tries: 0 # infinity
+                share_internet: false
+                priority: 999 # routing priority
         memtemp: # Display memory usage, cpu load and cpu temperature on screen
             enabled: false
             orientation: horizontal # horizontal/vertical
+        pawgps:
+            enabled: false
+            #The IP Address of your phone with Paw Server running, default (option is empty) is 192.168.44.1
+            ip: ''
+        gpio_buttons:
+            enabled: false
+            #The following is a list of the GPIO number for your button, and the command you want to run when it is pressed
+            gpios:
+            - 20: 'sudo touch /root/.pwnagotchi-auto && sudo systemctl restart pwnagotchi'
+            - 21: 'shutdown -h now'
     # monitor interface to use
     iface: mon0
     # command to run to bring the mon interface up in case it's not up already
@@ -160,6 +191,9 @@ personality:
     bored_num_epochs: 15
     # number of inactive epochs that triggers the sad state
     sad_num_epochs: 25
+    # number of encounters (times met on a channel) with another unit before considering it a friend and bond
+    # also used for cumulative bonding score of nearby units
+    bond_encounters_factor: 20000
 
 # ui configuration
 ui:
@@ -167,6 +201,8 @@ ui:
     faces:
         look_r: '( ⚆_⚆)'
         look_l: '(☉_☉ )'
+        look_r_happy: '( ◕‿◕)'
+        look_l_happy: '(◕‿◕ )'
         sleep: '(⇀‿‿↼)'
         sleep2: '(≖‿‿≖)'
         awake: '(◕‿‿◕)'
@@ -175,11 +211,13 @@ ui:
         cool: '(⌐■_■)'
         happy: '(•‿‿•)'
         excited: '(ᵔ◡◡ᵔ)'
+        grateful: '(^‿‿^)'
         motivated: '(☼‿‿☼)'
         demotivated: '(≖__≖)'
         smart: '(✜‿‿✜)'
         lonely: '(ب__ب)'
         sad: '(╥☁╥ )'
+        angry: "(-_-')"
         friend: '(♥‿‿♥)'
         broken: '(☓‿‿☓)'
         debug: '(#__#)'
@@ -191,14 +229,16 @@ ui:
     display:
         enabled: true
         rotation: 180
-        # Possible options inkyphat/inky, papirus/papi, waveshare_1/ws_1 or waveshare_2/ws_2, oledhat, waveshare27inch
+        # Possible options inkyphat/inky, papirus/papi, waveshare_1/ws_1 or waveshare_2/ws_2, oledhat, lcdhat, waveshare154inch, waveshare27inch, dfrobot/df
         type: 'waveshare_2'
         # Possible options red/yellow/black (black used for monocromatic displays)
+        # Waveshare tri-color 2.13in display can be over-driven with color set as 'fastAndFurious'
+        # THIS IS POTENTIALLY DANGEROUS. DO NOT USE UNLESS YOU UNDERSTAND THAT IT COULD KILL YOUR DISPLAY
         color: 'black'
         video:
             enabled: true
             address: '0.0.0.0'
-            origin: '*'
+            origin: null
             port: 8080
             # command to be executed when a new png frame is available
             # for instance, to use with framebuffer based displays:

pwnagotchi/locale/bg/LC_MESSAGES/voice.po

@@ -0,0 +1,226 @@
+# pwnagotchi voice data.
+# Copyright (C) 2019
+# This file is distributed under the same license as the pwnagotchi package.
+# FIRST AUTHOR <https://github.com/georgikoemdzhiev>, 2019.
+#
+#,
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-10-23 20:56+0200\n"
+"PO-Revision-Date: 2019-10-23 20:56+0200\n"
+"Last-Translator: Georgi Koemdzhiev <https://github.com/georgikoemdzhiev>\n"
+"Language-Team: \n"
+"Language: bulgarian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "ZzzzZZzzzzZzzz"
+msgstr ""
+
+msgid "Hi, I'm Pwnagotchi! Starting ..."
+msgstr "Здравей, аз съм Pwnagotchi! Стартиране ..."
+
+msgid "New day, new hunt, new pwns!"
+msgstr "Нов ден, нов лов, нови pwns!"
+
+msgid "Hack the Planet!"
+msgstr "Хакни планетата!"
+
+msgid "AI ready."
+msgstr "AI готов."
+
+msgid "The neural network is ready."
+msgstr "Невронната мрежа е готова."
+
+msgid "Generating keys, do not turn off ..."
+msgstr "Генериране на ключове, не изключвай ..."
+
+#, python-brace-format
+msgid "Hey, channel {channel} is free! Your AP will say thanks."
+msgstr "Здравей, канал {channel} е свободен! твоя AP ще каже благодаря."
+
+msgid "I'm bored ..."
+msgstr "Скучно ми е ..."
+
+msgid "Let's go for a walk!"
+msgstr "Хайда да се поразходим!"
+
+msgid "This is the best day of my life!"
+msgstr "Това е най-добрият ден в живота ми!"
+
+msgid "Shitty day :/"
+msgstr "Тъп ден :/"
+
+msgid "I'm extremely bored ..."
+msgstr "Супер много ми е скучно ..."
+
+msgid "I'm very sad ..."
+msgstr "Много съм тъжен ..."
+
+msgid "I'm sad"
+msgstr "Тъжен съм"
+
+msgid "I'm living the life!"
+msgstr "Живота ми е фантастичен!"
+
+msgid "I pwn therefore I am."
+msgstr "Аз живея за да pwn-вам."
+
+msgid "So many networks!!!"
+msgstr "Толкова много мрежи!!!"
+
+msgid "I'm having so much fun!"
+msgstr "Толкова много се забавлявам!"
+
+msgid "My crime is that of curiosity ..."
+msgstr "Моето престъпление е това че съм любопитен ..."
+
+#, python-brace-format
+msgid "Hello {name}! Nice to meet you."
+msgstr "Здравей {name}! Приятно ми е да се запознаем."
+
+#, python-brace-format
+msgid "Unit {name} is nearby!"
+msgstr "Устройство {name} е наблизо!"
+
+#, python-brace-format
+msgid "Uhm ... goodbye {name}"
+msgstr "Ами ... довиждане {name}"
+
+#, python-brace-format
+msgid "{name} is gone ..."
+msgstr "{name} изчезна ..."
+
+#, python-brace-format
+msgid "Whoops ... {name} is gone."
+msgstr "Упс ... {name} изчезна."
+
+#, python-brace-format
+msgid "{name} missed!"
+msgstr "{name} загубен!"
+
+msgid "Missed!"
+msgstr "Загубен!"
+
+msgid "Good friends are a blessing!"
+msgstr "Добрите приятели са благословия!"
+
+msgid "I love my friends!"
+msgstr "Обичам приятелите си!"
+
+msgid "Nobody wants to play with me ..."
+msgstr "Никой не иска да си играе с мен ..."
+
+msgid "I feel so alone ..."
+msgstr "Чувствам се толкова самотен ..."
+
+msgid "Where's everybody?!"
+msgstr "Къде са всички?!"
+
+#, python-brace-format
+msgid "Napping for {secs}s ..."
+msgstr "Заспивам за {secs} секунди ..."
+
+msgid "Zzzzz"
+msgstr "Zzzzz"
+
+#, python-brace-format
+msgid "ZzzZzzz ({secs}s)"
+msgstr "ZzzZzzz ({secs}s)"
+
+msgid "Good night."
+msgstr "Лека нощ."
+
+msgid "Zzz"
+msgstr "Zzz"
+
+#, python-brace-format
+msgid "Waiting for {secs}s ..."
+msgstr "Чакам {secs} секунди ..."
+
+#, python-brace-format
+msgid "Looking around ({secs}s)"
+msgstr "Оглеждам се ({secs}секунди)"
+
+#, python-brace-format
+msgid "Hey {what} let's be friends!"
+msgstr "Хей {what} нека станем приятели!"
+
+#, python-brace-format
+msgid "Associating to {what}"
+msgstr "Свръзване с {what}"
+
+#, python-brace-format
+msgid "Yo {what}!"
+msgstr "Ей {what}!"
+
+#, python-brace-format
+msgid "Just decided that {mac} needs no WiFi!"
+msgstr "Реших, че {mac} не се нуждае от WiFi!"
+
+#, python-brace-format
+msgid "Deauthenticating {mac}"
+msgstr "Неудостоверяване на {mac}"
+
+#, python-brace-format
+msgid "Kickbanning {mac}!"
+msgstr "Ритам и прогонвам {mac}!"
+
+#, python-brace-format
+msgid "Cool, we got {num} new handshake{plural}!"
+msgstr "Супер, имаме {num} нови handshake{plural}!"
+
+#, python-brace-format
+msgid "You have {count} new message{plural}!"
+msgstr "Имате {count} нови съобщения!"
+
+msgid "Ops, something went wrong ... Rebooting ..."
+msgstr "Упс, нещо се обърка ... Рестартиране ..."
+
+#, python-brace-format
+msgid "Kicked {num} stations\n"
+msgstr "Отхвърлих {num} станции\n"
+
+#, python-brace-format
+msgid "Made {num} new friends\n"
+msgstr "Направих {num} нови приятели\n"
+
+#, python-brace-format
+msgid "Got {num} handshakes\n"
+msgstr "Имам {num} handshakes\n"
+
+msgid "Met 1 peer"
+msgstr "Срещнах 1 връстник"
+
+#, python-brace-format
+msgid "Met {num} peers"
+msgstr "Срещнах {num} връстници"
+
+#, python-brace-format
+msgid ""
+"I've been pwning for {duration} and kicked {deauthed} clients! I've also met "
+"{associated} new friends and ate {handshakes} handshakes! #pwnagotchi "
+"#pwnlog #pwnlife #hacktheplanet #skynet"
+msgstr "Аз pwn-вах за {duration} и отхвърлих {deauthed} clients! Също така срещнах {associated} нови приятели и изядох {handshakes} handshakes! #pwnagotchi "
+"#pwnlog #pwnlife #hacktheplanet #skynet"
+
+msgid "hours"
+msgstr "часове"
+
+msgid "minutes"
+msgstr "минути"
+
+msgid "seconds"
+msgstr "секунди"
+
+msgid "hour"
+msgstr "час"
+
+msgid "minute"
+msgstr "минута"
+
+msgid "second"
+msgstr "секунда"

pwnagotchi/locale/ch/LC_MESSAGES/voice.po

@@ -0,0 +1,225 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <511225068@qq.com>, 2019.
+# 还有很多未翻译和翻译不准确，后期希望大家加入进来一起翻译！
+# 翻译可以联系QQ群：959559103 找 名字叫 初九 的 管理员
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-10-23 20:56+0200\n"
+"PO-Revision-Date: 2019-11-02 10:00+0008\n"
+"Last-Translator: 极客之眼-初九 <511225068@qq.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: chinese\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "ZzzzZZzzzzZzzz"
+msgstr ""
+
+msgid "Hi, I'm Pwnagotchi! Starting ..."
+msgstr "主人，你好.我是WiFi狩猎兽..."
+
+msgid "New day, new hunt, new pwns!"
+msgstr "美好的一天，狩猎开始!"
+
+msgid "Hack the Planet!"
+msgstr "我要入侵整个地球!"
+
+msgid "AI ready."
+msgstr "人工智能已启动."
+
+msgid "The neural network is ready."
+msgstr "神经元网络已启动."
+
+msgid "Generating keys, do not turn off ..."
+msgstr "创建密钥中, 请勿断电..."
+
+#, python-brace-format
+msgid "Hey, channel {channel} is free! Your AP will say thanks."
+msgstr ""
+
+msgid "I'm bored ..."
+msgstr "我无聊了..."
+
+msgid "Let's go for a walk!"
+msgstr "主人带我出门走走吧!"
+
+msgid "This is the best day of my life!"
+msgstr "这是我生命中最美好的一天!"
+
+msgid "Shitty day :/"
+msgstr "今天不开心 :/"
+
+msgid "I'm extremely bored ..."
+msgstr "主人，找点事做吧 ..."
+
+msgid "I'm very sad ..."
+msgstr "我很伤心..."
+
+msgid "I'm sad"
+msgstr "我伤心了"
+
+msgid "I'm living the life!"
+msgstr ""
+
+msgid "I pwn therefore I am."
+msgstr ""
+
+msgid "So many networks!!!"
+msgstr "哇，好多猎物!!!"
+
+msgid "I'm having so much fun!"
+msgstr "我玩的好开心!"
+
+msgid "My crime is that of curiosity ..."
+msgstr "我最大的缺点就是好奇..."
+
+#, python-brace-format
+msgid "Hello {name}! Nice to meet you."
+msgstr "你好{name}!很高兴认识你."
+
+#, python-brace-format
+msgid "Unit {name} is nearby!"
+msgstr ""
+
+#, python-brace-format
+msgid "Uhm ... goodbye {name}"
+msgstr "额 ... 再见{name}"
+
+#, python-brace-format
+msgid "{name} is gone ..."
+msgstr "{name} 它走了 ..."
+
+#, python-brace-format
+msgid "Whoops ... {name} is gone."
+msgstr "哎呀... {name} 离开了."
+
+#, python-brace-format
+msgid "{name} missed!"
+msgstr "刚刚错过了{name}!"
+
+msgid "Missed!"
+msgstr "刚刚错过了一个对的它"
+
+msgid "Good friends are a blessing!"
+msgstr "有个好朋友就是福气"
+
+msgid "I love my friends!"
+msgstr "我爱我的朋友!"
+
+msgid "Nobody wants to play with me ..."
+msgstr "没有人愿意和我玩耍..."
+
+msgid "I feel so alone ..."
+msgstr "我可能是天煞孤星..."
+
+msgid "Where's everybody?!"
+msgstr "朋友们都去哪里了?!"
+
+#, python-brace-format
+msgid "Napping for {secs}s ..."
+msgstr "小憩{secs}s ..."
+
+msgid "Zzzzz"
+msgstr ""
+
+#, python-brace-format
+msgid "ZzzZzzz ({secs}s)"
+msgstr ""
+
+msgid "Good night."
+msgstr "晚安宝贝."
+
+msgid "Zzz"
+msgstr ""
+
+#, python-brace-format
+msgid "Waiting for {secs}s ..."
+msgstr "等待{secs}s ..."
+
+#, python-brace-format
+msgid "Looking around ({secs}s)"
+msgstr "追踪四周猎物({secs}s)"
+
+#, python-brace-format
+msgid "Hey {what} let's be friends!"
+msgstr "嗨{what}我们做朋友吧!"
+
+#, python-brace-format
+msgid "Associating to {what}"
+msgstr "正在连接到{what}"
+
+#, python-brace-format
+msgid "Yo {what}!"
+msgstr "追踪到你了{what}!"
+
+#, python-brace-format
+msgid "Just decided that {mac} needs no WiFi!"
+msgstr "猎物{mac}不需要联网，我们给它断开!"
+
+#, python-brace-format
+msgid "Deauthenticating {mac}"
+msgstr "开始攻击猎物{mac}"
+
+#, python-brace-format
+msgid "Kickbanning {mac}!"
+msgstr "已捕获{mac}!"
+
+#, python-brace-format
+msgid "Cool, we got {num} new handshake{plural}!"
+msgstr "太酷了, 我们抓到了{num}新的猎物{plural}!"
+
+#, python-brace-format
+msgid "You have {count} new message{plural}!"
+msgstr "主人，有{count}新消息{plural}!"
+
+msgid "Ops, something went wrong ... Rebooting ..."
+msgstr "行动,额等等有点小问题... 重启ing ..."
+
+#, python-brace-format
+msgid "Kicked {num} stations\n"
+msgstr "限制了{num}个猎物\n"
+
+#, python-brace-format
+msgid "Made {num} new friends\n"
+msgstr "交了{num}新朋友\n"
+
+#, python-brace-format
+msgid "Got {num} handshakes\n"
+msgstr "捕获了{num}握手包\n"
+
+msgid "Met 1 peer"
+msgstr ""
+
+#, python-brace-format
+msgid "Met {num} peers"
+msgstr ""
+
+#, python-brace-format
+msgid ""
+"I've been pwning for {duration} and kicked {deauthed} clients! I've also met "
+"{associated} new friends and ate {handshakes} handshakes! #pwnagotchi "
+"#pwnlog #pwnlife #hacktheplanet #skynet"
+msgstr ""
+
+msgid "hours"
+msgstr "时"
+
+msgid "minutes"
+msgstr "分"
+
+msgid "seconds"
+msgstr "秒"
+
+msgid "hour"
+msgstr "时"
+
+msgid "minute"
+msgstr "分"
+
+msgid "second"
+msgstr "秒"

pwnagotchi/locale/de/LC_MESSAGES/voice.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-09 17:42+0200\n"
+"POT-Creation-Date: 2019-10-23 20:56+0200\n"
 "PO-Revision-Date: 2019-09-29 14:00+0200\n"
 "Last-Translator: dadav <33197631+dadav@users.noreply.github.com>\n"
 "Language-Team: DE <33197631+dadav@users.noreply.github.com>\n"
@@ -34,6 +34,9 @@ msgstr "KI bereit."
 msgid "The neural network is ready."
 msgstr "Das neurale Netz ist bereit."
 
+msgid "Generating keys, do not turn off ..."
+msgstr "Generiere Keys, nicht ausschalten ..."
+
 #, python-brace-format
 msgid "Hey, channel {channel} is free! Your AP will say thanks."
 msgstr "Hey, Channel {channel} ist frei! Dein AP wir des dir danken."
@@ -75,11 +78,11 @@ msgid "My crime is that of curiosity ..."
 msgstr "Mein Verbrechen ist das der Neugier ..."
 
 #, python-brace-format
-msgid "Hello {name}! Nice to meet you. {name}"
+msgid "Hello {name}! Nice to meet you."
 msgstr "Hallo {name}, nett Dich kennenzulernen."
 
 #, python-brace-format
-msgid "Unit {name} is nearby! {name}"
+msgid "Unit {name} is nearby!"
 msgstr "Gerät {name} ist in der nähe!!"
 
 #, python-brace-format
@@ -101,6 +104,12 @@ msgstr "{name} verpasst!"
 msgid "Missed!"
 msgstr "Verpasst!"
 
+msgid "Good friends are a blessing!"
+msgstr "Gute Freunde sind ein Segen!"
+
+msgid "I love my friends!"
+msgstr "Ich liebe meine Freunde!"
+
 msgid "Nobody wants to play with me ..."
 msgstr "Niemand will mit mir spielen ..."
 
@@ -163,6 +172,10 @@ msgstr "Kicke {mac}!"
 msgid "Cool, we got {num} new handshake{plural}!"
 msgstr "Cool, wir haben {num} neue Handshake{plural}!"
 
+#, python-brace-format
+msgid "You have {count} new message{plural}!"
+msgstr "Cool, wir haben {num} neue Handshake{plural}!"
+
 msgid "Ops, something went wrong ... Rebooting ..."
 msgstr "Ops, da ist etwas schief gelaufen ...Starte neu ..."
 

pwnagotchi/locale/fr/LC_MESSAGES/voice.po

@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the pwnagotchi package.
 # FIRST AUTHOR <7271496+quantumsheep@users.noreply.github.com>, 2019.
 #
-#, fuzzy
+#,
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-05 14:10+0200\n"
+"POT-Creation-Date: 2019-10-23 18:37+0200\n"
 "PO-Revision-Date: 2019-10-03 10:34+0200\n"
 "Last-Translator: quantumsheep <7271496+quantumsheep@users.noreply.github."
 "com>\n"
@@ -19,16 +19,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "ZzzzZZzzzzZzzz"
-msgstr ""
+msgstr "ZzzzZZzzzzZzzz"
 
 msgid "Hi, I'm Pwnagotchi! Starting ..."
-msgstr "Bonjour, je suis Pwnagotchi! Démarrage ..."
+msgstr "Bonjour, je suis Pwnagotchi ! Démarrage..."
 
 msgid "New day, new hunt, new pwns!"
 msgstr "Nouveau jour, nouvelle chasse, nouveaux pwns !"
 
 msgid "Hack the Planet!"
-msgstr "Hack la planète!"
+msgstr "Hack la planète !"
 
 msgid "AI ready."
 msgstr "L'IA est prête."
@@ -36,85 +36,88 @@ msgstr "L'IA est prête."
 msgid "The neural network is ready."
 msgstr "Le réseau neuronal est prêt."
 
+msgid "Generating keys, do not turn off ..."
+msgstr "Génération des clés, ne pas éteindre..."
+
 #, python-brace-format
 msgid "Hey, channel {channel} is free! Your AP will say thanks."
-msgstr "Hey, le channel {channel} est libre! Ton point d'accès va te remercier."
+msgstr "Hey, le canal {channel} est libre! Ton point d'accès va te remercier."
 
 msgid "I'm bored ..."
-msgstr "Je m'ennuie ..."
+msgstr "Je m'ennuie..."
 
 msgid "Let's go for a walk!"
-msgstr "Allons faire un tour!"
+msgstr "Allons faire un tour !"
 
 msgid "This is the best day of my life!"
-msgstr "C'est le meilleur jour de ma vie!"
+msgstr "C'est le meilleur jour de ma vie !"
 
 msgid "Shitty day :/"
 msgstr "Journée de merde :/"
 
 msgid "I'm extremely bored ..."
-msgstr "Je m'ennuie énormément ..."
+msgstr "Je m'ennuie énormément..."
 
 msgid "I'm very sad ..."
-msgstr "Je suis très triste ..."
+msgstr "Je suis très triste..."
 
 msgid "I'm sad"
 msgstr "Je suis triste"
 
 msgid "I'm living the life!"
-msgstr "Je vis la vie!"
+msgstr "Je vis la vie !"
 
 msgid "I pwn therefore I am."
 msgstr "Je pwn donc je suis."
 
 msgid "So many networks!!!"
-msgstr "Tellement de réseaux!!!"
+msgstr "Tellement de réseaux !!!"
 
 msgid "I'm having so much fun!"
-msgstr "Je m'amuse tellement!"
+msgstr "Je m'amuse tellement !"
 
 msgid "My crime is that of curiosity ..."
-msgstr "Mon crime, c'est la curiosité ..."
+msgstr "Mon crime, c'est la curiosité..."
 
 #, python-brace-format
-msgid "Hello {name}! Nice to meet you. {name}"
-msgstr "Bonjour {name}! Ravi de te rencontrer. {name}"
+msgid "Hello {name}! Nice to meet you."
+msgstr "Bonjour {name} ! Ravi de te rencontrer."
 
 #, python-brace-format
-msgid "Unit {name} is nearby! {name}"
-msgstr "L'unité {name} est proche! {name}"
+msgid "Unit {name} is nearby!"
+msgstr "L'unité {name} est proche !"
 
 #, python-brace-format
 msgid "Uhm ... goodbye {name}"
-msgstr "Hum ... au revoir {name}"
+msgstr "Hum... au revoir {name}"
 
 #, python-brace-format
 msgid "{name} is gone ..."
-msgstr "{name} est parti ..."
+msgstr "{name} est part ..."
 
 #, python-brace-format
 msgid "Whoops ... {name} is gone."
-msgstr "Oups ... {name} est parti."
+msgstr "Oups... {name} est parti."
 
 #, python-brace-format
 msgid "{name} missed!"
-msgstr "{name} raté!"
+msgstr "{name} raté !"
 
 msgid "Missed!"
-msgstr "Raté!"
+msgstr "Raté !"
 
 msgid "Nobody wants to play with me ..."
-msgstr "Personne ne veut jouer avec moi ..."
+msgstr "Personne ne veut jouer avec moi..."
 
 msgid "I feel so alone ..."
-msgstr "Je me sens si seul ..."
+msgstr "Je me sens si seul..."
 
 msgid "Where's everybody?!"
-msgstr "Où est tout le monde?!"
+msgstr "Où est tout le monde ?!"
 
 #, python-brace-format
 msgid "Napping for {secs}s ..."
-msgstr "Fais la sieste pendant {secs}s ..."
+msgstr "Fais la sieste pendant {secs}s..."
 
 msgid "Zzzzz"
 msgstr ""
@@ -123,9 +126,15 @@ msgstr ""
 msgid "ZzzZzzz ({secs}s)"
 msgstr ""
 
+msgid "Good night."
+msgstr "Bonne nuit."
+
+msgid "Zzz"
+msgstr "Zzz"
+
 #, python-brace-format
 msgid "Waiting for {secs}s ..."
-msgstr "Attends pendant {secs}s ..."
+msgstr "Attends pendant {secs}s..."
 
 #, python-brace-format
 msgid "Looking around ({secs}s)"
@@ -133,7 +142,7 @@ msgstr "Regarde autour ({secs}s)"
 
 #, python-brace-format
 msgid "Hey {what} let's be friends!"
-msgstr "Hey {what}, soyons amis!"
+msgstr "Hey {what}, soyons amis !"
 
 #, python-brace-format
 msgid "Associating to {what}"
@@ -141,11 +150,11 @@ msgstr "Association à {what}"
 
 #, python-brace-format
 msgid "Yo {what}!"
-msgstr ""
+msgstr "Yo {what} !"
 
 #, python-brace-format
 msgid "Just decided that {mac} needs no WiFi!"
-msgstr "Je viens de décider que {mac} n'a pas besoin de WiFi!"
+msgstr "Je viens de décider que {mac} n'a pas besoin de WiFi !"
 
 #, python-brace-format
 msgid "Deauthenticating {mac}"
@@ -153,14 +162,18 @@ msgstr "Désauthentification de {mac}"
 
 #, python-brace-format
 msgid "Kickbanning {mac}!"
-msgstr "Je kick et je bannis {mac}!"
+msgstr "Je kick et je bannis {mac} !"
 
 #, python-brace-format
 msgid "Cool, we got {num} new handshake{plural}!"
-msgstr "Cool, on a {num} nouveaux handshake{plural}!"
+msgstr "Cool, on a {num} nouveaux handshake{plural} !"
+
+#, python-brace-format
+msgid "You have {count} new message{plural}!"
+msgstr "Tu as {num} nouveaux message{plural} !"
 
 msgid "Ops, something went wrong ... Rebooting ..."
-msgstr "Oups, quelque chose s'est mal passé ... Redémarrage ..."
+msgstr "Oups, quelque chose s'est mal passé... Redémarrage..."
 
 #, python-brace-format
 msgid "Kicked {num} stations\n"
@@ -187,8 +200,8 @@ msgid ""
 "{associated} new friends and ate {handshakes} handshakes! #pwnagotchi "
 "#pwnlog #pwnlife #hacktheplanet #skynet"
 msgstr ""
-"J'ai pwn durant {duration} et kick {deauthed} clients! J'ai aussi rencontré "
-"{associated} nouveaux amis et dévoré {handshakes} handshakes! #pwnagotchi "
+"J'ai pwn durant {duration} et kick {deauthed} clients ! J'ai aussi rencontré "
+"{associated} nouveaux amis et dévoré {handshakes} handshakes ! #pwnagotchi "
 "#pwnlog #pwnlife #hacktheplanet #skynet"
 
 msgid "hours"

pwnagotchi/locale/voice.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-21 10:49+0200\n"
+"POT-Creation-Date: 2019-10-23 20:56+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -105,6 +105,12 @@ msgstr ""
 msgid "Missed!"
 msgstr ""
 
+msgid "Good friends are a blessing!"
+msgstr ""
+
+msgid "I love my friends!"
+msgstr ""
+
 msgid "Nobody wants to play with me ..."
 msgstr ""
 
@@ -167,6 +173,10 @@ msgstr ""
 msgid "Cool, we got {num} new handshake{plural}!"
 msgstr ""
 
+#, python-brace-format
+msgid "You have {count} new message{plural}!"
+msgstr ""
+
 msgid "Ops, something went wrong ... Rebooting ..."
 msgstr ""
 

pwnagotchi/log.py

@@ -137,7 +137,7 @@ class LastSession(object):
                                 'channel': 1,
                                 'rssi': int(rssi),
                                 'identity': pubkey,
-                                'advertisement':{
+                                'advertisement': {
                                     'name': name,
                                     'pwnd_tot': int(pwnd_tot)
                                 }})
@@ -167,11 +167,13 @@ class LastSession(object):
         self.duration_human = ', '.join(self.duration_human)
         self.avg_reward /= (self.epochs if self.epochs else 1)
 
-    def parse(self, skip=False):
+    def parse(self, ui, skip=False):
         if skip:
             logging.debug("skipping parsing of the last session logs ...")
         else:
-            logging.debug("parsing last session logs ...")
+            logging.debug("reading last session logs ...")
+
+            ui.on_reading_logs()
 
             lines = []
 
@@ -184,15 +186,24 @@ class LastSession(object):
                         lines.append(line)
                         if LastSession.START_TOKEN in line:
                             break
+
+                        lines_so_far = len(lines)
+                        if lines_so_far % 100 == 0:
+                            ui.on_reading_logs(lines_so_far)
+
                 lines.reverse()
 
             if len(lines) == 0:
                 lines.append("Initial Session");
 
+            ui.on_reading_logs()
+
             self.last_session = lines
             self.last_session_id = hashlib.md5(lines[0].encode()).hexdigest()
             self.last_saved_session_id = self._get_last_saved_session_id()
 
+            logging.debug("parsing last session logs (%d lines) ..." % len(lines))
+
             self._parse_stats()
         self.parsed = True
 

pwnagotchi/mesh/peer.py

@@ -1,17 +1,38 @@
 import time
 import logging
+import datetime
 
 import pwnagotchi.ui.faces as faces
 
 
+def parse_rfc3339(dt):
+    if dt == "0001-01-01T00:00:00Z":
+        return datetime.datetime.now()
+    return datetime.datetime.strptime(dt.split('.')[0], "%Y-%m-%dT%H:%M:%S")
+
+
 class Peer(object):
     def __init__(self, obj):
-        self.first_seen = time.time()
-        self.last_seen = self.first_seen
-        self.session_id = obj['session_id']
-        self.last_channel = obj['channel']
-        self.rssi = obj['rssi']
-        self.adv = obj['advertisement']
+        now = time.time()
+        just_met = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S")
+
+        try:
+            self.first_met = parse_rfc3339(obj.get('met_at', just_met))
+            self.first_seen = parse_rfc3339(obj.get('detected_at', just_met))
+            self.prev_seen = parse_rfc3339(obj.get('prev_seen_at', just_met))
+        except Exception as e:
+            logging.warning("error while parsing peer timestamps: %s" % e)
+            logging.debug(e, exc_info=True)
+            self.first_met = just_met
+            self.first_seen = just_met
+            self.prev_seen = just_met
+
+        self.last_seen = now  # should be seen_at
+        self.encounters = obj.get('encounters', 0)
+        self.session_id = obj.get('session_id', '')
+        self.last_channel = obj.get('channel', 1)
+        self.rssi = obj.get('rssi', 0)
+        self.adv = obj.get('advertisement', {})
 
     def update(self, new):
         if self.name() != new.name():
@@ -24,36 +45,45 @@ class Peer(object):
         self.rssi = new.rssi
         self.session_id = new.session_id
         self.last_seen = time.time()
+        self.prev_seen = new.prev_seen
+        self.first_met = new.first_met
+        self.encounters = new.encounters
 
     def inactive_for(self):
         return time.time() - self.last_seen
 
-    def _adv_field(self, name, default='???'):
-        return self.adv[name] if name in self.adv else default
+    def first_encounter(self):
+        return self.encounters == 1
+
+    def is_good_friend(self, config):
+        return self.encounters >= config['personality']['bond_encounters_factor']
 
     def face(self):
-        return self._adv_field('face', default=faces.FRIEND)
+        return self.adv.get('face', faces.FRIEND)
 
     def name(self):
-        return self._adv_field('name')
+        return self.adv.get('name', '???')
 
     def identity(self):
-        return self._adv_field('identity')
+        return self.adv.get('identity', '???')
+
+    def full_name(self):
+        return "%s@%s" % (self.name(), self.identity())
 
     def version(self):
-        return self._adv_field('version')
+        return self.adv.get('version', '1.0.0a')
 
     def pwnd_run(self):
-        return int(self._adv_field('pwnd_run', default=0))
+        return int(self.adv.get('pwnd_run', 0))
 
     def pwnd_total(self):
-        return int(self._adv_field('pwnd_tot', default=0))
+        return int(self.adv.get('pwnd_tot', 0))
 
     def uptime(self):
-        return self._adv_field('uptime', default=0)
+        return self.adv.get('uptime', 0)
 
     def epoch(self):
-        return self._adv_field('epoch', default=0)
+        return self.adv.get('epoch', 0)
 
     def full_name(self):
         return '%s@%s' % (self.name(), self.identity())

pwnagotchi/mesh/utils.py

@@ -53,11 +53,27 @@ class AsyncAdvertiser(object):
         self._advertisement['face'] = new
         grid.set_advertisement_data(self._advertisement)
 
-    def _adv_poller(self):
-        while True:
-            logging.debug("polling pwngrid-peer for peers ...")
+    def cumulative_encounters(self):
+        return sum(peer.encounters for _, peer in self._peers.items())
 
+    def _on_new_peer(self, peer):
+        logging.info("new peer %s detected (%d encounters)" % (peer.full_name(), peer.encounters))
+        self._view.on_new_peer(peer)
+        plugins.on('peer_detected', self, peer)
+
+    def _on_lost_peer(self, peer):
+        logging.info("lost peer %s" % peer.full_name())
+        self._view.on_lost_peer(peer)
+        plugins.on('peer_lost', self, peer)
+
+    def _adv_poller(self):
+        # give the system a few seconds to start the first time so that any expressions
+        # due to nearby units will be rendered properly
+        time.sleep(20)
+        while True:
             try:
+                logging.debug("polling pwngrid-peer for peers ...")
+
                 grid_peers = grid.peers()
                 new_peers = {}
 
@@ -72,24 +88,23 @@ class AsyncAdvertiser(object):
                 to_delete = []
                 for ident, peer in self._peers.items():
                     if ident not in new_peers:
-                        self._view.on_lost_peer(peer)
-                        plugins.on('peer_lost', self, peer)
                         to_delete.append(ident)
 
                 for ident in to_delete:
+                    self._on_lost_peer(self._peers[ident])
                     del self._peers[ident]
 
                 for ident, peer in new_peers.items():
                     # check who's new
                     if ident not in self._peers:
                         self._peers[ident] = peer
-                        self._view.on_new_peer(peer)
-                        plugins.on('peer_detected', self, peer)
+                        self._on_new_peer(peer)
                     # update the rest
                     else:
                         self._peers[ident].update(peer)
 
             except Exception as e:
-                logging.exception("error while polling pwngrid-peer")
+                logging.warning("error while polling pwngrid-peer: %s" % e)
+                logging.debug(e, exc_info=True)
 
-            time.sleep(1)
+            time.sleep(3)

pwnagotchi/plugins/__init__.py

@@ -7,23 +7,38 @@ default_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "defaul
 loaded = {}
 
 
-def dummy_callback():
-    pass
+class Plugin:
+    @classmethod
+    def __init_subclass__(cls, **kwargs):
+        super().__init_subclass__(**kwargs)
+        global loaded
+        plugin_name = cls.__module__.split('.')[0]
+        plugin_instance = cls()
+        logging.debug("loaded plugin %s as %s" % (plugin_name, plugin_instance))
+        loaded[plugin_name] = plugin_instance
 
 
 def on(event_name, *args, **kwargs):
-    global loaded
-    cb_name = 'on_%s' % event_name
     for plugin_name, plugin in loaded.items():
-        if cb_name in plugin.__dict__:
-            # print("calling %s %s(%s)" %(cb_name, args, kwargs))
+        one(plugin_name, event_name, *args, **kwargs)
+
+
+def one(plugin_name, event_name, *args, **kwargs):
+    global loaded
+    if plugin_name in loaded:
+        plugin = loaded[plugin_name]
+        cb_name = 'on_%s' % event_name
+        callback = getattr(plugin, cb_name, None)
+        if callback is not None and callable(callback):
             try:
-                plugin.__dict__[cb_name](*args, **kwargs)
+                callback(*args, **kwargs)
             except Exception as e:
                 logging.error("error while running %s.%s : %s" % (plugin_name, cb_name, e))
+                logging.error(e, exc_info=True)
 
 
 def load_from_file(filename):
+    logging.debug("loading %s" % filename)
     plugin_name = os.path.basename(filename.replace(".py", ""))
     spec = importlib.util.spec_from_file_location(plugin_name, filename)
     instance = importlib.util.module_from_spec(spec)
@@ -33,32 +48,33 @@ def load_from_file(filename):
 
 def load_from_path(path, enabled=()):
     global loaded
+    logging.debug("loading plugins from %s - enabled: %s" % (path, enabled))
     for filename in glob.glob(os.path.join(path, "*.py")):
-        name, plugin = load_from_file(filename)
-        if name in loaded:
-            raise Exception("plugin %s already loaded from %s" % (name, plugin.__file__))
-        elif name not in enabled:
-            # print("plugin %s is not enabled" % name)
-            pass
-        else:
-            loaded[name] = plugin
+        plugin_name = os.path.basename(filename.replace(".py", ""))
+        if plugin_name in enabled:
+            try:
+                load_from_file(filename)
+            except Exception as e:
+                logging.warning("error while loading %s: %s" % (filename, e))
+                logging.debug(e, exc_info=True)
 
     return loaded
 
 
 def load(config):
-    enabled = [name for name, options in config['main']['plugins'].items() if 'enabled' in options and options['enabled']]
-    custom_path = config['main']['custom_plugins'] if 'custom_plugins' in config['main'] else None
+    enabled = [name for name, options in config['main']['plugins'].items() if
+               'enabled' in options and options['enabled']]
+
     # load default plugins
-    loaded = load_from_path(default_path, enabled=enabled)
-    # set the options
-    for name, plugin in loaded.items():
-        plugin.__dict__['OPTIONS'] = config['main']['plugins'][name]
+    load_from_path(default_path, enabled=enabled)
+
     # load custom ones
+    custom_path = config['main']['custom_plugins'] if 'custom_plugins' in config['main'] else None
     if custom_path is not None:
-        loaded = load_from_path(custom_path, enabled=enabled)
-        # set the options
-        for name, plugin in loaded.items():
-            plugin.__dict__['OPTIONS'] = config['main']['plugins'][name]
+        load_from_path(custom_path, enabled=enabled)
+
+    # propagate options
+    for name, plugin in loaded.items():
+        plugin.options = config['main']['plugins'][name]
 
     on('loaded')

pwnagotchi/plugins/default/AircrackOnly.py

@@ -1,57 +1,57 @@
-__author__ = 'pwnagotchi [at] rossmarks [dot] uk'
-__version__ = '1.0.0'
-__name__ = 'AircrackOnly'
-__license__ = 'GPL3'
-__description__ = 'confirm pcap contains handshake/PMKID or delete it'
+import pwnagotchi.plugins as plugins
+
+import logging
+import subprocess
+import string
+import os
 
 '''
 Aircrack-ng needed, to install:
 > apt-get install aircrack-ng
 '''
 
-import logging
-import subprocess
-import string
-import re
-import os
 
-OPTIONS = dict()
+class AircrackOnly(plugins.Plugin):
+    __author__ = 'pwnagotchi [at] rossmarks [dot] uk'
+    __version__ = '1.0.1'
+    __license__ = 'GPL3'
+    __description__ = 'confirm pcap contains handshake/PMKID or delete it'
 
-def on_loaded():
-    logging.info("cleancap plugin loaded")
+    def __init__(self):
+        super().__init__(self)
+        self.text_to_set = ""
 
-def on_handshake(agent, filename, access_point, client_station):
-    display = agent._view
-    todelete = 0
+    def on_loaded(self):
+        logging.info("aircrackonly plugin loaded")
 
-    result = subprocess.run(('/usr/bin/aircrack-ng '+ filename +' | grep "1 handshake" | awk \'{print $2}\''),shell=True, stdout=subprocess.PIPE)
-    result = result.stdout.decode('utf-8').translate({ord(c) :None for c in string.whitespace})
-    if result:
-        logging.info("[AircrackOnly] contains handshake")
-    else:
-        todetele = 1
+    def on_handshake(self, agent, filename, access_point, client_station):
+        display = agent._view
+        todelete = 0
 
-    if todelete == 0:
-        result = subprocess.run(('/usr/bin/aircrack-ng '+ filename +' | grep "PMKID" | awk \'{print $2}\''),shell=True, stdout=subprocess.PIPE)
-        result = result.stdout.decode('utf-8').translate({ord(c) :None for c in string.whitespace})
+        result = subprocess.run(('/usr/bin/aircrack-ng ' + filename + ' | grep "1 handshake" | awk \'{print $2}\''),
+                                shell=True, stdout=subprocess.PIPE)
+        result = result.stdout.decode('utf-8').translate({ord(c): None for c in string.whitespace})
         if result:
-            logging.info("[AircrackOnly] contains PMKID")
+            logging.info("[AircrackOnly] contains handshake")
         else:
-            todetele = 1
+            todelete = 1
 
-    if todelete == 1:
-        os.remove(filename)
-        set_text("uncrackable pcap")
-        display.update(force=True)
+        if todelete == 0:
+            result = subprocess.run(('/usr/bin/aircrack-ng ' + filename + ' | grep "PMKID" | awk \'{print $2}\''),
+                                    shell=True, stdout=subprocess.PIPE)
+            result = result.stdout.decode('utf-8').translate({ord(c): None for c in string.whitespace})
+            if result:
+                logging.info("[AircrackOnly] contains PMKID")
+            else:
+                todelete = 1
 
-text_to_set = "";
-def set_text(text):
-    global text_to_set
-    text_to_set = text
+        if todelete == 1:
+            os.remove(filename)
+            self.text_to_set = "Removed an uncrackable pcap"
+            display.update(force=True)
 
-def on_ui_update(ui):
-    global text_to_set
-    if text_to_set:
-        ui.set('face', "(>.<)")
-        ui.set('status', text_to_set)
-        text_to_set = ""
+    def on_ui_update(self, ui):
+        if self.text_to_set:
+            ui.set('face', "(>.<)")
+            ui.set('status', self.text_to_set)
+            self.text_to_set = ""

pwnagotchi/plugins/default/auto-backup.py

@@ -1,46 +1,47 @@
-__author__ = '33197631+dadav@users.noreply.github.com'
-__version__ = '1.0.0'
-__name__ = 'auto-backup'
-__license__ = 'GPL3'
-__description__ = 'This plugin backups files when internet is availaible.'
-
+import pwnagotchi.plugins as plugins
 from pwnagotchi.utils import StatusFile
 import logging
 import os
 import subprocess
 
-OPTIONS = dict()
-READY = False
-STATUS = StatusFile('/root/.auto-backup')
 
+class AutoBackup(plugins.Plugin):
+    __author__ = '33197631+dadav@users.noreply.github.com'
+    __version__ = '1.0.0'
+    __license__ = 'GPL3'
+    __description__ = 'This plugin backups files when internet is available.'
 
-def on_loaded():
-    global READY
+    def __init__(self):
+        self.ready = False
+        self.status = StatusFile('/root/.auto-backup')
 
-    if 'files' not in OPTIONS or ('files' in OPTIONS and OPTIONS['files'] is None):
-        logging.error("AUTO-BACKUP: No files to backup.")
-        return
-
-    if 'interval' not in OPTIONS or ('interval' in OPTIONS and OPTIONS['interval'] is None):
-        logging.error("AUTO-BACKUP: Interval is not set.")
-        return
-
-    if 'commands' not in OPTIONS or ('commands' in OPTIONS and OPTIONS['commands'] is None):
-        logging.error("AUTO-BACKUP: No commands given.")
-        return
-
-    READY = True
-    logging.info("AUTO-BACKUP: Successfuly loaded.")
-
-
-def on_internet_available(agent):
-    global STATUS
-
-    if READY:
-        if STATUS.newer_then_days(OPTIONS['interval']):
+    def on_loaded(self):
+        if 'files' not in self.options or ('files' in self.options and self.options['files'] is None):
+            logging.error("AUTO-BACKUP: No files to backup.")
             return
 
-        files_to_backup = " ".join(OPTIONS['files'])
+        if 'interval' not in self.options or ('interval' in self.options and self.options['interval'] is None):
+            logging.error("AUTO-BACKUP: Interval is not set.")
+            return
+
+        if 'commands' not in self.options or ('commands' in self.options and self.options['commands'] is None):
+            logging.error("AUTO-BACKUP: No commands given.")
+            return
+
+        self.ready = True
+        logging.info("AUTO-BACKUP: Successfully loaded.")
+
+    def on_internet_available(self, agent):
+        if not self.ready:
+            return
+
+        if self.status.newer_then_days(self.options['interval']):
+            return
+
+        # Only backup existing files to prevent errors
+        existing_files = list(filter(lambda f: os.path.exists(f), self.options['files']))
+        files_to_backup = " ".join(existing_files)
+
         try:
             display = agent.view()
 
@@ -48,18 +49,19 @@ def on_internet_available(agent):
             display.set('status', 'Backing up ...')
             display.update()
 
-            for cmd in OPTIONS['commands']:
+            for cmd in self.options['commands']:
                 logging.info(f"AUTO-BACKUP: Running {cmd.format(files=files_to_backup)}")
                 process = subprocess.Popen(cmd.format(files=files_to_backup), shell=True, stdin=None,
-                                          stdout=open("/dev/null", "w"), stderr=None, executable="/bin/bash")
+                                           stdout=open("/dev/null", "w"), stderr=None, executable="/bin/bash")
                 process.wait()
                 if process.returncode > 0:
                     raise OSError(f"Command failed (rc: {process.returncode})")
 
             logging.info("AUTO-BACKUP: backup done")
-            STATUS.update()
+            display.set('status', 'Backup done!')
+            display.update()
+            self.status.update()
         except OSError as os_e:
             logging.info(f"AUTO-BACKUP: Error: {os_e}")
-
-        display.set('status', 'Backup done!')
-        display.update()
+            display.set('status', 'Backup failed!')
+            display.update()

pwnagotchi/plugins/default/auto-update.py

@@ -1,10 +1,5 @@
-__author__ = 'evilsocket@gmail.com'
-__version__ = '1.1.0'
-__name__ = 'auto-update'
-__license__ = 'GPL3'
-__description__ = 'This plugin checks when updates are available and applies them when internet is available.'
-
 import os
+import re
 import logging
 import subprocess
 import requests
@@ -14,21 +9,9 @@ import glob
 import pkg_resources
 
 import pwnagotchi
+import pwnagotchi.plugins as plugins
 from pwnagotchi.utils import StatusFile
 
-OPTIONS = dict()
-READY = False
-STATUS = StatusFile('/root/.auto-update')
-
-
-def on_loaded():
-    global READY
-    if 'interval' not in OPTIONS or ('interval' in OPTIONS and OPTIONS['interval'] is None):
-        logging.error("[update] main.plugins.auto-update.interval is not set")
-        return
-    READY = True
-    logging.info("[update] plugin loaded.")
-
 
 def check(version, repo, native=True):
     logging.debug("checking remote version for %s, local is %s" % (repo, version))
@@ -142,19 +125,47 @@ def install(display, update):
         if not os.path.exists(source_path):
             source_path = "%s-%s" % (source_path, update['available'])
 
+        # setup.py is going to install data files for us
         os.system("cd %s && pip3 install ." % source_path)
 
     return True
 
 
-def on_internet_available(agent):
-    global STATUS
+def parse_version(cmd):
+    out = subprocess.getoutput(cmd)
+    for part in out.split(' '):
+        part = part.replace('v', '').strip()
+        if re.search(r'^\d+\.\d+\.\d+.*$', part):
+            return part
+    raise Exception('could not parse version from "%s": output=\n%s' % (cmd, out))
 
-    logging.debug("[update] internet connectivity is available (ready %s)" % READY)
 
-    if READY:
-        if STATUS.newer_then_hours(OPTIONS['interval']):
-            logging.debug("[update] last check happened less than %d hours ago" % OPTIONS['interval'])
+class AutoUpdate(plugins.Plugin):
+    __author__ = 'evilsocket@gmail.com'
+    __version__ = '1.1.1'
+    __name__ = 'auto-update'
+    __license__ = 'GPL3'
+    __description__ = 'This plugin checks when updates are available and applies them when internet is available.'
+
+    def __init__(self):
+        self.ready = False
+        self.status = StatusFile('/root/.auto-update')
+
+    def on_loaded(self):
+        if 'interval' not in self.options or ('interval' in self.options and self.options['interval'] is None):
+            logging.error("[update] main.plugins.auto-update.interval is not set")
+            return
+        self.ready = True
+        logging.info("[update] plugin loaded.")
+
+    def on_internet_available(self, agent):
+        logging.debug("[update] internet connectivity is available (ready %s)" % self.ready)
+
+        if not self.ready:
+            return
+
+        if self.status.newer_then_hours(self.options['interval']):
+            logging.debug("[update] last check happened less than %d hours ago" % self.options['interval'])
             return
 
         logging.info("[update] checking for updates ...")
@@ -167,16 +178,17 @@ def on_internet_available(agent):
 
             to_install = []
             to_check = [
-                ('bettercap/bettercap', subprocess.getoutput('bettercap -version').split(' ')[1].replace('v', ''),
-                 True, 'bettercap'),
-                ('evilsocket/pwngrid', subprocess.getoutput('pwngrid -version').replace('v', ''), True, 'pwngrid-peer'),
+                ('bettercap/bettercap', parse_version('bettercap -version'), True, 'bettercap'),
+                ('evilsocket/pwngrid', parse_version('pwngrid -version'), True, 'pwngrid-peer'),
                 ('evilsocket/pwnagotchi', pwnagotchi.version, False, 'pwnagotchi')
             ]
 
             for repo, local_version, is_native, svc_name in to_check:
                 info = check(local_version, repo, is_native)
                 if info['url'] is not None:
-                    logging.warning("update for %s available: %s" % (repo, info['url']))
+                    logging.warning(
+                        "update for %s available (local version is '%s'): %s" % (
+                            repo, info['current'], info['url']))
                     info['service'] = svc_name
                     to_install.append(info)
 
@@ -184,7 +196,7 @@ def on_internet_available(agent):
             num_installed = 0
 
             if num_updates > 0:
-                if OPTIONS['install']:
+                if self.options['install']:
                     for update in to_install:
                         if install(display, update):
                             num_installed += 1
@@ -193,7 +205,7 @@ def on_internet_available(agent):
 
             logging.info("[update] done")
 
-            STATUS.update()
+            self.status.update()
 
             if num_installed > 0:
                 display.update(force=True, new_data={'status': 'Rebooting ...'})

pwnagotchi/plugins/default/bt-tether.py

@@ -1,9 +1,3 @@
-__author__ = '33197631+dadav@users.noreply.github.com'
-__version__ = '1.0.0'
-__name__ = 'bt-tether'
-__license__ = 'GPL3'
-__description__ = 'This makes the display reachable over bluetooth'
-
 import os
 import time
 import re
@@ -14,10 +8,7 @@ from pwnagotchi.ui.components import LabeledValue
 from pwnagotchi.ui.view import BLACK
 import pwnagotchi.ui.fonts as fonts
 from pwnagotchi.utils import StatusFile
-
-READY = False
-INTERVAL = StatusFile('/root/.bt-tether')
-OPTIONS = dict()
+import pwnagotchi.plugins as plugins
 
 
 class BTError(Exception):
@@ -26,6 +17,7 @@ class BTError(Exception):
     """
     pass
 
+
 class BTNap:
     """
     This class creates a bluetooth connection to the specified bt-mac
@@ -41,7 +33,6 @@ class BTNap:
     def __init__(self, mac):
         self._mac = mac
 
-
     @staticmethod
     def get_bus():
         """
@@ -59,9 +50,9 @@ class BTNap:
         """
         manager = getattr(BTNap.get_manager, 'cached_obj', None)
         if not manager:
-                manager = BTNap.get_manager.cached_obj = dbus.Interface(
-                        BTNap.get_bus().get_object(BTNap.IFACE_BASE, '/'),
-                        'org.freedesktop.DBus.ObjectManager' )
+            manager = BTNap.get_manager.cached_obj = dbus.Interface(
+                BTNap.get_bus().get_object(BTNap.IFACE_BASE, '/'),
+                'org.freedesktop.DBus.ObjectManager')
         return manager
 
     @staticmethod
@@ -82,7 +73,6 @@ class BTNap:
             iface = obj.dbus_interface
         return obj.Set(iface, k, v, dbus_interface=BTNap.IFACE_PROPS)
 
-
     @staticmethod
     def find_adapter(pattern=None):
         """
@@ -98,14 +88,14 @@ class BTNap:
         """
         bus, obj = BTNap.get_bus(), None
         for path, ifaces in objects.items():
-                adapter = ifaces.get(BTNap.IFACE_ADAPTER)
-                if adapter is None:
-                    continue
-                if not pattern or pattern == adapter['Address'] or path.endswith(pattern):
-                        obj = bus.get_object(BTNap.IFACE_BASE, path)
-                        yield dbus.Interface(obj, BTNap.IFACE_ADAPTER)
+            adapter = ifaces.get(BTNap.IFACE_ADAPTER)
+            if adapter is None:
+                continue
+            if not pattern or pattern == adapter['Address'] or path.endswith(pattern):
+                obj = bus.get_object(BTNap.IFACE_BASE, path)
+                yield dbus.Interface(obj, BTNap.IFACE_ADAPTER)
         if obj is None:
-                raise BTError('Bluetooth adapter not found')
+            raise BTError('Bluetooth adapter not found')
 
     @staticmethod
     def find_device(device_address, adapter_pattern=None):
@@ -132,7 +122,7 @@ class BTNap:
             device = ifaces.get(BTNap.IFACE_DEV)
             if device is None:
                 continue
-            if str(device['Address']) == device_address and path.startswith(path_prefix):
+            if str(device['Address']).lower() == device_address.lower() and path.startswith(path_prefix):
                 obj = bus.get_object(BTNap.IFACE_BASE, path)
                 return dbus.Interface(obj, BTNap.IFACE_DEV)
         raise BTError('Bluetooth device not found')
@@ -141,9 +131,14 @@ class BTNap:
         """
         Set power of devices to on/off
         """
+        logging.debug("BT-TETHER: Changing bluetooth device to %s", str(on))
 
-        devs = list(BTNap.find_adapter())
-        devs = dict((BTNap.prop_get(dev, 'Address'), dev) for dev in devs)
+        try:
+            devs = list(BTNap.find_adapter())
+            devs = dict((BTNap.prop_get(dev, 'Address'), dev) for dev in devs)
+        except BTError as bt_err:
+            logging.error(bt_err)
+            return None
 
         for dev_addr, dev in devs.items():
             BTNap.prop_set(dev, 'Powered', on)
@@ -154,37 +149,24 @@ class BTNap:
 
         return None
 
-    def is_connected(self):
-        """
-        Check if already connected
-        """
-        bt_dev = self.power(True)
-
-        if not bt_dev:
-            return False
-
-        try:
-            dev_remote = BTNap.find_device(self._mac, bt_dev)
-            return bool(BTNap.prop_get(dev_remote, 'Connected'))
-        except BTError:
-            pass
-        return False
-
 
     def is_paired(self):
         """
         Check if already connected
         """
+        logging.debug("BT-TETHER: Checking if device is paired")
+
         bt_dev = self.power(True)
 
         if not bt_dev:
+            logging.debug("BT-TETHER: No bluetooth device found.")
             return False
 
         try:
             dev_remote = BTNap.find_device(self._mac, bt_dev)
             return bool(BTNap.prop_get(dev_remote, 'Paired'))
         except BTError:
-            pass
+            logging.debug("BT-TETHER: Device is not paired.")
         return False
 
     def wait_for_device(self, timeout=15):
@@ -193,17 +175,20 @@ class BTNap:
 
         returns device if found None if not
         """
+        logging.debug("BT-TETHER: Waiting for device")
+
         bt_dev = self.power(True)
 
         if not bt_dev:
+            logging.debug("BT-TETHER: No bluetooth device found.")
             return None
 
         try:
+            logging.debug("BT-TETHER: Starting discovery ...")
             bt_dev.StartDiscovery()
-        except Exception:
-            # can fail with org.bluez.Error.NotReady / org.bluez.Error.Failed
-            # TODO: add loop?
-            pass
+        except Exception as bt_ex:
+            logging.error(bt_ex)
+            raise bt_ex
 
         dev_remote = None
 
@@ -211,73 +196,64 @@ class BTNap:
         while timeout > -1:
             try:
                 dev_remote = BTNap.find_device(self._mac, bt_dev)
-                logging.debug('Using remote device (addr: %s): %s',
-                    BTNap.prop_get(dev_remote, 'Address'), dev_remote.object_path )
+                logging.debug("BT-TETHER: Using remote device (addr: %s): %s",
+                              BTNap.prop_get(dev_remote, 'Address'), dev_remote.object_path)
                 break
             except BTError:
-                pass
+                logging.debug("BT-TETHER: Not found yet ...")
 
             time.sleep(1)
             timeout -= 1
 
         try:
+            logging.debug("BT-TETHER: Stopping Discovery ...")
             bt_dev.StopDiscovery()
-        except Exception:
-            # can fail with org.bluez.Error.NotReady / org.bluez.Error.Failed / org.bluez.Error.NotAuthorized
-            pass
+        except Exception as bt_ex:
+            logging.error(bt_ex)
+            raise bt_ex
 
         return dev_remote
 
-
-    def connect(self, reconnect=False):
-        """
-        Connect to device
-
-        return True if connected; False if failed
-        """
-
-        # check if device is close
-        dev_remote = self.wait_for_device()
-
-        if not dev_remote:
-            return False
-
+    @staticmethod
+    def pair(device):
+        logging.debug('BT-TETHER: Trying to pair ...')
         try:
-            dev_remote.Pair()
+            device.Pair()
             logging.info('BT-TETHER: Successful paired with device ;)')
-            time.sleep(10) # wait for bnep0
-        except Exception:
-            # can fail because of AlreadyExists etc.
-            pass
-
-        try:
-            dev_remote.ConnectProfile('nap')
-        except Exception:
-            pass
-
-        net = dbus.Interface(dev_remote, 'org.bluez.Network1')
-
-        try:
-            net.Connect('nap')
+            return True
         except dbus.exceptions.DBusException as err:
-            if err.get_dbus_name() != 'org.bluez.Error.Failed':
-                raise
+            if err.get_dbus_name() == 'org.bluez.Error.AlreadyExists':
+                logging.debug('BT-TETHER: Already paired ...')
+                return True
+        except Exception:
+            pass
+        return False
+
+    @staticmethod
+    def nap(device):
+        logging.debug('BT-TETHER: Trying to nap ...')
+
+        try:
+            logging.debug('BT-TETHER: Connecting to profile ...')
+            device.ConnectProfile('nap')
+        except Exception:  # raises exception, but still works
+            pass
+
+        net = dbus.Interface(device, 'org.bluez.Network1')
+
+        try:
+            logging.debug('BT-TETHER: Connecting to nap network ...')
+            net.Connect('nap')
+            return net, True
+        except dbus.exceptions.DBusException as err:
+            if err.get_dbus_name() == 'org.bluez.Error.AlreadyConnected':
+                return net, True
 
             connected = BTNap.prop_get(net, 'Connected')
-
             if not connected:
-                return False
+                return None, False
+            return net, True
 
-            if reconnect:
-                net.Disconnect()
-                return self.connect(reconnect=False)
-
-            return True
-
-
-#################################################
-#################################################
-#################################################
 
 class SystemdUnitWrapper:
     """
@@ -290,7 +266,7 @@ class SystemdUnitWrapper:
     @staticmethod
     def _action_on_unit(action, unit):
         process = subprocess.Popen(f"systemctl {action} {unit}", shell=True, stdin=None,
-                                  stdout=open("/dev/null", "w"), stderr=None, executable="/bin/bash")
+                                   stdout=open("/dev/null", "w"), stderr=None, executable="/bin/bash")
         process.wait()
         if process.returncode > 0:
             return False
@@ -302,7 +278,7 @@ class SystemdUnitWrapper:
         Calls systemctl daemon-reload
         """
         process = subprocess.Popen("systemctl daemon-reload", shell=True, stdin=None,
-                                  stdout=open("/dev/null", "w"), stderr=None, executable="/bin/bash")
+                                   stdout=open("/dev/null", "w"), stderr=None, executable="/bin/bash")
         process.wait()
         if process.returncode > 0:
             return False
@@ -380,24 +356,23 @@ class IfaceWrapper:
         """
         return open(f"{self.path}/operstate", 'r').read().rsplit('\n') == 'up'
 
-
     def set_addr(self, addr):
         """
         Set the netmask
         """
         process = subprocess.Popen(f"ip addr add {addr} dev {self.iface}", shell=True, stdin=None,
-                                  stdout=open("/dev/null", "w"), stderr=None, executable="/bin/bash")
+                                   stdout=open("/dev/null", "w"), stderr=None, executable="/bin/bash")
         process.wait()
 
-        if process.returncode == 2 or process.returncode == 0: # 2 = already set
+        if process.returncode == 2 or process.returncode == 0:  # 2 = already set
             return True
 
         return False
 
     @staticmethod
-    def set_route(addr):
-        process = subprocess.Popen(f"ip route replace default via {addr}", shell=True, stdin=None,
-                                  stdout=open("/dev/null", "w"), stderr=None, executable="/bin/bash")
+    def set_route(gateway, device):
+        process = subprocess.Popen(f"ip route replace default via {gateway} dev {device}", shell=True, stdin=None,
+                                   stdout=open("/dev/null", "w"), stderr=None, executable="/bin/bash")
         process.wait()
 
         if process.returncode > 0:
@@ -406,91 +381,179 @@ class IfaceWrapper:
         return True
 
 
+class Device:
+    def __init__(self, name, share_internet, mac, ip, netmask, interval, priority=10, scantime=15, search_order=0, max_tries=0, **kwargs):
+        self.name = name
+        self.status = StatusFile(f'/root/.bt-tether-{name}')
+        self.status.update()
+        self.tries = 0
+        self.network = None
 
-def on_loaded():
-    """
-    Gets called when the plugin gets loaded
-    """
-    global READY
-    global INTERVAL
+        self.max_tries = max_tries
+        self.search_order = search_order
+        self.share_internet = share_internet
+        self.ip = ip
+        self.netmask = netmask
+        self.interval = interval
+        self.mac = mac
+        self.scantime = scantime
+        self.priority = priority
 
-    for opt in ['share_internet', 'mac', 'ip', 'netmask', 'interval']:
-        if opt not in OPTIONS or (opt in OPTIONS and OPTIONS[opt] is None):
-            logging.error("BT-TET: Pleace specify the %s in your config.yml.", opt)
+    def connected(self):
+        """
+        Checks if device is connected
+        """
+        return self.network and BTNap.prop_get(self.network, 'Connected')
+
+    def interface(self):
+        """
+        Returns the interface name or None
+        """
+        if not self.connected():
+            return None
+        return BTNap.prop_get(self.network, 'Interface')
+
+
+class BTTether(plugins.Plugin):
+    __author__ = '33197631+dadav@users.noreply.github.com'
+    __version__ = '1.0.0'
+    __license__ = 'GPL3'
+    __description__ = 'This makes the display reachable over bluetooth'
+
+    def __init__(self):
+        self.ready = False
+        self.options = dict()
+        self.devices = dict()
+
+    def on_loaded(self):
+        # new config
+        if 'devices' in self.options:
+            for device, options in self.options['devices'].items():
+                for device_opt in ['enabled', 'priority', 'scantime', 'search_order', 'max_tries', 'share_internet', 'mac', 'ip', 'netmask', 'interval']:
+                    if device_opt not in options or (device_opt in options and options[device_opt] is None):
+                        logging.error("BT-TET: Pleace specify the %s for device %s.", device_opt, device)
+                        break
+                else:
+                    if options['enabled']:
+                        self.devices[device] = Device(name=device, **options)
+
+        # legacy
+        if 'mac' in self.options:
+            for opt in ['share_internet', 'mac', 'ip', 'netmask', 'interval']:
+                if opt not in self.options or (opt in self.options and self.options[opt] is None):
+                    logging.error("BT-TET: Please specify the %s in your config.yml.", opt)
+                    return
+
+            self.devices['legacy'] = Device(name='legacy', **self.options)
+
+        if not self.devices:
+            logging.error("BT-TET: No valid devices found")
             return
 
-    # ensure bluetooth is running
-    bt_unit = SystemdUnitWrapper('bluetooth.service')
-    if not bt_unit.is_active():
-        if not bt_unit.start():
-            logging.error("BT-TET: Can't start bluetooth.service")
+        # ensure bluetooth is running
+        bt_unit = SystemdUnitWrapper('bluetooth.service')
+        if not bt_unit.is_active():
+            if not bt_unit.start():
+                logging.error("BT-TET: Can't start bluetooth.service")
+                return
+
+        self.ready = True
+
+    def on_ui_setup(self, ui):
+        ui.add_element('bluetooth', LabeledValue(color=BLACK, label='BT', value='-', position=(ui.width() / 2 - 15, 0),
+                                                 label_font=fonts.Bold, text_font=fonts.Medium))
+
+    def on_ui_update(self, ui):
+        if not self.ready:
             return
 
-    INTERVAL.update()
-    READY = True
+        devices_to_try = list()
+        connected_priorities = list()
+        any_device_connected = False # if this is true, last status on screen should be C
 
+        for _, device in self.devices.items():
+            if device.connected():
+                connected_priorities.append(device.priority)
+                any_device_connected = True
+                continue
 
-def on_ui_update(ui):
-    """
-    Try to connect to device
-    """
+            if not device.max_tries or (device.max_tries > device.tries):
+                if not device.status.newer_then_minutes(device.interval):
+                    devices_to_try.append(device)
+                    device.status.update()
+                    device.tries += 1
 
-    if READY:
-        global INTERVAL
-        if INTERVAL.newer_then_minutes(OPTIONS['interval']):
-            return
+        sorted_devices = sorted(devices_to_try, key=lambda x: x.search_order)
 
-        INTERVAL.update()
+        for device in sorted_devices:
+            bt = BTNap(device.mac)
 
-        bt = BTNap(OPTIONS['mac'])
-
-        logging.debug('BT-TETHER: Check if already connected and paired')
-        if bt.is_connected() and bt.is_paired():
-            logging.debug('BT-TETHER: Already connected and paired')
-            ui.set('bluetooth', 'CON')
-        else:
-            logging.debug('BT-TETHER: Try to connect to mac')
-            if bt.connect():
-                logging.info('BT-TETHER: Successfuly connected')
-            else:
-                logging.error('BT-TETHER: Could not connect')
+            try:
+                logging.info('BT-TETHER: Search %d secs for %s ...', device.scantime, device.name)
+                dev_remote = bt.wait_for_device(timeout=device.scantime)
+                if dev_remote is None:
+                    logging.info('BT-TETHER: Could not find %s, try again in %d minutes.', device.name, device.interval)
+                    ui.set('bluetooth', 'NF')
+                    continue
+            except Exception as bt_ex:
+                logging.error(bt_ex)
                 ui.set('bluetooth', 'NF')
-                return
+                continue
 
-        btnap_iface = IfaceWrapper('bnep0')
-        logging.debug('BT-TETHER: Check interface')
-        if btnap_iface.exists():
-            logging.debug('BT-TETHER: Interface found')
-
-            # check ip
-            addr = f"{OPTIONS['ip']}/{OPTIONS['netmask']}"
-
-            logging.debug('BT-TETHER: Try to set ADDR to interface')
-            if not btnap_iface.set_addr(addr):
-                ui.set('bluetooth', 'ERR1')
-                logging.error("BT-TETHER: Could not set ip of bnep0 to %s", addr)
-                return
+            paired = bt.is_paired()
+            if not paired:
+                if BTNap.pair(dev_remote):
+                    logging.info('BT-TETHER: Paired with %s.', device.name)
+                else:
+                    logging.info('BT-TETHER: Pairing with %s failed ...', device.name)
+                    ui.set('bluetooth', 'PE')
+                    continue
             else:
-                logging.debug('BT-TETHER: Set ADDR to interface')
-
-            # change route if sharking
-            if OPTIONS['share_internet']:
-                logging.debug('BT-TETHER: Set routing and change resolv.conf')
-                IfaceWrapper.set_route(".".join(OPTIONS['ip'].split('.')[:-1] + ['1'])) # im not proud about that
-                # fix resolv.conf; dns over https ftw!
-                with open('/etc/resolv.conf', 'r+') as resolv:
-                    nameserver = resolv.read()
-                    if 'nameserver 9.9.9.9' not in nameserver:
-                        logging.info('BT-TETHER: Added nameserver')
-                        resolv.seek(0)
-                        resolv.write(nameserver + 'nameserver 9.9.9.9\n')
-
-            ui.set('bluetooth', 'CON')
-        else:
-            logging.error('BT-TETHER: bnep0 not found')
-            ui.set('bluetooth', 'ERR2')
+                logging.debug('BT-TETHER: Already paired.')
 
 
-def on_ui_setup(ui):
-    ui.add_element('bluetooth', LabeledValue(color=BLACK, label='BT', value='-', position=(ui.width() / 2 - 15, 0),
-                                       label_font=fonts.Bold, text_font=fonts.Medium))
+            logging.debug('BT-TETHER: Try to create nap connection with %s ...', device.name)
+            device.network, success = BTNap.nap(dev_remote)
+
+            if success:
+                if device.interface() is None:
+                    ui.set('bluetooth', 'BE')
+                    logging.info('BT-TETHER: Could not establish nap connection with %s', device.name)
+                    continue
+
+                logging.info('BT-TETHER: Created interface (%s)', device.interface())
+                ui.set('bluetooth', 'C')
+                any_device_connected = True
+                device.tries = 0 # reset tries
+            else:
+                logging.info('BT-TETHER: Could not establish nap connection with %s', device.name)
+                ui.set('bluetooth', 'NF')
+                continue
+
+            interface = device.interface()
+            addr = f"{device.ip}/{device.netmask}"
+            gateway = ".".join(device.ip.split('.')[:-1] + ['1'])
+
+            wrapped_interface = IfaceWrapper(interface)
+            logging.debug('BT-TETHER: Add ip to %s', interface)
+            if not wrapped_interface.set_addr(addr):
+                ui.set('bluetooth', 'AE')
+                logging.error("BT-TETHER: Could not add ip to %s", interface)
+                continue
+
+            if device.share_internet:
+                if not connected_priorities or device.priority > max(connected_priorities):
+                    logging.debug('BT-TETHER: Set default route to %s via %s', gateway, interface)
+                    IfaceWrapper.set_route(gateway, interface)
+                    connected_priorities.append(device.priority)
+
+                    logging.debug('BT-TETHER: Change resolv.conf if necessary ...')
+                    with open('/etc/resolv.conf', 'r+') as resolv:
+                        nameserver = resolv.read()
+                        if 'nameserver 9.9.9.9' not in nameserver:
+                            logging.info('BT-TETHER: Added nameserver')
+                            resolv.seek(0)
+                            resolv.write(nameserver + 'nameserver 9.9.9.9\n')
+
+        if any_device_connected:
+            ui.set('bluetooth', 'C')

pwnagotchi/plugins/default/example.py

@@ -1,182 +1,154 @@
-__author__ = 'evilsocket@gmail.com'
-__version__ = '1.0.0'
-__name__ = 'hello_world'
-__license__ = 'GPL3'
-__description__ = 'An example plugin for pwnagotchi that implements all the available callbacks.'
-
 import logging
 
+import pwnagotchi.plugins as plugins
 from pwnagotchi.ui.components import LabeledValue
 from pwnagotchi.ui.view import BLACK
 import pwnagotchi.ui.fonts as fonts
 
 
-# Will be set with the options in config.yml config['main']['plugins'][__name__]
-OPTIONS = dict()
+class Example(plugins.Plugin):
+    __author__ = 'evilsocket@gmail.com'
+    __version__ = '1.0.0'
+    __license__ = 'GPL3'
+    __description__ = 'An example plugin for pwnagotchi that implements all the available callbacks.'
 
-# called when <host>:<port>/plugins/<pluginname> is opened
-def on_webhook(response, path):
-    res = "<html><body><a>Hook triggered</a></body></html>"
-    response.send_response(200)
-    response.send_header('Content-type', 'text/html')
-    response.end_headers()
+    def __init__(self):
+        logging.debug("example plugin created")
 
-    try:
-        response.wfile.write(bytes(res, "utf-8"))
-    except Exception as ex:
-        logging.error(ex)
+    # called when the plugin is loaded
+    def on_loaded(self):
+        logging.warning("WARNING: this plugin should be disabled! options = " % self.options)
 
-# called when the plugin is loaded
-def on_loaded():
-    logging.warning("WARNING: plugin %s should be disabled!" % __name__)
+    # called when <host>:<port>/plugins/<pluginname> is opened
+    def on_webhook(self, response, path):
+        res = "<html><body><a>Hook triggered</a></body></html>"
+        response.send_response(200)
+        response.send_header('Content-type', 'text/html')
+        response.end_headers()
 
+        try:
+            response.wfile.write(bytes(res, "utf-8"))
+        except Exception as ex:
+            logging.error(ex)
 
-# called in manual mode when there's internet connectivity
-def on_internet_available(agent):
-    pass
+    # called in manual mode when there's internet connectivity
+    def on_internet_available(self, agent):
+        pass
 
+    # called to setup the ui elements
+    def on_ui_setup(self, ui):
+        # add custom UI elements
+        ui.add_element('ups', LabeledValue(color=BLACK, label='UPS', value='0%/0V', position=(ui.width() / 2 - 25, 0),
+                                           label_font=fonts.Bold, text_font=fonts.Medium))
 
-# called to setup the ui elements
-def on_ui_setup(ui):
-    # add custom UI elements
-    ui.add_element('ups', LabeledValue(color=BLACK, label='UPS', value='0%/0V', position=(ui.width() / 2 - 25, 0),
-                                       label_font=fonts.Bold, text_font=fonts.Medium))
+    # called when the ui is updated
+    def on_ui_update(self, ui):
+        # update those elements
+        some_voltage = 0.1
+        some_capacity = 100.0
+        ui.set('ups', "%4.2fV/%2i%%" % (some_voltage, some_capacity))
 
+    # called when the hardware display setup is done, display is an hardware specific object
+    def on_display_setup(self, display):
+        pass
 
-# called when the ui is updated
-def on_ui_update(ui):
-    # update those elements
-    some_voltage = 0.1
-    some_capacity = 100.0
+    # called when everything is ready and the main loop is about to start
+    def on_ready(self, agent):
+        logging.info("unit is ready")
+        # you can run custom bettercap commands if you want
+        #   agent.run('ble.recon on')
+        # or set a custom state
+        #   agent.set_bored()
 
-    ui.set('ups', "%4.2fV/%2i%%" % (some_voltage, some_capacity))
+    # called when the AI finished loading
+    def on_ai_ready(self, agent):
+        pass
 
+    # called when the AI finds a new set of parameters
+    def on_ai_policy(self, agent, policy):
+        pass
 
-# called when the hardware display setup is done, display is an hardware specific object
-def on_display_setup(display):
-    pass
+    # called when the AI starts training for a given number of epochs
+    def on_ai_training_start(self, agent, epochs):
+        pass
 
+    # called after the AI completed a training epoch
+    def on_ai_training_step(self, agent, _locals, _globals):
+        pass
 
-# called when everything is ready and the main loop is about to start
-def on_ready(agent):
-    logging.info("unit is ready")
-    # you can run custom bettercap commands if you want
-    #   agent.run('ble.recon on')
-    # or set a custom state
-    #   agent.set_bored()
+    # called when the AI has done training
+    def on_ai_training_end(self, agent):
+        pass
 
+    # called when the AI got the best reward so far
+    def on_ai_best_reward(self, agent, reward):
+        pass
 
-# called when the AI finished loading
-def on_ai_ready(agent):
-    pass
+    # called when the AI got the worst reward so far
+    def on_ai_worst_reward(self, agent, reward):
+        pass
 
+    # called when a non overlapping wifi channel is found to be free
+    def on_free_channel(self, agent, channel):
+        pass
 
-# called when the AI finds a new set of parameters
-def on_ai_policy(agent, policy):
-    pass
+    # called when the status is set to bored
+    def on_bored(self, agent):
+        pass
 
+    # called when the status is set to sad
+    def on_sad(self, agent):
+        pass
 
-# called when the AI starts training for a given number of epochs
-def on_ai_training_start(agent, epochs):
-    pass
+    # called when the status is set to excited
+    def on_excited(aself, gent):
+        pass
 
+    # called when the status is set to lonely
+    def on_lonely(self, agent):
+        pass
 
-# called after the AI completed a training epoch
-def on_ai_training_step(agent, _locals, _globals):
-    pass
+    # called when the agent is rebooting the board
+    def on_rebooting(self, agent):
+        pass
 
+    # called when the agent is waiting for t seconds
+    def on_wait(self, agent, t):
+        pass
 
-# called when the AI has done training
-def on_ai_training_end(agent):
-    pass
+    # called when the agent is sleeping for t seconds
+    def on_sleep(self, agent, t):
+        pass
 
+    # called when the agent refreshed its access points list
+    def on_wifi_update(self, agent, access_points):
+        pass
 
-# called when the AI got the best reward so far
-def on_ai_best_reward(agent, reward):
-    pass
+    # called when the agent is sending an association frame
+    def on_association(self, agent, access_point):
+        pass
 
+    # called when the agent is deauthenticating a client station from an AP
+    def on_deauthentication(self, agent, access_point, client_station):
+        pass
 
-# called when the AI got the worst reward so far
-def on_ai_worst_reward(agent, reward):
-    pass
+    # callend when the agent is tuning on a specific channel
+    def on_channel_hop(self, agent, channel):
+        pass
 
+    # called when a new handshake is captured, access_point and client_station are json objects
+    # if the agent could match the BSSIDs to the current list, otherwise they are just the strings of the BSSIDs
+    def on_handshake(self, agent, filename, access_point, client_station):
+        pass
 
-# called when a non overlapping wifi channel is found to be free
-def on_free_channel(agent, channel):
-    pass
+    # called when an epoch is over (where an epoch is a single loop of the main algorithm)
+    def on_epoch(self, agent, epoch, epoch_data):
+        pass
 
+    # called when a new peer is detected
+    def on_peer_detected(self, agent, peer):
+        pass
 
-# called when the status is set to bored
-def on_bored(agent):
-    pass
-
-
-# called when the status is set to sad
-def on_sad(agent):
-    pass
-
-
-# called when the status is set to excited
-def on_excited(agent):
-    pass
-
-
-# called when the status is set to lonely
-def on_lonely(agent):
-    pass
-
-
-# called when the agent is rebooting the board
-def on_rebooting(agent):
-    pass
-
-
-# called when the agent is waiting for t seconds
-def on_wait(agent, t):
-    pass
-
-
-# called when the agent is sleeping for t seconds
-def on_sleep(agent, t):
-    pass
-
-
-# called when the agent refreshed its access points list
-def on_wifi_update(agent, access_points):
-    pass
-
-
-# called when the agent is sending an association frame
-def on_association(agent, access_point):
-    pass
-
-
-# callend when the agent is deauthenticating a client station from an AP
-def on_deauthentication(agent, access_point, client_station):
-    pass
-
-
-# callend when the agent is tuning on a specific channel
-def on_channel_hop(agent, channel):
-    pass
-
-
-# called when a new handshake is captured, access_point and client_station are json objects
-# if the agent could match the BSSIDs to the current list, otherwise they are just the strings of the BSSIDs
-def on_handshake(agent, filename, access_point, client_station):
-    pass
-
-
-# called when an epoch is over (where an epoch is a single loop of the main algorithm)
-def on_epoch(agent, epoch, epoch_data):
-    pass
-
-
-# called when a new peer is detected
-def on_peer_detected(agent, peer):
-    pass
-
-
-# called when a known peer is lost
-def on_peer_lost(agent, peer):
-    pass
+    # called when a known peer is lost
+    def on_peer_lost(self, agent, peer):
+        pass

pwnagotchi/plugins/default/gpio_buttons.py

@@ -0,0 +1,40 @@
+import logging
+import RPi.GPIO as GPIO
+import subprocess
+import pwnagotchi.plugins as plugins
+
+
+class GPIOButtons(plugins.Plugin):
+    __author__ = 'ratmandu@gmail.com'
+    __version__ = '1.0.0'
+    __license__ = 'GPL3'
+    __description__ = 'GPIO Button support plugin'
+
+    def __init__(self):
+        self.running = False
+        self.ports = {}
+        self.commands = None
+
+    def runCommand(self, channel):
+        command = self.ports[channel]
+        logging.info(f"Button Pressed! Running command: {command}")
+        process = subprocess.Popen(command, shell=True, stdin=None, stdout=open("/dev/null", "w"), stderr=None,
+                                   executable="/bin/bash")
+        process.wait()
+
+    def on_loaded(self):
+        logging.info("GPIO Button plugin loaded.")
+
+        # get list of GPIOs
+        gpios = self.options['gpios']
+
+        # set gpio numbering
+        GPIO.setmode(GPIO.BCM)
+
+        for i in gpios:
+            gpio = list(i)[0]
+            command = i[gpio]
+            self.ports[gpio] = command
+            GPIO.setup(gpio, GPIO.IN, GPIO.PUD_UP)
+            GPIO.add_event_detect(gpio, GPIO.FALLING, callback=self.runCommand, bouncetime=250)
+            logging.info("Added command: %s to GPIO #%d", command, gpio)

pwnagotchi/plugins/default/gps.py

@@ -1,45 +1,42 @@
-__author__ = 'evilsocket@gmail.com'
-__version__ = '1.0.0'
-__name__ = 'gps'
-__license__ = 'GPL3'
-__description__ = 'Save GPS coordinates whenever an handshake is captured.'
-
 import logging
 import json
 import os
-
-running = False
-OPTIONS = dict()
+import pwnagotchi.plugins as plugins
 
 
-def on_loaded():
-    logging.info("gps plugin loaded for %s" % OPTIONS['device'])
+class GPS(plugins.Plugin):
+    __author__ = 'evilsocket@gmail.com'
+    __version__ = '1.0.0'
+    __license__ = 'GPL3'
+    __description__ = 'Save GPS coordinates whenever an handshake is captured.'
 
+    def __init__(self):
+        self.running = False
 
-def on_ready(agent):
-    global running
+    def on_loaded(self):
+        logging.info("gps plugin loaded for %s" % self.options['device'])
 
-    if os.path.exists(OPTIONS['device']):
-        logging.info("enabling gps bettercap's module for %s" % OPTIONS['device'])
-        try:
-            agent.run('gps off')
-        except:
-            pass
+    def on_ready(self, agent):
+        if os.path.exists(self.options['device']):
+            logging.info("enabling gps bettercap's module for %s" % self.options['device'])
+            try:
+                agent.run('gps off')
+            except:
+                pass
 
-        agent.run('set gps.device %s' % OPTIONS['device'])
-        agent.run('set gps.speed %d' % OPTIONS['speed'])
-        agent.run('gps on')
-        running = True
-    else:
-        logging.warning("no GPS detected")
+            agent.run('set gps.device %s' % self.options['device'])
+            agent.run('set gps.speed %d' % self.options['speed'])
+            agent.run('gps on')
+            running = True
+        else:
+            logging.warning("no GPS detected")
 
+    def on_handshake(self, agent, filename, access_point, client_station):
+        if self.running:
+            info = agent.session()
+            gps = info['gps']
+            gps_filename = filename.replace('.pcap', '.gps.json')
 
-def on_handshake(agent, filename, access_point, client_station):
-    if running:
-        info = agent.session()
-        gps = info['gps']
-        gps_filename = filename.replace('.pcap', '.gps.json')
-
-        logging.info("saving GPS to %s (%s)" % (gps_filename, gps))
-        with open(gps_filename, 'w+t') as fp:
-            json.dump(gps, fp)
+            logging.info("saving GPS to %s (%s)" % (gps_filename, gps))
+            with open(gps_filename, 'w+t') as fp:
+                json.dump(gps, fp)

pwnagotchi/plugins/default/grid.py

@@ -1,31 +1,12 @@
-__author__ = 'evilsocket@gmail.com'
-__version__ = '1.0.1'
-__name__ = 'grid'
-__license__ = 'GPL3'
-__description__ = 'This plugin signals the unit cryptographic identity and list of pwned networks and list of pwned ' \
-                  'networks to api.pwnagotchi.ai '
-
 import os
 import logging
 import time
 import glob
+import re
 
 import pwnagotchi.grid as grid
-import pwnagotchi.utils as utils
-from pwnagotchi.ui.components import LabeledValue
-from pwnagotchi.ui.view import BLACK
-import pwnagotchi.ui.fonts as fonts
-from pwnagotchi.utils import WifiInfo, extract_from_pcap
-
-OPTIONS = dict()
-REPORT = utils.StatusFile('/root/.api-report.json', data_format='json')
-
-UNREAD_MESSAGES = 0
-TOTAL_MESSAGES = 0
-
-
-def on_loaded():
-    logging.info("grid plugin loaded.")
+import pwnagotchi.plugins as plugins
+from pwnagotchi.utils import StatusFile, WifiInfo, extract_from_pcap
 
 
 def parse_pcap(filename):
@@ -40,6 +21,10 @@ def parse_pcap(filename):
         # /root/handshakes/BSSID.pcap
         essid, bssid = '', net_id
 
+    mac_re = re.compile('[0-9a-fA-F]{12}')
+    if not mac_re.match(bssid):
+        return '', ''
+
     it = iter(bssid)
     bssid = ':'.join([a + b for a, b in zip(it, it)])
 
@@ -56,93 +41,100 @@ def parse_pcap(filename):
     return info[WifiInfo.ESSID], info[WifiInfo.BSSID]
 
 
-def is_excluded(what):
-    for skip in OPTIONS['exclude']:
-        skip = skip.lower()
-        what = what.lower()
-        if skip in what or skip.replace(':', '') in what:
-            return True
-    return False
+class Grid(plugins.Plugin):
+    __author__ = 'evilsocket@gmail.com'
+    __version__ = '1.0.1'
+    __license__ = 'GPL3'
+    __description__ = 'This plugin signals the unit cryptographic identity and list of pwned networks and list of pwned ' \
+                      'networks to api.pwnagotchi.ai '
 
+    def __init__(self):
+        self.options = dict()
+        self.report = StatusFile('/root/.api-report.json', data_format='json')
 
-def on_ui_update(ui):
-    new_value = ' %d (%d)' % (UNREAD_MESSAGES, TOTAL_MESSAGES)
-    if not ui.has_element('mailbox') and UNREAD_MESSAGES > 0:
-        if ui.is_inky():
-            pos = (80, 0)
-        else:
-            pos = (100, 0)
-        ui.add_element('mailbox',
-                       LabeledValue(color=BLACK, label='MSG', value=new_value,
-                                    position=pos,
-                                    label_font=fonts.Bold,
-                                    text_font=fonts.Medium))
-    ui.set('mailbox', new_value)
+        self.unread_messages = 0
+        self.total_messages = 0
 
+    def is_excluded(self, what):
+        for skip in self.options['exclude']:
+            skip = skip.lower()
+            what = what.lower()
+            if skip in what or skip.replace(':', '') in what:
+                return True
+        return False
 
-def set_reported(reported, net_id):
-    global REPORT
-    reported.append(net_id)
-    REPORT.update(data={'reported': reported})
+    def on_loaded(self):
+        logging.info("grid plugin loaded.")
 
+    def set_reported(self, reported, net_id):
+        reported.append(net_id)
+        self.report.update(data={'reported': reported})
 
-def on_internet_available(agent):
-    global REPORT, UNREAD_MESSAGES, TOTAL_MESSAGES
-
-    logging.debug("internet available")
-
-    try:
-        grid.update_data(agent.last_session)
-    except Exception as e:
-        logging.error("error connecting to the pwngrid-peer service: %s" % e)
-        return
-
-    try:
+    def check_inbox(self, agent):
         logging.debug("checking mailbox ...")
-
         messages = grid.inbox()
-        TOTAL_MESSAGES = len(messages)
-        UNREAD_MESSAGES = len([m for m in messages if m['seen_at'] is None])
+        self.total_messages = len(messages)
+        self.unread_messages = len([m for m in messages if m['seen_at'] is None])
 
-        if TOTAL_MESSAGES:
-            on_ui_update(agent.view())
-            logging.debug(" %d unread messages of %d total" % (UNREAD_MESSAGES, TOTAL_MESSAGES))
+        if self.unread_messages:
+            logging.debug("[grid] unread:%d total:%d" % (self.unread_messages, self.total_messages))
+            agent.view().on_unread_messages(self.unread_messages, self.total_messages)
 
+    def check_handshakes(self, agent):
         logging.debug("checking pcaps")
 
         pcap_files = glob.glob(os.path.join(agent.config()['bettercap']['handshakes'], "*.pcap"))
         num_networks = len(pcap_files)
-        reported = REPORT.data_field_or('reported', default=[])
+        reported = self.report.data_field_or('reported', default=[])
         num_reported = len(reported)
         num_new = num_networks - num_reported
 
         if num_new > 0:
-            if OPTIONS['report']:
+            if self.options['report']:
                 logging.info("grid: %d new networks to report" % num_new)
-                logging.debug("OPTIONS: %s" % OPTIONS)
-                logging.debug("  exclude: %s" % OPTIONS['exclude'])
+                logging.debug("self.options: %s" % self.options)
+                logging.debug("  exclude: %s" % self.options['exclude'])
 
                 for pcap_file in pcap_files:
                     net_id = os.path.basename(pcap_file).replace('.pcap', '')
                     if net_id not in reported:
-                        if is_excluded(net_id):
+                        if self.is_excluded(net_id):
                             logging.debug("skipping %s due to exclusion filter" % pcap_file)
-                            set_reported(reported, net_id)
+                            self.set_reported(reported, net_id)
                             continue
 
                         essid, bssid = parse_pcap(pcap_file)
                         if bssid:
-                            if is_excluded(essid) or is_excluded(bssid):
+                            if self.is_excluded(essid) or self.is_excluded(bssid):
                                 logging.debug("not reporting %s due to exclusion filter" % pcap_file)
-                                set_reported(reported, net_id)
+                                self.set_reported(reported, net_id)
                             else:
                                 if grid.report_ap(essid, bssid):
-                                    set_reported(reported, net_id)
+                                    self.set_reported(reported, net_id)
                                 time.sleep(1.5)
                         else:
                             logging.warning("no bssid found?!")
             else:
                 logging.debug("grid: reporting disabled")
 
-    except Exception as e:
-        logging.error("grid api: %s" % e)
+    def on_internet_available(self, agent):
+        logging.debug("internet available")
+
+        try:
+            grid.update_data(agent.last_session)
+        except Exception as e:
+            logging.error("error connecting to the pwngrid-peer service: %s" % e)
+            logging.debug(e, exc_info=True)
+            return
+
+        try:
+            self.check_inbox(agent)
+        except Exception as e:
+            logging.error("[grid] error while checking inbox: %s" % e)
+            logging.debug(e, exc_info=True)
+
+        try:
+            self.check_handshakes(agent)
+        except Exception as e:
+            logging.error("[grid] error while checking pcaps: %s" % e)
+            logging.debug(e, exc_info=True)

pwnagotchi/plugins/default/memtemp.py

@@ -17,48 +17,51 @@
 # - Added horizontal and vertical orientation
 #
 ###############################################################
-
-__author__ = 'https://github.com/xenDE'
-__version__ = '1.0.1'
-__name__ = 'memtemp'
-__license__ = 'GPL3'
-__description__ = 'A plugin that will display memory/cpu usage and temperature'
-
 from pwnagotchi.ui.components import LabeledValue
 from pwnagotchi.ui.view import BLACK
 import pwnagotchi.ui.fonts as fonts
+import pwnagotchi.plugins as plugins
 import pwnagotchi
 import logging
 
-OPTIONS = dict()
 
+class MemTemp(plugins.Plugin):
+    __author__ = 'https://github.com/xenDE'
+    __version__ = '1.0.1'
+    __license__ = 'GPL3'
+    __description__ = 'A plugin that will display memory/cpu usage and temperature'
 
-def on_loaded():
-    logging.info("memtemp plugin loaded.")
+    def on_loaded(self):
+        logging.info("memtemp plugin loaded.")
 
+    def mem_usage(self):
+        return int(pwnagotchi.mem_usage() * 100)
 
-def mem_usage():
-    return int(pwnagotchi.mem_usage() * 100)
+    def cpu_load(self):
+        return int(pwnagotchi.cpu_load() * 100)
 
+    def on_ui_setup(self, ui):
+        if ui.is_waveshare_v2():
+            h_pos = (180, 80)
+            v_pos = (180, 61)
+        else:
+            h_pos = (155, 76)
+            v_pos = (180, 61)
 
-def cpu_load():
-    return int(pwnagotchi.cpu_load() * 100)
+        if self.options['orientation'] == "horizontal":
+            ui.add_element('memtemp', LabeledValue(color=BLACK, label='', value='mem cpu temp\n - -  -',
+                                                   position=h_pos,
+                                                   label_font=fonts.Small, text_font=fonts.Small))
+        elif self.options['orientation'] == "vertical":
+            ui.add_element('memtemp', LabeledValue(color=BLACK, label='', value=' mem:-\n cpu:-\ntemp:-',
+                                                   position=v_pos,
+                                                   label_font=fonts.Small, text_font=fonts.Small))
 
+    def on_ui_update(self, ui):
+        if self.options['orientation'] == "horizontal":
+            ui.set('memtemp',
+                   " mem cpu temp\n %s%% %s%%  %sc" % (self.mem_usage(), self.cpu_load(), pwnagotchi.temperature()))
 
-def on_ui_setup(ui):
-    if OPTIONS['orientation'] == "horizontal":
-        ui.add_element('memtemp', LabeledValue(color=BLACK, label='', value='mem cpu temp\n - -  -',
-                                               position=(ui.width() / 2 + 30, ui.height() / 2 + 15),
-                                               label_font=fonts.Small, text_font=fonts.Small))
-    elif OPTIONS['orientation'] == "vertical":
-        ui.add_element('memtemp', LabeledValue(color=BLACK, label='', value=' mem:-\n cpu:-\ntemp:-',
-                                               position=(ui.width() / 2 + 55, ui.height() / 2),
-                                               label_font=fonts.Small, text_font=fonts.Small))
-
-
-def on_ui_update(ui):
-    if OPTIONS['orientation'] == "horizontal":
-        ui.set('memtemp', " mem cpu temp\n %s%% %s%%  %sc" % (mem_usage(), cpu_load(), pwnagotchi.temperature()))
-
-    elif OPTIONS['orientation'] == "vertical":
-        ui.set('memtemp', " mem:%s%%\n cpu:%s%%\ntemp:%sc" % (mem_usage(), cpu_load(), pwnagotchi.temperature()))
+        elif self.options['orientation'] == "vertical":
+            ui.set('memtemp',
+                   " mem:%s%%\n cpu:%s%%\ntemp:%sc" % (self.mem_usage(), self.cpu_load(), pwnagotchi.temperature()))

pwnagotchi/plugins/default/net-pos.py

@@ -1,140 +1,134 @@
-__author__ = 'zenzen san'
-__version__ = '2.0.0'
-__name__ = 'net-pos'
-__license__ = 'GPL3'
-__description__ = """Saves a json file with the access points with more signal
-                     whenever a handshake is captured.
-                     When internet is available the files are converted in geo locations
-                     using Mozilla LocationService """
-
 import logging
 import json
 import os
 import requests
+import pwnagotchi.plugins as plugins
 from pwnagotchi.utils import StatusFile
 
 MOZILLA_API_URL = 'https://location.services.mozilla.com/v1/geolocate?key={api}'
-REPORT = StatusFile('/root/.net_pos_saved', data_format='json')
-SKIP = list()
-READY = False
-OPTIONS = dict()
 
 
-def on_loaded():
-    global READY
+class NetPos(plugins.Plugin):
+    __author__ = 'zenzen san'
+    __version__ = '2.0.0'
+    __license__ = 'GPL3'
+    __description__ = """Saves a json file with the access points with more signal
+                         whenever a handshake is captured.
+                         When internet is available the files are converted in geo locations
+                         using Mozilla LocationService """
 
-    if 'api_key' not in OPTIONS or ('api_key' in OPTIONS and OPTIONS['api_key'] is None):
-        logging.error("NET-POS: api_key isn't set. Can't use mozilla's api.")
-        return
+    def __init__(self):
+        self.report = StatusFile('/root/.net_pos_saved', data_format='json')
+        self.skip = list()
+        self.ready = False
 
-    READY = True
+    def on_loaded(self):
+        if 'api_key' not in self.options or ('api_key' in self.options and self.options['api_key'] is None):
+            logging.error("NET-POS: api_key isn't set. Can't use mozilla's api.")
+            return
 
-    logging.info("net-pos plugin loaded.")
+        self.ready = True
+        logging.info("net-pos plugin loaded.")
 
-def _append_saved(path):
-    to_save = list()
-    if isinstance(path, str):
-        to_save.append(path)
-    elif isinstance(path, list):
-        to_save += path
-    else:
-        raise TypeError("Expected list or str, got %s" % type(path))
+    def _append_saved(self, path):
+        to_save = list()
+        if isinstance(path, str):
+            to_save.append(path)
+        elif isinstance(path, list):
+            to_save += path
+        else:
+            raise TypeError("Expected list or str, got %s" % type(path))
 
-    with open('/root/.net_pos_saved', 'a') as saved_file:
-        for x in to_save:
-            saved_file.write(x + "\n")
+        with open('/root/.net_pos_saved', 'a') as saved_file:
+            for x in to_save:
+                saved_file.write(x + "\n")
 
-def on_internet_available(agent):
-    global SKIP
-    global REPORT
+    def on_internet_available(self, agent):
+        if self.ready:
+            config = agent.config()
+            display = agent.view()
+            reported = self.report.data_field_or('reported', default=list())
+            handshake_dir = config['bettercap']['handshakes']
 
-    if READY:
-        config = agent.config()
-        display = agent.view()
-        reported = REPORT.data_field_or('reported', default=list())
-        handshake_dir = config['bettercap']['handshakes']
+            all_files = os.listdir(handshake_dir)
+            all_np_files = [os.path.join(handshake_dir, filename)
+                            for filename in all_files
+                            if filename.endswith('.net-pos.json')]
+            new_np_files = set(all_np_files) - set(reported) - set(self.skip)
 
-        all_files = os.listdir(handshake_dir)
-        all_np_files = [os.path.join(handshake_dir, filename)
-                     for filename in all_files
-                     if filename.endswith('.net-pos.json')]
-        new_np_files = set(all_np_files) - set(reported) - set(SKIP)
-
-        if new_np_files:
-            logging.info("NET-POS: Found %d new net-pos files. Fetching positions ...", len(new_np_files))
-            display.set('status', f"Found {len(new_np_files)} new net-pos files. Fetching positions ...")
-            display.update(force=True)
-            for idx, np_file in enumerate(new_np_files):
-
-                geo_file = np_file.replace('.net-pos.json', '.geo.json')
-                if os.path.exists(geo_file):
-                    # got already the position
-                    reported.append(np_file)
-                    REPORT.update(data={'reported': reported})
-                    continue
-
-                try:
-                    geo_data = _get_geo_data(np_file) # returns json obj
-                except requests.exceptions.RequestException as req_e:
-                    logging.error("NET-POS: %s", req_e)
-                    SKIP += np_file
-                    continue
-                except json.JSONDecodeError as js_e:
-                    logging.error("NET-POS: %s", js_e)
-                    SKIP += np_file
-                    continue
-                except OSError as os_e:
-                    logging.error("NET-POS: %s", os_e)
-                    SKIP += np_file
-                    continue
-
-                with open(geo_file, 'w+t') as sf:
-                    json.dump(geo_data, sf)
-
-                reported.append(np_file)
-                REPORT.update(data={'reported': reported})
-
-                display.set('status', f"Fetching positions ({idx+1}/{len(new_np_files)})")
+            if new_np_files:
+                logging.info("NET-POS: Found %d new net-pos files. Fetching positions ...", len(new_np_files))
+                display.set('status', f"Found {len(new_np_files)} new net-pos files. Fetching positions ...")
                 display.update(force=True)
+                for idx, np_file in enumerate(new_np_files):
 
+                    geo_file = np_file.replace('.net-pos.json', '.geo.json')
+                    if os.path.exists(geo_file):
+                        # got already the position
+                        reported.append(np_file)
+                        self.report.update(data={'reported': reported})
+                        continue
 
-def on_handshake(agent, filename, access_point, client_station):
-    netpos = _get_netpos(agent)
-    netpos_filename = filename.replace('.pcap', '.net-pos.json')
-    logging.info("NET-POS: Saving net-location to %s", netpos_filename)
+                    try:
+                        geo_data = self._get_geo_data(np_file)  # returns json obj
+                    except requests.exceptions.RequestException as req_e:
+                        logging.error("NET-POS: %s", req_e)
+                        self.skip += np_file
+                        continue
+                    except json.JSONDecodeError as js_e:
+                        logging.error("NET-POS: %s", js_e)
+                        self.skip += np_file
+                        continue
+                    except OSError as os_e:
+                        logging.error("NET-POS: %s", os_e)
+                        self.skip += np_file
+                        continue
 
-    try:
-        with open(netpos_filename, 'w+t') as net_pos_file:
-            json.dump(netpos, net_pos_file)
-    except OSError as os_e:
-        logging.error("NET-POS: %s", os_e)
+                    with open(geo_file, 'w+t') as sf:
+                        json.dump(geo_data, sf)
 
+                    reported.append(np_file)
+                    self.report.update(data={'reported': reported})
 
-def _get_netpos(agent):
-    aps = agent.get_access_points()
-    netpos = dict()
-    netpos['wifiAccessPoints'] = list()
-    # 6 seems a good number to save a wifi networks location
-    for access_point in sorted(aps, key=lambda i: i['rssi'], reverse=True)[:6]:
-        netpos['wifiAccessPoints'].append({'macAddress': access_point['mac'],
-                                           'signalStrength': access_point['rssi']})
-    return netpos
+                    display.set('status', f"Fetching positions ({idx + 1}/{len(new_np_files)})")
+                    display.update(force=True)
 
-def _get_geo_data(path, timeout=30):
-    geourl = MOZILLA_API_URL.format(api=OPTIONS['api_key'])
+    def on_handshake(self, agent, filename, access_point, client_station):
+        netpos = self._get_netpos(agent)
+        netpos_filename = filename.replace('.pcap', '.net-pos.json')
+        logging.info("NET-POS: Saving net-location to %s", netpos_filename)
 
-    try:
-        with open(path, "r") as json_file:
-            data = json.load(json_file)
-    except json.JSONDecodeError as js_e:
-        raise js_e
-    except OSError as os_e:
-        raise os_e
+        try:
+            with open(netpos_filename, 'w+t') as net_pos_file:
+                json.dump(netpos, net_pos_file)
+        except OSError as os_e:
+            logging.error("NET-POS: %s", os_e)
 
-    try:
-        result = requests.post(geourl,
-                json=data,
-                timeout=timeout)
-        return result.json()
-    except requests.exceptions.RequestException as req_e:
-        raise req_e
+    def _get_netpos(self, agent):
+        aps = agent.get_access_points()
+        netpos = dict()
+        netpos['wifiAccessPoints'] = list()
+        # 6 seems a good number to save a wifi networks location
+        for access_point in sorted(aps, key=lambda i: i['rssi'], reverse=True)[:6]:
+            netpos['wifiAccessPoints'].append({'macAddress': access_point['mac'],
+                                               'signalStrength': access_point['rssi']})
+        return netpos
+
+    def _get_geo_data(self, path, timeout=30):
+        geourl = MOZILLA_API_URL.format(api=self.options['api_key'])
+
+        try:
+            with open(path, "r") as json_file:
+                data = json.load(json_file)
+        except json.JSONDecodeError as js_e:
+            raise js_e
+        except OSError as os_e:
+            raise os_e
+
+        try:
+            result = requests.post(geourl,
+                                   json=data,
+                                   timeout=timeout)
+            return result.json()
+        except requests.exceptions.RequestException as req_e:
+            raise req_e

pwnagotchi/plugins/default/onlinehashcrack.py

@@ -1,86 +1,82 @@
-__author__ = '33197631+dadav@users.noreply.github.com'
-__version__ = '2.0.0'
-__name__ = 'onlinehashcrack'
-__license__ = 'GPL3'
-__description__ = 'This plugin automatically uploades handshakes to https://onlinehashcrack.com'
-
 import os
 import logging
 import requests
 from pwnagotchi.utils import StatusFile
-
-READY = False
-REPORT = StatusFile('/root/.ohc_uploads', data_format='json')
-SKIP = list()
-OPTIONS = dict()
+import pwnagotchi.plugins as plugins
 
 
-def on_loaded():
-    """
-    Gets called when the plugin gets loaded
-    """
-    global READY
+class OnlineHashCrack(plugins.Plugin):
+    __author__ = '33197631+dadav@users.noreply.github.com'
+    __version__ = '2.0.0'
+    __license__ = 'GPL3'
+    __description__ = 'This plugin automatically uploads handshakes to https://onlinehashcrack.com'
 
-    if 'email' not in OPTIONS or ('email' in OPTIONS and OPTIONS['email'] is None):
-        logging.error("OHC: Email isn't set. Can't upload to onlinehashcrack.com")
-        return
+    def __init__(self):
+        self.ready = False
+        self.report = StatusFile('/root/.ohc_uploads', data_format='json')
+        self.skip = list()
 
-    READY = True
+    def on_loaded(self):
+        """
+        Gets called when the plugin gets loaded
+        """
+        if 'email' not in self.options or ('email' in self.options and self.options['email'] is None):
+            logging.error("OHC: Email isn't set. Can't upload to onlinehashcrack.com")
+            return
 
+        self.ready = True
 
-def _upload_to_ohc(path, timeout=30):
-    """
-    Uploads the file to onlinehashcrack.com
-    """
-    with open(path, 'rb') as file_to_upload:
-        data = {'email': OPTIONS['email']}
-        payload = {'file': file_to_upload}
+    def _upload_to_ohc(self, path, timeout=30):
+        """
+        Uploads the file to onlinehashcrack.com
+        """
+        with open(path, 'rb') as file_to_upload:
+            data = {'email': self.options['email']}
+            payload = {'file': file_to_upload}
 
-        try:
-            result = requests.post('https://api.onlinehashcrack.com',
-                    data=data,
-                    files=payload,
-                    timeout=timeout)
-            if 'already been sent' in result.text:
-                logging.warning(f"{path} was already uploaded.")
-        except requests.exceptions.RequestException as e:
-            logging.error(f"OHC: Got an exception while uploading {path} -> {e}")
-            raise e
+            try:
+                result = requests.post('https://api.onlinehashcrack.com',
+                                       data=data,
+                                       files=payload,
+                                       timeout=timeout)
+                if 'already been sent' in result.text:
+                    logging.warning(f"{path} was already uploaded.")
+            except requests.exceptions.RequestException as e:
+                logging.error(f"OHC: Got an exception while uploading {path} -> {e}")
+                raise e
 
+    def on_internet_available(self, agent):
+        """
+        Called in manual mode when there's internet connectivity
+        """
+        if self.ready:
+            display = agent.view()
+            config = agent.config()
+            reported = self.report.data_field_or('reported', default=list())
 
-def on_internet_available(agent):
-    """
-    Called in manual mode when there's internet connectivity
-    """
-    global REPORT
-    global SKIP
-    if READY:
-        display = agent.view()
-        config = agent.config()
-        reported = REPORT.data_field_or('reported', default=list())
+            handshake_dir = config['bettercap']['handshakes']
+            handshake_filenames = os.listdir(handshake_dir)
+            handshake_paths = [os.path.join(handshake_dir, filename) for filename in handshake_filenames if
+                               filename.endswith('.pcap')]
+            handshake_new = set(handshake_paths) - set(reported) - set(self.skip)
 
-        handshake_dir = config['bettercap']['handshakes']
-        handshake_filenames = os.listdir(handshake_dir)
-        handshake_paths = [os.path.join(handshake_dir, filename) for filename in handshake_filenames if filename.endswith('.pcap')]
-        handshake_new = set(handshake_paths) - set(reported) - set(SKIP)
-
-        if handshake_new:
-            logging.info("OHC: Internet connectivity detected. Uploading new handshakes to onelinehashcrack.com")
-
-            for idx, handshake in enumerate(handshake_new):
-                display.set('status', f"Uploading handshake to onlinehashcrack.com ({idx + 1}/{len(handshake_new)})")
-                display.update(force=True)
-                try:
-                    _upload_to_ohc(handshake)
-                    reported.append(handshake)
-                    REPORT.update(data={'reported': reported})
-                    logging.info(f"OHC: Successfuly uploaded {handshake}")
-                except requests.exceptions.RequestException as req_e:
-                    SKIP.append(handshake)
-                    logging.error("OHC: %s", req_e)
-                    continue
-                except OSError as os_e:
-                    SKIP.append(handshake)
-                    logging.error("OHC: %s", os_e)
-                    continue
+            if handshake_new:
+                logging.info("OHC: Internet connectivity detected. Uploading new handshakes to onelinehashcrack.com")
 
+                for idx, handshake in enumerate(handshake_new):
+                    display.set('status',
+                                f"Uploading handshake to onlinehashcrack.com ({idx + 1}/{len(handshake_new)})")
+                    display.update(force=True)
+                    try:
+                        self._upload_to_ohc(handshake)
+                        reported.append(handshake)
+                        self.report.update(data={'reported': reported})
+                        logging.info(f"OHC: Successfully uploaded {handshake}")
+                    except requests.exceptions.RequestException as req_e:
+                        self.skip.append(handshake)
+                        logging.error("OHC: %s", req_e)
+                        continue
+                    except OSError as os_e:
+                        self.skip.append(handshake)
+                        logging.error("OHC: %s", os_e)
+                        continue

pwnagotchi/plugins/default/paw-gps.py

@@ -0,0 +1,32 @@
+import logging
+import requests
+import pwnagotchi.plugins as plugins
+
+'''
+You need an bluetooth connection to your android phone which is running PAW server with the GPS "hack" from Systemic:
+https://raw.githubusercontent.com/systemik/pwnagotchi-bt-tether/master/GPS-via-PAW
+'''
+
+
+class PawGPS(plugins.Plugin):
+    __author__ = 'leont'
+    __version__ = '1.0.0'
+    __name__ = 'pawgps'
+    __license__ = 'GPL3'
+    __description__ = 'Saves GPS coordinates whenever an handshake is captured. The GPS data is get from PAW on android '
+
+    def on_loaded(self):
+        logging.info("PAW-GPS loaded")
+        if 'ip' not in self.options or ('ip' in self.options and self.options['ip'] is None):
+            logging.info("PAW-GPS: No IP Address in the config file is defined, it uses the default (192.168.44.1)")
+
+    def on_handshake(self, agent, filename, access_point, client_station):
+        if 'ip' not in self.options or ('ip' in self.options and self.options['ip'] is None):
+            ip = "192.168.44.1"
+
+        gps = requests.get('http://' + ip + '/gps.xhtml')
+        gps_filename = filename.replace('.pcap', '.gps.json')
+
+        logging.info("saving GPS to %s (%s)" % (gps_filename, gps))
+        with open(gps_filename, 'w+t') as f:
+            f.write(gps.text)

pwnagotchi/plugins/default/quickdic.py

@@ -1,8 +1,8 @@
-__author__ = 'pwnagotchi [at] rossmarks [dot] uk'
-__version__ = '1.0.0'
-__name__ = 'quickdic'
-__license__ = 'GPL3'
-__description__ = 'Run a quick dictionary scan against captured handshakes'
+import logging
+import subprocess
+import string
+import re
+import pwnagotchi.plugins as plugins
 
 '''
 Aircrack-ng needed, to install:
@@ -11,42 +11,41 @@ Upload wordlist files in .txt format to folder in config file (Default: /opt/wor
 Cracked handshakes stored in handshake folder as [essid].pcap.cracked 
 '''
 
-import logging
-import subprocess
-import string
-import re
 
-OPTIONS = dict()
+class QuickDic(plugins.Plugin):
+    __author__ = 'pwnagotchi [at] rossmarks [dot] uk'
+    __version__ = '1.0.0'
+    __license__ = 'GPL3'
+    __description__ = 'Run a quick dictionary scan against captured handshakes'
 
-def on_loaded():
-    logging.info("Quick dictionary check plugin loaded")
+    def __init__(self):
+        self.text_to_set = ""
 
-def on_handshake(agent, filename, access_point, client_station):
-    display = agent._view
+    def on_loaded(self):
+        logging.info("Quick dictionary check plugin loaded")
 
-    result = subprocess.run(('/usr/bin/aircrack-ng '+ filename +' | grep "1 handshake" | awk \'{print $2}\''),shell=True, stdout=subprocess.PIPE)
-    result = result.stdout.decode('utf-8').translate({ord(c) :None for c in string.whitespace})
-    if not result:
-        logging.info("[quickdic] No handshake")
-    else:
-        logging.info("[quickdic] Handshake confirmed")
-        result2 = subprocess.run(('aircrack-ng -w `echo '+OPTIONS['wordlist_folder']+'*.txt | sed \'s/\ /,/g\'` -l '+filename+'.cracked -q -b '+result+' '+filename+' | grep KEY'),shell=True,stdout=subprocess.PIPE)
-        result2 = result2.stdout.decode('utf-8').strip()
-        logging.info("[quickdic] "+result2)
-        if result2 != "KEY NOT FOUND":
-            key = re.search('\[(.*)\]', result2)
-            pwd = str(key.group(1))
-            set_text("Cracked password: "+pwd)
-            display.update(force=True)
+    def on_handshake(self, agent, filename, access_point, client_station):
+        display = agent.view()
+        result = subprocess.run(('/usr/bin/aircrack-ng ' + filename + ' | grep "1 handshake" | awk \'{print $2}\''),
+                                shell=True, stdout=subprocess.PIPE)
+        result = result.stdout.decode('utf-8').translate({ord(c): None for c in string.whitespace})
+        if not result:
+            logging.info("[quickdic] No handshake")
+        else:
+            logging.info("[quickdic] Handshake confirmed")
+            result2 = subprocess.run(('aircrack-ng -w `echo ' + self.options[
+                'wordlist_folder'] + '*.txt | sed \'s/\ /,/g\'` -l ' + filename + '.cracked -q -b ' + result + ' ' + filename + ' | grep KEY'),
+                                     shell=True, stdout=subprocess.PIPE)
+            result2 = result2.stdout.decode('utf-8').strip()
+            logging.info("[quickdic] " + result2)
+            if result2 != "KEY NOT FOUND":
+                key = re.search('\[(.*)\]', result2)
+                pwd = str(key.group(1))
+                self.text_to_set = "Cracked password: " + pwd
+                display.update(force=True)
 
-text_to_set = "";
-def set_text(text):
-    global text_to_set
-    text_to_set = text
-
-def on_ui_update(ui):
-    global text_to_set
-    if text_to_set:
-        ui.set('face', "(·ω·)")
-        ui.set('status', text_to_set)
-        text_to_set = ""
+    def on_ui_update(self, ui):
+        if self.text_to_set:
+            ui.set('face', "(·ω·)")
+            ui.set('status', self.text_to_set)
+            self.text_to_set = ""

pwnagotchi/plugins/default/screen_refresh.py

@@ -1,24 +1,23 @@
-__author__ = 'pwnagotcchi [at] rossmarks [dot] uk'
-__version__ = '1.0.0'
-__name__ = 'screen_refresh'
-__license__ = 'GPL3'
-__description__ = 'Refresh he e-ink display after X amount of updates'
-
 import logging
-
-OPTIONS = dict()
-update_count = 0;
+import pwnagotchi.plugins as plugins
 
 
-def on_loaded():
-    logging.info("Screen refresh plugin loaded")
+class ScreenRefresh(plugins.Plugin):
+    __author__ = 'pwnagotchi [at] rossmarks [dot] uk'
+    __version__ = '1.0.0'
+    __license__ = 'GPL3'
+    __description__ = 'Refresh he e-ink display after X amount of updates'
 
+    def __init__(self):
+        self.update_count = 0;
 
-def on_ui_update(ui):
-    global update_count
-    update_count += 1
-    if update_count == OPTIONS['refresh_interval']:
-        ui.init_display()
-        ui.set('status', "Screen cleaned")
-        logging.info("Screen refreshing")
-        update_count = 0
+    def on_loaded(self):
+        logging.info("Screen refresh plugin loaded")
+
+    def on_ui_update(self, ui):
+        self.update_count += 1
+        if self.update_count == self.options['refresh_interval']:
+            ui.init_display()
+            ui.set('status', "Screen cleaned")
+            logging.info("Screen refreshing")
+            self.update_count = 0

pwnagotchi/plugins/default/twitter.py

@@ -1,50 +1,49 @@
-__author__ = '33197631+dadav@users.noreply.github.com'
-__version__ = '1.0.0'
-__name__ = 'twitter'
-__license__ = 'GPL3'
-__description__ = 'This plugin creates tweets about the recent activity of pwnagotchi'
-
 import logging
 from pwnagotchi.voice import Voice
-
-OPTIONS = dict()
-
-def on_loaded():
-    logging.info("twitter plugin loaded.")
+import pwnagotchi.plugins as plugins
 
 
-# called in manual mode when there's internet connectivity
-def on_internet_available(agent):
-    config = agent.config()
-    display = agent.view()
-    last_session = agent.last_session
+class Twitter(plugins.Plugin):
+    __author__ = 'evilsocket@gmail.com'
+    __version__ = '1.0.0'
+    __license__ = 'GPL3'
+    __description__ = 'This plugin creates tweets about the recent activity of pwnagotchi'
 
-    if last_session.is_new() and last_session.handshakes > 0:
-        try:
-            import tweepy
-        except ImportError:
-            logging.error("Couldn't import tweepy")
-            return
+    def on_loaded(self):
+        logging.info("twitter plugin loaded.")
 
-        logging.info("detected a new session and internet connectivity!")
+    # called in manual mode when there's internet connectivity
+    def on_internet_available(self, agent):
+        config = agent.config()
+        display = agent.view()
+        last_session = agent.last_session
 
-        picture = '/dev/shm/pwnagotchi.png'
+        if last_session.is_new() and last_session.handshakes > 0:
+            try:
+                import tweepy
+            except ImportError:
+                logging.error("Couldn't import tweepy")
+                return
 
-        display.on_manual_mode(last_session)
-        display.update(force=True)
-        display.image().save(picture, 'png')
-        display.set('status', 'Tweeting...')
-        display.update(force=True)
+            logging.info("detected a new session and internet connectivity!")
 
-        try:
-            auth = tweepy.OAuthHandler(OPTIONS['consumer_key'], OPTIONS['consumer_secret'])
-            auth.set_access_token(OPTIONS['access_token_key'], OPTIONS['access_token_secret'])
-            api = tweepy.API(auth)
+            picture = '/root/pwnagotchi.png'
 
-            tweet = Voice(lang=config['main']['lang']).on_last_session_tweet(last_session)
-            api.update_with_media(filename=picture, status=tweet)
-            last_session.save_session_id()
+            display.on_manual_mode(last_session)
+            display.update(force=True)
+            display.image().save(picture, 'png')
+            display.set('status', 'Tweeting...')
+            display.update(force=True)
 
-            logging.info("tweeted: %s" % tweet)
-        except Exception as e:
-            logging.exception("error while tweeting")
+            try:
+                auth = tweepy.OAuthHandler(self.options['consumer_key'], self.options['consumer_secret'])
+                auth.set_access_token(self.options['access_token_key'], self.options['access_token_secret'])
+                api = tweepy.API(auth)
+
+                tweet = Voice(lang=config['main']['lang']).on_last_session_tweet(last_session)
+                api.update_with_media(filename=picture, status=tweet)
+                last_session.save_session_id()
+
+                logging.info("tweeted: %s" % tweet)
+            except Exception as e:
+                logging.exception("error while tweeting")

pwnagotchi/plugins/default/unfiltered_example.py

@@ -1,22 +0,0 @@
-__author__ = 'diemelcw@gmail.com'
-__version__ = '1.0.0'
-__name__ = 'unfiltered_example'
-__license__ = 'GPL3'
-__description__ = 'An example plugin for pwnagotchi that implements on_unfiltered_ap_list(agent,aps)'
-
-import logging
-
-# Will be set with the options in config.yml config['main']['plugins'][__name__]
-OPTIONS = dict()
-
-# called when the plugin is loaded
-def on_loaded():
-    logging.warning("%s plugin loaded" % __name__)
-    
-# called when AP list is ready, before whitelist filtering has occured
-def on_unfiltered_ap_list(agent,aps):
-    logging.info("Unfiltered AP list to follow")
-    for ap in aps:
-        logging.info(ap['hostname'])
-    
-    ## Additional logic here ##

pwnagotchi/plugins/default/ups_lite.py

@@ -1,23 +1,18 @@
 # Based on UPS Lite v1.1 from https://github.com/xenDE
 #
-# funtions for get UPS status - needs enable "i2c" in raspi-config
+# functions for get UPS status - needs enable "i2c" in raspi-config
 #
 # https://github.com/linshuqin329/UPS-Lite
 #
 # For Raspberry Pi Zero Ups Power Expansion Board with Integrated Serial Port S3U4
 # https://www.ebay.de/itm/For-Raspberry-Pi-Zero-Ups-Power-Expansion-Board-with-Integrated-Serial-Port-S3U4/323873804310
 # https://www.aliexpress.com/item/32888533624.html
-__author__ = 'evilsocket@gmail.com'
-__version__ = '1.0.0'
-__name__ = 'ups_lite'
-__license__ = 'GPL3'
-__description__ = 'A plugin that will add a voltage indicator for the UPS Lite v1.1'
-
 import struct
 
 from pwnagotchi.ui.components import LabeledValue
 from pwnagotchi.ui.view import BLACK
 import pwnagotchi.ui.fonts as fonts
+import pwnagotchi.plugins as plugins
 
 
 # TODO: add enable switch in config.yml an cleanup all to the best place
@@ -47,18 +42,21 @@ class UPS:
             return 0.0
 
 
-ups = None
+class UPSLite(plugins.Plugin):
+    __author__ = 'evilsocket@gmail.com'
+    __version__ = '1.0.0'
+    __license__ = 'GPL3'
+    __description__ = 'A plugin that will add a voltage indicator for the UPS Lite v1.1'
 
+    def __init__(self):
+        self.ups = None
 
-def on_loaded():
-    global ups
-    ups = UPS()
+    def on_loaded(self):
+        self.ups = UPS()
 
+    def on_ui_setup(self, ui):
+        ui.add_element('ups', LabeledValue(color=BLACK, label='UPS', value='0%/0V', position=(ui.width() / 2 - 25, 0),
+                                           label_font=fonts.Bold, text_font=fonts.Medium))
 
-def on_ui_setup(ui):
-    ui.add_element('ups', LabeledValue(color=BLACK, label='UPS', value='0%/0V', position=(ui.width() / 2 - 25, 0),
-                                       label_font=fonts.Bold, text_font=fonts.Medium))
-
-
-def on_ui_update(ui):
-    ui.set('ups', "%4.2fV/%2i%%" % (ups.voltage(), ups.capacity()))
+    def on_ui_update(self, ui):
+        ui.set('ups', "%4.2fV/%2i%%" % (self.ups.voltage(), self.ups.capacity()))

pwnagotchi/plugins/default/wigle.py

@@ -1,9 +1,3 @@
-__author__ = '33197631+dadav@users.noreply.github.com'
-__version__ = '2.0.0'
-__name__ = 'wigle'
-__license__ = 'GPL3'
-__description__ = 'This plugin automatically uploades collected wifis to wigle.net'
-
 import os
 import logging
 import json
@@ -12,24 +6,7 @@ import csv
 from datetime import datetime
 import requests
 from pwnagotchi.utils import WifiInfo, FieldNotFoundError, extract_from_pcap, StatusFile
-
-READY = False
-REPORT = StatusFile('/root/.wigle_uploads', data_format='json')
-SKIP = list()
-OPTIONS = dict()
-
-
-def on_loaded():
-    """
-    Gets called when the plugin gets loaded
-    """
-    global READY
-
-    if 'api_key' not in OPTIONS or ('api_key' in OPTIONS and OPTIONS['api_key'] is None):
-        logging.error("WIGLE: api_key isn't set. Can't upload to wigle.net")
-        return
-
-    READY = True
+import pwnagotchi.plugins as plugins
 
 
 def _extract_gps_data(path):
@@ -54,16 +31,19 @@ def _format_auth(data):
         out = f"{out}[{auth}]"
     return out
 
+
 def _transform_wigle_entry(gps_data, pcap_data):
     """
     Transform to wigle entry in file
     """
     dummy = StringIO()
     # write kismet header
-    dummy.write("WigleWifi-1.4,appRelease=20190201,model=Kismet,release=2019.02.01.{},device=kismet,display=kismet,board=kismet,brand=kismet\n")
-    dummy.write("MAC,SSID,AuthMode,FirstSeen,Channel,RSSI,CurrentLatitude,CurrentLongitude,AltitudeMeters,AccuracyMeters,Type")
+    dummy.write(
+        "WigleWifi-1.4,appRelease=20190201,model=Kismet,release=2019.02.01.{},device=kismet,display=kismet,board=kismet,brand=kismet\n")
+    dummy.write(
+        "MAC,SSID,AuthMode,FirstSeen,Channel,RSSI,CurrentLatitude,CurrentLongitude,AltitudeMeters,AccuracyMeters,Type")
 
-    writer = csv.writer(dummy, delimiter=",", quoting=csv.QUOTE_NONE)
+    writer = csv.writer(dummy, delimiter=",", quoting=csv.QUOTE_NONE, escapechar="\\")
     writer.writerow([
         pcap_data[WifiInfo.BSSID],
         pcap_data[WifiInfo.ESSID],
@@ -75,10 +55,11 @@ def _transform_wigle_entry(gps_data, pcap_data):
         gps_data['Latitude'],
         gps_data['Longitude'],
         gps_data['Altitude'],
-        0, # accuracy?
+        0,  # accuracy?
         'WIFI'])
     return dummy.getvalue()
 
+
 def _send_to_wigle(lines, api_key, timeout=30):
     """
     Uploads the file to wigle-net
@@ -109,87 +90,100 @@ def _send_to_wigle(lines, api_key, timeout=30):
         raise re_e
 
 
-def on_internet_available(agent):
-    from scapy.all import Scapy_Exception
-    """
-    Called in manual mode when there's internet connectivity
-    """
-    global REPORT
-    global SKIP
+class Wigle(plugins.Plugin):
+    __author__ = '33197631+dadav@users.noreply.github.com'
+    __version__ = '2.0.0'
+    __license__ = 'GPL3'
+    __description__ = 'This plugin automatically uploads collected wifis to wigle.net'
 
-    if READY:
-        config = agent.config()
-        display = agent.view()
-        reported = REPORT.data_field_or('reported', default=list())
+    def __init__(self):
+        self.ready = False
+        self.report = StatusFile('/root/.wigle_uploads', data_format='json')
+        self.skip = list()
 
-        handshake_dir = config['bettercap']['handshakes']
-        all_files = os.listdir(handshake_dir)
-        all_gps_files = [os.path.join(handshake_dir, filename)
-                     for filename in all_files
-                     if filename.endswith('.gps.json')]
-        new_gps_files = set(all_gps_files) - set(reported) - set(SKIP)
+    def on_loaded(self):
+        if 'api_key' not in self.options or ('api_key' in self.options and self.options['api_key'] is None):
+            logging.error("WIGLE: api_key isn't set. Can't upload to wigle.net")
+            return
+        self.ready = True
 
-        if new_gps_files:
-            logging.info("WIGLE: Internet connectivity detected. Uploading new handshakes to wigle.net")
+    def on_internet_available(self, agent):
+        from scapy.all import Scapy_Exception
+        """
+        Called in manual mode when there's internet connectivity
+        """
+        if self.ready:
+            config = agent.config()
+            display = agent.view()
+            reported = self.report.data_field_or('reported', default=list())
 
-            csv_entries = list()
-            no_err_entries = list()
+            handshake_dir = config['bettercap']['handshakes']
+            all_files = os.listdir(handshake_dir)
+            all_gps_files = [os.path.join(handshake_dir, filename)
+                             for filename in all_files
+                             if filename.endswith('.gps.json')]
+            new_gps_files = set(all_gps_files) - set(reported) - set(self.skip)
 
-            for gps_file in new_gps_files:
-                pcap_filename = gps_file.replace('.gps.json', '.pcap')
+            if new_gps_files:
+                logging.info("WIGLE: Internet connectivity detected. Uploading new handshakes to wigle.net")
 
-                if not os.path.exists(pcap_filename):
-                    logging.error("WIGLE: Can't find pcap for %s", gps_file)
-                    SKIP.append(gps_file)
-                    continue
+                csv_entries = list()
+                no_err_entries = list()
 
-                try:
-                    gps_data = _extract_gps_data(gps_file)
-                except OSError as os_err:
-                    logging.error("WIGLE: %s", os_err)
-                    SKIP.append(gps_file)
-                    continue
-                except json.JSONDecodeError as json_err:
-                    logging.error("WIGLE: %s", json_err)
-                    SKIP.append(gps_file)
-                    continue
+                for gps_file in new_gps_files:
+                    pcap_filename = gps_file.replace('.gps.json', '.pcap')
 
-                if gps_data['Latitude'] == 0 and gps_data['Longitude'] == 0:
-                    logging.warning("WIGLE: Not enough gps-informations for %s. Trying again next time.", gps_file)
-                    SKIP.append(gps_file)
-                    continue
+                    if not os.path.exists(pcap_filename):
+                        logging.error("WIGLE: Can't find pcap for %s", gps_file)
+                        self.skip.append(gps_file)
+                        continue
 
+                    try:
+                        gps_data = _extract_gps_data(gps_file)
+                    except OSError as os_err:
+                        logging.error("WIGLE: %s", os_err)
+                        self.skip.append(gps_file)
+                        continue
+                    except json.JSONDecodeError as json_err:
+                        logging.error("WIGLE: %s", json_err)
+                        self.skip.append(gps_file)
+                        continue
 
-                try:
-                    pcap_data = extract_from_pcap(pcap_filename, [WifiInfo.BSSID,
-                                                                  WifiInfo.ESSID,
-                                                                  WifiInfo.ENCRYPTION,
-                                                                  WifiInfo.CHANNEL,
-                                                                  WifiInfo.RSSI])
-                except FieldNotFoundError:
-                    logging.error("WIGLE: Could not extract all informations. Skip %s", gps_file)
-                    SKIP.append(gps_file)
-                    continue
-                except Scapy_Exception as sc_e:
-                    logging.error("WIGLE: %s", sc_e)
-                    SKIP.append(gps_file)
-                    continue
+                    if gps_data['Latitude'] == 0 and gps_data['Longitude'] == 0:
+                        logging.warning("WIGLE: Not enough gps-information for %s. Trying again next time.", gps_file)
+                        self.skip.append(gps_file)
+                        continue
 
-                new_entry = _transform_wigle_entry(gps_data, pcap_data)
-                csv_entries.append(new_entry)
-                no_err_entries.append(gps_file)
+                    try:
+                        pcap_data = extract_from_pcap(pcap_filename, [WifiInfo.BSSID,
+                                                                      WifiInfo.ESSID,
+                                                                      WifiInfo.ENCRYPTION,
+                                                                      WifiInfo.CHANNEL,
+                                                                      WifiInfo.RSSI])
+                    except FieldNotFoundError:
+                        logging.error("WIGLE: Could not extract all information. Skip %s", gps_file)
+                        self.skip.append(gps_file)
+                        continue
+                    except Scapy_Exception as sc_e:
+                        logging.error("WIGLE: %s", sc_e)
+                        self.skip.append(gps_file)
+                        continue
 
-            if csv_entries:
-                display.set('status', "Uploading gps-data to wigle.net ...")
-                display.update(force=True)
-                try:
-                    _send_to_wigle(csv_entries, OPTIONS['api_key'])
-                    reported += no_err_entries
-                    REPORT.update(data={'reported': reported})
-                    logging.info("WIGLE: Successfuly uploaded %d files", len(no_err_entries))
-                except requests.exceptions.RequestException as re_e:
-                    SKIP += no_err_entries
-                    logging.error("WIGLE: Got an exception while uploading %s", re_e)
-                except OSError as os_e:
-                    SKIP += no_err_entries
-                    logging.error("WIGLE: Got the following error: %s", os_e)
+                    new_entry = _transform_wigle_entry(gps_data, pcap_data)
+                    csv_entries.append(new_entry)
+                    no_err_entries.append(gps_file)
+
+                if csv_entries:
+                    display.set('status', "Uploading gps-data to wigle.net ...")
+                    display.update(force=True)
+                    try:
+                        _send_to_wigle(csv_entries, self.options['api_key'])
+                        reported += no_err_entries
+                        self.report.update(data={'reported': reported})
+                        logging.info("WIGLE: Successfully uploaded %d files", len(no_err_entries))
+                    except requests.exceptions.RequestException as re_e:
+                        self.skip += no_err_entries
+                        logging.error("WIGLE: Got an exception while uploading %s", re_e)
+                    except OSError as os_e:
+                        self.skip += no_err_entries
+                        logging.error("WIGLE: Got the following error: %s", os_e)

pwnagotchi/plugins/default/wpa-sec.py

@@ -1,87 +1,84 @@
-__author__ = '33197631+dadav@users.noreply.github.com'
-__version__ = '2.0.1'
-__name__ = 'wpa-sec'
-__license__ = 'GPL3'
-__description__ = 'This plugin automatically uploades handshakes to https://wpa-sec.stanev.org'
-
 import os
 import logging
 import requests
 from pwnagotchi.utils import StatusFile
-
-READY = False
-REPORT = StatusFile('/root/.wpa_sec_uploads', data_format='json')
-OPTIONS = dict()
-SKIP = list()
+import pwnagotchi.plugins as plugins
 
 
-def on_loaded():
-    """
-    Gets called when the plugin gets loaded
-    """
-    global READY
+class WpaSec(plugins.Plugin):
+    __author__ = '33197631+dadav@users.noreply.github.com'
+    __version__ = '2.0.1'
+    __license__ = 'GPL3'
+    __description__ = 'This plugin automatically uploads handshakes to https://wpa-sec.stanev.org'
 
-    if 'api_key' not in OPTIONS or ('api_key' in OPTIONS and OPTIONS['api_key'] is None):
-        logging.error("WPA_SEC: API-KEY isn't set. Can't upload to wpa-sec.stanev.org")
-        return
+    def __init__(self):
+        self.ready = False
+        self.report = StatusFile('/root/.wpa_sec_uploads', data_format='json')
+        self.options = dict()
+        self.skip = list()
 
-    if 'api_url' not in OPTIONS or ('api_url' in OPTIONS and OPTIONS['api_url'] is None):
-        logging.error("WPA_SEC: API-URL isn't set. Can't upload, no endpoint configured.")
-        return
-        
-    READY = True
+    def _upload_to_wpasec(self, path, timeout=30):
+        """
+        Uploads the file to https://wpa-sec.stanev.org, or another endpoint.
+        """
+        with open(path, 'rb') as file_to_upload:
+            cookie = {'key': self.options['api_key']}
+            payload = {'file': file_to_upload}
 
+            try:
+                result = requests.post(self.options['api_url'],
+                                       cookies=cookie,
+                                       files=payload,
+                                       timeout=timeout)
+                if ' already submitted' in result.text:
+                    logging.warning("%s was already submitted.", path)
+            except requests.exceptions.RequestException as req_e:
+                raise req_e
 
-def _upload_to_wpasec(path, timeout=30):
-    """
-    Uploads the file to https://wpa-sec.stanev.org, or another endpoint. 
-    """
-    with open(path, 'rb') as file_to_upload:
-        cookie = {'key': OPTIONS['api_key']}
-        payload = {'file': file_to_upload}
+    def on_loaded(self):
+        """
+        Gets called when the plugin gets loaded
+        """
+        if 'api_key' not in self.options or ('api_key' in self.options and self.options['api_key'] is None):
+            logging.error("WPA_SEC: API-KEY isn't set. Can't upload to wpa-sec.stanev.org")
+            return
 
-        try:
-            result = requests.post(OPTIONS['api_url'],
-                    cookies=cookie,
-                    files=payload,
-                    timeout=timeout)
-            if ' already submitted' in result.text:
-                logging.warning("%s was already submitted.", path)
-        except requests.exceptions.RequestException as req_e:
-            raise req_e
+        if 'api_url' not in self.options or ('api_url' in self.options and self.options['api_url'] is None):
+            logging.error("WPA_SEC: API-URL isn't set. Can't upload, no endpoint configured.")
+            return
 
+        self.ready = True
 
-def on_internet_available(agent):
-    """
-    Called in manual mode when there's internet connectivity
-    """
-    global REPORT
-    global SKIP
-    if READY:
-        config = agent.config()
-        display = agent.view()
-        reported = REPORT.data_field_or('reported', default=list())
+    def on_internet_available(self, agent):
+        """
+        Called in manual mode when there's internet connectivity
+        """
+        if self.ready:
+            config = agent.config()
+            display = agent.view()
+            reported = self.report.data_field_or('reported', default=list())
 
-        handshake_dir = config['bettercap']['handshakes']
-        handshake_filenames = os.listdir(handshake_dir)
-        handshake_paths = [os.path.join(handshake_dir, filename) for filename in handshake_filenames if filename.endswith('.pcap')]
-        handshake_new = set(handshake_paths) - set(reported) - set(SKIP)
+            handshake_dir = config['bettercap']['handshakes']
+            handshake_filenames = os.listdir(handshake_dir)
+            handshake_paths = [os.path.join(handshake_dir, filename) for filename in handshake_filenames if
+                               filename.endswith('.pcap')]
+            handshake_new = set(handshake_paths) - set(reported) - set(self.skip)
 
-        if handshake_new:
-            logging.info("WPA_SEC: Internet connectivity detected. Uploading new handshakes to wpa-sec.stanev.org")
+            if handshake_new:
+                logging.info("WPA_SEC: Internet connectivity detected. Uploading new handshakes to wpa-sec.stanev.org")
 
-            for idx, handshake in enumerate(handshake_new):
-                display.set('status', f"Uploading handshake to wpa-sec.stanev.org ({idx + 1}/{len(handshake_new)})")
-                display.update(force=True)
-                try:
-                    _upload_to_wpasec(handshake)
-                    reported.append(handshake)
-                    REPORT.update(data={'reported': reported})
-                    logging.info("WPA_SEC: Successfuly uploaded %s", handshake)
-                except requests.exceptions.RequestException as req_e:
-                    SKIP.append(handshake)
-                    logging.error("WPA_SEC: %s", req_e)
-                    continue
-                except OSError as os_e:
-                    logging.error("WPA_SEC: %s", os_e)
-                    continue
+                for idx, handshake in enumerate(handshake_new):
+                    display.set('status', f"Uploading handshake to wpa-sec.stanev.org ({idx + 1}/{len(handshake_new)})")
+                    display.update(force=True)
+                    try:
+                        self._upload_to_wpasec(handshake)
+                        reported.append(handshake)
+                        self.report.update(data={'reported': reported})
+                        logging.info("WPA_SEC: Successfully uploaded %s", handshake)
+                    except requests.exceptions.RequestException as req_e:
+                        self.skip.append(handshake)
+                        logging.error("WPA_SEC: %s", req_e)
+                        continue
+                    except OSError as os_e:
+                        logging.error("WPA_SEC: %s", os_e)
+                        continue

pwnagotchi/ui/display.py

@@ -1,7 +1,8 @@
 import os
 import logging
-import pwnagotchi.plugins as plugins
+import threading
 
+import pwnagotchi.plugins as plugins
 import pwnagotchi.ui.hw as hw
 import pwnagotchi.ui.web as web
 from pwnagotchi.ui.view import View
@@ -18,6 +19,14 @@ class Display(View):
 
         self.init_display()
 
+        self._canvas_next_event = threading.Event()
+        self._canvas_next = None
+        self._render_thread_instance = threading.Thread(
+            target=self._render_thread,
+            daemon=True
+        )
+        self._render_thread_instance.start()
+
     def is_inky(self):
         return self._implementation.name == 'inky'
 
@@ -42,6 +51,15 @@ class Display(View):
     def is_lcdhat(self):
         return self._implementation.name == 'lcdhat'
 
+    def is_dfrobot(self):
+        return self._implementation.name == 'dfrobot'
+
+    def is_waveshare154inch(self):
+        return self._implementation.name == 'waveshare154inch'
+
+    def is_waveshare213d(self):
+        return self._implementation.name == 'waveshare213d'
+
     def is_waveshare_any(self):
         return self.is_waveshare_v1() or self.is_waveshare_v2()
 
@@ -62,6 +80,14 @@ class Display(View):
             img = self._canvas if self._rotation == 0 else self._canvas.rotate(-self._rotation)
         return img
 
+    def _render_thread(self):
+        """Used for non-blocking screen updating."""
+
+        while True:
+            self._canvas_next_event.wait()
+            self._canvas_next_event.clear()
+            self._implementation.render(self._canvas_next)
+
     def _on_view_rendered(self, img):
         web.update_frame(img)
         try:
@@ -73,4 +99,5 @@ class Display(View):
         if self._enabled:
             self._canvas = (img if self._rotation == 0 else img.rotate(self._rotation))
             if self._implementation is not None:
-                self._implementation.render(self._canvas)
+                self._canvas_next = self._canvas
+                self._canvas_next_event.set()

pwnagotchi/ui/faces.py

@@ -1,5 +1,7 @@
 LOOK_R = '( ⚆_⚆)'
 LOOK_L = '(☉_☉ )'
+LOOK_R_HAPPY = '( ◕‿◕)'
+LOOK_L_HAPPY = '(◕‿◕ )'
 SLEEP = '(⇀‿‿↼)'
 SLEEP2 = '(≖‿‿≖)'
 AWAKE = '(◕‿‿◕)'
@@ -7,12 +9,14 @@ BORED = '(-__-)'
 INTENSE = '(°▃▃°)'
 COOL = '(⌐■_■)'
 HAPPY = '(•‿‿•)'
+GRATEFUL = '(^‿‿^)'
 EXCITED = '(ᵔ◡◡ᵔ)'
 MOTIVATED = '(☼‿‿☼)'
 DEMOTIVATED = '(≖__≖)'
 SMART = '(✜‿‿✜)'
 LONELY = '(ب__ب)'
 SAD = '(╥☁╥ )'
+ANGRY = "(-_-')"
 FRIEND = '(♥‿‿♥)'
 BROKEN = '(☓‿‿☓)'
 DEBUG = '(#__#)'

pwnagotchi/ui/hw/__init__.py

@@ -2,9 +2,13 @@ from pwnagotchi.ui.hw.inky import Inky
 from pwnagotchi.ui.hw.papirus import Papirus
 from pwnagotchi.ui.hw.oledhat import OledHat
 from pwnagotchi.ui.hw.lcdhat import LcdHat
+from pwnagotchi.ui.hw.dfrobot import DFRobot
 from pwnagotchi.ui.hw.waveshare1 import WaveshareV1
 from pwnagotchi.ui.hw.waveshare2 import WaveshareV2
 from pwnagotchi.ui.hw.waveshare27inch import Waveshare27inch
+from pwnagotchi.ui.hw.waveshare29inch import Waveshare29inch
+from pwnagotchi.ui.hw.waveshare154inch import Waveshare154inch
+from pwnagotchi.ui.hw.waveshare213d import Waveshare213d
 
 
 def display_for(config):
@@ -21,6 +25,9 @@ def display_for(config):
     if config['ui']['display']['type'] == 'lcdhat':
         return LcdHat(config)
 
+    if config['ui']['display']['type'] == 'dfrobot':
+        return DFRobot(config)
+
     elif config['ui']['display']['type'] == 'waveshare_1':
         return WaveshareV1(config)
 
@@ -33,3 +40,8 @@ def display_for(config):
     elif config['ui']['display']['type'] == 'waveshare29inch':
         return Waveshare29inch(config)
     
+    elif config['ui']['display']['type'] == 'waveshare154inch':
+        return Waveshare154inch(config)
+
+    elif config['ui']['display']['type'] == 'waveshare213d':
+        return Waveshare213d(config)

pwnagotchi/ui/hw/dfrobot.py

@@ -0,0 +1,43 @@
+import logging
+
+import pwnagotchi.ui.fonts as fonts
+from pwnagotchi.ui.hw.base import DisplayImpl
+
+class DFRobot(DisplayImpl):
+  def __init__(self, config):
+    super(DFRobot, self).__init__(config, 'dfrobot')
+    self._display = None
+
+  def layout(self):
+    fonts.setup(10, 9, 10, 35)
+    self._layout['width'] = 250
+    self._layout['height'] = 122
+    self._layout['face'] = (0, 40)
+    self._layout['name'] = (5, 20)
+    self._layout['channel'] = (0, 0)
+    self._layout['aps'] = (28, 0)
+    self._layout['uptime'] = (185, 0)
+    self._layout['line1'] = [0, 14, 250, 14]
+    self._layout['line2'] = [0, 108, 250, 108]
+    self._layout['friend_face'] = (0, 92)
+    self._layout['friend_name'] = (40, 94)
+    self._layout['shakes'] = (0, 109)
+    self._layout['mode'] = (225, 109)
+    self._layout['status'] = {
+        'pos': (125, 20),
+        'font': fonts.Medium,
+        'max': 20
+    }
+    return self._layout
+
+  def initialize(self):
+    logging.info("initializing dfrobot display")
+    from pwnagotchi.ui.hw.libs.dfrobot.dfrobot import DFRobot
+    self._display = DFRobot()
+
+  def render(self, canvas):
+    buf = self._display.getbuffer(canvas)
+    self._display.display(buf)
+
+  def clear(self):
+    self._display.Clear(0xFF)

pwnagotchi/ui/hw/inky.py

@@ -33,15 +33,25 @@ class Inky(DisplayImpl):
 
     def initialize(self):
         logging.info("initializing inky display")
-        from pwnagotchi.ui.hw.libs.inkyphat.inkyphatfast import InkyPHATFast
-        self._display = InkyPHATFast(self.config['color'])
-        self._display.set_border(InkyPHATFast.BLACK)
+
+        if self.config['color'] == 'fastAndFurious':
+            logging.info("Initializing Inky in 2-color FAST MODE")
+            logging.info("THIS MAY BE POTENTIALLY DANGEROUS. NO WARRANTY IS PROVIDED")
+            logging.info("USE THIS DISPLAY IN THIS MODE AT YOUR OWN RISK")
+
+            from pwnagotchi.ui.hw.libs.inkyphat.inkyphatfast import InkyPHATFast
+            self._display = InkyPHATFast('black')
+            self._display.set_border(InkyPHATFast.BLACK)
+        else:
+            from inky import InkyPHAT
+            self._display = InkyPHAT(self.config['color'])
+            self._display.set_border(InkyPHAT.BLACK)
 
     def render(self, canvas):
-        if self.config['color'] != 'mono':
-            display_colors = 3
-        else:
+        if self.config['color'] == 'black' or self.config['color'] == 'fastAndFurious':
             display_colors = 2
+        else:
+            display_colors = 3
 
         img_buffer = canvas.convert('RGB').convert('P', palette=1, colors=display_colors)
         if self.config['color'] == 'red':

pwnagotchi/ui/hw/lcdhat.py

@@ -37,7 +37,7 @@ class LcdHat(DisplayImpl):
         from pwnagotchi.ui.hw.libs.waveshare.lcdhat.epd import EPD
         self._display = EPD()
         self._display.init()
-        self._display.Clear()
+        self._display.clear()
 
     def render(self, canvas):
         self._display.display(canvas)

pwnagotchi/ui/hw/libs/dfrobot/LICENSE

@@ -0,0 +1,504 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+    USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random
+  Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!

pwnagotchi/ui/hw/libs/dfrobot/dfrobot.py

@@ -0,0 +1,66 @@
+# DFRobot display support
+
+import logging
+from . import dfrobot_epaper
+
+#Resolution of display
+WIDTH = 250
+HEIGHT = 122
+
+RASPBERRY_SPI_BUS = 0
+RASPBERRY_SPI_DEV = 0
+RASPBERRY_PIN_CS = 27
+RASPBERRY_PIN_CD = 17
+RASPBERRY_PIN_BUSY = 4
+
+class DFRobot:
+  def __init__(self):
+    self._display = dfrobot_epaper.DFRobot_Epaper_SPI(RASPBERRY_SPI_BUS, RASPBERRY_SPI_DEV, RASPBERRY_PIN_CS, RASPBERRY_PIN_CD, RASPBERRY_PIN_BUSY)
+    self._display.begin()
+    self.clear(0xFF)
+    self.FULL = self._display.FULL
+    self.PART = self._display.PART
+
+  def getbuffer(self, image):
+    if HEIGHT % 8 == 0:
+      linewidth = HEIGHT // 8
+    else:
+      linewidth = HEIGHT // 8 + 1
+
+    buf = [0xFF] * (linewidth * WIDTH)
+    image_monocolor = image.convert('1')
+    imwidth, imheight = image_monocolor.size
+    pixels = image_monocolor.load()
+
+    if (imwidth == HEIGHT and imheight == WIDTH):
+      for y in range(imheight):
+        for x in range(imwidth):
+          if pixels[x,y] == 0:
+            x = imwidth - x
+            buf[x // 8 + y * linewidth] &= ~(0x80 >> (x % 8))
+    elif (imwidth == WIDTH and imheight == HEIGHT):
+      for y in range(imheight):
+        for x in range(imwidth):
+          newx = y
+          newy = WIDTH - x - 1
+          if pixels[x,y] == 0:
+            newy = imwidth - newy - 1
+            buf[newx // 8 + newy * linewidth] &= ~(0x80 >> (y % 8))
+    return buf
+  
+  def flush(self, type):
+    self._display.flush(type)
+
+  def display(self, buf):
+    self._display.setBuffer(buf)
+    self.flush(self._display.PART)
+
+  def clear(self, color):
+    if HEIGHT % 8 == 0:
+      linewidth = HEIGHT // 8
+    else:
+      linewidth = HEIGHT // 8 + 1
+
+    buf = [color] * (linewidth * WIDTH)
+    self._display.setBuffer(buf)
+    self.flush(self._display.FULL)

pwnagotchi/ui/hw/libs/dfrobot/dfrobot_epaper.py

@@ -0,0 +1,208 @@
+# -*- coding:utf-8 -*-
+
+import time
+
+import sys
+sys.path.append("..")
+
+
+try:
+  from .spi import SPI
+  from .gpio import GPIO
+except:
+  print("unknown platform")
+  exit()
+
+CONFIG_IL0376F = {
+
+}
+
+CONFIG_IL3895 = {
+  
+}
+
+class DFRobot_Epaper:
+
+  XDOT = 128
+  YDOT = 250
+
+  FULL = True
+  PART = False
+
+  def __init__(self, width = 250, height = 122):
+    # length = width * height // 8
+    length = 4000
+    self._displayBuffer = bytearray(length)
+    i = 0
+    while i < length:
+      self._displayBuffer[i] = 0xff
+      i = i + 1
+
+    self._isBusy = False
+    self._busyExitEdge = GPIO.RISING
+
+  def _busyCB(self, channel):
+    self._isBusy = False
+
+  def setBusyExitEdge(self, edge):
+    if edge != GPIO.HIGH and edge != GPIO.LOW:
+      return
+    self._busyEdge = edge
+
+  def begin(self):
+    pass
+    # self.setBusyCB(self._busyCB)
+    # self._powerOn()
+
+  def setBuffer(self, buffer):
+    self._displayBuffer = buffer
+
+  def pixel(self, x, y, color):
+    if x < 0 or x >= self._width:
+      return
+    if y < 0 or y >= self._height:
+      return
+    x = int(x)
+    y = int(y)
+    m = int(x * 16 + (y + 1) / 8)
+    sy = int((y + 1) % 8)
+    if color == self.WHITE:
+      if sy != 0:
+        self._displayBuffer[m] = self._displayBuffer[m] | int(pow(2, 8 - sy))
+      else:
+        self._displayBuffer[m - 1] = self._displayBuffer[m - 1] | 1
+    elif color == self.BLACK:
+      if sy != 0:
+        self._displayBuffer[m] = self._displayBuffer[m] & (0xff - int(pow(2, 8 - sy)))
+      else:
+        self._displayBuffer[m - 1] = self._displayBuffer[m - 1] & 0xfe
+
+  def _setWindow(self, x, y):
+    hres = y // 8
+    hres = hres << 3
+    vres_h = x >> 8
+    vres_l = x & 0xff
+    self.writeCmdAndData(0x61, [hres, vres_h, vres_l])
+
+  def _initLut(self, mode):
+    if mode == self.FULL:
+      self.writeCmdAndData(0x32, [0x22,0x55,0xAA,0x55,0xAA,0x55,0xAA,
+                                  0x11,0x00,0x00,0x00,0x00,0x00,0x00,
+                                  0x00,0x00,0x1E,0x1E,0x1E,0x1E,0x1E,
+                                  0x1E,0x1E,0x1E,0x01,0x00,0x00,0x00,0x00])
+    elif mode == self.PART:
+      self.writeCmdAndData(0x32, [0x18,0x00,0x00,0x00,0x00,0x00,0x00,
+                                  0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+                                  0x00,0x00,0x0F,0x01,0x00,0x00,0x00,
+                                  0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00])
+
+  def _setRamData(self, xStart, xEnd, yStart, yStart1, yEnd, yEnd1):
+    self.writeCmdAndData(0x44, [xStart, xEnd])
+    self.writeCmdAndData(0x45, [yStart, yStart1, yEnd, yEnd1])
+
+  def _setRamPointer(self, x, y, y1):
+    self.writeCmdAndData(0x4e, [x])
+    self.writeCmdAndData(0x4f, [y, y1])
+
+  def _init(self):
+    self.writeCmdAndData(0x01, [(self.YDOT - 1) % 256, (self.YDOT - 1) // 256, 0x00])
+    self.writeCmdAndData(0x0c, [0xd7, 0xd6, 0x9d])
+    self.writeCmdAndData(0x2c, [0xa8])
+    self.writeCmdAndData(0x3a, [0x1a])
+    self.writeCmdAndData(0x3b, [0x08])
+    self.writeCmdAndData(0x11, [0x01])
+    self._setRamData(0x00, (self.XDOT - 1) // 8, (self.YDOT - 1) % 256, (self.YDOT - 1) // 256, 0x00, 0x00)
+    self._setRamPointer(0x00, (self.YDOT - 1) % 256, (self.YDOT - 1) // 256)
+  
+  def _writeDisRam(self, sizeX, sizeY):
+    if sizeX % 8 != 0:
+      sizeX = sizeX + (8 - sizeX % 8)
+    sizeX = sizeX // 8
+    self.writeCmdAndData(0x24, self._displayBuffer[0: sizeX * sizeY])
+
+  def _updateDis(self, mode):
+    if mode == self.FULL:
+      self.writeCmdAndData(0x22, [0xc7])
+    elif mode == self.PART:
+      self.writeCmdAndData(0x22, [0x04])
+    else:
+      return
+    self.writeCmdAndData(0x20, [])
+    self.writeCmdAndData(0xff, [])
+
+  def _waitBusyExit(self):
+    temp = 0
+    while self.readBusy() != False:
+      time.sleep(0.01)
+      temp = temp + 1
+      if (temp % 200) == 0:
+        print("waitBusyExit")
+
+  def _powerOn(self):
+    self.writeCmdAndData(0x22, [0xc0])
+    self.writeCmdAndData(0x20, [])
+
+  def _powerOff(self):
+    self.writeCmdAndData(0x12, [])
+    self.writeCmdAndData(0x82, [0x00])
+    self.writeCmdAndData(0x01, [0x02, 0x00, 0x00, 0x00, 0x00])
+    self.writeCmdAndData(0x02, [])
+
+  def _disPart(self, xStart, xEnd, yStart, yEnd):
+    self._setRamData(xStart // 8, xEnd // 8, yEnd % 256, yEnd // 256, yStart % 256, yStart // 256)
+    self._setRamPointer(xStart // 8, yEnd % 256, yEnd // 256)
+    self._writeDisRam(xEnd - xStart, yEnd - yStart + 1)
+    self._updateDis(self.PART)
+
+  def flush(self, mode):
+    if mode != self.FULL and mode != self.PART:
+      return
+    self._init()
+    self._initLut(mode)
+    self._powerOn()
+    if mode == self.PART:
+      self._disPart(0, self.XDOT - 1, 0, self.YDOT - 1)
+    else:
+      self._setRamPointer(0x00, (self.YDOT - 1) % 256, (self.YDOT - 1) // 256)
+      self._writeDisRam(self.XDOT, self.YDOT)
+      self._updateDis(mode)
+  
+  def startDrawBitmapFile(self, x, y):
+    self._bitmapFileStartX = x
+    self._bitmapFileStartY = y
+
+  def bitmapFileHelper(self, buf):
+    for i in range(len(buf) // 3):
+      addr = i * 3
+      if buf[addr] == 0x00 and buf[addr + 1] == 0x00 and buf[addr + 2] == 0x00:
+        self.pixel(self._bitmapFileStartX, self._bitmapFileStartY, self.BLACK)
+      else:
+        self.pixel(self._bitmapFileStartX, self._bitmapFileStartY, self.WHITE)
+      self._bitmapFileStartX += 1
+  
+  def endDrawBitmapFile(self):
+    self.flush(self.PART)
+
+class DFRobot_Epaper_SPI(DFRobot_Epaper):
+
+  def __init__(self, bus, dev, cs, cd, busy):
+    DFRobot_Epaper.__init__(self)
+    self._spi = SPI(bus, dev)
+    self._cs = GPIO(cs, GPIO.OUT)
+    self._cd = GPIO(cd, GPIO.OUT)
+    self._busy = GPIO(busy, GPIO.IN)
+  
+  def writeCmdAndData(self, cmd, data = []):
+    self._waitBusyExit()
+    self._cs.setOut(GPIO.LOW)
+    self._cd.setOut(GPIO.LOW)
+    self._spi.transfer([cmd])
+    self._cd.setOut(GPIO.HIGH)
+    self._spi.transfer(data)
+    self._cs.setOut(GPIO.HIGH)
+
+  def readBusy(self):
+    return self._busy.read()
+
+  def setBusyCB(self, cb):
+    self._busy.setInterrupt(self._busyExitEdge, cb)

pwnagotchi/ui/hw/libs/dfrobot/gpio.py

@@ -0,0 +1,64 @@
+# -*- coding:utf-8 -*-
+
+import time
+import RPi.GPIO as RPIGPIO
+
+RPIGPIO.setmode(RPIGPIO.BCM)
+RPIGPIO.setwarnings(False)
+
+class GPIO:
+
+  HIGH = RPIGPIO.HIGH
+  LOW = RPIGPIO.LOW
+
+  OUT = RPIGPIO.OUT
+  IN = RPIGPIO.IN
+
+  RISING = RPIGPIO.RISING
+  FALLING = RPIGPIO.FALLING
+  BOTH = RPIGPIO.BOTH
+
+  def __init__(self, pin, mode, defaultOut = HIGH):
+    self._pin = pin
+    self._fInt = None
+    self._intDone = True
+    self._intMode = None
+    if mode == self.OUT:
+      RPIGPIO.setup(pin, mode)
+      if defaultOut == self.HIGH:
+        RPIGPIO.output(pin, defaultOut)
+      else:
+        RPIGPIO.output(pin, self.LOW)
+    else:
+      RPIGPIO.setup(pin, self.IN, pull_up_down = RPIGPIO.PUD_UP)
+
+  def setOut(self, level):
+    if level:
+      RPIGPIO.output(self._pin, self.HIGH)
+    else:
+      RPIGPIO.output(self._pin, self.LOW)
+
+  def _intCB(self, status):
+    if self._intDone:
+      self._intDone = False
+      time.sleep(0.02)
+      if self._intMode == self.BOTH:
+        self._fInt()
+      elif self._intMode == self.RISING and self.read() == self.HIGH:
+        self._fInt()
+      elif self._intMode == self.FALLING and self.read() == self.LOW:
+        self._fInt()
+      self._intDone = True
+
+  def setInterrupt(self, mode, cb):
+    if mode != self.RISING and mode != self.FALLING and mode != self.BOTH:
+      return
+    self._intMode = mode
+    RPIGPIO.add_event_detect(self._pin, mode, self._intCB)
+    self._fInt = cb
+
+  def read(self):
+    return RPIGPIO.input(self._pin)
+  
+  def cleanup(self):
+    RPIGPIO.cleanup()

pwnagotchi/ui/hw/libs/dfrobot/spi.py

@@ -0,0 +1,21 @@
+# -*- coding:utf-8 -*-
+
+import spidev
+
+class SPI:
+
+  MODE_1 = 1
+  MODE_2 = 2
+  MODE_3 = 3
+  MODE_4 = 4
+
+  def __init__(self, bus, dev, speed = 3900000, mode = MODE_4):
+    self._bus = spidev.SpiDev()
+    self._bus.open(bus, dev)
+    self._bus.no_cs = True
+    self._bus.max_speed_hz = speed
+
+  def transfer(self, buf):
+    if len(buf):
+      return self._bus.xfer(buf)
+    return []

pwnagotchi/ui/hw/libs/papirus/epd.py

@@ -47,7 +47,7 @@ to use:
   image = Image.new('1', epd.size, 0)
   # draw on image
   epd.clear()         # clear the panel
-  epd.display(image)  # tranfer image data
+  epd.display(image)  # transfer image data
   epd.update()        # refresh the panel image - not needed if auto=true
 """
 
@@ -173,7 +173,7 @@ to use:
 
         # attempt grayscale conversion, and then to single bit
         # better to do this before calling this if the image is to
-        # be dispayed several times
+        # be displayed several times
         if image.mode != "1":
             image = ImageOps.grayscale(image).convert("1", dither=Image.FLOYDSTEINBERG)
 

pwnagotchi/ui/hw/libs/waveshare/lcdhat/ST7789.py

@@ -7,24 +7,25 @@ import numpy as np
 class ST7789(object):
     """class for ST7789  240*240 1.3inch OLED displays."""
 
-    def __init__(self,spi,rst = 27,dc = 25,bl = 24):
+    def __init__(self, spi, rst=27, dc=25, bl=24):
         self.width = 240
         self.height = 240
-        #Initialize DC RST pin
+        # Initialize DC RST pin
         self._dc = dc
         self._rst = rst
         self._bl = bl
         GPIO.setmode(GPIO.BCM)
         GPIO.setwarnings(False)
-        GPIO.setup(self._dc,GPIO.OUT)
-        GPIO.setup(self._rst,GPIO.OUT)
-        GPIO.setup(self._bl,GPIO.OUT)
+        GPIO.setup(self._dc, GPIO.OUT)
+        GPIO.setup(self._rst, GPIO.OUT)
+        GPIO.setup(self._bl, GPIO.OUT)
         GPIO.output(self._bl, GPIO.HIGH)
-        #Initialize SPI
+        # Initialize SPI
         self._spi = spi
         self._spi.max_speed_hz = 40000000
 
     """    Write register address and data     """
+
     def command(self, cmd):
         GPIO.output(self._dc, GPIO.LOW)
         self._spi.writebytes([cmd])
@@ -34,13 +35,13 @@ class ST7789(object):
         self._spi.writebytes([val])
 
     def Init(self):
-        """Initialize dispaly"""    
+        """Initialize display"""
         self.reset()
 
         self.command(0x36)
-        self.data(0x70)                 #self.data(0x00)
+        self.data(0x70)  # self.data(0x00)
 
-        self.command(0x3A) 
+        self.command(0x3A)
         self.data(0x05)
 
         self.command(0xB2)
@@ -51,7 +52,7 @@ class ST7789(object):
         self.data(0x33)
 
         self.command(0xB7)
-        self.data(0x35) 
+        self.data(0x35)
 
         self.command(0xBB)
         self.data(0x19)
@@ -63,13 +64,13 @@ class ST7789(object):
         self.data(0x01)
 
         self.command(0xC3)
-        self.data(0x12)   
+        self.data(0x12)
 
         self.command(0xC4)
         self.data(0x20)
 
         self.command(0xC6)
-        self.data(0x0F) 
+        self.data(0x0F)
 
         self.command(0xD0)
         self.data(0xA4)
@@ -106,7 +107,7 @@ class ST7789(object):
         self.data(0x1F)
         self.data(0x20)
         self.data(0x23)
-        
+
         self.command(0x21)
 
         self.command(0x11)
@@ -115,51 +116,51 @@ class ST7789(object):
 
     def reset(self):
         """Reset the display"""
-        GPIO.output(self._rst,GPIO.HIGH)
+        GPIO.output(self._rst, GPIO.HIGH)
         time.sleep(0.01)
-        GPIO.output(self._rst,GPIO.LOW)
+        GPIO.output(self._rst, GPIO.LOW)
         time.sleep(0.01)
-        GPIO.output(self._rst,GPIO.HIGH)
+        GPIO.output(self._rst, GPIO.HIGH)
         time.sleep(0.01)
-        
+
     def SetWindows(self, Xstart, Ystart, Xend, Yend):
-        #set the X coordinates
+        # set the X coordinates
         self.command(0x2A)
-        self.data(0x00)               #Set the horizontal starting point to the high octet
-        self.data(Xstart & 0xff)      #Set the horizontal starting point to the low octet
-        self.data(0x00)               #Set the horizontal end to the high octet
-        self.data((Xend - 1) & 0xff) #Set the horizontal end to the low octet 
-        
-        #set the Y coordinates
+        self.data(0x00)  # Set the horizontal starting point to the high octet
+        self.data(Xstart & 0xff)  # Set the horizontal starting point to the low octet
+        self.data(0x00)  # Set the horizontal end to the high octet
+        self.data((Xend - 1) & 0xff)  # Set the horizontal end to the low octet
+
+        # set the Y coordinates
         self.command(0x2B)
         self.data(0x00)
         self.data((Ystart & 0xff))
         self.data(0x00)
-        self.data((Yend - 1) & 0xff )
+        self.data((Yend - 1) & 0xff)
 
-        self.command(0x2C)    
-    
-    def ShowImage(self,Image,Xstart,Ystart):
+        self.command(0x2C)
+
+    def ShowImage(self, Image, Xstart, Ystart):
         """Set buffer to value of Python Imaging Library image."""
         """Write display buffer to physical display"""
         imwidth, imheight = Image.size
         if imwidth != self.width or imheight != self.height:
             raise ValueError('Image must be same dimensions as display \
-                ({0}x{1}).' .format(self.width, self.height))
+                ({0}x{1}).'.format(self.width, self.height))
         img = np.asarray(Image)
-        pix = np.zeros((self.width,self.height,2), dtype = np.uint8)
-        pix[...,[0]] = np.add(np.bitwise_and(img[...,[0]],0xF8),np.right_shift(img[...,[1]],5))
-        pix[...,[1]] = np.add(np.bitwise_and(np.left_shift(img[...,[1]],3),0xE0),np.right_shift(img[...,[2]],3))
+        pix = np.zeros((self.width, self.height, 2), dtype=np.uint8)
+        pix[..., [0]] = np.add(np.bitwise_and(img[..., [0]], 0xF8), np.right_shift(img[..., [1]], 5))
+        pix[..., [1]] = np.add(np.bitwise_and(np.left_shift(img[..., [1]], 3), 0xE0), np.right_shift(img[..., [2]], 3))
         pix = pix.flatten().tolist()
-        self.SetWindows ( 0, 0, self.width, self.height)
-        GPIO.output(self._dc,GPIO.HIGH)
-        for i in range(0,len(pix),4096):
-            self._spi.writebytes(pix[i:i+4096])		
-        
+        self.SetWindows(0, 0, self.width, self.height)
+        GPIO.output(self._dc, GPIO.HIGH)
+        for i in range(0, len(pix), 4096):
+            self._spi.writebytes(pix[i:i + 4096])
+
     def clear(self):
         """Clear contents of image buffer"""
-        _buffer = [0xff]*(self.width * self.height * 2)
-        self.SetWindows ( 0, 0, self.width, self.height)
-        GPIO.output(self._dc,GPIO.HIGH)
-        for i in range(0,len(_buffer),4096):
-            self._spi.writebytes(_buffer[i:i+4096])		
+        _buffer = [0xff] * (self.width * self.height * 2)
+        self.SetWindows(0, 0, self.width, self.height)
+        GPIO.output(self._dc, GPIO.HIGH)
+        for i in range(0, len(_buffer), 4096):
+            self._spi.writebytes(_buffer[i:i + 4096])

pwnagotchi/ui/hw/libs/waveshare/lcdhat/config.py

@@ -7,70 +7,15 @@
 # * | Date        :   2019-10-18
 # * | Info        :
 # ******************************************************************************/
-
-import RPi.GPIO as GPIO
-import time
-from smbus import SMBus
 import spidev
 
-import ctypes
-# import spidev
-
 # Pin definition
-RST_PIN         = 27
-DC_PIN          = 25
-BL_PIN          = 24
+RST_PIN = 27
+DC_PIN = 25
+BL_PIN = 24
 
 Device_SPI = 1
 Device_I2C = 0
 
 Device = Device_SPI
 spi = spidev.SpiDev(0, 0)
-
-def digital_write(pin, value):
-    GPIO.output(pin, value)
-
-def digital_read(pin):
-    return GPIO.input(BUSY_PIN)
-
-def delay_ms(delaytime):
-    time.sleep(delaytime / 1000.0)
-
-def spi_writebyte(data):
-    # SPI.writebytes(data)
-    spi.writebytes([data[0]])
-
-def i2c_writebyte(reg, value):
-    bus.write_byte_data(address, reg, value)
-
-    # time.sleep(0.01)
-def module_init():
-    # print("module_init")
-
-    GPIO.setmode(GPIO.BCM)
-    GPIO.setwarnings(False)
-    GPIO.setup(RST_PIN, GPIO.OUT)
-    GPIO.setup(DC_PIN, GPIO.OUT)
-
-
-    # SPI.max_speed_hz = 2000000
-    # SPI.mode = 0b00
-    # i2c_writebyte(0xff,0xff)
-    # spi.SYSFS_software_spi_begin()
-    # spi.SYSFS_software_spi_setDataMode(0);
-    # spi.SYSFS_software_spi_setClockDivider(1);
-    #spi.max_speed_hz = 2000000
-    #spi.mode = 0b00
-
-    GPIO.output(BL_PIN, 1)
-    GPIO.output(DC_PIN, 0)
-    return 0
-
-def module_exit():
-    spi.SYSFS_software_spi_end()
-    GPIO.output(RST_PIN, 0)
-    GPIO.output(DC_PIN, 0)
-
-
-
-### END OF FILE ###

pwnagotchi/ui/hw/libs/waveshare/lcdhat/epd.py

@@ -1,28 +1,21 @@
 from . import ST7789
 from . import config
 
-# Display resolution
-EPD_WIDTH       = 240
-EPD_HEIGHT      = 240
-
-disp = ST7789.ST7789(config.spi,config.RST_PIN, config.DC_PIN, config.BL_PIN)
 
 class EPD(object):
-
     def __init__(self):
         self.reset_pin = config.RST_PIN
         self.dc_pin = config.DC_PIN
-        #self.busy_pin = config.BUSY_PIN
-        #self.cs_pin = config.CS_PIN
-        self.width = EPD_WIDTH
-        self.height = EPD_HEIGHT
+        self.width = 240
+        self.height = 240
+        self.st7789 = ST7789.ST7789(config.spi, config.RST_PIN, config.DC_PIN, config.BL_PIN)
 
     def init(self):
-        disp.Init()
+        self.st7789.Init()
 
-    def Clear(self):
-        disp.clear()
+    def clear(self):
+        self.st7789.clear()
 
     def display(self, image):
         rgb_im = image.convert('RGB')
-        disp.ShowImage(rgb_im,0,0)
+        self.st7789.ShowImage(rgb_im, 0, 0)

pwnagotchi/ui/hw/libs/waveshare/oledhat/SH1106.py

@@ -34,7 +34,7 @@ class SH1106(object):
     def Init(self):
         if (config.module_init() != 0):
             return -1
-        """Initialize dispaly"""
+        """Initialize display"""
         self.reset()
         self.command(0xAE);#--turn off oled panel
         self.command(0x02);#---set low column address

pwnagotchi/ui/hw/libs/waveshare/oledhat/config.py

@@ -9,11 +9,11 @@
 # * | Info        :
 # ******************************************************************************/
 # Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documnetation files (the "Software"), to deal
+# of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to  whom the Software is
-# furished to do so, subject to the following conditions:
+# furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.

pwnagotchi/ui/hw/libs/waveshare/v1/epd2in13.py

@@ -9,11 +9,11 @@
 # # | Info        :   python demo
 # -----------------------------------------------------------------------------
 # Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documnetation files (the "Software"), to deal
+# of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to  whom the Software is
-# furished to do so, subject to the following conditions:
+# furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.

pwnagotchi/ui/hw/libs/waveshare/v1/epd2in13bc.py

@@ -9,11 +9,11 @@
 # # | Info        :   python demo
 # -----------------------------------------------------------------------------
 # Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documnetation files (the "Software"), to deal
+# of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to  whom the Software is
-# furished to do so, subject to the following conditions:
+# furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
@@ -47,11 +47,11 @@ class EPD:
     # Hardware reset
     def reset(self):
         epdconfig.digital_write(self.reset_pin, GPIO.HIGH)
-        epdconfig.delay_ms(200) 
+        epdconfig.delay_ms(200)
         epdconfig.digital_write(self.reset_pin, GPIO.LOW)         # module reset
         epdconfig.delay_ms(200)
         epdconfig.digital_write(self.reset_pin, GPIO.HIGH)
-        epdconfig.delay_ms(200)   
+        epdconfig.delay_ms(200)
 
     def send_command(self, command):
         epdconfig.digital_write(self.dc_pin, GPIO.LOW)
@@ -64,8 +64,9 @@ class EPD:
         epdconfig.digital_write(self.cs_pin, GPIO.LOW)
         epdconfig.spi_writebyte([data])
         epdconfig.digital_write(self.cs_pin, GPIO.HIGH)
-        
+
     def ReadBusy(self):
+        epdconfig.delay_ms(20)
         while(epdconfig.digital_read(self.busy_pin) == 0):      # 0: idle, 1: busy
             epdconfig.delay_ms(100)
 
@@ -79,16 +80,16 @@ class EPD:
         self.send_data(0x17)
         self.send_data(0x17)
         self.send_data(0x17)
-        
+
         self.send_command(0x04) # POWER_ON
         self.ReadBusy()
-        
+
         self.send_command(0x00) # PANEL_SETTING
         self.send_data(0x8F)
-        
+
         self.send_command(0x50) # VCOM_AND_DATA_INTERVAL_SETTING
         self.send_data(0xF0)
-        
+
         self.send_command(0x61) # RESOLUTION_SETTING
         self.send_data(self.width & 0xff)
         self.send_data(self.height >> 8)
@@ -120,7 +121,7 @@ class EPD:
         for i in range(0, int(self.width * self.height / 8)):
             self.send_data(imageblack[i])
         self.send_command(0x92)
-        
+
         self.send_command(0x12) # REFRESH
         self.ReadBusy()
 
@@ -129,26 +130,26 @@ class EPD:
         for i in range(0, int(self.width * self.height / 8)):
             self.send_data(imageblack[i])
         self.send_command(0x92)
-        
+
         self.send_command(0x13)
         for i in range(0, int(self.width * self.height / 8)):
             self.send_data(imagecolor[i])
         self.send_command(0x92)
-        
+
         self.send_command(0x12) # REFRESH
         self.ReadBusy()
-        
+
     def Clear(self):
         self.send_command(0x10)
         for i in range(0, int(self.width * self.height / 8)):
             self.send_data(0xFF)
-        self.send_command(0x92) 
-        
+        self.send_command(0x92)
+
         self.send_command(0x13)
         for i in range(0, int(self.width * self.height / 8)):
             self.send_data(0xFF)
         self.send_command(0x92)
-        
+
         self.send_command(0x12) # REFRESH
         self.ReadBusy()
 
@@ -157,7 +158,7 @@ class EPD:
         self.ReadBusy()
         self.send_command(0x07) # DEEP_SLEEP
         self.send_data(0xA5) # check code
-        
+
 #        epdconfig.module_exit()
 ### END OF FILE ###
 

pwnagotchi/ui/hw/libs/waveshare/v1/epd2in13bcFAST.py

@@ -0,0 +1,359 @@
+# *****************************************************************************
+# * | File        :	  epd2in13d.py
+# * | Author      :   Waveshare team
+# * | Function    :   Electronic paper driver
+# * | Info        :
+# *----------------
+# * | This version:   V4.0
+# * | Date        :   2019-06-20
+# # | Info        :   python demo
+# -----------------------------------------------------------------------------
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documnetation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to  whom the Software is
+# furished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+
+# =============================================================================
+# THIS FILE HAS BEEN MODIFIED FROM ORIGINAL, IT HAS BEEN MODIFIED TO RUN THE
+# THREE COLOR WAVESHARE 2.13IN DISPLAY AT A MUCH, MUCH FASTER RATE THAN NORMAL
+# AND IT COULD DAMAGE YOUR DISPLAY. THERE IS NO WARRANTY INCLUDED AND YOU USE
+# THIS CODE AT YOUR OWN RISK. WE ARE NOT RESPONSIBLE FOR ANYTHING THAT HAPPENS
+# INCLUDING BUT NOT LIMITED TO: DESTRUCTION OF YOUR DISPLAY, PI, HOUSE, CAR,
+# SPACE-TIME-CONTINUUM, OR IF THE CODE KILLS YOUR CAT. IF YOU AREN'T WILLING TO 
+# TAKE THESE RISKS, PLEASE DO NOT USE THIS CODE.
+# =============================================================================
+
+
+import logging
+from . import epdconfig
+from PIL import Image
+import RPi.GPIO as GPIO
+
+# Display resolution
+EPD_WIDTH       = 104
+EPD_HEIGHT      = 212
+
+class EPD:
+    def __init__(self):
+        self.reset_pin = epdconfig.RST_PIN
+        self.dc_pin = epdconfig.DC_PIN
+        self.busy_pin = epdconfig.BUSY_PIN
+        self.cs_pin = epdconfig.CS_PIN
+        self.width = EPD_WIDTH
+        self.height = EPD_HEIGHT
+
+    lut_vcomDC = [  
+        0x00, 0x08, 0x00, 0x00, 0x00, 0x02,
+        0x60, 0x28, 0x28, 0x00, 0x00, 0x01,
+        0x00, 0x14, 0x00, 0x00, 0x00, 0x01,
+        0x00, 0x12, 0x12, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00,
+    ]
+
+    lut_ww = [  
+        0x40, 0x08, 0x00, 0x00, 0x00, 0x02,
+        0x90, 0x28, 0x28, 0x00, 0x00, 0x01,
+        0x40, 0x14, 0x00, 0x00, 0x00, 0x01,
+        0xA0, 0x12, 0x12, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+
+    lut_bw = [  
+        0x40, 0x17, 0x00, 0x00, 0x00, 0x02,
+        0x90, 0x0F, 0x0F, 0x00, 0x00, 0x03,
+        0x40, 0x0A, 0x01, 0x00, 0x00, 0x01,
+        0xA0, 0x0E, 0x0E, 0x00, 0x00, 0x02,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+
+    lut_wb = [
+        0x80, 0x08, 0x00, 0x00, 0x00, 0x02,
+        0x90, 0x28, 0x28, 0x00, 0x00, 0x01,
+        0x80, 0x14, 0x00, 0x00, 0x00, 0x01,
+        0x50, 0x12, 0x12, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+
+    lut_bb = [ 
+        0x80, 0x08, 0x00, 0x00, 0x00, 0x02,
+        0x90, 0x28, 0x28, 0x00, 0x00, 0x00,
+        0x80, 0x14, 0x00, 0x00, 0x00, 0x01,
+        0x50, 0x12, 0x12, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+    
+    lut_vcom1 = [  
+        0xA0, 0x10, 0x10, 0x00, 0x00, 0x02,
+        0x00, 0x10, 0x10, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00,
+    ]
+
+    lut_ww1 = [  
+        0x50, 0x01, 0x01, 0x00, 0x00, 0x01,
+        0xA0, 0x42, 0x42, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+
+    lut_bw1 = [  
+        0x50, 0x01, 0x01, 0x00, 0x00, 0x01,
+        0xA0, 0x42, 0x42, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+
+    lut_wb1 = [
+        0xA0, 0x01, 0x01, 0x00, 0x00, 0x01,
+        0x50, 0x42, 0x42, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+
+    lut_bb1 = [ 
+        0xA0, 0x01, 0x01, 0x00, 0x00, 0x01,
+        0x50, 0x42, 0x42, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ] 
+
+        
+    # Hardware reset
+    def reset(self):
+        epdconfig.digital_write(self.reset_pin, 1)
+        epdconfig.delay_ms(200) 
+        epdconfig.digital_write(self.reset_pin, 0)
+        epdconfig.delay_ms(10)
+        epdconfig.digital_write(self.reset_pin, 1)
+        epdconfig.delay_ms(200)   
+
+    def send_command(self, command):
+        epdconfig.digital_write(self.dc_pin, 0)
+        epdconfig.digital_write(self.cs_pin, 0)
+        epdconfig.spi_writebyte([command])
+        epdconfig.digital_write(self.cs_pin, 1)
+
+    def send_data(self, data):
+        epdconfig.digital_write(self.dc_pin, 1)
+        epdconfig.digital_write(self.cs_pin, 0)
+        epdconfig.spi_writebyte([data])
+        epdconfig.digital_write(self.cs_pin, 1)
+        
+    def ReadBusy(self):
+        logging.debug("e-Paper busy")
+        while(epdconfig.digital_read(self.busy_pin) == 0):      # 0: idle, 1: busy
+            self.send_command(0x71)
+            epdconfig.delay_ms(100)  
+        logging.debug("e-Paper busy release")
+        
+    def TurnOnDisplay(self):
+        self.send_command(0x12)
+        epdconfig.delay_ms(10)
+        self.ReadBusy()
+        
+    def init(self):
+        if (epdconfig.module_init() != 0):
+            return -1
+        # EPD hardware init start
+        self.reset()
+        
+        self.send_command(0x01)	# POWER SETTING
+        self.send_data(0x03)
+        self.send_data(0x00)
+        self.send_data(0x2b)
+        self.send_data(0x2b)
+        self.send_data(0x03)
+
+        self.send_command(0x06)	# boost soft start
+        self.send_data(0x17) # A
+        self.send_data(0x17) # B
+        self.send_data(0x17) # C
+
+        self.send_command(0x04)
+        self.ReadBusy()
+
+        self.send_command(0x00)	# panel setting
+        self.send_data(0xbf) # LUT from OTP,128x296
+        self.send_data(0x0d) # VCOM to 0V fast
+
+        self.send_command(0x30)	# PLL setting
+        self.send_data(0x21) # 3a 100HZ   29 150Hz 39 200HZ	31 171HZ
+
+        self.send_command(0x61)	# resolution setting
+        self.send_data(self.width)
+        self.send_data((self.height >> 8) & 0xff)
+        self.send_data(self.height& 0xff)
+
+        self.send_command(0x82)	# vcom_DC setting
+        self.send_data(0x28)
+        return 0
+        
+    def SetFullReg(self):
+        self.send_command(0x82)
+        self.send_data(0x00)
+        self.send_command(0X50)
+        self.send_data(0x97)
+#        self.send_command(0x00)	# panel setting
+#        self.send_data(0x9f) # LUT from OTP,128x296
+
+    def SetPartReg(self):
+#        self.send_command(0x00)	# panel setting
+#        self.send_data(0xbf) # LUT from OTP,128x296
+        self.send_command(0x82)
+        self.send_data(0x03)
+        self.send_command(0X50)
+        self.send_data(0x47)
+        
+        self.send_command(0x20) # vcom
+        for count in range(0, 44):
+            self.send_data(self.lut_vcom1[count])
+        self.send_command(0x21) # ww --
+        for count in range(0, 42):
+            self.send_data(self.lut_ww1[count])
+        self.send_command(0x22) # bw r
+        for count in range(0, 42):
+            self.send_data(self.lut_bw1[count])
+        self.send_command(0x23) # wb w
+        for count in range(0, 42):
+            self.send_data(self.lut_wb1[count])
+        self.send_command(0x24) # bb b
+        for count in range(0, 42):
+            self.send_data(self.lut_bb1[count])
+
+    def getbuffer(self, image):
+        # logging.debug("bufsiz = ",int(self.width/8) * self.height)
+        buf = [0xFF] * (int(self.width/8) * self.height)
+        image_monocolor = image.convert('1')
+        imwidth, imheight = image_monocolor.size
+        pixels = image_monocolor.load()
+        # logging.debug("imwidth = %d, imheight = %d",imwidth,imheight)
+        if(imwidth == self.width and imheight == self.height):
+            logging.debug("Vertical")
+            for y in range(imheight):
+                for x in range(imwidth):
+                    # Set the bits for the column of pixels at the current position.
+                    if pixels[x, y] == 0:
+                        buf[int((x + y * self.width) / 8)] &= ~(0x80 >> (x % 8))
+        elif(imwidth == self.height and imheight == self.width):
+            logging.debug("Horizontal")
+            for y in range(imheight):
+                for x in range(imwidth):
+                    newx = y
+                    newy = self.height - x - 1
+                    if pixels[x, y] == 0:
+                        buf[int((newx + newy*self.width) / 8)] &= ~(0x80 >> (y % 8))
+        return buf
+
+    def display(self, image):
+        if (Image == None):
+            return
+            
+        self.send_command(0x10)
+        for i in range(0, int(self.width * self.height / 8)):
+            self.send_data(0x00)
+        epdconfig.delay_ms(10)
+        
+        self.send_command(0x13)
+        for i in range(0, int(self.width * self.height / 8)):
+            self.send_data(image[i])
+        epdconfig.delay_ms(10)
+        
+        self.SetFullReg()
+        self.TurnOnDisplay()
+        
+    def DisplayPartial(self, image):   
+        if (Image == None):
+            return
+            
+        self.SetPartReg()
+        self.send_command(0x91)
+        self.send_command(0x90)
+        self.send_data(0)
+        self.send_data(self.width - 1)
+
+        self.send_data(0)
+        self.send_data(0)
+        self.send_data(int(self.height / 256))
+        self.send_data(self.height % 256 - 1)
+        self.send_data(0x28)
+            
+        self.send_command(0x10)
+        for i in range(0, int(self.width * self.height / 8)):
+            self.send_data(image[i])
+        epdconfig.delay_ms(10)
+        
+        self.send_command(0x13)
+        for i in range(0, int(self.width * self.height / 8)):
+            self.send_data(~image[i])
+        epdconfig.delay_ms(10)
+          
+        self.TurnOnDisplay()
+        
+    def Clear(self):
+        self.send_command(0x10)
+        for i in range(0, int(self.width * self.height / 8)):
+            self.send_data(0x00)
+        epdconfig.delay_ms(10)
+        
+        self.send_command(0x13)
+        for i in range(0, int(self.width * self.height / 8)):
+            self.send_data(0x00)
+        epdconfig.delay_ms(10)
+        
+        self.SetFullReg()
+        self.TurnOnDisplay()
+
+    def sleep(self):
+        self.send_command(0X50)
+        self.send_data(0xf7)
+        self.send_command(0X02) # power off
+        self.send_command(0X07) # deep sleep  
+        self.send_data(0xA5)
+
+        epdconfig.module_exit()
+
+### END OF FILE ###

pwnagotchi/ui/hw/libs/waveshare/v1/epdconfig.py

@@ -9,11 +9,11 @@
 # * | Info        :   
 # ******************************************************************************
 # Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documnetation files (the "Software"), to deal
+# of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to  whom the Software is
-# furished to do so, subject to the following conditions:
+# furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.

pwnagotchi/ui/hw/libs/waveshare/v154inch/epd1in54b.py

@@ -0,0 +1,219 @@
+# *****************************************************************************
+# * | File        :	  epd1in54b.py
+# * | Author      :   Waveshare team
+# * | Function    :   Electronic paper driver
+# * | Info        :
+# *----------------
+# * | This version:   V4.0
+# * | Date        :   2019-06-20
+# # | Info        :   python demo
+# -----------------------------------------------------------------------------
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documnetation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to  whom the Software is
+# furished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+import logging
+from . import epdconfig
+
+# Display resolution
+EPD_WIDTH       = 200
+EPD_HEIGHT      = 200
+
+class EPD:
+    def __init__(self):
+        self.reset_pin = epdconfig.RST_PIN
+        self.dc_pin = epdconfig.DC_PIN
+        self.busy_pin = epdconfig.BUSY_PIN
+        self.cs_pin = epdconfig.CS_PIN
+        self.width = EPD_WIDTH
+        self.height = EPD_HEIGHT
+
+    lut_vcom0 = [0x0E, 0x14, 0x01, 0x0A, 0x06, 0x04, 0x0A, 0x0A, 0x0F, 0x03, 0x03, 0x0C, 0x06, 0x0A, 0x00]
+    lut_w = [0x0E, 0x14, 0x01, 0x0A, 0x46, 0x04, 0x8A, 0x4A, 0x0F, 0x83, 0x43, 0x0C, 0x86, 0x0A, 0x04]
+    lut_b = [0x0E, 0x14, 0x01, 0x8A, 0x06, 0x04, 0x8A, 0x4A, 0x0F, 0x83, 0x43, 0x0C, 0x06, 0x4A, 0x04]
+    lut_g1 = [0x8E, 0x94, 0x01, 0x8A, 0x06, 0x04, 0x8A, 0x4A, 0x0F, 0x83, 0x43, 0x0C, 0x06, 0x0A, 0x04]
+    lut_g2 = [0x8E, 0x94, 0x01, 0x8A, 0x06, 0x04, 0x8A, 0x4A, 0x0F, 0x83, 0x43, 0x0C, 0x06, 0x0A, 0x04]
+    lut_vcom1 = [0x03, 0x1D, 0x01, 0x01, 0x08, 0x23, 0x37, 0x37, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+    lut_red0 = [0x83, 0x5D, 0x01, 0x81, 0x48, 0x23, 0x77, 0x77, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
+    lut_red1 = [0x03, 0x1D, 0x01, 0x01, 0x08, 0x23, 0x37, 0x37, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00] 
+    
+    # Hardware reset
+    def reset(self):
+        epdconfig.digital_write(self.reset_pin, 1)
+        epdconfig.delay_ms(200) 
+        epdconfig.digital_write(self.reset_pin, 0) # module reset
+        epdconfig.delay_ms(10)
+        epdconfig.digital_write(self.reset_pin, 1)
+        epdconfig.delay_ms(200)   
+
+    def send_command(self, command):
+        epdconfig.digital_write(self.dc_pin, 0)
+        epdconfig.digital_write(self.cs_pin, 0)
+        epdconfig.spi_writebyte([command])
+        epdconfig.digital_write(self.cs_pin, 1)
+
+    def send_data(self, data):
+        epdconfig.digital_write(self.dc_pin, 1)
+        epdconfig.digital_write(self.cs_pin, 0)
+        epdconfig.spi_writebyte([data])
+        epdconfig.digital_write(self.cs_pin, 1)
+        
+    def ReadBusy(self):
+        logging.debug("e-Paper busy")
+        while(epdconfig.digital_read(self.busy_pin) == 0):
+            epdconfig.delay_ms(100)    
+        logging.debug("e-Paper busy release")
+      
+    def set_lut_bw(self):
+        self.send_command(0x20) # vcom
+        for count in range(0, 15):
+            self.send_data(self.lut_vcom0[count])
+        self.send_command(0x21) # ww --
+        for count in range(0, 15):
+            self.send_data(self.lut_w[count])
+        self.send_command(0x22) # bw r
+        for count in range(0, 15):
+            self.send_data(self.lut_b[count])
+        self.send_command(0x23) # wb w
+        for count in range(0, 15):
+            self.send_data(self.lut_g1[count])
+        self.send_command(0x24) # bb b
+        for count in range(0, 15):
+            self.send_data(self.lut_g2[count])
+
+    def set_lut_red(self):
+        self.send_command(0x25)
+        for count in range(0, 15):
+            self.send_data(self.lut_vcom1[count])
+        self.send_command(0x26)
+        for count in range(0, 15):
+            self.send_data(self.lut_red0[count])
+        self.send_command(0x27)
+        for count in range(0, 15):
+            self.send_data(self.lut_red1[count])
+            
+    def init(self):
+        if (epdconfig.module_init() != 0):
+            return -1
+        # EPD hardware init start
+        self.reset()
+        
+        self.send_command(0x01) # POWER_SETTING
+        self.send_data(0x07)
+        self.send_data(0x00)
+        self.send_data(0x08)
+        self.send_data(0x00)
+        self.send_command(0x06) # BOOSTER_SOFT_START
+        self.send_data(0x07)
+        self.send_data(0x07)
+        self.send_data(0x07)
+        self.send_command(0x04) # POWER_ON
+
+        self.ReadBusy()
+
+        self.send_command(0X00) # PANEL_SETTING
+        self.send_data(0xCF)
+        self.send_command(0X50) # VCOM_AND_DATA_INTERVAL_SETTING
+        self.send_data(0x17)
+        self.send_command(0x30) # PLL_CONTROL
+        self.send_data(0x39)
+        self.send_command(0x61) # TCON_RESOLUTION set x and y
+        self.send_data(0xC8)
+        self.send_data(0x00)
+        self.send_data(0xC8)
+        self.send_command(0x82) # VCM_DC_SETTING_REGISTER
+        self.send_data(0x0E)
+        
+        self.set_lut_bw()
+        self.set_lut_red()
+        return 0
+
+    def getbuffer(self, image):
+        buf = [0xFF] * int(self.width * self.height / 8)
+        # Set buffer to value of Python Imaging Library image.
+        # Image must be in mode 1.
+        image_monocolor = image.convert('1')
+        imwidth, imheight = image_monocolor.size
+        if imwidth != self.width or imheight != self.height:
+            raise ValueError('Image must be same dimensions as display \
+                ({0}x{1}).' .format(self.width, self.height))
+
+        pixels = image_monocolor.load()
+        for y in range(self.height):
+            for x in range(self.width):
+                # Set the bits for the column of pixels at the current position.
+                if pixels[x, y] == 0:
+                    buf[int((x + y * self.width) / 8)] &= ~(0x80 >> (x % 8))
+        return buf
+
+    def display(self, blackimage, redimage):
+        # send black data
+        if (blackimage != None):
+            self.send_command(0x10) # DATA_START_TRANSMISSION_1
+            for i in range(0, int(self.width * self.height / 8)):
+                temp = 0x00
+                for bit in range(0, 4):
+                    if (blackimage[i] & (0x80 >> bit) != 0):
+                        temp |= 0xC0 >> (bit * 2)
+                self.send_data(temp)  
+                temp = 0x00
+                for bit in range(4, 8):
+                    if (blackimage[i] & (0x80 >> bit) != 0):
+                        temp |= 0xC0 >> ((bit - 4) * 2)
+                self.send_data(temp)
+                
+        # send red data        
+        if (redimage != None):
+            self.send_command(0x13) # DATA_START_TRANSMISSION_2
+            for i in range(0, int(self.width * self.height / 8)):
+                self.send_data(redimage[i])  
+
+        self.send_command(0x12) # DISPLAY_REFRESH
+        self.ReadBusy()
+
+    def Clear(self):
+        self.send_command(0x10) # DATA_START_TRANSMISSION_1
+        for i in range(0, int(self.width * self.height / 8)):
+            self.send_data(0xFF)
+            self.send_data(0xFF)
+            
+        self.send_command(0x13) # DATA_START_TRANSMISSION_2
+        for i in range(0, int(self.width * self.height / 8)):
+            self.send_data(0xFF)
+
+        self.send_command(0x12) # DISPLAY_REFRESH
+        self.ReadBusy()
+
+    def sleep(self):
+        self.send_command(0x50) # VCOM_AND_DATA_INTERVAL_SETTING
+        self.send_data(0x17)
+        self.send_command(0x82) # to solve Vcom drop 
+        self.send_data(0x00)        
+        self.send_command(0x01) # power setting      
+        self.send_data(0x02) # gate switch to external
+        self.send_data(0x00)
+        self.send_data(0x00) 
+        self.send_data(0x00) 
+        self.ReadBusy()
+        
+        self.send_command(0x02) # power off
+        
+        epdconfig.module_exit()
+
+### END OF FILE ###
+

pwnagotchi/ui/hw/libs/waveshare/v154inch/epdconfig.py

@@ -0,0 +1,154 @@
+# /*****************************************************************************
+# * | File        :	  epdconfig.py
+# * | Author      :   Waveshare team
+# * | Function    :   Hardware underlying interface
+# * | Info        :
+# *----------------
+# * | This version:   V1.0
+# * | Date        :   2019-06-21
+# * | Info        :   
+# ******************************************************************************
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documnetation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to  whom the Software is
+# furished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+import os
+import logging
+import sys
+import time
+
+
+class RaspberryPi:
+    # Pin definition
+    RST_PIN         = 17
+    DC_PIN          = 25
+    CS_PIN          = 8
+    BUSY_PIN        = 24
+
+    def __init__(self):
+        import spidev
+        import RPi.GPIO
+
+        self.GPIO = RPi.GPIO
+
+        # SPI device, bus = 0, device = 0
+        self.SPI = spidev.SpiDev(0, 0)
+
+    def digital_write(self, pin, value):
+        self.GPIO.output(pin, value)
+
+    def digital_read(self, pin):
+        return self.GPIO.input(pin)
+
+    def delay_ms(self, delaytime):
+        time.sleep(delaytime / 1000.0)
+
+    def spi_writebyte(self, data):
+        self.SPI.writebytes(data)
+
+    def module_init(self):
+        self.GPIO.setmode(self.GPIO.BCM)
+        self.GPIO.setwarnings(False)
+        self.GPIO.setup(self.RST_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.DC_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.CS_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.BUSY_PIN, self.GPIO.IN)
+        self.SPI.max_speed_hz = 4000000
+        self.SPI.mode = 0b00
+        return 0
+
+    def module_exit(self):
+        logging.debug("spi end")
+        self.SPI.close()
+
+        logging.debug("close 5V, Module enters 0 power consumption ...")
+        self.GPIO.output(self.RST_PIN, 0)
+        self.GPIO.output(self.DC_PIN, 0)
+
+        self.GPIO.cleanup()
+
+
+class JetsonNano:
+    # Pin definition
+    RST_PIN         = 17
+    DC_PIN          = 25
+    CS_PIN          = 8
+    BUSY_PIN        = 24
+
+    def __init__(self):
+        import ctypes
+        find_dirs = [
+            os.path.dirname(os.path.realpath(__file__)),
+            '/usr/local/lib',
+            '/usr/lib',
+        ]
+        self.SPI = None
+        for find_dir in find_dirs:
+            so_filename = os.path.join(find_dir, 'sysfs_software_spi.so')
+            if os.path.exists(so_filename):
+                self.SPI = ctypes.cdll.LoadLibrary(so_filename)
+                break
+        if self.SPI is None:
+            raise RuntimeError('Cannot find sysfs_software_spi.so')
+
+        import Jetson.GPIO
+        self.GPIO = Jetson.GPIO
+
+    def digital_write(self, pin, value):
+        self.GPIO.output(pin, value)
+
+    def digital_read(self, pin):
+        return self.GPIO.input(self.BUSY_PIN)
+
+    def delay_ms(self, delaytime):
+        time.sleep(delaytime / 1000.0)
+
+    def spi_writebyte(self, data):
+        self.SPI.SYSFS_software_spi_transfer(data[0])
+
+    def module_init(self):
+        self.GPIO.setmode(self.GPIO.BCM)
+        self.GPIO.setwarnings(False)
+        self.GPIO.setup(self.RST_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.DC_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.CS_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.BUSY_PIN, self.GPIO.IN)
+        self.SPI.SYSFS_software_spi_begin()
+        return 0
+
+    def module_exit(self):
+        logging.debug("spi end")
+        self.SPI.SYSFS_software_spi_end()
+
+        logging.debug("close 5V, Module enters 0 power consumption ...")
+        self.GPIO.output(self.RST_PIN, 0)
+        self.GPIO.output(self.DC_PIN, 0)
+
+        self.GPIO.cleanup()
+
+
+if os.path.exists('/sys/bus/platform/drivers/gpiomem-bcm2835'):
+    implementation = RaspberryPi()
+else:
+    implementation = JetsonNano()
+
+for func in [x for x in dir(implementation) if not x.startswith('_')]:
+    setattr(sys.modules[__name__], func, getattr(implementation, func))
+
+
+### END OF FILE ###

pwnagotchi/ui/hw/libs/waveshare/v2/waveshare.py

@@ -27,11 +27,11 @@
 #   epd.display(getbuffer(image))
 # ******************************************************************************//
 # Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documnetation files (the "Software"), to deal
+# of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and//or sell
 # copies of the Software, and to permit persons to  whom the Software is
-# furished to do so, subject to the following conditions:
+# furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.

pwnagotchi/ui/hw/libs/waveshare/v213d/epd2in13d.py

@@ -0,0 +1,358 @@
+# *****************************************************************************
+# * | File        :	  epd2in13d.py
+# * | Author      :   Waveshare team
+# * | Function    :   Electronic paper driver
+# * | Info        :
+# *----------------
+# * | This version:   V4.0
+# * | Date        :   2019-06-20
+# # | Info        :   python demo
+# -----------------------------------------------------------------------------
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documnetation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to  whom the Software is
+# furished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+
+import logging
+from . import epdconfig
+from PIL import Image
+import RPi.GPIO as GPIO
+
+# Display resolution
+EPD_WIDTH       = 104
+EPD_HEIGHT      = 212
+
+class EPD:
+    def __init__(self):
+        self.reset_pin = epdconfig.RST_PIN
+        self.dc_pin = epdconfig.DC_PIN
+        self.busy_pin = epdconfig.BUSY_PIN
+        self.cs_pin = epdconfig.CS_PIN
+        self.width = EPD_WIDTH
+        self.height = EPD_HEIGHT
+
+    lut_vcomDC = [  
+        0x00, 0x08, 0x00, 0x00, 0x00, 0x02,
+        0x60, 0x28, 0x28, 0x00, 0x00, 0x01,
+        0x00, 0x14, 0x00, 0x00, 0x00, 0x01,
+        0x00, 0x12, 0x12, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00,
+    ]
+
+    lut_ww = [  
+        0x40, 0x08, 0x00, 0x00, 0x00, 0x02,
+        0x90, 0x28, 0x28, 0x00, 0x00, 0x01,
+        0x40, 0x14, 0x00, 0x00, 0x00, 0x01,
+        0xA0, 0x12, 0x12, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+
+    lut_bw = [  
+        0x40, 0x17, 0x00, 0x00, 0x00, 0x02,
+        0x90, 0x0F, 0x0F, 0x00, 0x00, 0x03,
+        0x40, 0x0A, 0x01, 0x00, 0x00, 0x01,
+        0xA0, 0x0E, 0x0E, 0x00, 0x00, 0x02,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+
+    lut_wb = [
+        0x80, 0x08, 0x00, 0x00, 0x00, 0x02,
+        0x90, 0x28, 0x28, 0x00, 0x00, 0x01,
+        0x80, 0x14, 0x00, 0x00, 0x00, 0x01,
+        0x50, 0x12, 0x12, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+
+    lut_bb = [ 
+        0x80, 0x08, 0x00, 0x00, 0x00, 0x02,
+        0x90, 0x28, 0x28, 0x00, 0x00, 0x01,
+        0x80, 0x14, 0x00, 0x00, 0x00, 0x01,
+        0x50, 0x12, 0x12, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+    
+    lut_vcom1 = [  
+        0x00, 0x19, 0x01, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00,
+    ]
+
+    lut_ww1 = [  
+        0x00, 0x19, 0x01, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+
+    lut_bw1 = [  
+        0x80, 0x19, 0x01, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+
+    lut_wb1 = [
+        0x40, 0x19, 0x01, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+
+    lut_bb1 = [ 
+        0x00, 0x19, 0x01, 0x00, 0x00, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+        
+    # Hardware reset
+    def reset(self):
+        epdconfig.digital_write(self.reset_pin, 1)
+        epdconfig.delay_ms(200) 
+        epdconfig.digital_write(self.reset_pin, 0)
+        epdconfig.delay_ms(10)
+        epdconfig.digital_write(self.reset_pin, 1)
+        epdconfig.delay_ms(200)   
+
+    def send_command(self, command):
+        epdconfig.digital_write(self.dc_pin, 0)
+        epdconfig.digital_write(self.cs_pin, 0)
+        epdconfig.spi_writebyte([command])
+        epdconfig.digital_write(self.cs_pin, 1)
+
+    def send_data(self, data):
+        epdconfig.digital_write(self.dc_pin, 1)
+        epdconfig.digital_write(self.cs_pin, 0)
+        epdconfig.spi_writebyte([data])
+        epdconfig.digital_write(self.cs_pin, 1)
+        
+    def ReadBusy(self):
+        logging.debug("e-Paper busy")
+        while(epdconfig.digital_read(self.busy_pin) == 0):      # 0: idle, 1: busy
+            self.send_command(0x71)
+            epdconfig.delay_ms(100)  
+        logging.debug("e-Paper busy release")
+        
+    def TurnOnDisplay(self):
+        self.send_command(0x12)
+        epdconfig.delay_ms(10)
+        self.ReadBusy()
+        
+    def init(self):
+        if (epdconfig.module_init() != 0):
+            return -1
+        # EPD hardware init start
+        self.reset()
+        
+        self.send_command(0x01)	# POWER SETTING
+        self.send_data(0x03)
+        self.send_data(0x00)
+        self.send_data(0x2b)
+        self.send_data(0x2b)
+        self.send_data(0x03)
+
+        self.send_command(0x06)	# boost soft start
+        self.send_data(0x17) # A
+        self.send_data(0x17) # B
+        self.send_data(0x17) # C
+
+        self.send_command(0x04)
+        self.ReadBusy()
+
+        self.send_command(0x00)	# panel setting
+        self.send_data(0xbf) # LUT from OTP,128x296
+        self.send_data(0x0d) # VCOM to 0V fast
+
+        self.send_command(0x30)	# PLL setting
+        self.send_data(0x3a) # 3a 100HZ   29 150Hz 39 200HZ	31 171HZ
+
+        self.send_command(0x61)	# resolution setting
+        self.send_data(self.width)
+        self.send_data((self.height >> 8) & 0xff)
+        self.send_data(self.height& 0xff)
+
+        self.send_command(0x82)	# vcom_DC setting
+        self.send_data(0x28)
+        return 0
+        
+    def SetFullReg(self):
+        self.send_command(0x82)
+        self.send_data(0x00)
+        self.send_command(0X50)
+        self.send_data(0x97)
+        
+        self.send_command(0x20) # vcom
+        for count in range(0, 44):
+            self.send_data(self.lut_vcomDC[count])
+        self.send_command(0x21) # ww --
+        for count in range(0, 42):
+            self.send_data(self.lut_ww[count])
+        self.send_command(0x22) # bw r
+        for count in range(0, 42):
+            self.send_data(self.lut_bw[count])
+        self.send_command(0x23) # wb w
+        for count in range(0, 42):
+            self.send_data(self.lut_wb[count])
+        self.send_command(0x24) # bb b
+        for count in range(0, 42):
+            self.send_data(self.lut_bb[count])
+    
+    def SetPartReg(self):
+        self.send_command(0x82)
+        self.send_data(0x03)
+        self.send_command(0X50)
+        self.send_data(0x47)
+        
+        self.send_command(0x20) # vcom
+        for count in range(0, 44):
+            self.send_data(self.lut_vcom1[count])
+        self.send_command(0x21) # ww --
+        for count in range(0, 42):
+            self.send_data(self.lut_ww1[count])
+        self.send_command(0x22) # bw r
+        for count in range(0, 42):
+            self.send_data(self.lut_bw1[count])
+        self.send_command(0x23) # wb w
+        for count in range(0, 42):
+            self.send_data(self.lut_wb1[count])
+        self.send_command(0x24) # bb b
+        for count in range(0, 42):
+            self.send_data(self.lut_bb1[count])
+
+    def getbuffer(self, image):
+        # logging.debug("bufsiz = ",int(self.width/8) * self.height)
+        buf = [0xFF] * (int(self.width/8) * self.height)
+        image_monocolor = image.convert('1')
+        imwidth, imheight = image_monocolor.size
+        pixels = image_monocolor.load()
+        # logging.debug("imwidth = %d, imheight = %d",imwidth,imheight)
+        if(imwidth == self.width and imheight == self.height):
+            logging.debug("Vertical")
+            for y in range(imheight):
+                for x in range(imwidth):
+                    # Set the bits for the column of pixels at the current position.
+                    if pixels[x, y] == 0:
+                        buf[int((x + y * self.width) / 8)] &= ~(0x80 >> (x % 8))
+        elif(imwidth == self.height and imheight == self.width):
+            logging.debug("Horizontal")
+            for y in range(imheight):
+                for x in range(imwidth):
+                    newx = y
+                    newy = self.height - x - 1
+                    if pixels[x, y] == 0:
+                        buf[int((newx + newy*self.width) / 8)] &= ~(0x80 >> (y % 8))
+        return buf
+
+    def display(self, image):
+        if (Image == None):
+            return
+            
+        self.send_command(0x10)
+        for i in range(0, int(self.width * self.height / 8)):
+            self.send_data(0x00)
+        epdconfig.delay_ms(10)
+        
+        self.send_command(0x13)
+        for i in range(0, int(self.width * self.height / 8)):
+            self.send_data(image[i])
+        epdconfig.delay_ms(10)
+        
+        self.SetFullReg()
+        self.TurnOnDisplay()
+        
+    def DisplayPartial(self, image):   
+        if (Image == None):
+            return
+            
+        self.SetPartReg()
+        self.send_command(0x91)
+        self.send_command(0x90)
+        self.send_data(0)
+        self.send_data(self.width - 1)
+
+        self.send_data(0)
+        self.send_data(0)
+        self.send_data(int(self.height / 256))
+        self.send_data(self.height % 256 - 1)
+        self.send_data(0x28)
+            
+        self.send_command(0x10)
+        for i in range(0, int(self.width * self.height / 8)):
+            self.send_data(image[i])
+        epdconfig.delay_ms(10)
+        
+        self.send_command(0x13)
+        for i in range(0, int(self.width * self.height / 8)):
+            self.send_data(~image[i])
+        epdconfig.delay_ms(10)
+          
+        self.TurnOnDisplay()
+        
+    def Clear(self):
+        self.send_command(0x10)
+        for i in range(0, int(self.width * self.height / 8)):
+            self.send_data(0x00)
+        epdconfig.delay_ms(10)
+        
+        self.send_command(0x13)
+        for i in range(0, int(self.width * self.height / 8)):
+            self.send_data(0xFF)
+        epdconfig.delay_ms(10)
+        
+        self.SetFullReg()
+        self.TurnOnDisplay()
+
+    def sleep(self):
+        self.send_command(0X50)
+        self.send_data(0xf7)
+        self.send_command(0X02) # power off
+        self.send_command(0X07) # deep sleep  
+        self.send_data(0xA5)
+
+        epdconfig.module_exit()
+
+### END OF FILE ###
+

pwnagotchi/ui/hw/libs/waveshare/v213d/epdconfig.py

@@ -0,0 +1,154 @@
+# /*****************************************************************************
+# * | File        :	  epdconfig.py
+# * | Author      :   Waveshare team
+# * | Function    :   Hardware underlying interface
+# * | Info        :
+# *----------------
+# * | This version:   V1.0
+# * | Date        :   2019-06-21
+# * | Info        :   
+# ******************************************************************************
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documnetation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to  whom the Software is
+# furished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+import os
+import logging
+import sys
+import time
+
+
+class RaspberryPi:
+    # Pin definition
+    RST_PIN         = 17
+    DC_PIN          = 25
+    CS_PIN          = 8
+    BUSY_PIN        = 24
+
+    def __init__(self):
+        import spidev
+        import RPi.GPIO
+
+        self.GPIO = RPi.GPIO
+
+        # SPI device, bus = 0, device = 0
+        self.SPI = spidev.SpiDev(0, 0)
+
+    def digital_write(self, pin, value):
+        self.GPIO.output(pin, value)
+
+    def digital_read(self, pin):
+        return self.GPIO.input(pin)
+
+    def delay_ms(self, delaytime):
+        time.sleep(delaytime / 1000.0)
+
+    def spi_writebyte(self, data):
+        self.SPI.writebytes(data)
+
+    def module_init(self):
+        self.GPIO.setmode(self.GPIO.BCM)
+        self.GPIO.setwarnings(False)
+        self.GPIO.setup(self.RST_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.DC_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.CS_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.BUSY_PIN, self.GPIO.IN)
+        self.SPI.max_speed_hz = 4000000
+        self.SPI.mode = 0b00
+        return 0
+
+    def module_exit(self):
+        logging.debug("spi end")
+        self.SPI.close()
+
+        logging.debug("close 5V, Module enters 0 power consumption ...")
+        self.GPIO.output(self.RST_PIN, 0)
+        self.GPIO.output(self.DC_PIN, 0)
+
+        self.GPIO.cleanup()
+
+
+class JetsonNano:
+    # Pin definition
+    RST_PIN         = 17
+    DC_PIN          = 25
+    CS_PIN          = 8
+    BUSY_PIN        = 24
+
+    def __init__(self):
+        import ctypes
+        find_dirs = [
+            os.path.dirname(os.path.realpath(__file__)),
+            '/usr/local/lib',
+            '/usr/lib',
+        ]
+        self.SPI = None
+        for find_dir in find_dirs:
+            so_filename = os.path.join(find_dir, 'sysfs_software_spi.so')
+            if os.path.exists(so_filename):
+                self.SPI = ctypes.cdll.LoadLibrary(so_filename)
+                break
+        if self.SPI is None:
+            raise RuntimeError('Cannot find sysfs_software_spi.so')
+
+        import Jetson.GPIO
+        self.GPIO = Jetson.GPIO
+
+    def digital_write(self, pin, value):
+        self.GPIO.output(pin, value)
+
+    def digital_read(self, pin):
+        return self.GPIO.input(self.BUSY_PIN)
+
+    def delay_ms(self, delaytime):
+        time.sleep(delaytime / 1000.0)
+
+    def spi_writebyte(self, data):
+        self.SPI.SYSFS_software_spi_transfer(data[0])
+
+    def module_init(self):
+        self.GPIO.setmode(self.GPIO.BCM)
+        self.GPIO.setwarnings(False)
+        self.GPIO.setup(self.RST_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.DC_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.CS_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.BUSY_PIN, self.GPIO.IN)
+        self.SPI.SYSFS_software_spi_begin()
+        return 0
+
+    def module_exit(self):
+        logging.debug("spi end")
+        self.SPI.SYSFS_software_spi_end()
+
+        logging.debug("close 5V, Module enters 0 power consumption ...")
+        self.GPIO.output(self.RST_PIN, 0)
+        self.GPIO.output(self.DC_PIN, 0)
+
+        self.GPIO.cleanup()
+
+
+if os.path.exists('/sys/bus/platform/drivers/gpiomem-bcm2835'):
+    implementation = RaspberryPi()
+else:
+    implementation = JetsonNano()
+
+for func in [x for x in dir(implementation) if not x.startswith('_')]:
+    setattr(sys.modules[__name__], func, getattr(implementation, func))
+
+
+### END OF FILE ###

pwnagotchi/ui/hw/libs/waveshare/v27inch/epd2in7.py

@@ -1,39 +1,19 @@
-# /*****************************************************************************
-# * | File        :	  EPD_1in54.py
+# *****************************************************************************
+# * | File        :	  epd2in7.py
 # * | Author      :   Waveshare team
 # * | Function    :   Electronic paper driver
 # * | Info        :
 # *----------------
-# * |	This version:   V3.0
-# * | Date        :   2018-11-06
-# * | Info        :   python2 demo
-# * 1.Remove:
-#   digital_write(self, pin, value)
-#   digital_read(self, pin)
-#   delay_ms(self, delaytime)
-#   set_lut(self, lut)
-#   self.lut = self.lut_full_update
-# * 2.Change:
-#   display_frame -> TurnOnDisplay
-#   set_memory_area -> SetWindow
-#   set_memory_pointer -> SetCursor
-#   get_frame_buffer -> getbuffer
-#   set_frame_memory -> display
-# * 3.How to use
-#   epd = epd2in7.EPD()
-#   epd.init(epd.lut_full_update)
-#   image = Image.new('1', (epd1in54.EPD_WIDTH, epd1in54.EPD_HEIGHT), 255)
-#   ...
-#   drawing ......
-#   ...
-#   epd.display(getbuffer(image))
-# ******************************************************************************/
+# * | This version:   V4.0
+# * | Date        :   2019-06-20
+# # | Info        :   python demo
+# -----------------------------------------------------------------------------
 # Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documnetation files (the "Software"), to deal
+# of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to  whom the Software is
-# furished to do so, subject to the following conditions:
+# furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
@@ -47,64 +27,31 @@
 # THE SOFTWARE.
 #
 
-
+import logging
 from . import epdconfig
-from PIL import Image
-import RPi.GPIO as GPIO
 
 # Display resolution
 EPD_WIDTH       = 176
 EPD_HEIGHT      = 264
 
-# EPD2IN7 commands
-PANEL_SETTING                               = 0x00
-POWER_SETTING                               = 0x01
-POWER_OFF                                   = 0x02
-POWER_OFF_SEQUENCE_SETTING                  = 0x03
-POWER_ON                                    = 0x04
-POWER_ON_MEASURE                            = 0x05
-BOOSTER_SOFT_START                          = 0x06
-DEEP_SLEEP                                  = 0x07
-DATA_START_TRANSMISSION_1                   = 0x10
-DATA_STOP                                   = 0x11
-DISPLAY_REFRESH                             = 0x12
-DATA_START_TRANSMISSION_2                   = 0x13
-PARTIAL_DATA_START_TRANSMISSION_1           = 0x14
-PARTIAL_DATA_START_TRANSMISSION_2           = 0x15
-PARTIAL_DISPLAY_REFRESH                     = 0x16
-LUT_FOR_VCOM                                = 0x20
-LUT_WHITE_TO_WHITE                          = 0x21
-LUT_BLACK_TO_WHITE                          = 0x22
-LUT_WHITE_TO_BLACK                          = 0x23
-LUT_BLACK_TO_BLACK                          = 0x24
-PLL_CONTROL                                 = 0x30
-TEMPERATURE_SENSOR_COMMAND                  = 0x40
-TEMPERATURE_SENSOR_CALIBRATION              = 0x41
-TEMPERATURE_SENSOR_WRITE                    = 0x42
-TEMPERATURE_SENSOR_READ                     = 0x43
-VCOM_AND_DATA_INTERVAL_SETTING              = 0x50
-LOW_POWER_DETECTION                         = 0x51
-TCON_SETTING                                = 0x60
-TCON_RESOLUTION                             = 0x61
-SOURCE_AND_GATE_START_SETTING               = 0x62
-GET_STATUS                                  = 0x71
-AUTO_MEASURE_VCOM                           = 0x80
-VCOM_VALUE                                  = 0x81
-VCM_DC_SETTING_REGISTER                     = 0x82
-PROGRAM_MODE                                = 0xA0
-ACTIVE_PROGRAM                              = 0xA1
-READ_OTP_DATA                               = 0xA2
-
+GRAY1  = 0xff #white
+GRAY2  = 0xC0
+GRAY3  = 0x80 #gray
+GRAY4  = 0x00 #Blackest
 class EPD:
     def __init__(self):
         self.reset_pin = epdconfig.RST_PIN
         self.dc_pin = epdconfig.DC_PIN
         self.busy_pin = epdconfig.BUSY_PIN
+        self.cs_pin = epdconfig.CS_PIN
         self.width = EPD_WIDTH
         self.height = EPD_HEIGHT
+        self.GRAY1  = GRAY1 #white
+        self.GRAY2  = GRAY2
+        self.GRAY3  = GRAY3 #gray
+        self.GRAY4  = GRAY4 #Blackest
 
-    lut_vcom_dc = [
-        0x00, 0x00,
+    lut_vcom_dc = [0x00, 0x00,
         0x00, 0x08, 0x00, 0x00, 0x00, 0x02,
         0x60, 0x28, 0x28, 0x00, 0x00, 0x01,
         0x00, 0x14, 0x00, 0x00, 0x00, 0x01,
@@ -148,147 +95,418 @@ class EPD:
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    ]    
+    ]
+    ###################full screen update LUT######################
+    #0~3 gray
+    gray_lut_vcom = [
+    0x00, 0x00,
+    0x00, 0x0A, 0x00, 0x00, 0x00, 0x01,
+    0x60, 0x14, 0x14, 0x00, 0x00, 0x01,
+    0x00, 0x14, 0x00, 0x00, 0x00, 0x01,
+    0x00, 0x13, 0x0A, 0x01, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,				
+    ]
+    #R21
+    gray_lut_ww =[
+    0x40, 0x0A, 0x00, 0x00, 0x00, 0x01,
+    0x90, 0x14, 0x14, 0x00, 0x00, 0x01,
+    0x10, 0x14, 0x0A, 0x00, 0x00, 0x01,
+    0xA0, 0x13, 0x01, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+    #R22H	r
+    gray_lut_bw =[
+    0x40, 0x0A, 0x00, 0x00, 0x00, 0x01,
+    0x90, 0x14, 0x14, 0x00, 0x00, 0x01,
+    0x00, 0x14, 0x0A, 0x00, 0x00, 0x01,
+    0x99, 0x0C, 0x01, 0x03, 0x04, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+    #R23H	w
+    gray_lut_wb =[
+    0x40, 0x0A, 0x00, 0x00, 0x00, 0x01,
+    0x90, 0x14, 0x14, 0x00, 0x00, 0x01,
+    0x00, 0x14, 0x0A, 0x00, 0x00, 0x01,
+    0x99, 0x0B, 0x04, 0x04, 0x01, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+    #R24H	b
+    gray_lut_bb =[
+    0x80, 0x0A, 0x00, 0x00, 0x00, 0x01,
+    0x90, 0x14, 0x14, 0x00, 0x00, 0x01,
+    0x20, 0x14, 0x0A, 0x00, 0x00, 0x01,
+    0x50, 0x13, 0x01, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    ]
+    
     # Hardware reset
     def reset(self):
-        epdconfig.digital_write(self.reset_pin, GPIO.HIGH)
+        epdconfig.digital_write(self.reset_pin, 1)
         epdconfig.delay_ms(200) 
-        epdconfig.digital_write(self.reset_pin, GPIO.LOW)         # module reset
-        epdconfig.delay_ms(200)
-        epdconfig.digital_write(self.reset_pin, GPIO.HIGH)
+        epdconfig.digital_write(self.reset_pin, 0)
+        epdconfig.delay_ms(10)
+        epdconfig.digital_write(self.reset_pin, 1)
         epdconfig.delay_ms(200)   
 
     def send_command(self, command):
-        epdconfig.digital_write(self.dc_pin, GPIO.LOW)
+        epdconfig.digital_write(self.dc_pin, 0)
+        epdconfig.digital_write(self.cs_pin, 0)
         epdconfig.spi_writebyte([command])
+        epdconfig.digital_write(self.cs_pin, 1)
 
     def send_data(self, data):
-        epdconfig.digital_write(self.dc_pin, GPIO.HIGH)
+        epdconfig.digital_write(self.dc_pin, 1)
+        epdconfig.digital_write(self.cs_pin, 0)
         epdconfig.spi_writebyte([data])
+        epdconfig.digital_write(self.cs_pin, 1)
         
-    def wait_until_idle(self):        
-        while(epdconfig.digital_read(self.busy_pin) == 0):      # 0: idle, 1: busy
-            self.send_command(0x71)
-        epdconfig.delay_ms(100)    
+    def ReadBusy(self):        
+        logging.debug("e-Paper busy")
+        while(epdconfig.digital_read(self.busy_pin) == 0):      #  0: idle, 1: busy
+            epdconfig.delay_ms(200)                
+        logging.debug("e-Paper busy release")
 
     def set_lut(self):
-        self.send_command(LUT_FOR_VCOM)               # vcom
+        self.send_command(0x20) # vcom
         for count in range(0, 44):
             self.send_data(self.lut_vcom_dc[count])
-        self.send_command(LUT_WHITE_TO_WHITE)         # ww --
+        self.send_command(0x21) # ww --
         for count in range(0, 42):
             self.send_data(self.lut_ww[count])
-        self.send_command(LUT_BLACK_TO_WHITE)         # bw r
+        self.send_command(0x22) # bw r
         for count in range(0, 42):
             self.send_data(self.lut_bw[count])
-        self.send_command(LUT_WHITE_TO_BLACK)         # wb w
+        self.send_command(0x23) # wb w
         for count in range(0, 42):
             self.send_data(self.lut_bb[count])
-        self.send_command(LUT_BLACK_TO_BLACK)         # bb b
+        self.send_command(0x24) # bb b
         for count in range(0, 42):
             self.send_data(self.lut_wb[count])
             
+    def gray_SetLut(self):
+        self.send_command(0x20)
+        for count in range(0, 44):        #vcom
+            self.send_data(self.gray_lut_vcom[count])
+            
+        self.send_command(0x21)							#red not use
+        for count in range(0, 42): 
+            self.send_data(self.gray_lut_ww[count])
+
+        self.send_command(0x22)							#bw r
+        for count in range(0, 42): 
+            self.send_data(self.gray_lut_bw[count])
+
+        self.send_command(0x23)							#wb w
+        for count in range(0, 42): 
+            self.send_data(self.gray_lut_wb[count])
+
+        self.send_command(0x24)							#bb b
+        for count in range(0, 42): 
+            self.send_data(self.gray_lut_bb[count])
+
+        self.send_command(0x25)							#vcom
+        for count in range(0, 42): 
+            self.send_data(self.gray_lut_ww[count])
+    
     def init(self):
         if (epdconfig.module_init() != 0):
             return -1
+            
         # EPD hardware init start
         self.reset()
-        self.send_command(POWER_SETTING)
-        self.send_data(0x03)                  # VDS_EN, VDG_EN
-        self.send_data(0x00)                  # VCOM_HV, VGHL_LV[1], VGHL_LV[0]
-        self.send_data(0x2b)                  # VDH
-        self.send_data(0x2b)                  # VDL
-        self.send_data(0x09)                  # VDHR
-        self.send_command(BOOSTER_SOFT_START)
+        
+        self.send_command(0x01) # POWER_SETTING
+        self.send_data(0x03) # VDS_EN, VDG_EN
+        self.send_data(0x00) # VCOM_HV, VGHL_LV[1], VGHL_LV[0]
+        self.send_data(0x2b) # VDH
+        self.send_data(0x2b) # VDL
+        self.send_data(0x09) # VDHR
+        
+        self.send_command(0x06) # BOOSTER_SOFT_START
         self.send_data(0x07)
         self.send_data(0x07)
         self.send_data(0x17)
+        
         # Power optimization
         self.send_command(0xF8)
         self.send_data(0x60)
         self.send_data(0xA5)
+        
         # Power optimization
         self.send_command(0xF8)
         self.send_data(0x89)
         self.send_data(0xA5)
+        
         # Power optimization
         self.send_command(0xF8)
         self.send_data(0x90)
         self.send_data(0x00)
+        
         # Power optimization
         self.send_command(0xF8)
         self.send_data(0x93)
         self.send_data(0x2A)
+        
         # Power optimization
         self.send_command(0xF8)
         self.send_data(0xA0)
         self.send_data(0xA5)
+        
         # Power optimization
         self.send_command(0xF8)
         self.send_data(0xA1)
         self.send_data(0x00)
+        
         # Power optimization
         self.send_command(0xF8)
         self.send_data(0x73)
         self.send_data(0x41)
-        self.send_command(PARTIAL_DISPLAY_REFRESH)
+        
+        self.send_command(0x16) # PARTIAL_DISPLAY_REFRESH
         self.send_data(0x00)
-        self.send_command(POWER_ON)
-        self.wait_until_idle()
+        self.send_command(0x04) # POWER_ON
+        self.ReadBusy()
 
-        self.send_command(PANEL_SETTING)
-        self.send_data(0xAF)        # KW-BF   KWR-AF    BWROTP 0f
-        self.send_command(PLL_CONTROL)
-        self.send_data(0x3A)        # 3A 100HZ   29 150Hz 39 200HZ    31 171HZ
-        self.send_command(VCM_DC_SETTING_REGISTER)
+        self.send_command(0x00) # PANEL_SETTING
+        self.send_data(0xAF) # KW-BF   KWR-AF    BWROTP 0f
+        
+        self.send_command(0x30) # PLL_CONTROL
+        self.send_data(0x3A) # 3A 100HZ   29 150Hz 39 200HZ    31 171HZ
+        
+        self.send_command(0x82) # VCM_DC_SETTING_REGISTER
         self.send_data(0x12)
         self.set_lut()
-        # EPD hardware init end
         return 0
 
+    def Init_4Gray(self):
+        if (epdconfig.module_init() != 0):
+            return -1
+        self.reset()
+        
+        self.send_command(0x01)			#POWER SETTING
+        self.send_data (0x03)
+        self.send_data (0x00)    
+        self.send_data (0x2b)															 
+        self.send_data (0x2b)		
+
+
+        self.send_command(0x06)         #booster soft start
+        self.send_data (0x07)		#A
+        self.send_data (0x07)		#B
+        self.send_data (0x17)		#C 
+
+        self.send_command(0xF8)         #boost??
+        self.send_data (0x60)
+        self.send_data (0xA5)
+
+        self.send_command(0xF8)         #boost??
+        self.send_data (0x89)
+        self.send_data (0xA5)
+
+        self.send_command(0xF8)         #boost??
+        self.send_data (0x90)
+        self.send_data (0x00)
+
+        self.send_command(0xF8)         #boost??
+        self.send_data (0x93)
+        self.send_data (0x2A)
+
+        self.send_command(0xF8)         #boost??
+        self.send_data (0xa0)
+        self.send_data (0xa5)
+
+        self.send_command(0xF8)         #boost??
+        self.send_data (0xa1)
+        self.send_data (0x00)
+
+        self.send_command(0xF8)         #boost??
+        self.send_data (0x73)
+        self.send_data (0x41)
+
+        self.send_command(0x16)
+        self.send_data(0x00)	
+
+        self.send_command(0x04)
+        self.ReadBusy()
+
+        self.send_command(0x00)			#panel setting
+        self.send_data(0xbf)		#KW-BF   KWR-AF	BWROTP 0f
+
+        self.send_command(0x30)			#PLL setting
+        self.send_data (0x90)      	#100hz 
+
+        self.send_command(0x61)			#resolution setting
+        self.send_data (0x00)		#176
+        self.send_data (0xb0)     	 
+        self.send_data (0x01)		#264
+        self.send_data (0x08)
+
+        self.send_command(0x82)			#vcom_DC setting
+        self.send_data (0x12)
+
+        self.send_command(0X50)			#VCOM AND DATA INTERVAL SETTING			
+        self.send_data(0x97)
+
     def getbuffer(self, image):
-        # print "bufsiz = ",(self.width/8) * self.height
-        buf = [0xFF] * ((self.width//8) * self.height)
+        # logging.debug("bufsiz = ",int(self.width/8) * self.height)
+        buf = [0xFF] * (int(self.width/8) * self.height)
         image_monocolor = image.convert('1')
         imwidth, imheight = image_monocolor.size
         pixels = image_monocolor.load()
-        # print "imwidth = %d, imheight = %d",imwidth,imheight
+        # logging.debug("imwidth = %d, imheight = %d",imwidth,imheight)
         if(imwidth == self.width and imheight == self.height):
-            print("Vertical")
+            logging.debug("Vertical")
             for y in range(imheight):
                 for x in range(imwidth):
                     # Set the bits for the column of pixels at the current position.
                     if pixels[x, y] == 0:
-                        buf[(x + y * self.width) // 8] &= ~(0x80 >> (x % 8))
+                        buf[int((x + y * self.width) / 8)] &= ~(0x80 >> (x % 8))
         elif(imwidth == self.height and imheight == self.width):
-            print("Horizontal")
+            logging.debug("Horizontal")
             for y in range(imheight):
                 for x in range(imwidth):
                     newx = y
                     newy = self.height - x - 1
                     if pixels[x, y] == 0:
-                        buf[(newx + newy*self.width) // 8] &= ~(0x80 >> (y % 8))
+                        buf[int((newx + newy*self.width) / 8)] &= ~(0x80 >> (y % 8))
         return buf
-
+    
+    def getbuffer_4Gray(self, image):
+        # logging.debug("bufsiz = ",int(self.width/8) * self.height)
+        buf = [0xFF] * (int(self.width / 4) * self.height)
+        image_monocolor = image.convert('L')
+        imwidth, imheight = image_monocolor.size
+        pixels = image_monocolor.load()
+        i=0
+        # logging.debug("imwidth = %d, imheight = %d",imwidth,imheight)
+        if(imwidth == self.width and imheight == self.height):
+            logging.debug("Vertical")
+            for y in range(imheight):
+                for x in range(imwidth):
+                    # Set the bits for the column of pixels at the current position.
+                    if(pixels[x, y] == 0xC0):
+                        pixels[x, y] = 0x80
+                    elif (pixels[x, y] == 0x80):
+                        pixels[x, y] = 0x40
+                    i= i+1
+                    if(i%4 == 0):
+                        buf[int((x + (y * self.width))/4)] = ((pixels[x-3, y]&0xc0) | (pixels[x-2, y]&0xc0)>>2 | (pixels[x-1, y]&0xc0)>>4 | (pixels[x, y]&0xc0)>>6)
+                        
+        elif(imwidth == self.height and imheight == self.width):
+            logging.debug("Horizontal")
+            for x in range(imwidth):
+                for y in range(imheight):
+                    newx = y
+                    newy = x
+                    if(pixels[x, y] == 0xC0):
+                        pixels[x, y] = 0x80
+                    elif (pixels[x, y] == 0x80):
+                        pixels[x, y] = 0x40
+                    i= i+1
+                    if(i%4 == 0):
+                        buf[int((newx + (newy * self.width))/4)] = ((pixels[x, y-3]&0xc0) | (pixels[x, y-2]&0xc0)>>2 | (pixels[x, y-1]&0xc0)>>4 | (pixels[x, y]&0xc0)>>6) 
+        return buf
+    
     def display(self, image):
-        self.send_command(DATA_START_TRANSMISSION_1)
-        for i in range(0, self.width * self.height // 8):
+        self.send_command(0x10)
+        for i in range(0, int(self.width * self.height / 8)):
             self.send_data(0xFF)
-        self.send_command(DATA_START_TRANSMISSION_2)
-        for i in range(0, self.width * self.height // 8):
+        self.send_command(0x13)
+        for i in range(0, int(self.width * self.height / 8)):
             self.send_data(image[i])
-        self.send_command(DISPLAY_REFRESH) 
-        self.wait_until_idle()
+        self.send_command(0x12) 
+        self.ReadBusy()
+
+    def display_4Gray(self, image):
+        self.send_command(0x10)
+        for i in range(0, 5808):                     #5808*4  46464
+            temp3=0
+            for j in range(0, 2):
+                temp1 = image[i*2+j]
+                for k in range(0, 2):
+                    temp2 = temp1&0xC0 
+                    if(temp2 == 0xC0):
+                        temp3 |= 0x01#white
+                    elif(temp2 == 0x00):
+                        temp3 |= 0x00  #black
+                    elif(temp2 == 0x80): 
+                        temp3 |= 0x01  #gray1
+                    else: #0x40
+                        temp3 |= 0x00 #gray2
+                    temp3 <<= 1	
+                    
+                    temp1 <<= 2
+                    temp2 = temp1&0xC0 
+                    if(temp2 == 0xC0):  #white
+                        temp3 |= 0x01
+                    elif(temp2 == 0x00): #black
+                        temp3 |= 0x00
+                    elif(temp2 == 0x80):
+                        temp3 |= 0x01 #gray1
+                    else :   #0x40
+                            temp3 |= 0x00	#gray2	
+                    if(j!=1 or k!=1):				
+                        temp3 <<= 1
+                    temp1 <<= 2
+            self.send_data(temp3)
+            
+        self.send_command(0x13)	       
+        for i in range(0, 5808):                #5808*4  46464
+            temp3=0
+            for j in range(0, 2):
+                temp1 = image[i*2+j]
+                for k in range(0, 2):
+                    temp2 = temp1&0xC0 
+                    if(temp2 == 0xC0):
+                        temp3 |= 0x01#white
+                    elif(temp2 == 0x00):
+                        temp3 |= 0x00  #black
+                    elif(temp2 == 0x80):
+                        temp3 |= 0x00  #gray1
+                    else: #0x40
+                        temp3 |= 0x01 #gray2
+                    temp3 <<= 1	
+                    
+                    temp1 <<= 2
+                    temp2 = temp1&0xC0 
+                    if(temp2 == 0xC0):  #white
+                        temp3 |= 0x01
+                    elif(temp2 == 0x00): #black
+                        temp3 |= 0x00
+                    elif(temp2 == 0x80):
+                        temp3 |= 0x00 #gray1
+                    else:    #0x40
+                            temp3 |= 0x01	#gray2
+                    if(j!=1 or k!=1):					
+                        temp3 <<= 1
+                    temp1 <<= 2
+            self.send_data(temp3)
+        
+        self.gray_SetLut()
+        self.send_command(0x12)
+        epdconfig.delay_ms(200)
+        self.ReadBusy()
+        # pass
         
     def Clear(self, color):
-        self.send_command(DATA_START_TRANSMISSION_1)
-        for i in range(0, self.width * self.height // 8):
+        self.send_command(0x10)
+        for i in range(0, int(self.width * self.height / 8)):
             self.send_data(0xFF)
-        self.send_command(DATA_START_TRANSMISSION_2)
-        for i in range(0, self.width * self.height // 8):
+        self.send_command(0x13)
+        for i in range(0, int(self.width * self.height / 8)):
             self.send_data(0xFF)
-        self.send_command(DISPLAY_REFRESH) 
-        self.wait_until_idle()
+        self.send_command(0x12) 
+        self.ReadBusy()
 
     def sleep(self):
         self.send_command(0X50)
@@ -296,5 +514,7 @@ class EPD:
         self.send_command(0X02)
         self.send_command(0X07)
         self.send_data(0xA5)
+        
+        epdconfig.module_exit()
 ### END OF FILE ###
 

pwnagotchi/ui/hw/libs/waveshare/v27inch/epdconfig.py

@@ -1,25 +1,19 @@
 # /*****************************************************************************
-# * | File        :	  EPD_1in54.py
+# * | File        :	  epdconfig.py
 # * | Author      :   Waveshare team
 # * | Function    :   Hardware underlying interface
 # * | Info        :
 # *----------------
-# * |	This version:   V2.0
-# * | Date        :   2018-11-01
+# * | This version:   V1.0
+# * | Date        :   2019-06-21
 # * | Info        :   
-# * 1.Remove:
-#   digital_write(self, pin, value)
-#   digital_read(self, pin)
-#   delay_ms(self, delaytime)
-#   set_lut(self, lut)
-#   self.lut = self.lut_full_update
-# ******************************************************************************/
+# ******************************************************************************
 # Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documnetation files (the "Software"), to deal
+# of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to  whom the Software is
-# furished to do so, subject to the following conditions:
+# furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
@@ -33,41 +27,128 @@
 # THE SOFTWARE.
 #
 
-
-import spidev
-import RPi.GPIO as GPIO
+import os
+import logging
+import sys
 import time
 
-# Pin definition
-RST_PIN         = 17
-DC_PIN          = 25
-CS_PIN          = 8
-BUSY_PIN        = 24
 
-# SPI device, bus = 0, device = 0
-SPI = spidev.SpiDev(0, 0)
+class RaspberryPi:
+    # Pin definition
+    RST_PIN         = 17
+    DC_PIN          = 25
+    CS_PIN          = 8
+    BUSY_PIN        = 24
 
-def digital_write(pin, value):
-    GPIO.output(pin, value)
+    def __init__(self):
+        import spidev
+        import RPi.GPIO
 
-def digital_read(pin):
-    return GPIO.input(BUSY_PIN)
+        self.GPIO = RPi.GPIO
 
-def delay_ms(delaytime):
-    time.sleep(delaytime / 1000.0)
+        # SPI device, bus = 0, device = 0
+        self.SPI = spidev.SpiDev(0, 0)
 
-def spi_writebyte(data):
-    SPI.writebytes(data)
+    def digital_write(self, pin, value):
+        self.GPIO.output(pin, value)
+
+    def digital_read(self, pin):
+        return self.GPIO.input(pin)
+
+    def delay_ms(self, delaytime):
+        time.sleep(delaytime / 1000.0)
+
+    def spi_writebyte(self, data):
+        self.SPI.writebytes(data)
+
+    def module_init(self):
+        self.GPIO.setmode(self.GPIO.BCM)
+        self.GPIO.setwarnings(False)
+        self.GPIO.setup(self.RST_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.DC_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.CS_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.BUSY_PIN, self.GPIO.IN)
+        self.SPI.max_speed_hz = 4000000
+        self.SPI.mode = 0b00
+        return 0
+
+    def module_exit(self):
+        logging.debug("spi end")
+        self.SPI.close()
+
+        logging.debug("close 5V, Module enters 0 power consumption ...")
+        self.GPIO.output(self.RST_PIN, 0)
+        self.GPIO.output(self.DC_PIN, 0)
+
+        self.GPIO.cleanup()
+
+
+class JetsonNano:
+    # Pin definition
+    RST_PIN         = 17
+    DC_PIN          = 25
+    CS_PIN          = 8
+    BUSY_PIN        = 24
+
+    def __init__(self):
+        import ctypes
+        find_dirs = [
+            os.path.dirname(os.path.realpath(__file__)),
+            '/usr/local/lib',
+            '/usr/lib',
+        ]
+        self.SPI = None
+        for find_dir in find_dirs:
+            so_filename = os.path.join(find_dir, 'sysfs_software_spi.so')
+            if os.path.exists(so_filename):
+                self.SPI = ctypes.cdll.LoadLibrary(so_filename)
+                break
+        if self.SPI is None:
+            raise RuntimeError('Cannot find sysfs_software_spi.so')
+
+        import Jetson.GPIO
+        self.GPIO = Jetson.GPIO
+
+    def digital_write(self, pin, value):
+        self.GPIO.output(pin, value)
+
+    def digital_read(self, pin):
+        return self.GPIO.input(self.BUSY_PIN)
+
+    def delay_ms(self, delaytime):
+        time.sleep(delaytime / 1000.0)
+
+    def spi_writebyte(self, data):
+        self.SPI.SYSFS_software_spi_transfer(data[0])
+
+    def module_init(self):
+        self.GPIO.setmode(self.GPIO.BCM)
+        self.GPIO.setwarnings(False)
+        self.GPIO.setup(self.RST_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.DC_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.CS_PIN, self.GPIO.OUT)
+        self.GPIO.setup(self.BUSY_PIN, self.GPIO.IN)
+        self.SPI.SYSFS_software_spi_begin()
+        return 0
+
+    def module_exit(self):
+        logging.debug("spi end")
+        self.SPI.SYSFS_software_spi_end()
+
+        logging.debug("close 5V, Module enters 0 power consumption ...")
+        self.GPIO.output(self.RST_PIN, 0)
+        self.GPIO.output(self.DC_PIN, 0)
+
+        self.GPIO.cleanup()
+
+
+if os.path.exists('/sys/bus/platform/drivers/gpiomem-bcm2835'):
+    implementation = RaspberryPi()
+else:
+    implementation = JetsonNano()
+
+for func in [x for x in dir(implementation) if not x.startswith('_')]:
+    setattr(sys.modules[__name__], func, getattr(implementation, func))
 
-def module_init():
-    GPIO.setmode(GPIO.BCM)
-    GPIO.setwarnings(False)
-    GPIO.setup(RST_PIN, GPIO.OUT)
-    GPIO.setup(DC_PIN, GPIO.OUT)
-    GPIO.setup(CS_PIN, GPIO.OUT)
-    GPIO.setup(BUSY_PIN, GPIO.IN)
-    SPI.max_speed_hz = 2000000
-    SPI.mode = 0b00
-    return 0;
 
 ### END OF FILE ###

pwnagotchi/ui/hw/waveshare1.py

@@ -60,7 +60,14 @@ class WaveshareV1(DisplayImpl):
             self._display.init(self._display.lut_full_update)
             self._display.Clear(0xFF)
             self._display.init(self._display.lut_partial_update)
-
+        elif self.config['color'] == 'fastAndFurious':
+            logging.info("initializing waveshare v1 3-color display in FAST MODE")
+            logging.info("THIS MAY BE POTENTIALLY DANGEROUS. NO WARRANTY IS PROVIDED")
+            logging.info("USE THIS DISPLAY IN THIS MODE AT YOUR OWN RISK")
+            from pwnagotchi.ui.hw.libs.waveshare.v1.epd2in13bcFAST import EPD
+            self._display = EPD()
+            self._display.init()
+            self._display.Clear()
         else:
             logging.info("initializing waveshare v1 display 3-color mode")
             from pwnagotchi.ui.hw.libs.waveshare.v1.epd2in13bc import EPD
@@ -72,13 +79,11 @@ class WaveshareV1(DisplayImpl):
         if self.config['color'] == 'black':
             buf = self._display.getbuffer(canvas)
             self._display.display(buf)
+        elif self.config['color'] == 'fastAndFurious':
+            buf_black = self._display.getbuffer(canvas)
+            self._display.DisplayPartial(buf_black)
         else:
             buf_black = self._display.getbuffer(canvas)
-            # emptyImage = Image.new('1', (self._display.height, self._display.width), 255)
-            # buf_color = self._display.getbuffer(emptyImage)
-            # self._display.display(buf_black,buf_color)
-            # Custom display function that only handles black
-            # Was included in epd2in13bc.py
             self._display.displayBlack(buf_black)
 
     def clear(self):

pwnagotchi/ui/hw/waveshare154inch.py

@@ -0,0 +1,47 @@
+import logging
+
+import pwnagotchi.ui.fonts as fonts
+from pwnagotchi.ui.hw.base import DisplayImpl
+
+
+class Waveshare154inch(DisplayImpl):
+    def __init__(self, config):
+        super(Waveshare154inch, self).__init__(config, 'waveshare_1_54inch')
+        self._display = None
+
+    def layout(self):
+        fonts.setup(10, 9, 10, 35)
+        self._layout['width'] = 200
+        self._layout['height'] = 200
+        self._layout['face'] = (0, 40)
+        self._layout['name'] = (5, 20)
+        self._layout['channel'] = (0, 0)
+        self._layout['aps'] = (28, 0)
+        self._layout['uptime'] = (135, 0)
+        self._layout['line1'] = [0, 14, 200, 14]
+        self._layout['line2'] = [0, 186, 200, 186]
+        self._layout['friend_face'] = (0, 92)
+        self._layout['friend_name'] = (40, 94)
+        self._layout['shakes'] = (0, 187)
+        self._layout['mode'] = (170, 187)
+        self._layout['status'] = {
+            'pos': (5, 90),
+            'font': fonts.Medium,
+            'max': 20
+        }
+        return self._layout
+
+    def initialize(self):
+        logging.info("initializing waveshare v154 display")
+        from pwnagotchi.ui.hw.libs.waveshare.v154inch.epd1in54b import EPD
+        self._display = EPD()
+        self._display.init()
+        self._display.Clear()
+
+    def render(self, canvas):
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf, None)
+
+    def clear(self):
+        pass
+        #self._display.Clear()

pwnagotchi/ui/hw/waveshare213d.py

@@ -0,0 +1,47 @@
+import logging
+
+import pwnagotchi.ui.fonts as fonts
+from pwnagotchi.ui.hw.base import DisplayImpl
+
+
+class Waveshare213d(DisplayImpl):
+    def __init__(self, config):
+        super(Waveshare213d, self).__init__(config, 'waveshare213d')
+        self._display = None
+
+    def layout(self):
+        fonts.setup(10, 8, 10, 25)
+        self._layout['width'] = 212
+        self._layout['height'] = 104
+        self._layout['face'] = (0, 26)
+        self._layout['name'] = (5, 15)
+        self._layout['channel'] = (0, 0)
+        self._layout['aps'] = (28, 0)
+        self._layout['uptime'] = (147, 0)
+        self._layout['line1'] = [0, 12, 212, 12]
+        self._layout['line2'] = [0, 92, 212, 92]
+        self._layout['friend_face'] = (0, 76)
+        self._layout['friend_name'] = (40, 78)
+        self._layout['shakes'] = (0, 93)
+        self._layout['mode'] = (187, 93)
+        self._layout['status'] = {
+            'pos': (91, 15),
+            'font': fonts.Medium,
+            'max': 20
+        }
+        return self._layout
+
+    def initialize(self):
+        logging.info("initializing waveshare 213d display")
+        from pwnagotchi.ui.hw.libs.waveshare.v213d.epd2in13d import EPD
+        self._display = EPD()
+        self._display.init()
+        self._display.Clear()
+
+    def render(self, canvas):
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
+
+    def clear(self):
+        #pass
+        self._display.Clear()

pwnagotchi/ui/view.py

@@ -2,6 +2,7 @@ import _thread
 from threading import Lock
 import time
 import logging
+import random
 from PIL import ImageDraw
 
 import pwnagotchi.utils as utils
@@ -25,6 +26,7 @@ class View(object):
         # setup faces from the configuration in case the user customized them
         faces.load_from_config(config['ui']['faces'])
 
+        self._agent = None
         self._render_cbs = []
         self._config = config
         self._canvas = None
@@ -88,6 +90,9 @@ class View(object):
 
         ROOT = self
 
+    def set_agent(self, agent):
+        self._agent = agent
+
     def has_element(self, key):
         self._state.has_element(key)
 
@@ -147,6 +152,7 @@ class View(object):
         self.set('shakes', '%d (%s)' % (last_session.handshakes, \
                                         utils.total_unique_handshakes(self._config['bettercap']['handshakes'])))
         self.set_closest_peer(last_session.last_peer, last_session.peers)
+        self.update()
 
     def is_normal(self):
         return self._state.get('face') not in (
@@ -201,9 +207,21 @@ class View(object):
         self.update()
 
     def on_new_peer(self, peer):
-        self.set('face', faces.FRIEND)
+        face = ''
+        # first time they met, neutral mood
+        if peer.first_encounter():
+            face = random.choice((faces.AWAKE, faces.COOL))
+        # a good friend, positive expression
+        elif peer.is_good_friend(self._config):
+            face = random.choice((faces.MOTIVATED, faces.FRIEND, faces.HAPPY))
+        # normal friend, neutral-positive
+        else:
+            face = random.choice((faces.EXCITED, faces.HAPPY, faces.SMART))
+
+        self.set('face', face)
         self.set('status', self._voice.on_new_peer(peer))
         self.update()
+        time.sleep(3)
 
     def on_lost_peer(self, peer):
         self.set('face', faces.LONELY)
@@ -215,12 +233,17 @@ class View(object):
         self.set('status', self._voice.on_free_channel(channel))
         self.update()
 
+    def on_reading_logs(self, lines_so_far=0):
+        self.set('face', faces.SMART)
+        self.set('status', self._voice.on_reading_logs(lines_so_far))
+        self.update()
+
     def wait(self, secs, sleeping=True):
         was_normal = self.is_normal()
         part = secs / 10.0
 
         for step in range(0, 10):
-            # if we weren't in a normal state before goin
+            # if we weren't in a normal state before going
             # to sleep, keep that face and status on for
             # a while, otherwise the sleep animation will
             # always override any minor state change before it
@@ -234,10 +257,11 @@ class View(object):
                         self.set('status', self._voice.on_awakening())
                 else:
                     self.set('status', self._voice.on_waiting(int(secs)))
+                    good_mood = self._agent.in_good_mood()
                     if step % 2 == 0:
-                        self.set('face', faces.LOOK_R)
+                        self.set('face', faces.LOOK_R_HAPPY if good_mood else faces.LOOK_R)
                     else:
-                        self.set('face', faces.LOOK_L)
+                        self.set('face', faces.LOOK_L_HAPPY if good_mood else faces.LOOK_L)
 
             time.sleep(part)
             secs -= part
@@ -260,6 +284,11 @@ class View(object):
         self.set('status', self._voice.on_sad())
         self.update()
 
+    def on_angry(self):
+        self.set('face', faces.ANGRY)
+        self.set('status', self._voice.on_angry())
+        self.update()
+
     def on_motivated(self, reward):
         self.set('face', faces.MOTIVATED)
         self.set('status', self._voice.on_motivated(reward))
@@ -290,6 +319,11 @@ class View(object):
         self.set('status', self._voice.on_miss(who))
         self.update()
 
+    def on_grateful(self):
+        self.set('face', faces.GRATEFUL)
+        self.set('status', self._voice.on_grateful())
+        self.update()
+
     def on_lonely(self):
         self.set('face', faces.LONELY)
         self.set('status', self._voice.on_lonely())
@@ -300,6 +334,12 @@ class View(object):
         self.set('status', self._voice.on_handshakes(new_shakes))
         self.update()
 
+    def on_unread_messages(self, count, total):
+        self.set('face', faces.EXCITED)
+        self.set('status', self._voice.on_unread_messages(count, total))
+        self.update()
+        time.sleep(5.0)
+
     def on_rebooting(self):
         self.set('face', faces.BROKEN)
         self.set('status', self._voice.on_rebooting())

pwnagotchi/ui/web.py

@@ -52,7 +52,7 @@ INDEX = """<html>
         <img src="/ui" id="ui" style="width:100%%"/>
         <br/>
         <hr/>
-        <form action="/shutdown" onsubmit="return confirm('This will halt the unit, continue?');">
+        <form method="POST" action="/shutdown" onsubmit="return confirm('This will halt the unit, continue?');">
             <input type="submit" class="block" value="Shutdown"/>
         </form>
     </div>
@@ -75,7 +75,7 @@ SHUTDOWN = """<html>
 
 
 class Handler(BaseHTTPRequestHandler):
-    AllowedOrigin = '*'
+    AllowedOrigin = None  # CORS headers are not sent
 
     # suppress internal logging
     def log_message(self, format, *args):
@@ -88,12 +88,13 @@ class Handler(BaseHTTPRequestHandler):
         self.send_header("X-XSS-Protection", "1; mode=block")
         self.send_header("Referrer-Policy", "same-origin")
         # cors
-        self.send_header("Access-Control-Allow-Origin", Handler.AllowedOrigin)
-        self.send_header('Access-Control-Allow-Credentials', 'true')
-        self.send_header("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS")
-        self.send_header("Access-Control-Allow-Headers",
-                         "Accept, Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization")
-        self.send_header("Vary", "Origin")
+        if Handler.AllowedOrigin:
+            self.send_header("Access-Control-Allow-Origin", Handler.AllowedOrigin)
+            self.send_header('Access-Control-Allow-Credentials', 'true')
+            self.send_header("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS")
+            self.send_header("Access-Control-Allow-Headers",
+                            "Accept, Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization")
+            self.send_header("Vary", "Origin")
 
     # just render some html in a 200 response
     def _html(self, html):
@@ -130,44 +131,54 @@ class Handler(BaseHTTPRequestHandler):
             except:
                 pass
 
+    # check the Origin header vs CORS
+    def _is_allowed(self):
+        if not Handler.AllowedOrigin or Handler.AllowedOrigin == '*':
+            return True
+
+        # TODO: FIX doesn't work with GET requests same-origin
+        origin = self.headers.get('origin')
+        if not origin:
+            logging.warning("request with no Origin header from %s" % self.address_string())
+            return False
+
+        if origin != Handler.AllowedOrigin:
+            logging.warning("request with blocked Origin from %s: %s" % (self.address_string(), origin))
+            return False
+
+        return True
+
     def do_OPTIONS(self):
         self.send_response(200)
         self._send_cors_headers()
         self.end_headers()
 
-    # check the Origin header vs CORS
-    def _is_allowed(self):
-        origin = self.headers.get('origin')
-        if not origin and Handler.AllowedOrigin != '*':
-            logging.warning("request with no Origin header from %s" % self.address_string())
-            return False
+    def do_POST(self):
+        if not self._is_allowed():
+            return
+        if self.path.startswith('/shutdown'):
+            self._shutdown()
+        else:
+            self.send_response(404)
 
-        if Handler.AllowedOrigin != '*':
-            if origin != Handler.AllowedOrigin:
-                logging.warning("request with blocked Origin from %s: %s" % (self.address_string(), origin))
-                return False
-
-        return True
-
-    # main entry point of the http server
     def do_GET(self):
         if not self._is_allowed():
             return
 
         if self.path == '/':
             self._index()
-        elif self.path.startswith('/shutdown'):
-            self._shutdown()
 
         elif self.path.startswith('/ui'):
             self._image()
+
         elif self.path.startswith('/plugins'):
-            plugin_from_path = re.match(r'\/plugins\/([^\/]+)(\/.*)?', self.path)
-            if plugin_from_path:
-                plugin_name = plugin_from_path.groups()[0]
-                right_path = plugin_from_path.groups()[1] if len(plugin_from_path.groups()) == 2 else None
-                if plugin_name in plugins.loaded and hasattr(plugins.loaded[plugin_name], 'on_webhook'):
-                    plugins.loaded[plugin_name].on_webhook(self, right_path)
+            matches = re.match(r'\/plugins\/([^\/]+)(\/.*)?', self.path)
+            if matches:
+                groups = matches.groups()
+                plugin_name = groups[0]
+                right_path = groups[1] if len(groups) == 2 else None
+                plugins.one(plugin_name, 'webhook', self, right_path)
+
         else:
             self.send_response(404)
 
@@ -179,11 +190,8 @@ class Server(object):
         self._address = config['video']['address']
         self._httpd = None
 
-        if 'origin' in config['video'] and config['video']['origin'] != '*':
+        if 'origin' in config['video']:
             Handler.AllowedOrigin = config['video']['origin']
-        else:
-            logging.warning("THE WEB UI IS RUNNING WITH ALLOWED ORIGIN SET TO *, READ WHY YOU SHOULD CHANGE IT HERE " +
-                            "https://developer.mozilla.org/it/docs/Web/HTTP/CORS")
 
         if self._enabled:
             _thread.start_new_thread(self._http_serve, ())

pwnagotchi/utils.py

@@ -38,6 +38,12 @@ def load_config(args):
         # https://stackoverflow.com/questions/42392600/oserror-errno-18-invalid-cross-device-link
         shutil.move("/boot/config.yml", args.user_config)
 
+    # check for an entire pwnagotchi folder on /boot/
+    if os.path.isdir('/boot/pwnagotchi'):
+        print("installing /boot/pwnagotchi to /etc/pwnagotchi ...")
+        shutil.rmtree('/etc/pwnagotchi', ignore_errors=True)
+        shutil.move('/boot/pwnagotchi', '/etc/')
+
     # if not config is found, copy the defaults
     if not os.path.exists(args.config):
         print("copying %s to %s ..." % (ref_defaults_file, args.config))
@@ -59,12 +65,16 @@ def load_config(args):
         config = yaml.safe_load(fp)
 
     # load the user config
-    if os.path.exists(args.user_config):
-        with open(args.user_config) as fp:
-            user_config = yaml.safe_load(fp)
-            # if the file is empty, safe_load will return None and merge_config will boom.
-            if user_config:
-                config = merge_config(user_config, config)
+    try:
+        if os.path.exists(args.user_config):
+            with open(args.user_config) as fp:
+                user_config = yaml.safe_load(fp)
+                # if the file is empty, safe_load will return None and merge_config will boom.
+                if user_config:
+                    config = merge_config(user_config, config)
+    except yaml.YAMLError as ex:
+        print("There was an error processing the configuration file:\n%s " % ex)
+        exit(1)
 
     # the very first step is to normalize the display name so we don't need dozens of if/elif around
     if config['ui']['display']['type'] in ('inky', 'inkyphat'):
@@ -73,7 +83,7 @@ def load_config(args):
     elif config['ui']['display']['type'] in ('papirus', 'papi'):
         config['ui']['display']['type'] = 'papirus'
 
-    elif config['ui']['display']['type'] in ('oledhat'):
+    elif config['ui']['display']['type'] in ('oledhat',):
         config['ui']['display']['type'] = 'oledhat'
 
     elif config['ui']['display']['type'] in ('ws_1', 'ws1', 'waveshare_1', 'waveshare1'):
@@ -85,12 +95,22 @@ def load_config(args):
     elif config['ui']['display']['type'] in ('ws_27inch', 'ws27inch', 'waveshare_27inch', 'waveshare27inch'):
         config['ui']['display']['type'] = 'waveshare27inch'
 
+    elif config['ui']['display']['type'] in ('lcdhat',):
+        config['ui']['display']['type'] = 'lcdhat'
+
+    elif config['ui']['display']['type'] in ('dfrobot', 'df'):
+        config['ui']['display']['type'] = 'dfrobot'
+
+    elif config['ui']['display']['type'] in ('ws_154inch', 'ws154inch', 'waveshare_154inch', 'waveshare154inch'):
+        config['ui']['display']['type'] = 'waveshare154inch'
+
+    elif config['ui']['display']['type'] in ('ws_213d', 'ws213d', 'waveshare_213d', 'waveshare213d'):
+        config['ui']['display']['type'] = 'waveshare213d'
+
     else:
         print("unsupported display type %s" % config['ui']['display']['type'])
         exit(1)
 
-    print("Effective Configuration:")
-    print(yaml.dump(config, default_flow_style=False))
     return config
 
 
@@ -109,6 +129,12 @@ def setup_logging(args, config):
     console_handler.setFormatter(formatter)
     root.addHandler(console_handler)
 
+    # https://stackoverflow.com/questions/24344045/how-can-i-completely-remove-any-logging-from-requests-module-in-python?noredirect=1&lq=1
+    logging.getLogger("urllib3").propagate = False
+    requests_log = logging.getLogger("requests")
+    requests_log.addHandler(logging.NullHandler())
+    requests_log.propagate = False
+
 
 def secs_to_hhmmss(secs):
     mins, secs = divmod(secs, 60)
@@ -267,7 +293,7 @@ class StatusFile(object):
         return self._updated is not None and ((datetime.now() - self._updated).seconds / 60) < minutes
 
     def newer_then_hours(self, hours):
-        return self._updated is not None and ((datetime.now() - self._updated).seconds / (60*60)) < hours
+        return self._updated is not None and ((datetime.now() - self._updated).seconds / (60 * 60)) < hours
 
     def newer_then_days(self, days):
         return self._updated is not None and (datetime.now() - self._updated).days < days

pwnagotchi/voice.py

@@ -43,6 +43,12 @@ class Voice:
     def on_free_channel(self, channel):
         return self._('Hey, channel {channel} is free! Your AP will say thanks.').format(channel=channel)
 
+    def on_reading_logs(self, lines_so_far=0):
+        if lines_so_far == 0:
+            return self._('Reading last session logs ...')
+        else:
+            return self._('Read {lines_so_far} log lines so far ...').format(lines_so_far=lines_so_far)
+
     def on_bored(self):
         return random.choice([
             self._('I\'m bored ...'),
@@ -61,6 +67,13 @@ class Voice:
             self._('I\'m sad'),
             '...'])
 
+    def on_angry(self):
+        # passive aggressive or not? :D
+        return random.choice([
+            '...',
+            self._('Leave me alone ...'),
+            self._('I\'m mad at you!')])
+
     def on_excited(self):
         return random.choice([
             self._('I\'m living the life!'),
@@ -70,9 +83,14 @@ class Voice:
             self._('My crime is that of curiosity ...')])
 
     def on_new_peer(self, peer):
-        return random.choice([
-            self._('Hello {name}! Nice to meet you.').format(name=peer.name()),
-            self._('Unit {name} is nearby!').format(name=peer.name())])
+        if peer.first_encounter():
+            return random.choice([
+                self._('Hello {name}! Nice to meet you.').format(name=peer.name())])
+        else:
+            return random.choice([
+                self._('Yo {name}! Sup?').format(name=peer.name()),
+                self._('Hey {name} how are you doing?').format(name=peer.name()),
+                self._('Unit {name} is nearby!').format(name=peer.name())])
 
     def on_lost_peer(self, peer):
         return random.choice([
@@ -85,6 +103,11 @@ class Voice:
             self._('{name} missed!').format(name=who),
             self._('Missed!')])
 
+    def on_grateful(self):
+        return random.choice([
+            self._('Good friends are a blessing!'),
+            self._('I love my friends!')])
+
     def on_lonely(self):
         return random.choice([
             self._('Nobody wants to play with me ...'),
@@ -129,6 +152,10 @@ class Voice:
         s = 's' if new_shakes > 1 else ''
         return self._('Cool, we got {num} new handshake{plural}!').format(num=new_shakes, plural=s)
 
+    def on_unread_messages(self, count, total):
+        s = 's' if count > 1 else ''
+        return self._('You have {count} new message{plural}!').format(count=count, plural=s)
+
     def on_rebooting(self):
         return self._("Ops, something went wrong ... Rebooting ...")