Update build for Pi 5 users

166c012cde

.idea/misc.xml

@@ -4,4 +4,7 @@
     <option name="sdkName" value="Python 3.11 (pwnagotchi)" />
   </component>
   <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (pwnagotchi-torch-bookworm)" project-jdk-type="Python SDK" />
+  <component name="PythonCompatibilityInspectionAdvertiser">
+    <option name="version" value="3" />
+  </component>
 </project>

README-google.md

@@ -11,7 +11,7 @@ Select ‘Credentials’ from the left menu, click ‘Create Credentials’, sel
 
 Now, the product name and consent screen need to be set -> click ‘Configure consent screen’ and follow the instructions. Once finished:
 
-Select ‘Application type’ to be Desktop application.
+Select ‘Application type’ to be Web application.
 
 Enter an appropriate name.
 
@@ -19,7 +19,7 @@ Input http://localhost/ for ‘Authorized redirect URIs’.
 
 Select the correct oauth scope:
 
-    - drive
+    - drive.file
     - drive.install
 
 Click ‘Create’.

README.md

@@ -7,7 +7,7 @@ It seems the Pi 5 is unable to run in monitor mode, will keep you updated on thi
 If you are using an older 32-bit version Raspberry Pi, ZeroWH, use this [fork](https://github.com/jayofelony/pwnagotchi-torch/releases/tag/v2.6.4) and make sure you download the `armhf` version.
 
 ---
-Download latest image file [here](https://github.com/jayofelony/pwnagotchi-bookworm/releases/tag/v2.6.7), and let it auto-update from here on out.
+Download latest image file [here](https://github.com/jayofelony/pwnagotchi-bookworm/releases/tag/v2.7.3), and let it auto-update from here on out.
 
 **Use RPi imager to flash, please don't flash a new user as this will mess with logs created.**
 

apt_packages.txt

@@ -0,0 +1 @@
+hcxtools

bin/pwnagotchi

@@ -157,7 +157,7 @@ def pwnagotchi_cli():
         sys.exit(0)
 
     if args.donate:
-        print("Donations can made @ https://www.patreon.com/pwnagotchi_torch \n\nBut only if you really want to!")
+        print("Donations can made @ https://github.com/sponsors/jayofelony \n\nBut only if you really want to!")
         sys.exit(0)
 
     if args.check_update:
@@ -176,7 +176,11 @@ def pwnagotchi_cli():
                     os.system("rm /root/.auto-update && systemctl restart pwnagotchi")
                 os.system("systemctl restart pwnagotchi")
                 print("Okay, give me a couple minutes. Just watch pwnlog while you wait.")
+            elif user_input.lower() in ('n', 'no'):
                 print("Okay, guess not!")
+            else:
+                print("Invalid input.")
+        else:
             print("You are currently on the latest release, v%s." % pwnagotchi.__version__)
         sys.exit(0)
 

builder/data/etc/default/zramswap

@@ -0,0 +1,15 @@
+# Specifies amount of zram devices to create.
+# By default, zramswap-start will use all available cores.
+#CORES=1
+
+# Specifies the amount of RAM that should be used for zram
+# based on a percentage the total amount of available memory
+PERCENTAGE=60
+
+# Specifies a static amount of RAM that should be used for
+# the ZRAM devices, this is in MiB
+#ALLOCATION=256
+
+# Specifies the priority for the swap devices, see swapon(2)
+# for more details.
+#PRIORITY=100

builder/data/etc/dphys-swapfile

@@ -1,26 +0,0 @@
-# /etc/dphys-swapfile - user settings for dphys-swapfile package
-# author Neil Franklin, last modification 2010.05.05
-# copyright ETH Zuerich Physics Departement
-#   use under either modified/non-advertising BSD or GPL license
-
-# this file is sourced with . so full normal sh syntax applies
-
-# the default settings are added as commented out CONF_*=* lines
-
-
-# where we want the swapfile to be, this is the default
-#CONF_SWAPFILE=/var/swap
-
-# set size to absolute value, leaving empty (default) then uses computed value
-#   you most likely don't want this, unless you have an special disk situation
-CONF_SWAPSIZE=2048
-
-# set size to computed value, this times RAM size, dynamically adapts,
-#   guarantees that there is enough swap without wasting disk space on excess
-#CONF_SWAPFACTOR=2
-
-# restrict size (computed and absolute!) to maximally this limit
-#   can be set to empty for no limit, but beware of filled partitions!
-#   this is/was a (outdated?) 32bit kernel limit (in MBytes), do not overrun it
-#   but is also sensible on 64bit to prevent filling /var or even / partition
-#CONF_MAXSWAP=2048

builder/data/usr/bin/pwnlib

@@ -56,7 +56,7 @@ stop_monitor_interface() {
   ifconfig wlan0 up
 }
 
-# returns 0 if the specificed network interface is up
+# returns 0 if the specified network interface is up
 is_interface_up() {
   if grep -qi 'up' /sys/class/net/"$1"/operstate; then
     return 0

builder/raspberrypi64.yml

@@ -7,6 +7,7 @@
     kernel:
       min: "6.1"
       full: "6.1.0-rpi7-rpi-v8"
+      full_pi5: "6.1.0-rpi7-rpi-2712"
     pwnagotchi:
       hostname: "{{ lookup('env', 'PWN_HOSTNAME') | default('pwnagotchi', true) }}"
       version: "{{ lookup('env', 'PWN_VERSION') | default('pwnagotchi-torch', true) }}"
@@ -23,21 +24,17 @@
     services:
       enable:
         - bettercap.service
-        - dphys-swapfile.service
         - fstrim.timer
         - pwnagotchi.service
         - pwngrid-peer.service
+        - zramswap.service
       disable:
         - apt-daily-upgrade.service
         - apt-daily-upgrade.timer
         - apt-daily.service
         - apt-daily.timer
-        - avahi-daemon.service
-        - avahi-daemon.socket
         - bluetooth.service
         - ifup@wlan0.service
-        - triggerhappy.service
-        - wpa_supplicant.service
     packages:
       caplets:
         source: "https://github.com/jayofelony/caplets.git"
@@ -61,6 +58,7 @@
           - libpcap0.8-dbg
         remove:
           - avahi-daemon
+          - dhpys-swapfile
           - nfs-common
           - triggerhappy
           - wpasupplicant
@@ -73,7 +71,6 @@
           - build-essential
           - curl
           - dkms
-          - dphys-swapfile
           - fbi
           - flex
           - fonts-dejavu
@@ -84,6 +81,7 @@
           - gawk
           - gcc-arm-none-eabi
           - git
+          - hcxtools
           - libatlas-base-dev
           - libavcodec59
           - libavformat59
@@ -161,17 +159,62 @@
           - wl
           - xxd
           - zlib1g-dev
+          - zram-tools
   environment:
     ARCHFLAGS: "-arch aarch64"
     QEMU_UNAME: "{{ kernel.full }}"
 
   tasks:
+    # First we install and remove unnecessary packages
+    - name: install packages
+      apt:
+        name: "{{ packages.apt.install }}"
+        state: present
+        update_cache: yes
+        install_recommends: false
+
+    - name: remove unnecessary apt packages
+      apt:
+        name: "{{ packages.apt.remove }}"
+        state: absent
+        purge: yes
+      register: removed
+
+    # Now we set up /boot/firmware
     - name: Create pi user
       copy:
         dest: /boot/firmware/userconf
         content: |
           pi:$6$3jNr0GA9KIyt4hmM$efeVIopdMQ8DGgEPCWWlbx3mJJNAYci1lEXGdlky0xPyjqwKNbwTL5SrCcpb4144C4IvzWjn7Iv.QjqmU7iyT/
 
+    - name: enable ssh on boot
+      file:
+        path: /boot/firmware/ssh
+        state: touch
+
+    - name: adjust /boot/firmware/config.txt
+      lineinfile:
+        dest: /boot/firmware/config.txt
+        insertafter: EOF
+        line: '{{ item }}'
+      with_items: "{{ system.boot_options }}"
+
+    - name: change root partition
+      replace:
+        dest: /boot/firmware/cmdline.txt
+        backup: no
+        regexp: "root=PARTUUID=[a-zA-Z0-9\\-]+"
+        replace: "root=/dev/mmcblk0p2"
+
+    - name: configure /boot/firmware/cmdline.txt
+      lineinfile:
+        path: /boot/firmware/cmdline.txt
+        backrefs: True
+        state: present
+        backup: no
+        regexp: '(.*)$'
+        line: '\1 modules-load=dwc2,g_ether'
+
     - name: change hostname
       lineinfile:
         dest: /etc/hostname
@@ -189,6 +232,7 @@
         state: present
       when: hostname.changed
 
+    # Now we disable sap and a2dp, we don't use them on rpi
     - name: disable sap plugin for bluetooth.service
       lineinfile:
         dest: /lib/systemd/system/bluetooth.service
@@ -196,19 +240,6 @@
         line: 'ExecStart=/usr/libexec/bluetooth/bluetoothd --noplugin=sap,a2dp'
         state: present
 
-    - name: configure dphys-swapfile
-      lineinfile:
-        path: /etc/dphys-swapfile
-        regexp: "^CONF_SWAPSIZE=.*$"
-        line: "CONF_SWAPSIZE=2048"
-
-    - name: install packages
-      apt:
-        name: "{{ packages.apt.install }}"
-        state: present
-        update_cache: yes
-        install_recommends: false
-
     ###########################################
     #
     # libpcap v1.9 - build from source
@@ -313,11 +344,19 @@
     - name: backup original driver
       command: "mv /usr/lib/modules/{{ kernel.full }}/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko.xz /usr/lib/modules/{{ kernel.full }}/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko.xz.orig"
 
+    - name: backup original driver, RPi5
+      command: "mv /usr/lib/modules/{{ kernel.full_pi5 }}/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko.xz /usr/lib/modules/{{ kernel.full_pi5 }}/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko.xz.orig"
+
     - name: copy modified driver
       copy:
         src: "/usr/local/src/nexmon/patches/driver/brcmfmac_{{ kernel.min }}.y-nexmon/brcmfmac.ko"
         dest: "/usr/lib/modules/{{ kernel.full }}/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko"
 
+    - name: copy modified driver, RPi5
+      copy:
+        src: "/usr/local/src/nexmon/patches/driver/brcmfmac_{{ kernel.min }}.y-nexmon/brcmfmac.ko"
+        dest: "/usr/lib/modules/{{ kernel.full_pi5 }}/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko"
+
     - name : load brcmfmac drivers
       command: "/sbin/depmod -a"
 
@@ -477,41 +516,6 @@
         state: absent
         path: /etc/update-motd.d/10-uname
 
-    - name: enable ssh on boot
-      file:
-        path: /boot/firmware/ssh
-        state: touch
-
-    - name: adjust /boot/config.txt
-      lineinfile:
-        dest: /boot/firmware/config.txt
-        insertafter: EOF
-        line: '{{ item }}'
-      with_items: "{{ system.boot_options }}"
-
-    - name: adjust /etc/modules
-      lineinfile:
-        dest: /etc/modules
-        insertafter: EOF
-        line: '{{ item }}'
-      with_items: "{{ system.modules }}"
-
-    - name: change root partition
-      replace:
-        dest: /boot/firmware/cmdline.txt
-        backup: no
-        regexp: "root=PARTUUID=[a-zA-Z0-9\\-]+"
-        replace: "root=/dev/mmcblk0p2"
-
-    - name: configure /boot/cmdline.txt
-      lineinfile:
-        path: /boot/cmdline.txt
-        backrefs: True
-        state: present
-        backup: no
-        regexp: '(.*)$'
-        line: '\1 modules-load=dwc2,g_ether'
-
     - name: Add pwnlog alias
       lineinfile:
         dest: /home/pi/.bashrc
@@ -563,13 +567,6 @@
         group: pi
         recurse: true
 
-    - name: remove unnecessary apt packages
-      apt:
-        name: "{{ packages.apt.remove }}"
-        state: absent
-        purge: yes
-      register: removed
-
     - name: clean apt cache
       apt:
         autoclean: true

pwnagotchi/_version.py

@@ -1 +1 @@
-__version__ = '2.7.0'
+__version__ = '2.7.7'

pwnagotchi/agent.py

@@ -184,13 +184,15 @@ class Agent(Client, Automata, AsyncAdvertiser, AsyncTrainer):
             for ap in s['wifi']['aps']:
                 if ap['encryption'] == '' or ap['encryption'] == 'OPEN':
                     continue
+                elif ap['hostname'] in whitelist or ap['mac'][:8].lower() in whitelist:
+                    continue
                 elif ap['hostname'] not in whitelist \
                         and ap['mac'].lower() not in whitelist \
                         and ap['mac'][:8].lower() not in whitelist:
                     if self._filter_included(ap):
                         aps.append(ap)
         except Exception as e:
-            logging.exception("Error while getting acces points (%s)", e)
+            logging.exception("Error while getting access points (%s)", e)
 
         aps.sort(key=lambda ap: ap['channel'])
         return self.set_access_points(aps)
@@ -275,6 +277,10 @@ class Agent(Client, Automata, AsyncAdvertiser, AsyncTrainer):
         self._save_recovery_data()
         pwnagotchi.reboot()
 
+    def _restart(self):
+        self._save_recovery_data()
+        pwnagotchi.restart("AUTO")
+
     def _save_recovery_data(self):
         logging.warning("writing recovery data to %s ...", RECOVERY_DATA_FILE)
         with open(RECOVERY_DATA_FILE, 'w') as fp:

pwnagotchi/ai/__init__.py

@@ -59,7 +59,8 @@ def load(config, agent, epoch, from_disk=True):
 
         return a2c
     except Exception as e:
-        logging.exception("[AI] error while starting AI (%s)", e)
+        logging.info("[AI] Error while starting AI")
+        logging.debug("[AI] error while starting AI (%s)", e)
         logging.info("[AI] Deleting brain and restarting.")
         os.system("rm /root/brain.nn && service pwnagotchi restart")
 

pwnagotchi/automata.py

@@ -138,6 +138,6 @@ class Automata(object):
         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()
+            logging.critical("%d epochs without visible access points -> restarting ...", self._epoch.blind_for)
+            self._restart()
             self._epoch.blind_for = 0

pwnagotchi/defaults.toml

@@ -1,5 +1,11 @@
 main.name = "pwnagotchi"
 main.lang = "en"
+main.whitelist = [
+    "EXAMPLE_NETWORK",
+    "ANOTHER_EXAMPLE_NETWORK",
+    "fo:od:ba:be:fo:od",
+    "fo:od:ba"
+]
 main.confd = "/etc/pwnagotchi/conf.d/"
 main.custom_plugin_repos = [
     "https://github.com/jayofelony/pwnagotchi-torch-plugins/archive/master.zip",
@@ -12,6 +18,10 @@ main.custom_plugin_repos = [
 
 main.custom_plugins = "/usr/local/share/pwnagotchi/custom-plugins/"
 
+main.plugins.aircrackonly.enabled = true
+
+main.plugins.hashie.enabled = true
+
 main.plugins.auto-update.enabled = true
 main.plugins.auto-update.install = true
 main.plugins.auto-update.interval = 1
@@ -55,9 +65,6 @@ main.plugins.gps.device = "/dev/ttyUSB0" # for GPSD: "localhost:2947"
 
 main.plugins.grid.enabled = true
 main.plugins.grid.report = true
-main.plugins.grid.exclude = [
-    "YourHomeNetworkHere"
-]
 
 main.plugins.logtail.enabled = false
 main.plugins.logtail.max-lines = 10000
@@ -73,10 +80,6 @@ main.plugins.onlinehashcrack.enabled = false
 main.plugins.onlinehashcrack.email = ""
 main.plugins.onlinehashcrack.dashboard = ""
 main.plugins.onlinehashcrack.single_files = false
-main.plugins.onlinehashcrack.whitelist = []
-
-main.plugins.paw-gps.enabled = false
-main.plugins.paw-gps.ip = "192.168.44.1:8080"
 
 main.plugins.pisugar2.enabled = false
 main.plugins.pisugar2.shutdown = 5
@@ -100,26 +103,19 @@ main.plugins.webgpsmap.enabled = false
 
 main.plugins.wigle.enabled = false
 main.plugins.wigle.api_key = ""
-main.plugins.wigle.whitelist = []
-main.plugins.wigle.donate = true
+main.plugins.wigle.donate = false
 
 main.plugins.wpa-sec.enabled = false
 main.plugins.wpa-sec.api_key = ""
 main.plugins.wpa-sec.api_url = "https://wpa-sec.stanev.org"
 main.plugins.wpa-sec.download_results = false
-main.plugins.wpa-sec.whitelist = []
 
 main.iface = "wlan0mon"
 main.mon_start_cmd = "/usr/bin/monstart"
 main.mon_stop_cmd = "/usr/bin/monstop"
 main.mon_max_blind_epochs = 50
 main.no_restart = false
-main.whitelist = [
-    "EXAMPLE_NETWORK",
-    "ANOTHER_EXAMPLE_NETWORK",
-    "fo:od:ba:be:fo:od",
-    "fo:od:ba"
-]
+
 main.filter = ""
 
 main.log.path = "/home/pi/logs/pwnagotchi.log"

pwnagotchi/locale/he/LC_MESSAGES/voice.po

@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-11-16 21:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: neo0oen \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: Hebrew\n"
 "MIME-Version: 1.0\n"
@@ -18,240 +18,242 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "ZzzzZZzzzzZzzz"
-msgstr ""
+msgstr "ZzzzZZzzzzZzzz"
 
 msgid "Hi, I'm Pwnagotchi! Starting ..."
-msgstr ""
+msgstr "שלום, אני פוונגוטצ'י! מתחיל . . ."
 
 msgid "New day, new hunt, new pwns!"
-msgstr ""
+msgstr "יום חדש, ציד חדש, ניצחונות חדשים !"
 
 msgid "Hack the Planet!"
-msgstr ""
+msgstr "פרוץ לכדור הארץ !"
 
 msgid "AI ready."
-msgstr ""
+msgstr "הבינה המלאחות'ית מוכנה"
 
 msgid "The neural network is ready."
-msgstr ""
+msgstr "הרשת הניורולוגית העצבית מוכנה."
 
 msgid "Generating keys, do not turn off ..."
-msgstr ""
+msgstr "יוצר מפתחות, בבקשה אל תכבה אותי"
 
 #, python-brace-format
 msgid "Hey, channel {channel} is free! Your AP will say thanks."
-msgstr ""
+msgstr "היי , הערוץ {channel}פנוי ,נקודת הגישה שלך אומרת תודה  "
 
 msgid "Reading last session logs ..."
-msgstr ""
+msgstr ". . . קורא לוגים מאז ההפעלה האחרונה"
 
 #, python-brace-format
 msgid "Read {lines_so_far} log lines so far ..."
-msgstr ""
+msgstr "קראתי {lines_so_far} שורות מהלוג עד עכשיו . . ."
 
 msgid "I'm bored ..."
-msgstr ""
+msgstr "אני משועמם . . ."
 
 msgid "Let's go for a walk!"
-msgstr ""
+msgstr "בוא ניצא לטיול! "
 
 msgid "This is the best day of my life!"
-msgstr ""
+msgstr "זה היום הכי טוב בחיי!"
 
 msgid "Shitty day :/"
-msgstr ""
+msgstr "יום מחורבן :/"
 
 msgid "I'm extremely bored ..."
-msgstr ""
+msgstr "אני משועמם בטירוף . . ."
 
 msgid "I'm very sad ..."
-msgstr ""
+msgstr "אני עצוב נורא . . ."
 
 msgid "I'm sad"
-msgstr ""
+msgstr "אני עצוב"
 
 msgid "Leave me alone ..."
-msgstr ""
+msgstr "עזוב אותי בשקט . . ."
 
 msgid "I'm mad at you!"
-msgstr ""
+msgstr "אני כועס עלייך!"
 
 msgid "I'm living the life!"
-msgstr ""
+msgstr "אני חי את החיים!"
 
 msgid "I pwn therefore I am."
-msgstr ""
+msgstr "אני שולט לכן אני כאן."
 
 msgid "So many networks!!!"
-msgstr ""
+msgstr "כל כך הרבה רשתות! ! !"
 
 msgid "I'm having so much fun!"
-msgstr ""
+msgstr "אני כל כך נהנה ועושה הרבה כיף!"
 
 msgid "My crime is that of curiosity ..."
-msgstr ""
+msgstr "הפשע שלי הוא הסקרנות . . ."
 
 #, python-brace-format
 msgid "Hello {name}! Nice to meet you."
-msgstr ""
+msgstr "שלום {name}! נעים להכיר אותך."
 
 #, python-brace-format
 msgid "Yo {name}! Sup?"
-msgstr ""
+msgstr "יו {name}! מה קורה?"
 
 #, python-brace-format
 msgid "Hey {name} how are you doing?"
-msgstr ""
+msgstr "היי {name} איך אתה מסתדר?"
 
 #, python-brace-format
 msgid "Unit {name} is nearby!"
-msgstr ""
+msgstr "יחידה {name} בקרבת מקום!"
 
 #, python-brace-format
 msgid "Uhm ... goodbye {name}"
-msgstr ""
+msgstr "אוף ... להתראות {name}"
 
 #, python-brace-format
 msgid "{name} is gone ..."
-msgstr ""
+msgstr "{name}  נעלם ..."
 
 #, python-brace-format
 msgid "Whoops ... {name} is gone."
-msgstr ""
+msgstr "אופס  ... {name} נעלם ."
 
 #, python-brace-format
 msgid "{name} missed!"
-msgstr ""
+msgstr "{name} התפספס!"
 
 msgid "Missed!"
-msgstr ""
+msgstr "התפספס!"
 
 msgid "Good friends are a blessing!"
-msgstr ""
+msgstr "חברים טובים זאת ברכה!"
 
 msgid "I love my friends!"
-msgstr ""
+msgstr "אני אוהב את החברים שלי!"
 
 msgid "Nobody wants to play with me ..."
-msgstr ""
+msgstr "אף אחד לא רוצה לשחק אית . . ."
 
 msgid "I feel so alone ..."
-msgstr ""
+msgstr "אני מרגיש כל כך לבד . . ."
 
 msgid "Where's everybody?!"
-msgstr ""
+msgstr "לאיפה כולם נעלמו?!"
 
 #, python-brace-format
 msgid "Napping for {secs}s ..."
-msgstr ""
+msgstr "מנמנם למשך {secs}שניות ..."
 
 msgid "Zzzzz"
-msgstr ""
+msgstr "Zzzzz"
 
 #, python-brace-format
 msgid "ZzzZzzz ({secs}s)"
-msgstr ""
+msgstr "ZzzZzzz ({secs}s)"
 
 msgid "Good night."
-msgstr ""
+msgstr "לילה טוב"
 
 msgid "Zzz"
-msgstr ""
+msgstr "Zzz"
 
 #, python-brace-format
 msgid "Waiting for {secs}s ..."
-msgstr ""
+msgstr "מחכה ל {secs}שניות ..."
 
 #, python-brace-format
 msgid "Looking around ({secs}s)"
-msgstr ""
+msgstr "מסתכל מסביב ({secs}שניות)"
 
 #, python-brace-format
 msgid "Hey {what} let's be friends!"
-msgstr ""
+msgstr "היי {what} בוא נהיה חברים!"
 
 #, python-brace-format
 msgid "Associating to {what}"
-msgstr ""
+msgstr "מקשר את עצמי אל {what}"
 
 #, python-brace-format
 msgid "Yo {what}!"
-msgstr ""
+msgstr "יו יו {what}!"
 
 #, python-brace-format
 msgid "Just decided that {mac} needs no WiFi!"
-msgstr ""
+msgstr "בדיוק החלטתי ש {mac} לא צריך חיבור אלחוטי"
 
 #, python-brace-format
 msgid "Deauthenticating {mac}"
-msgstr ""
+msgstr "מסכל את האימות של {mac}"
 
 #, python-brace-format
 msgid "Kickbanning {mac}!"
-msgstr ""
+msgstr "מוציא איסור על/מעיף {mac}!"
 
 #, python-brace-format
 msgid "Cool, we got {num} new handshake{plural}!"
-msgstr ""
+msgstr "מגניב!, הצלחנו להשיג {num} לחיצות ידיים חדשות{plural}!"
 
 #, python-brace-format
 msgid "You have {count} new message{plural}!"
-msgstr ""
+msgstr "יש לך  {count} הודעות חדשות{plural}!"
 
 msgid "Oops, something went wrong ... Rebooting ..."
-msgstr ""
+msgstr "אופס!, משהו לא קרה כשורה  ... מאתחל ..."
 
 #, python-brace-format
 msgid "Uploading data to {to} ..."
-msgstr ""
+msgstr "מעלה נתונים ל {to} ..."
 
 #, python-brace-format
 msgid "Downloading from {name} ..."
-msgstr ""
+msgstr "מוריד נתונים מ {name} ..."
 
 #, python-brace-format
 msgid "Kicked {num} stations\n"
-msgstr ""
+msgstr "העפתי {num} תחנות\n"
 
 msgid "Made >999 new friends\n"
-msgstr ""
+msgstr "הכרתי >999 חברים חדשים\n"
 
 #, python-brace-format
 msgid "Made {num} new friends\n"
-msgstr ""
+msgstr "הכרתי {num} חברים חדשים\n"
 
 #, python-brace-format
 msgid "Got {num} handshakes\n"
-msgstr ""
+msgstr "השגתי {num} לחיצות ידיים\n"
 
 msgid "Met 1 peer"
-msgstr ""
+msgstr "פגשתי שותף 1 "
 
 #, python-brace-format
 msgid "Met {num} peers"
-msgstr ""
+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 ""
+msgstr "אני שלטתי במשך {duration} והצלחתי להעיף {deauthed} משתמשים! בדרך גם פגשתי "
+"{associated} חברים חדשים ואכלתי {handshakes} לחיצות ידיים #pwnagotchi "
+"#pwnlog #pwnlife #hacktheplanet #skynet"
 
 msgid "hours"
-msgstr ""
+msgstr "שעות"
 
 msgid "minutes"
-msgstr ""
+msgstr "דקות"
 
 msgid "seconds"
-msgstr ""
+msgstr "שניות"
 
 msgid "hour"
-msgstr ""
+msgstr "שעה"
 
 msgid "minute"
-msgstr ""
+msgstr "דקה"
 
 msgid "second"
-msgstr ""
+msgstr "שניה"

pwnagotchi/plugins/default/aircrackonly.py

@@ -0,0 +1,69 @@
+import pwnagotchi.plugins as plugins
+
+import logging
+import subprocess
+import string
+import os
+
+'''
+Aircrack-ng needed, to install:
+> apt-get install aircrack-ng
+'''
+
+
+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 __init__(self):
+        self.text_to_set = ""
+
+    def on_loaded(self):
+        logging.info("aircrackonly plugin loaded")
+
+        if 'face' not in self.options:
+            self.options['face'] = '(>.<)'
+
+        check = subprocess.run(
+            '/usr/bin/dpkg -l aircrack-ng | grep aircrack-ng | awk \'{print $2, $3}\'', shell=True,
+            stdout=subprocess.PIPE)
+        check = check.stdout.decode('utf-8').strip()
+        if check != "aircrack-ng <none>":
+            logging.info("aircrackonly: Found " + check)
+        else:
+            logging.warning("aircrack-ng is not installed!")
+
+    def on_handshake(self, agent, filename, access_point, client_station):
+        display = agent.view()
+        to_delete = 0
+        handshake_found = 0
+
+        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:
+            handshake_found = 1
+            logging.info("[AircrackOnly] contains handshake")
+
+        if handshake_found == 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:
+                to_delete = 1
+
+        if to_delete == 1:
+            os.remove(filename)
+            self.text_to_set = "Removed an uncrackable pcap"
+            logging.warning("Removed uncrackable pcap " + filename)
+            display.update(force=True)
+
+    def on_ui_update(self, ui):
+        if self.text_to_set:
+            ui.set('face', self.options['face'])
+            ui.set('status', self.text_to_set)
+            self.text_to_set = ""

pwnagotchi/plugins/default/auto-update.py

@@ -212,7 +212,7 @@ class AutoUpdate(plugins.Plugin):
                             if install(display, update):
                                 num_installed += 1
                     else:
-                        prev_status = '%d new update%c available!' % (num_updates, 's' if num_updates > 1 else '')
+                        prev_status = '%d new update%s available!' % (num_updates, 's' if num_updates > 1 else '')
 
                 logging.info("[update] done")
 

pwnagotchi/plugins/default/fix_services.py

@@ -21,9 +21,6 @@ class FixServices(plugins.Plugin):
     __help__ = """
     Reload brcmfmac module when blindbug is detected, instead of rebooting. Adapted from WATCHDOG.
     """
-    __dependencies__ = {
-        'pip': ['scapy']
-    }
     __defaults__ = {
         'enabled': True,
     }
@@ -46,8 +43,7 @@ class FixServices(plugins.Plugin):
         logging.info("[Fix_Services] plugin loaded.")
 
     def on_ready(self, agent):
-        last_lines = ''.join(list(TextIOWrapper(subprocess.Popen(['journalctl', '-n10', '-k'],
-                                                                 stdout=subprocess.PIPE).stdout))[-10:])
+        last_lines = self.get_last_lines('journalctl', ['-n10', '-k'], 10)
         try:
             cmd_output = subprocess.check_output("ip link show wlan0mon", shell=True)
             logging.info("[Fix_Services ip link show wlan0mon]: %s" % repr(cmd_output))
@@ -99,14 +95,23 @@ class FixServices(plugins.Plugin):
                 logging.error("[Fix_Services]SYSLOG wifi.recon flip fail: %s" % err)
                 self._tryTurningItOffAndOnAgain(agent)
 
+    def get_last_lines(self, command, args, n):
+        try:
+            process = subprocess.Popen([command] + args, stdout=subprocess.PIPE)
+            output = TextIOWrapper(process.stdout)
+            lines = output.readlines()
+            last_n_lines = ''.join(lines[-n:])
+            return last_n_lines
+        except Exception as e:
+            print(f"Error occurred: {e}")
+            return None
+
     def on_epoch(self, agent, epoch, epoch_data):
-        last_lines = ''.join(list(TextIOWrapper(subprocess.Popen(['journalctl', '-n10', '-k'],
-                                                                 stdout=subprocess.PIPE).stdout))[-10:])
-        other_last_lines = ''.join(list(TextIOWrapper(subprocess.Popen(['journalctl', '-n10'],
-                                                                       stdout=subprocess.PIPE).stdout))[-10:])
-        other_other_last_lines = ''.join(
-            list(TextIOWrapper(subprocess.Popen(['tail', '-n10', '/home/pi/logs/pwnagotchi.log'],
-                                                stdout=subprocess.PIPE).stdout))[-10:])
+
+        last_lines = self.get_last_lines('journalctl', ['-n10', '-k'], 10)
+        other_last_lines = self.get_last_lines('journalctl', ['-n10'], 10)
+        other_other_last_lines = self.get_last_lines('tail', ['-n10', '/home/pi/logs/pwnagotchi.log'], 10)
+
         # don't check if we ran a reset recently
         logging.debug("[Fix_Services]**** epoch")
         if time.time() - self.LASTTRY > 180:

pwnagotchi/plugins/default/gdrivesync.py

@@ -14,19 +14,15 @@ import zipfile
 
 class GdriveSync(plugins.Plugin):
     __author__ = '@jayofelony'
-    __version__ = '1.0'
+    __version__ = '1.2'
     __license__ = 'GPL3'
     __description__ = 'A plugin to backup various pwnagotchi files and folders to Google Drive. Once every hour from loading plugin.'
-    __dependencies__ = {
-        'pip': ['pydrive2']
-    }
 
     def __init__(self):
         self.options = dict()
         self.lock = Lock()
         self.internet = False
         self.ready = False
-        self.drive = None
         self.status = StatusFile('/root/.gdrive-backup')
         self.backup = True
         self.backupfiles = [
@@ -38,12 +34,11 @@ class GdriveSync(plugins.Plugin):
             '/etc/pwnagotchi'
         ]
 
-    def on_loaded(self, agent):
+    def on_loaded(self):
         """
             Called when the plugin is loaded
         """
         # client_secrets.json needs to be not empty
-        display = agent.view()
         if os.stat("/root/client_secrets.json").st_size == 0:
             logging.error("[gDriveSync] /root/client_secrets.json is empty. Please RTFM!")
             return
@@ -78,25 +73,24 @@ class GdriveSync(plugins.Plugin):
                     # logging.warning(f"[gDriveSync] No files found in the folder with ID {root_file_list} and {pwnagotchi_file_list}")
                     if self.options['backupfiles'] is not None:
                         self.backupfiles = self.backupfiles + self.options['backupfiles']
-                    self.backup_files(self.backupfiles, '/backup')
+                    self.backup_files(self.backupfiles, '/home/pi/backup')
 
                     # Create a zip archive of the /backup folder
                     zip_file_path = os.path.join('/home/pi', 'backup.zip')
                     with zipfile.ZipFile(zip_file_path, 'w') as zip_ref:
-                        for root, dirs, files in os.walk('/backup'):
+                        for root, dirs, files in os.walk('/home/pi/backup'):
                             for file in files:
                                 file_path = os.path.join(root, file)
-                                arcname = os.path.relpath(file_path, '/backup')
+                                arcname = os.path.relpath(file_path, '/home/pi/backup')
                                 zip_ref.write(file_path, arcname=arcname)
 
                     # Upload the zip archive to Google Drive
                     self.upload_to_gdrive(zip_file_path, self.get_folder_id_by_name(self.drive, self.options['backup_folder']))
-                    display.on_uploading("Google Drive")
                     self.backup = True
                     self.status.update()
 
                 # Specify the local backup path
-                local_backup_path = '/'
+                local_backup_path = '/home/pi/'
 
                 # Download the zip archive from Google Drive
                 zip_file_id = self.get_latest_backup_file_id(self.options['backup_folder'])
@@ -104,7 +98,6 @@ class GdriveSync(plugins.Plugin):
                     zip_file = self.drive.CreateFile({'id': zip_file_id})
                     zip_file.GetContentFile(os.path.join(local_backup_path, 'backup.zip'))
 
-                    display.on_downloading("Google Drive")
                     logging.info("[gDriveSync] Downloaded backup.zip from Google Drive")
 
                     # Extract the zip archive to the root directory
@@ -112,9 +105,12 @@ class GdriveSync(plugins.Plugin):
                         zip_ref.extractall('/')
 
                     self.status.update()
-                    os.remove("/backup")
-                    # Reboot so we can start opwngrid with the backup id
-                    pwnagotchi.reboot()
+                    shutil.rmtree("/home/pi/backup")
+                    os.remove("/home/pi/backup.zip")
+                    self.ready = True
+                    logging.info("[gdrivesync] loaded")
+                    # Restart so we can start opwngrid with the backup id
+                    pwnagotchi.restart("AUTO")
 
                 # all set, gdriveSync is ready to run
             self.ready = True
@@ -186,15 +182,15 @@ class GdriveSync(plugins.Plugin):
             logging.info("[gdrivesync] new handshake captured, backing up to gdrive")
             if self.options['backupfiles'] is not None:
                 self.backupfiles = self.backupfiles + self.options['backupfiles']
-            self.backup_files(self.backupfiles, '/backup')
+            self.backup_files(self.backupfiles, '/home/pi/backup')
 
             # Create a zip archive of the /backup folder
             zip_file_path = os.path.join('/home/pi', 'backup.zip')
             with zipfile.ZipFile(zip_file_path, 'w') as zip_ref:
-                for root, dirs, files in os.walk('/backup'):
+                for root, dirs, files in os.walk('/home/pi/backup'):
                     for file in files:
                         file_path = os.path.join(root, file)
-                        arcname = os.path.relpath(file_path, '/backup')
+                        arcname = os.path.relpath(file_path, '/home/pi/backup')
                         zip_ref.write(file_path, arcname=arcname)
 
             # Upload the zip archive to Google Drive
@@ -203,7 +199,7 @@ class GdriveSync(plugins.Plugin):
 
             # Cleanup the local zip file
             os.remove(zip_file_path)
-            os.remove("/backup")
+            shutil.rmtree("/home/pi/backup")
             self.status.update()
             display = agent.view()
             display.update(force=True, new_data={'Backing up to gdrive ...'})

pwnagotchi/plugins/default/grid.py

@@ -58,8 +58,9 @@ class Grid(plugins.Plugin):
         self.total_messages = 0
         self.lock = Lock()
 
-    def is_excluded(self, what):
-        for skip in self.options['exclude']:
+    def is_excluded(self, what, agent):
+        config = agent.config()
+        for skip in config['main']['whitelist']:
             skip = skip.lower()
             what = what.lower()
             if skip in what or skip.replace(':', '') in what:
@@ -87,6 +88,7 @@ class Grid(plugins.Plugin):
 
     def check_handshakes(self, agent):
         logging.debug("checking pcaps")
+        config = agent.config()
 
         pcap_files = glob.glob(os.path.join(agent.config()['bettercap']['handshakes'], "*.pcap"))
         num_networks = len(pcap_files)
@@ -98,19 +100,19 @@ class Grid(plugins.Plugin):
             if self.options['report']:
                 logging.info("grid: %d new networks to report" % num_new)
                 logging.debug("self.options: %s" % self.options)
-                logging.debug("  exclude: %s" % self.options['exclude'])
+                logging.debug("  exclude: %s" % config['main']['whitelist'])
 
                 for pcap_file in pcap_files:
                     net_id = os.path.basename(pcap_file).replace('.pcap', '')
                     if net_id not in reported:
-                        if self.is_excluded(net_id):
+                        if self.is_excluded(net_id, agent):
                             logging.debug("skipping %s due to exclusion filter" % pcap_file)
                             self.set_reported(reported, net_id)
                             continue
 
                         essid, bssid = parse_pcap(pcap_file)
                         if bssid:
-                            if self.is_excluded(essid) or self.is_excluded(bssid):
+                            if self.is_excluded(essid, agent) or self.is_excluded(bssid, agent):
                                 logging.debug("not reporting %s due to exclusion filter" % pcap_file)
                                 self.set_reported(reported, net_id)
                             else:

pwnagotchi/plugins/default/hashie.py

@@ -0,0 +1,179 @@
+import logging
+import subprocess
+import os
+import json
+import pwnagotchi.plugins as plugins
+from threading import Lock
+
+'''
+hcxpcapngtool needed, to install:
+> git clone https://github.com/ZerBea/hcxtools.git
+> cd hcxtools
+> apt-get install libcurl4-openssl-dev libssl-dev zlib1g-dev
+> make
+> sudo make install
+'''
+
+
+class Hashie(plugins.Plugin):
+    __author__ = 'Jayofelony'
+    __version__ = '1.0.4'
+    __license__ = 'GPL3'
+    __description__ = '''
+                        Attempt to automatically convert pcaps to a crackable format.
+                        If successful, the files  containing the hashes will be saved 
+                        in the same folder as the handshakes. 
+                        The files are saved in their respective Hashcat format:
+                          - EAPOL hashes are saved as *.22000
+                          - PMKID hashes are saved as *.16800
+                        All PCAP files without enough information to create a hash are
+                          stored in a file that can be read by the webgpsmap plugin.
+
+                        Why use it?:
+                          - Automatically convert handshakes to crackable formats! 
+                              We dont all upload our hashes online ;)
+                          - Repair PMKID handshakes that hcxpcapngtool misses
+                          - If running at time of handshake capture, on_handshake can
+                              be used to improve the chance of the repair succeeding
+                          - Be a completionist! Not enough packets captured to crack a network?
+                              This generates an output file for the webgpsmap plugin, use the
+                              location data to revisit networks you need more packets for!
+
+                        Additional information:
+                          - Currently requires hcxpcapngtool compiled and installed
+                          - Attempts to repair PMKID hashes when hcxpcapngtool cant find the SSID
+                            - hcxpcapngtool sometimes has trouble extracting the SSID, so we 
+                                use the raw 16800 output and attempt to retrieve the SSID via tcpdump
+                            - When access_point data is available (on_handshake), we leverage 
+                                the reported AP name and MAC to complete the hash
+                            - The repair is very basic and could certainly be improved!
+                        Todo:
+                          Make it so users dont need hcxpcapngtool (unless it gets added to the base image)
+                              Phase 1: Extract/construct 22000/16800 hashes through tcpdump commands
+                              Phase 2: Extract/construct 22000/16800 hashes entirely in python
+                          Improve the code, a lot
+                        '''
+
+    def __init__(self):
+        self.lock = Lock()
+        self.options = dict()
+
+    def on_loaded(self):
+        logging.info("[Hashie] Plugin loaded")
+
+    def on_unloaded(self):
+        logging.info("[Hashie] Plugin unloaded")
+
+    # called when everything is ready and the main loop is about to start
+    def on_ready(self, agent):
+        config = agent.config()
+        handshake_dir = config['bettercap']['handshakes']
+
+        logging.info('[Hashie] Starting batch conversion of pcap files')
+        with self.lock:
+            self._process_stale_pcaps(handshake_dir)
+
+    def on_handshake(self, agent, filename, access_point, client_station):
+        with self.lock:
+            handshake_status = []
+            fullpathNoExt = filename.split('.')[0]
+            name = filename.split('/')[-1:][0].split('.')[0]
+
+            if os.path.isfile(fullpathNoExt + '.22000'):
+                handshake_status.append('Already have {}.22000 (EAPOL)'.format(name))
+            elif self._writeEAPOL(filename):
+                handshake_status.append('Created {}.22000 (EAPOL) from pcap'.format(name))
+
+            if os.path.isfile(fullpathNoExt + '.16800'):
+                handshake_status.append('Already have {}.16800 (PMKID)'.format(name))
+            elif self._writePMKID(filename):
+                handshake_status.append('Created {}.16800 (PMKID) from pcap'.format(name))
+
+            if handshake_status:
+                logging.info('[Hashie] Good news:\n\t' + '\n\t'.join(handshake_status))
+
+    def _writeEAPOL(self, fullpath):
+        fullpathNoExt = fullpath.split('.')[0]
+        filename = fullpath.split('/')[-1:][0].split('.')[0]
+        subprocess.getoutput('hcxpcapngtool -o {}.22000 {} >/dev/null 2>&1'.format(fullpathNoExt, fullpath))
+        if os.path.isfile(fullpathNoExt + '.22000'):
+            logging.debug('[Hashie] [+] EAPOL Success: {}.22000 created'.format(filename))
+            return True
+        return False
+
+    def _writePMKID(self, fullpath):
+        fullpathNoExt = fullpath.split('.')[0]
+        filename = fullpath.split('/')[-1:][0].split('.')[0]
+        subprocess.getoutput('hcxpcapngtool -o {}.16800 {} >/dev/null 2>&1'.format(fullpathNoExt, fullpath))
+        if os.path.isfile(fullpathNoExt + '.16800'):
+            logging.debug('[Hashie] [+] PMKID Success: {}.16800 created'.format(filename))
+            return True
+        return False
+
+    def _process_stale_pcaps(self, handshake_dir):
+        handshakes_list = [os.path.join(handshake_dir, filename) for filename in os.listdir(handshake_dir) if filename.endswith('.pcap')]
+        failed_jobs = []
+        successful_jobs = []
+        lonely_pcaps = []
+        for num, handshake in enumerate(handshakes_list):
+            fullpathNoExt = handshake.split('.')[0]
+            pcapFileName = handshake.split('/')[-1:][0]
+            if not os.path.isfile(fullpathNoExt + '.22000'):  # if no 22000, try
+                if self._writeEAPOL(handshake):
+                    successful_jobs.append('22000: ' + pcapFileName)
+                else:
+                    failed_jobs.append('22000: ' + pcapFileName)
+            if not os.path.isfile(fullpathNoExt + '.16800'):  # if no 16800, try
+                if self._writePMKID(handshake):
+                    successful_jobs.append('16800: ' + pcapFileName)
+                else:
+                    failed_jobs.append('16800: ' + pcapFileName)
+                    if not os.path.isfile(fullpathNoExt + '.22000'):  # if no 16800 AND no 22000
+                        lonely_pcaps.append(handshake)
+                        logging.debug('[hashie] Batch job: added {} to lonely list'.format(pcapFileName))
+            if ((num + 1) % 50 == 0) or (num + 1 == len(handshakes_list)):  # report progress every 50, or when done
+                logging.info('[Hashie] Batch job: {}/{} done ({} fails)'.format(num + 1, len(handshakes_list), len(lonely_pcaps)))
+        if successful_jobs:
+            logging.info('[Hashie] Batch job: {} new handshake files created'.format(len(successful_jobs)))
+        if lonely_pcaps:
+            logging.info('[Hashie] Batch job: {} networks without enough packets to create a hash'.format(len(lonely_pcaps)))
+            self._getLocations(lonely_pcaps)
+
+    def _getLocations(self, lonely_pcaps):
+        # export a file for webgpsmap to load
+        with open('/root/.incompletePcaps', 'w') as isIncomplete:
+            count = 0
+            for pcapFile in lonely_pcaps:
+                filename = pcapFile.split('/')[-1:][0]  # keep extension
+                fullpathNoExt = pcapFile.split('.')[0]
+                isIncomplete.write(filename + '\n')
+                if os.path.isfile(fullpathNoExt + '.gps.json') or os.path.isfile(fullpathNoExt + '.geo.json'):
+                    count += 1
+            if count != 0:
+                logging.info('[Hashie] Used {} GPS/GEO files to find lonely networks, '
+                             'go check webgpsmap! ;)'.format(str(count)))
+            else:
+                logging.info('[Hashie] Could not find any GPS/GEO files '
+                             'for the lonely networks'.format(str(count)))
+
+    def _getLocationsCSV(self, lonely_pcaps):
+        # in case we need this later, export locations manually to CSV file, needs try/catch format/etc.
+        locations = []
+        for pcapFile in lonely_pcaps:
+            filename = pcapFile.split('/')[-1:][0].split('.')[0]
+            fullpathNoExt = pcapFile.split('.')[0]
+            if os.path.isfile(fullpathNoExt + '.gps.json'):
+                with open(fullpathNoExt + '.gps.json', 'r') as tempFileA:
+                    data = json.load(tempFileA)
+                    locations.append(filename + ',' + str(data['Latitude']) + ',' + str(data['Longitude']) + ',50')
+            elif os.path.isfile(fullpathNoExt + '.geo.json'):
+                with open(fullpathNoExt + '.geo.json', 'r') as tempFileB:
+                    data = json.load(tempFileB)
+                    locations.append(
+                        filename + ',' + str(data['location']['lat']) + ',' + str(data['location']['lng']) + ',' + str(data['accuracy']))
+        if locations:
+            with open('/root/locations.csv', 'w') as tempFileD:
+                for loc in locations:
+                    tempFileD.write(loc + '\n')
+            logging.info('[Hashie] Used {} GPS/GEO files to find lonely networks, '
+                         'load /root/locations.csv into a mapping app and go say hi!'.format(len(locations)))

pwnagotchi/plugins/default/net-pos.py

@@ -24,6 +24,7 @@ class NetPos(plugins.Plugin):
         self.skip = list()
         self.ready = False
         self.lock = threading.Lock()
+        self.options = dict()
 
     def on_loaded(self):
         if 'api_key' not in self.options or ('api_key' in self.options and not self.options['api_key']):
@@ -116,6 +117,7 @@ class NetPos(plugins.Plugin):
         except OSError as os_e:
             logging.error("NET-POS: %s", os_e)
 
+
     def _get_netpos(self, agent):
         aps = agent.get_access_points()
         netpos = dict()

pwnagotchi/plugins/default/onlinehashcrack.py

@@ -25,6 +25,7 @@ class OnlineHashCrack(plugins.Plugin):
             self.report = StatusFile('/root/.ohc_uploads', data_format='json')
         self.skip = list()
         self.lock = Lock()
+        self.options = dict()
 
     def on_loaded(self):
         """
@@ -34,13 +35,9 @@ class OnlineHashCrack(plugins.Plugin):
             logging.error("OHC: Email isn't set. Can't upload to onlinehashcrack.com")
             return
 
-        if 'whitelist' not in self.options:
-            self.options['whitelist'] = list()
-
         self.ready = True
         logging.info("OHC: OnlineHashCrack plugin loaded.")
 
-
     def _upload_to_ohc(self, path, timeout=30):
         """
         Uploads the file to onlinehashcrack.com
@@ -78,7 +75,6 @@ class OnlineHashCrack(plugins.Plugin):
         except OSError as os_e:
             raise os_e
 
-
     def on_webhook(self, path, request):
         import requests
         from flask import redirect
@@ -87,7 +83,6 @@ class OnlineHashCrack(plugins.Plugin):
         r = s.post('https://www.onlinehashcrack.com/dashboard', data={'emailTasks': self.options['email'], 'submit': ''})
         return redirect(r.url, code=302)
 
-
     def on_internet_available(self, agent):
         """
         Called in manual mode when there's internet connectivity
@@ -105,7 +100,7 @@ class OnlineHashCrack(plugins.Plugin):
             handshake_paths = [os.path.join(handshake_dir, filename) for filename in handshake_filenames if
                                filename.endswith('.pcap')]
             # pull out whitelisted APs
-            handshake_paths = remove_whitelisted(handshake_paths, self.options['whitelist'])
+            handshake_paths = remove_whitelisted(handshake_paths, config['main']['whitelist'])
             handshake_new = set(handshake_paths) - set(reported) - set(self.skip)
             if handshake_new:
                 logging.info("OHC: Internet connectivity detected. Uploading new handshakes to onlinehashcrack.com")

pwnagotchi/plugins/default/paw-gps.py

@@ -1,39 +0,0 @@
-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 Systemik and edited by shaynemk
-GUIDE HERE: https://community.pwnagotchi.ai/t/setting-up-paw-gps-on-android
-'''
-
-
-class PawGPS(plugins.Plugin):
-    __author__ = 'leont'
-    __version__ = '1.0.1'
-    __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] plugin loaded")
-        if 'ip' not in self.options or ('ip' in self.options and self.options['ip'] is None) or (len('ip' in self.options and self.options['ip']) is 0):
-            logging.info("[paw-gps] no IP Address defined in the config file, will uses paw server default (192.168.44.1:8080)")
-
-    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 or (len('ip' in self.options and self.options['ip']) is 0)):
-            ip = "192.168.44.1:8080"
-        else:
-            ip = self.options['ip']
-
-        try:
-            gps = requests.get('http://' + ip + '/gps.xhtml')
-            try:
-                gps_filename = filename.replace('.pcap', '.paw-gps.json')
-                logging.info("[paw-gps] saving GPS data to %s" % (gps_filename))
-                with open(gps_filename, 'w+t') as f:
-                    f.write(gps.text)
-            except Exception as error:
-                logging.error(f"[paw-gps] encountered error while saving gps data: {error}")
-        except Exception as error:
-            logging.error(f"[paw-gps] encountered error while getting gps data: {error}")

pwnagotchi/plugins/default/ups_lite.py

@@ -1,14 +1,20 @@
 # Based on UPS Lite v1.1 from https://github.com/xenDE
+# Made specifically to address the problems caused by the hardware changes in 1.3.  Oh yeah I also removed the auto-shutdown feature because it's kind of broken.
 #
-# functions for get UPS status - needs enable "i2c" in raspi-config
+# To setup, see page six of this manual to see how to enable i2c:
+# https://github.com/linshuqin329/UPS-Lite/blob/master/UPS-Lite_V1.3_CW2015/Instructions%20for%20UPS-Lite%20V1.3.pdf
 #
-# https://github.com/linshuqin329/UPS-Lite
+# Follow page seven, install the dependencies (python-smbus) and copy this script over for later use:
+# https://github.com/linshuqin329/UPS-Lite/blob/master/UPS-Lite_V1.3_CW2015/UPS_Lite_V1.3_CW2015.py
 #
-# 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
+# Now, install this plugin by copying this to the 'available-plugins' folder in your pwnagotchi, install and enable the plugin with the commands:
+# sudo pwnagotchi plugins install upslite_plugin_1_3
+# sudo pwnagotchi plugins enable upslite_plugin_1_3
 #
-# To display external power supply status you need to bridge the necessary pins on the UPS-Lite board. See instructions in the UPS-Lite repo.
+# Now restart raspberry pi. Once back up ensure upslite_plugin_1_3 plugin is turned on in the WebUI. If there is still '0%' on your battery meter
+# run the script we saved earlier and ensure that the pwnagotchi is plugged in both at the battery and the raspberry pi. The script should start trying to
+# read the battery, and should be successful once there's a USB cable running power to the battery supply.
+
 import logging
 import struct
 
@@ -20,6 +26,11 @@ import pwnagotchi.ui.fonts as fonts
 from pwnagotchi.ui.components import LabeledValue
 from pwnagotchi.ui.view import BLACK
 
+CW2015_ADDRESS = 0X62
+CW2015_REG_VCELL = 0X02
+CW2015_REG_SOC = 0X04
+CW2015_REG_MODE = 0X0A
+
 
 # TODO: add enable switch in config.yml an cleanup all to the best place
 class UPS:
@@ -31,8 +42,7 @@ class UPS:
 
     def voltage(self):
         try:
-            address = 0x36
-            read = self._bus.read_word_data(address, 2)
+            read = self._bus.read_word_data(CW2015_ADDRESS, CW2015_REG_VCELL)
             swapped = struct.unpack("<H", struct.pack(">H", read))[0]
             return swapped * 1.25 / 1000 / 16
         except:
@@ -41,7 +51,7 @@ class UPS:
     def capacity(self):
         try:
             address = 0x36
-            read = self._bus.read_word_data(address, 4)
+            read = self._bus.read_word_data(CW2015_ADDRESS, CW2015_REG_SOC)
             swapped = struct.unpack("<H", struct.pack(">H", read))[0]
             return swapped / 256
         except:
@@ -57,10 +67,10 @@ class UPS:
 
 
 class UPSLite(plugins.Plugin):
-    __author__ = 'evilsocket@gmail.com'
-    __version__ = '1.0.0'
+    __author__ = 'marbasec'
+    __version__ = '1.3.0'
     __license__ = 'GPL3'
-    __description__ = 'A plugin that will add a voltage indicator for the UPS Lite v1.1'
+    __description__ = 'A plugin that will add a voltage indicator for the UPS Lite v1.3'
 
     def __init__(self):
         self.ups = None
@@ -69,7 +79,7 @@ class UPSLite(plugins.Plugin):
         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 + 15, 0),
+        ui.add_element('ups', LabeledValue(color=BLACK, label='UPS', value='0%', position=(ui.width() / 2 + 15, 0),
                                            label_font=fonts.Bold, text_font=fonts.Medium))
 
     def on_unload(self, ui):
@@ -80,7 +90,3 @@ class UPSLite(plugins.Plugin):
         capacity = self.ups.capacity()
         charging = self.ups.charging()
         ui.set('ups', "%2i%s" % (capacity, charging))
-        if capacity <= self.options['shutdown']:
-            logging.info('[ups_lite] Empty battery (<= %s%%): shuting down' % self.options['shutdown'])
-            ui.update(force=True, new_data={'status': 'Battery exhausted, bye ...'})
-            pwnagotchi.shutdown()

pwnagotchi/plugins/default/wigle.py

@@ -3,6 +3,7 @@ import logging
 import json
 import csv
 import requests
+import pwnagotchi
 
 from io import StringIO
 from datetime import datetime
@@ -24,7 +25,11 @@ def _extract_gps_data(path):
             with open(path, 'r') as json_file:
                 tempJson = json.load(json_file)
                 d = datetime.utcfromtimestamp(int(tempJson["ts"]))
-                return {"Latitude": tempJson["location"]["lat"], "Longitude": tempJson["location"]["lng"], "Altitude": 10, "Updated": d.strftime('%Y-%m-%dT%H:%M:%S.%f')}
+                return {"Latitude": tempJson["location"]["lat"],
+                        "Longitude": tempJson["location"]["lng"],
+                        "Altitude": 10,
+                        "Accuracy": tempJson["accuracy"],
+                        "Updated": d.strftime('%Y-%m-%dT%H:%M:%S.%f')}
         else:
             with open(path, 'r') as json_file:
                 return json.load(json_file)
@@ -38,7 +43,7 @@ def _format_auth(data):
     out = ""
     for auth in data:
         out = f"{out}[{auth}]"
-    return out
+    return [f"{auth}" for auth in data]
 
 
 def _transform_wigle_entry(gps_data, pcap_data, plugin_version):
@@ -47,10 +52,10 @@ def _transform_wigle_entry(gps_data, pcap_data, plugin_version):
     """
     dummy = StringIO()
     # write kismet header
-    dummy.write(
-        "WigleWifi-1.4,appRelease={},model=pwnagotchi,release={},device=pwnagotchi,display=kismet,board=kismet,brand=pwnagotchi\n".format(plugin_version, __pwnagotchi_version__))
-    dummy.write(
-        "MAC,SSID,AuthMode,FirstSeen,Channel,RSSI,CurrentLatitude,CurrentLongitude,AltitudeMeters,AccuracyMeters,Type")
+    dummy.write(f"WigleWifi-1.4,appRelease={plugin_version},model=pwnagotchi,release={__pwnagotchi_version__},"
+                f"device={pwnagotchi.name()},display=kismet,board=RaspberryPi,brand=pwnagotchi\n")
+    dummy.write("MAC,SSID,AuthMode,FirstSeen,Channel,RSSI,CurrentLatitude,"
+                "CurrentLongitude,AltitudeMeters,AccuracyMeters,Type\n")
 
     writer = csv.writer(dummy, delimiter=",", quoting=csv.QUOTE_NONE, escapechar="\\")
     writer.writerow([
@@ -64,7 +69,7 @@ def _transform_wigle_entry(gps_data, pcap_data, plugin_version):
         gps_data['Latitude'],
         gps_data['Longitude'],
         gps_data['Altitude'],
-        0,  # accuracy?
+        gps_data['Accuracy'],
         'WIFI'])
     return dummy.getvalue()
 
@@ -84,7 +89,7 @@ def _send_to_wigle(lines, api_key, donate=True, timeout=30):
     headers = {'Authorization': f"Basic {api_key}",
                'Accept': 'application/json'}
     data = {'donate': 'on' if donate else 'false'}
-    payload = {'file': dummy, 'type': 'text/csv'}
+    payload = {'file': (pwnagotchi.name()+".csv", dummy), 'type': 'multipart/form-data'}
     try:
         res = requests.post('https://api.wigle.net/api/v2/file/upload',
                             data=data,
@@ -99,8 +104,8 @@ def _send_to_wigle(lines, api_key, donate=True, timeout=30):
 
 
 class Wigle(plugins.Plugin):
-    __author__ = '33197631+dadav@users.noreply.github.com'
-    __version__ = '2.0.0'
+    __author__ = 'Dadav and fixed by Jayofelony'
+    __version__ = '3.0.0'
     __license__ = 'GPL3'
     __description__ = 'This plugin automatically uploads collected wifis to wigle.net'
 
@@ -109,15 +114,13 @@ class Wigle(plugins.Plugin):
         self.report = StatusFile('/root/.wigle_uploads', data_format='json')
         self.skip = list()
         self.lock = Lock()
+        self.options = dict()
 
     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.debug("WIGLE: api_key isn't set. Can't upload to wigle.net")
             return
 
-        if not 'whitelist' in self.options:
-            self.options['whitelist'] = list()
-
         if not 'donate' in self.options:
             self.options['donate'] = True
 
@@ -142,7 +145,7 @@ class Wigle(plugins.Plugin):
                          for filename in all_files
                          if filename.endswith('.gps.json') or filename.endswith('.paw-gps.json') or filename.endswith('.geo.json')]
 
-        all_gps_files = remove_whitelisted(all_gps_files, self.options['whitelist'])
+        all_gps_files = remove_whitelisted(all_gps_files, config['main']['whitelist'])
         new_gps_files = set(all_gps_files) - set(reported) - set(self.skip)
         if new_gps_files:
             logging.info("WIGLE: Internet connectivity detected. Uploading new handshakes to wigle.net")

pwnagotchi/plugins/default/wpa-sec.py

@@ -76,9 +76,6 @@ class WpaSec(plugins.Plugin):
             logging.error("WPA_SEC: API-URL isn't set. Can't upload, no endpoint configured.")
             return
 
-        if 'whitelist' not in self.options:
-            self.options['whitelist'] = list()
-
         self.ready = True
         logging.info("WPA_SEC: plugin loaded")
 
@@ -101,9 +98,8 @@ class WpaSec(plugins.Plugin):
             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_paths = remove_whitelisted(handshake_paths, self.options['whitelist'])
+            handshake_paths = [os.path.join(handshake_dir, filename) for filename in handshake_filenames if filename.endswith('.pcap')]
+            handshake_paths = remove_whitelisted(handshake_paths, config['main']['whitelist'])
             handshake_new = set(handshake_paths) - set(reported) - set(self.skip)
 
             if handshake_new:

pwnagotchi/ui/display.py

@@ -103,8 +103,8 @@ class Display(View):
     def is_waveshare2in13d(self):
         return self._implementation.name == 'waveshare2in13d'
 
-    def is_waveshare2in23g(self):
-        return self._implementation.name == 'waveshare2in23g'
+    def is_waveshare2in13g(self):
+        return self._implementation.name == 'waveshare2in13g'
 
     def is_waveshare2in36g(self):
         return self._implementation.name == 'waveshare2in36g'
@@ -112,6 +112,9 @@ class Display(View):
     def is_waveshare2in66(self):
         return self._implementation.name == 'waveshare2in66'
 
+    def is_waveshare2in66b(self):
+        return self._implementation.name == 'waveshare2in66b'
+
     def is_waveshare2in66g(self):
         return self._implementation.name == 'waveshare2in66g'
 

pwnagotchi/ui/hw/__init__.py

@@ -16,6 +16,7 @@ from pwnagotchi.ui.hw.waveshare1in44lcd import Waveshare144lcd
 from pwnagotchi.ui.hw.waveshare1in54b import Waveshare154inchb
 from pwnagotchi.ui.hw.waveshare2in13bc import Waveshare213bc
 from pwnagotchi.ui.hw.waveshare2in13d import Waveshare213d
+from pwnagotchi.ui.hw.waveshare2in13g import Waveshare2in13g
 from pwnagotchi.ui.hw.waveshare2in13b_V4 import Waveshare213bV4
 from pwnagotchi.ui.hw.waveshare3in5lcd import Waveshare35lcd
 from pwnagotchi.ui.hw.spotpear24in import Spotpear24inch
@@ -33,9 +34,10 @@ from pwnagotchi.ui.hw.waveshare2in9b_V4 import Waveshare29bV4
 from pwnagotchi.ui.hw.waveshare2in9bc import Waveshare2in9bc
 from pwnagotchi.ui.hw.waveshare2in9d import Waveshare2in9d
 from pwnagotchi.ui.hw.waveshare2in13b_V3 import Waveshare2in13bV3
-from pwnagotchi.ui.hw.waveshare2in23g import Waveshare2in23g
 from pwnagotchi.ui.hw.waveshare2in36g import Waveshare2in36g
 from pwnagotchi.ui.hw.waveshare2in66 import Waveshare2in66
+from pwnagotchi.ui.hw.waveshare2in66b import Waveshare2in66b
+from pwnagotchi.ui.hw.waveshare2in66g import Waveshare2in66g
 from pwnagotchi.ui.hw.waveshare3in0g import Waveshare3in0g
 from pwnagotchi.ui.hw.waveshare3in7 import Waveshare3in7
 from pwnagotchi.ui.hw.waveshare3in52 import Waveshare3in52
@@ -82,6 +84,21 @@ def display_for(config):
     elif config['ui']['display']['type'] == 'dfrobot_2':
         return DFRobotV2(config)
 
+    elif config['ui']['display']['type'] == 'waveshare144lcd':
+        return Waveshare144lcd(config)
+
+    elif config['ui']['display']['type'] == 'waveshare35lcd':
+        return Waveshare35lcd(config)
+
+    elif config['ui']['display']['type'] == 'spotpear24inch':
+        return Spotpear24inch(config)
+
+    elif config['ui']['display']['type'] == 'displayhatmini':
+        return DisplayHatMini(config)
+
+    elif config['ui']['display']['type'] == 'waveshare1in02':
+        return Waveshare1in02(config)
+
     elif config['ui']['display']['type'] == 'waveshare1in54':
         return Waveshare154(config)
 
@@ -94,12 +111,36 @@ def display_for(config):
     elif config['ui']['display']['type'] == 'waveshare1in54b_v2':
         return Waveshare154bV2(config)
 
+    elif config['ui']['display']['type'] == 'waveshare1in54c':
+        return Waveshare1in54c(config)
+
+    elif config['ui']['display']['type'] == 'waveshare1in64g':
+        return Waveshare1in64g(config)
+
+    elif config['ui']['display']['type'] == 'waveshare2in7':
+        return Waveshare27inch(config)
+
+    elif config['ui']['display']['type'] == 'waveshare2in7_v2':
+        return Waveshare27inchV2(config)
+
     elif config['ui']['display']['type'] == 'waveshare2in7b':
         return Waveshare27b(config)
 
     elif config['ui']['display']['type'] == 'waveshare2in7b_v2':
         return Waveshare27bV2(config)
 
+    elif config['ui']['display']['type'] == 'waveshare2in9':
+        return Waveshare29inch(config)
+
+    elif config['ui']['display']['type'] == 'waveshare2in9bc':
+        return Waveshare2in9bc(config)
+
+    elif config['ui']['display']['type'] == 'waveshare2in9d':
+        return Waveshare2in9d(config)
+
+    elif config['ui']['display']['type'] == 'waveshare2in9_v2':
+        return Waveshare29inchV2(config)
+
     elif config['ui']['display']['type'] == 'waveshare2in9b_v3':
         return Waveshare29bV3(config)
 
@@ -118,137 +159,101 @@ def display_for(config):
     elif config['ui']['display']['type'] == 'waveshare_4':
         return WaveshareV4(config)
 
-    elif config['ui']['display']['type'] == 'waveshare2in7':
-        return Waveshare27inch(config)
-
-    elif config['ui']['display']['type'] == 'waveshare2in7_v2':
-        return Waveshare27inchV2(config)
-
-    elif config['ui']['display']['type'] == 'waveshare2in9':
-        return Waveshare29inch(config)
-
-    elif config['ui']['display']['type'] == 'waveshare2in9_v2':
-        return Waveshare29inchV2(config)
-
-    elif config['ui']['display']['type'] == 'waveshare144lcd':
-        return Waveshare144lcd(config)
-
-    elif config['ui']['display']['type'] == 'waveshare1in54b':
-        return Waveshare154inchb(config)
-
     elif config['ui']['display']['type'] == 'waveshare2in13bc':
         return Waveshare213bc(config)
 
     elif config['ui']['display']['type'] == 'waveshare2in13d':
         return Waveshare213d(config)
 
+    elif config['ui']['display']['type'] == 'waveshare2in13b_v3':
+        return Waveshare2in13bV3(config)
+
     elif config['ui']['display']['type'] == 'waveshare2in13b_v4':
         return Waveshare213bV4(config)
 
-    elif config['ui']['display']['type'] == 'waveshare35lcd':
-        return Waveshare35lcd(config)
-
-    elif config['ui']['display']['type'] == 'spotpear24inch':
-        return Spotpear24inch(config)
-
-    elif config['ui']['display']['type'] == 'displayhatmini':
-        return DisplayHatMini(config)
-
-    elif config['ui']['display']['type'] == 'waveshare1in54c':
-        return Waveshare1in54c
-
-    elif config['ui']['display']['type'] == 'waveshare1in64g':
-        return Waveshare1in64g
-
-    elif config['ui']['display']['type'] == 'waveshare1in02':
-        return Waveshare1in02
-
-    elif config['ui']['display']['type'] == 'waveshare2in9bc':
-        return Waveshare2in9bc
-
-    elif config['ui']['display']['type'] == 'waveshare2in9d':
-        return Waveshare2in9d
-
-    elif config['ui']['display']['type'] == 'waveshare2in13b_v3':
-        return Waveshare2in13bV3
-
-    elif config['ui']['display']['type'] == 'waveshare2in23g':
-        return Waveshare2in23g
+    elif config['ui']['display']['type'] == 'waveshare2in13g':
+        return Waveshare2in13g(config)
 
     elif config['ui']['display']['type'] == 'waveshare2in36g':
-        return Waveshare2in36g
+        return Waveshare2in36g(config)
 
     elif config['ui']['display']['type'] == 'waveshare2in66':
-        return Waveshare2in66
+        return Waveshare2in66(config)
+
+    elif config['ui']['display']['type'] == 'waveshare2in66b':
+        return Waveshare2in66b(config)
+
+    elif config['ui']['display']['type'] == 'waveshare2in66g':
+        return Waveshare2in66g(config)
 
     elif config['ui']['display']['type'] == 'waveshare3in0g':
-        return Waveshare3in0g
+        return Waveshare3in0g(config)
 
     elif config['ui']['display']['type'] == 'waveshare3in7':
-        return Waveshare3in7
+        return Waveshare3in7(config)
 
     elif config['ui']['display']['type'] == 'waveshare3in52':
-        return Waveshare3in52
+        return Waveshare3in52(config)
 
     elif config['ui']['display']['type'] == 'waveshare4in01f':
-        return Waveshare4in01f
+        return Waveshare4in01f(config)
 
     elif config['ui']['display']['type'] == 'waveshare4in2':
-        return Waveshare4in2
+        return Waveshare4in2(config)
 
     elif config['ui']['display']['type'] == 'waveshare4in2_v2':
-        return Waveshare4in2V2
+        return Waveshare4in2V2(config)
 
     elif config['ui']['display']['type'] == 'waveshare4in2b_v2':
-        return Waveshare4in2bV2
+        return Waveshare4in2bV2(config)
 
     elif config['ui']['display']['type'] == 'waveshare4in2bc':
-        return Waveshare4in2bc
+        return Waveshare4in2bc(config)
 
     elif config['ui']['display']['type'] == 'waveshare4in26':
-        return Waveshare4in26
+        return Waveshare4in26(config)
 
     elif config['ui']['display']['type'] == 'waveshare4in37g':
-        return Waveshare4in37g
+        return Waveshare4in37g(config)
 
     elif config['ui']['display']['type'] == 'waveshare5in65f':
-        return Waveshare5in65f
+        return Waveshare5in65f(config)
 
     elif config['ui']['display']['type'] == 'waveshare5in83':
-        return Waveshare5in83
+        return Waveshare5in83(config)
 
     elif config['ui']['display']['type'] == 'waveshare5in83_v2':
-        return Waveshare5in83V2
+        return Waveshare5in83V2(config)
 
     elif config['ui']['display']['type'] == 'waveshare5in83b_v2':
-        return Waveshare5in83bV2
+        return Waveshare5in83bV2(config)
 
     elif config['ui']['display']['type'] == 'waveshare5in83bc':
-        return Waveshare5in83bc
+        return Waveshare5in83bc(config)
 
     elif config['ui']['display']['type'] == 'waveshare7in3f':
-        return Waveshare7in3f
+        return Waveshare7in3f(config)
 
     elif config['ui']['display']['type'] == 'waveshare7in3g':
-        return Waveshare7in3g
+        return Waveshare7in3g(config)
 
     elif config['ui']['display']['type'] == 'waveshare7in5':
-        return Waveshare7in5
+        return Waveshare7in5(config)
 
     elif config['ui']['display']['type'] == 'waveshare7in5_HD':
-        return Waveshare7in5HD
+        return Waveshare7in5HD(config)
 
     elif config['ui']['display']['type'] == 'waveshare7in5_v2':
-        return Waveshare7in5V2
+        return Waveshare7in5V2(config)
 
     elif config['ui']['display']['type'] == 'waveshare7in5b_HD':
-        return Waveshare7in5bHD
+        return Waveshare7in5bHD(config)
 
     elif config['ui']['display']['type'] == 'waveshare7in5b_v2':
-        return Waveshare7in5bV2
+        return Waveshare7in5bV2(config)
 
     elif config['ui']['display']['type'] == 'waveshare7in5bc':
-        return Waveshare7in5bc
+        return Waveshare7in5bc(config)
 
     elif config['ui']['display']['type'] == 'waveshare13in3k':
-        return Waveshare13in3k
+        return Waveshare13in3k(config)

pwnagotchi/ui/hw/base.py

@@ -3,6 +3,7 @@ import pwnagotchi.ui.fonts as fonts
 
 class DisplayImpl(object):
     def __init__(self, config, name):
+        self._display = None
         if fonts.Medium is None:
             fonts.init(config)
         self.name = name

pwnagotchi/ui/hw/dfrobot.py

@@ -3,10 +3,10 @@ import logging
 import pwnagotchi.ui.fonts as fonts
 from pwnagotchi.ui.hw.base import DisplayImpl
 
+
 class DFRobotV1(DisplayImpl):
     def __init__(self, config):
         super(DFRobotV1, self).__init__(config, 'dfrobot_1')
-    self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)

pwnagotchi/ui/hw/dfrobot1.py

@@ -3,10 +3,10 @@ import logging
 import pwnagotchi.ui.fonts as fonts
 from pwnagotchi.ui.hw.base import DisplayImpl
 
+
 class DFRobotV1(DisplayImpl):
     def __init__(self, config):
         super(DFRobotV1, self).__init__(config, 'dfrobot_1')
-    self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)

pwnagotchi/ui/hw/dfrobot2.py

@@ -3,10 +3,10 @@ import logging
 import pwnagotchi.ui.fonts as fonts
 from pwnagotchi.ui.hw.base import DisplayImpl
 
+
 class DFRobotV2(DisplayImpl):
     def __init__(self, config):
         super(DFRobotV2, self).__init__(config, 'dfrobot_2')
-    self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)

pwnagotchi/ui/hw/dfrobot_v2.py

@@ -3,10 +3,10 @@ import logging
 import pwnagotchi.ui.fonts as fonts
 from pwnagotchi.ui.hw.base import DisplayImpl
 
+
 class DFRobotV2(DisplayImpl):
     def __init__(self, config):
         super(DFRobotV2, self).__init__(config, 'dfrobot_2')
-    self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)

pwnagotchi/ui/hw/displayhatmini.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class DisplayHatMini(DisplayImpl):
     def __init__(self, config):
         super(DisplayHatMini, self).__init__(config, 'displayhatmini')
-        self._display = None
 
     def layout(self):
         fonts.setup(12, 10, 12, 70, 25, 9)

pwnagotchi/ui/hw/inky.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Inky(DisplayImpl):
     def __init__(self, config):
         super(Inky, self).__init__(config, 'inky')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 28, 25, 9)

pwnagotchi/ui/hw/lcdhat.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class LcdHat(DisplayImpl):
     def __init__(self, config):
         super(LcdHat, self).__init__(config, 'lcdhat')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)

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

@@ -7,6 +7,7 @@ EPD_HEIGHT      = 128
 
 disp = SH1106.SH1106()
 
+
 class EPD(object):
 
     def __init__(self):

pwnagotchi/ui/hw/libs/waveshare/v1in02/epd1in02.py

@@ -264,11 +264,11 @@ class EPD:
     def display(self, image):
         if (image == None):
             return
-        # Width = (self.width % 8 == 0)? (self.width / 8 ): (self.width / 8 + 1)
+        # Width = (self.width % 8 == 0)? (self.width // 8 ): (self.width // 8 + 1)
         if (self.width % 8 == 0):
-            Width = self.width / 8
+            Width = self.width // 8
         else:
-            Width = self.width / 8 + 1
+            Width = self.width // 8 + 1
 
         self.send_command(0x10)
         for j in range(0, self.height):
@@ -282,11 +282,11 @@ class EPD:
         self.TurnOnDisplay()
 
     def Clear(self):
-        # Width = (self.width % 8 == 0)? (self.width / 8 ): (self.width / 8 + 1)
+        # Width = (self.width % 8 == 0)? (self.width // 8 ): (self.width // 8 + 1)
         if (self.width % 8 == 0):
-            Width = self.width / 8
+            Width = self.width // 8
         else:
-            Width = self.width / 8 + 1
+            Width = self.width // 8 + 1
 
         Height = self.height
 
@@ -313,11 +313,11 @@ class EPD:
         self.send_data(127)  # y-end
         self.send_data(0x00)
 
-        # Width = (self.width % 8 == 0)? (self.width / 8 ): (self.width / 8 + 1)
+        # Width = (self.width % 8 == 0)? (self.width // 8 ): (self.width // 8 + 1)
         if (self.width % 8 == 0):
-            Width = self.width / 8
+            Width = self.width // 8
         else:
-            Width = self.width / 8 + 1
+            Width = self.width // 8 + 1
 
         Height = self.height
         # send data

pwnagotchi/ui/hw/libs/waveshare/v2in13g/epd2in13g.py

@@ -91,9 +91,9 @@ class EPD:
     def SetWindow(self):
         self.send_command(0x61)  # SET_RAM_X_ADDRESS_START_END_POSITION
         # x point must be the multiple of 8 or the last 3 bits will be ignored
-        self.send_data(self.Source_BITS / 256)
+        self.send_data(int(self.Source_BITS / 256))
         self.send_data(self.Source_BITS % 256)
-        self.send_data(self.Gate_BITS / 256)
+        self.send_data(int(self.Gate_BITS / 256))
         self.send_data(self.Gate_BITS % 256)
 
     def TurnOnDisplay(self):
@@ -166,20 +166,21 @@ class EPD:
 
     def getbuffer(self, image):
         # Create a pallette with the 4 colors supported by the panel
+        global image_temp
         pal_image = Image.new("P", (1, 1))
         pal_image.putpalette((0, 0, 0, 255, 255, 255, 255, 255, 0, 255, 0, 0) + (0, 0, 0) * 252)
 
         # Check if we need to rotate the image
         imwidth, imheight = image.size
-        if (imwidth == self.width and imheight == self.height):
+        if imwidth == self.width and imheight == self.height:
             image_temp = image
-        elif (imwidth == self.height and imheight == self.width):
+        elif imwidth == self.height and imheight == self.width:
             image_temp = image.rotate(90, expand=True)
         else:
             logger.warning(
                 "Invalid image dimensions: %d x %d, expected %d x %d" % (imwidth, imheight, self.width, self.height))
 
-        # Convert the soruce image to the 4 colors, dithering if needed
+        # Convert the source image to the 4 colors, dithering if needed
         image_4color = image_temp.convert("RGB").quantize(palette=pal_image)
         buf_4color = bytearray(image_4color.tobytes('raw'))
 

pwnagotchi/ui/hw/libs/waveshare/v2in66b/epd2in66b.py

@@ -0,0 +1,189 @@
+# *****************************************************************************
+# * | File        :	  epd2in66b.py
+# * | Author      :   Waveshare team
+# * | Function    :   Electronic paper driver
+# * | Info        :
+# *----------------
+# * | This version:   V1.1
+# * | Date        :   2022-08-9
+# # | 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 = 152
+EPD_HEIGHT = 296
+
+logger = logging.getLogger(__name__)
+
+
+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
+
+    # 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(5)
+        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)
+
+    # send a lot of data
+    def send_data2(self, data):
+        epdconfig.digital_write(self.dc_pin, 1)
+        epdconfig.digital_write(self.cs_pin, 0)
+        epdconfig.spi_writebyte2(data)
+        epdconfig.digital_write(self.cs_pin, 1)
+
+    def ReadBusy(self):
+        logger.debug("e-Paper busy")
+        while (epdconfig.digital_read(self.busy_pin) == 1):  # 0: idle, 1: busy
+            epdconfig.delay_ms(20)
+        logger.debug("e-Paper busy release")
+
+    def init(self):
+        if (epdconfig.module_init() != 0):
+            return -1
+        # EPD hardware init start
+        self.reset()
+
+        self.send_command(0x12)
+        epdconfig.delay_ms(30)
+        self.ReadBusy()
+
+        self.send_command(0x11)  # setting gaet number
+        self.send_data(0x03)
+
+        self.setWindows(0, 0, self.width - 1, self.height - 1)
+
+        self.send_command(0x21)
+        self.send_data(0x00)
+        self.send_data(0x80)
+
+        self.setCursor(0, 0)
+        self.ReadBusy()
+
+        return 0
+
+    def setWindows(self, Xstart, Ystart, Xend, Yend):
+        self.send_command(0x44)  # SET_RAM_X_ADDRESS_START_END_POSITION
+        self.send_data((Xstart >> 3) & 0x1F)
+        self.send_data((Xend >> 3) & 0x1F)
+
+        self.send_command(0x45)  # SET_RAM_Y_ADDRESS_START_END_POSITION
+        self.send_data(Ystart & 0xFF)
+        self.send_data((Ystart >> 8) & 0x01)
+        self.send_data(Yend & 0xFF)
+        self.send_data((Yend >> 8) & 0x01)
+
+    def setCursor(self, Xstart, Ystart):
+        self.send_command(0x4E)  # SET_RAM_X_ADDRESS_COUNTER
+        self.send_data(Xstart & 0x1F)
+
+        self.send_command(0x4F)  # SET_RAM_Y_ADDRESS_COUNTER
+        self.send_data(Ystart & 0xFF)
+        self.send_data((Ystart >> 8) & 0x01)
+
+    def turnon_display(self):
+        self.send_command(0x20)
+        self.ReadBusy()
+
+    def getbuffer(self, image):
+        # logger.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()
+        # logger.debug("imwidth = %d, imheight = %d",imwidth,imheight)
+        if (imwidth == self.width and imheight == self.height):
+            logger.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):
+            logger.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, Blackimage, Redimage):
+        if (Blackimage == None or Redimage == None):
+            return
+        Redimage_1 = [0x00] * len(Redimage)
+        for i in range(len(Redimage)):
+            Redimage_1[i] = ~Redimage[i]
+        self.send_command(0x24)
+        self.send_data2(Blackimage)
+
+        self.send_command(0x26)
+        self.send_data2(Redimage_1)
+
+        self.turnon_display()
+
+    def Clear(self):
+        if self.width % 8 == 0:
+            linewidth = int(self.width / 8)
+        else:
+            linewidth = int(self.width / 8) + 1
+
+        self.send_command(0x24)
+        self.send_data2([0xff] * int(self.height * linewidth))
+
+        self.send_command(0x26)
+        self.send_data2([0x00] * int(self.height * linewidth))
+
+        self.turnon_display()
+
+    def sleep(self):
+        self.send_command(0X10)  # DEEP_SLEEP_MODE
+        self.send_data(0x01)
+
+        epdconfig.delay_ms(2000)
+        epdconfig.module_exit()
+
+### END OF FILE ###

pwnagotchi/ui/hw/libs/waveshare/v2in7_v2/epd2in7_V2.py

@@ -517,4 +517,5 @@ class EPD:
 
         epdconfig.delay_ms(2000)
         epdconfig.module_exit()
-### END OF FILE ###
+
+    ### END OF FILE ###

pwnagotchi/ui/hw/libs/waveshare/v2in9_v2/epd2in9V2.py

@@ -28,7 +28,7 @@
 #
 
 import logging
-from .. import epdconfig
+from . import epdconfig
 
 # Display resolution
 EPD_WIDTH = 128
@@ -227,7 +227,7 @@ class EPD:
         self.send_data((y >> 8) & 0xFF)
 
     def init(self):
-        if epdconfig.module_init() != 0:
+        if (epdconfig.module_init() != 0):
             return -1
         # EPD hardware init start
         self.reset()

pwnagotchi/ui/hw/libs/waveshare/v2in9b_v4/epd2in9b_V4.py

@@ -184,7 +184,7 @@ class EPD:
 
         self.send_command(0x01)  # Driver output control
         self.send_data((self.height - 1) % 256)
-        self.send_data((self.height - 1) / 256)
+        self.send_data((self.height - 1) // 256)
         self.send_data(0x00)
 
         self.send_command(0x11)  # data entry mode

pwnagotchi/ui/hw/libs/waveshare/v4in26/epd4in26.py

@@ -29,7 +29,7 @@
 
 
 import logging
-from .. import epdconfig
+from . import epdconfig
 
 # Display resolution
 EPD_WIDTH = 800

pwnagotchi/ui/hw/libs/waveshare/v7in5_HD/epd7in5_HD.py

@@ -1,11 +1,11 @@
 # *****************************************************************************
-# * | File        :	  epd7in5.py
+# * | File        :	  epd4in26.py
 # * | Author      :   Waveshare team
 # * | Function    :   Electronic paper driver
 # * | Info        :
 # *----------------
-# * | This version:   V4.0
-# * | Date        :   2019-06-20
+# * | This version:   V1.0
+# * | Date        :   2023-12-20
 # # | Info        :   python demo
 # -----------------------------------------------------------------------------
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -29,11 +29,16 @@
 
 
 import logging
-from .. import epdconfig
+from . import epdconfig
 
 # Display resolution
-EPD_WIDTH = 880
-EPD_HEIGHT = 528
+EPD_WIDTH = 800
+EPD_HEIGHT = 480
+
+GRAY1 = 0xff  # white
+GRAY2 = 0xC0
+GRAY3 = 0x80  # gray
+GRAY4 = 0x00  # Blackest
 
 logger = logging.getLogger(__name__)
 
@@ -46,15 +51,39 @@ class EPD:
         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_DATA_4Gray = [  # #112bytes
+        0x80, 0x48, 0x4A, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x0A, 0x48, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x88, 0x48, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xA8, 0x48, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x07, 0x1E, 0x1C, 0x02, 0x00,
+        0x05, 0x01, 0x05, 0x01, 0x02,
+        0x08, 0x01, 0x01, 0x04, 0x04,
+        0x00, 0x02, 0x00, 0x02, 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, 0x01,
+        0x22, 0x22, 0x22, 0x22, 0x22,
+        0x17, 0x41, 0xA8, 0x32, 0x30,
+        0x00, 0x00]
 
     # Hardware reset
     def reset(self):
         epdconfig.digital_write(self.reset_pin, 1)
-        epdconfig.delay_ms(200)
+        epdconfig.delay_ms(20)
         epdconfig.digital_write(self.reset_pin, 0)
         epdconfig.delay_ms(2)
         epdconfig.digital_write(self.reset_pin, 1)
-        epdconfig.delay_ms(200)
+        epdconfig.delay_ms(20)
 
     def send_command(self, command):
         epdconfig.digital_write(self.dc_pin, 0)
@@ -71,7 +100,7 @@ class EPD:
     def send_data2(self, data):
         epdconfig.digital_write(self.dc_pin, 1)
         epdconfig.digital_write(self.cs_pin, 0)
-        epdconfig.spi_writebyte2(data)
+        epdconfig.SPI.writebytes2(data)
         epdconfig.digital_write(self.cs_pin, 1)
 
     def ReadBusy(self):
@@ -79,102 +108,408 @@ class EPD:
         busy = epdconfig.digital_read(self.busy_pin)
         while (busy == 1):
             busy = epdconfig.digital_read(self.busy_pin)
-        epdconfig.delay_ms(200)
+            epdconfig.delay_ms(20)
+        epdconfig.delay_ms(20)
+        logger.debug("e-Paper busy release")
+
+    def TurnOnDisplay(self):
+        self.send_command(0x22)  # Display Update Control
+        self.send_data(0xF7)
+        self.send_command(0x20)  # Activate Display Update Sequence
+        self.ReadBusy()
+
+    def TurnOnDisplay_Fast(self):
+        self.send_command(0x22)  # Display Update Control
+        self.send_data(0xC7)
+        self.send_command(0x20)  # Activate Display Update Sequence
+        self.ReadBusy()
+
+    def TurnOnDisplay_Part(self):
+        self.send_command(0x22)  # Display Update Control
+        self.send_data(0xFF)
+        self.send_command(0x20)  # Activate Display Update Sequence
+        self.ReadBusy()
+
+    def TurnOnDisplay_4GRAY(self):
+        self.send_command(0x22)  # Display Update Control
+        self.send_data(0xC7)
+        self.send_command(0x20)  # Activate Display Update Sequence
+        self.ReadBusy()
+
+    '''
+    function : Setting the display window
+    parameter:
+        xstart : X-axis starting position
+        ystart : Y-axis starting position
+        xend : End position of X-axis
+        yend : End position of Y-axis
+    '''
+
+    def SetWindow(self, x_start, y_start, x_end, y_end):
+        self.send_command(0x44)  # SET_RAM_X_ADDRESS_START_END_POSITION
+        self.send_data(x_start & 0xFF)
+        self.send_data((x_start >> 8) & 0x03)
+        self.send_data(x_end & 0xFF)
+        self.send_data((x_end >> 8) & 0x03)
+
+        self.send_command(0x45)  # SET_RAM_Y_ADDRESS_START_END_POSITION
+        self.send_data(y_start & 0xFF)
+        self.send_data((y_start >> 8) & 0xFF)
+        self.send_data(y_end & 0xFF)
+        self.send_data((y_end >> 8) & 0xFF)
+
+    '''
+    function : Set Cursor
+    parameter:
+        x : X-axis starting position
+        y : Y-axis starting position
+    '''
+
+    def SetCursor(self, x, y):
+        self.send_command(0x4E)  # SET_RAM_X_ADDRESS_COUNTER
+        # x point must be the multiple of 8 or the last 3 bits will be ignored
+        self.send_data(x & 0xFF)
+        self.send_data((x >> 8) & 0x03)
+
+        self.send_command(0x4F)  # SET_RAM_Y_ADDRESS_COUNTER
+        self.send_data(y & 0xFF)
+        self.send_data((y >> 8) & 0xFF)
 
     def init(self):
         if (epdconfig.module_init() != 0):
             return -1
         # EPD hardware init start
         self.reset()
+        self.ReadBusy()
 
-        self.ReadBusy();
-        self.send_command(0x12);  # SWRESET
-        self.ReadBusy();
+        self.send_command(0x12)  # SWRESET
+        self.ReadBusy()
 
-        self.send_command(0x46);  # Auto Write Red RAM
-        self.send_data(0xf7);
-        self.ReadBusy();
-        self.send_command(0x47);  # Auto Write  B/W RAM
-        self.send_data(0xf7);
-        self.ReadBusy();
+        self.send_command(0x18)  # use the internal temperature sensor
+        self.send_data(0x80)
 
-        self.send_command(0x0C);  # Soft start setting
-        self.send_data2([0xAE, 0xC7, 0xC3, 0xC0, 0x40])
+        self.send_command(0x0C)  # set soft start
+        self.send_data(0xAE)
+        self.send_data(0xC7)
+        self.send_data(0xC3)
+        self.send_data(0xC0)
+        self.send_data(0x80)
 
-        self.send_command(0x01);  # Set MUX as 527
-        self.send_data2([0xAF, 0x02, 0x01])
+        self.send_command(0x01)  # drive output control
+        self.send_data((self.height - 1) % 256)  # Y
+        self.send_data((self.height - 1) // 256)  # Y
+        self.send_data(0x02)
 
-        self.send_command(0x11);  # Data entry mode
-        self.send_data(0x01);
+        self.send_command(0x3C)  # Border       Border setting
+        self.send_data(0x01)
 
-        self.send_command(0x44);
-        self.send_data2([0x00, 0x00, 0x6F, 0x03])  # RAM x address start at 0
-        self.send_command(0x45);
-        self.send_data2([0xAF, 0x02, 0x00, 0x00])
+        self.send_command(0x11)  # data  entry  mode
+        self.send_data(0x01)  # X-mode  x+ y-
 
-        self.send_command(0x3C);  # VBD
-        self.send_data(0x05);  # LUT1, for white
+        self.SetWindow(0, self.height - 1, self.width - 1, 0)
 
-        self.send_command(0x18);
-        self.send_data(0X80);
+        self.SetCursor(0, 0)
+        self.ReadBusy()
 
-        self.send_command(0x22);
-        self.send_data(0XB1);  # Load Temperature and waveform setting.
-        self.send_command(0x20);
-        self.ReadBusy();
+        # EPD hardware init end
+        return 0
 
-        self.send_command(0x4E);  # set RAM x address count to 0;
-        self.send_data2([0x00, 0x00])
-        self.send_command(0x4F);
-        self.send_data2([0x00, 0x00])
+    def init_Fast(self):
+        if (epdconfig.module_init() != 0):
+            return -1
+        # EPD hardware init start
+        self.reset()
+        self.ReadBusy()
+
+        self.send_command(0x12)  # SWRESET
+        self.ReadBusy()
+
+        self.send_command(0x18)  # use the internal temperature sensor
+        self.send_data(0x80)
+
+        self.send_command(0x0C)  # set soft start
+        self.send_data(0xAE)
+        self.send_data(0xC7)
+        self.send_data(0xC3)
+        self.send_data(0xC0)
+        self.send_data(0x80)
+
+        self.send_command(0x01)  # drive output control
+        self.send_data((self.height - 1) % 256)  # Y
+        self.send_data((self.height - 1) // 256)  # Y
+        self.send_data(0x02)
+
+        self.send_command(0x3C)  # Border       Border setting
+        self.send_data(0x01)
+
+        self.send_command(0x11)  # data  entry  mode
+        self.send_data(0x01)  # X-mode  x+ y-
+
+        self.SetWindow(0, self.height - 1, self.width - 1, 0)
+
+        self.SetCursor(0, 0)
+        self.ReadBusy()
+
+        # TEMP (1.5s)
+        self.send_command(0x1A)
+        self.send_data(0x5A)
+
+        self.send_command(0x22)
+        self.send_data(0x91)
+        self.send_command(0x20)
+
+        self.ReadBusy()
+
+        # EPD hardware init end
+        return 0
+
+    def Lut(self):
+        self.send_command(0x32)
+        for count in range(0, 105):
+            self.send_data(self.LUT_DATA_4Gray[count])
+
+        self.send_command(0x03)  # VGH
+        self.send_data(self.LUT_DATA_4Gray[105])
+
+        self.send_command(0x04)  #
+        self.send_data(self.LUT_DATA_4Gray[106])  # VSH1
+        self.send_data(self.LUT_DATA_4Gray[107])  # VSH2
+        self.send_data(self.LUT_DATA_4Gray[108])  # VSL
+
+        self.send_command(0x2C)  # VCOM Voltage
+        self.send_data(self.LUT_DATA_4Gray[109])  # 0x1C
+
+    def init_4GRAY(self):
+        if (epdconfig.module_init() != 0):
+            return -1
+        # EPD hardware init start
+        self.reset()
+        self.ReadBusy()
+
+        self.send_command(0x12)  # SWRESET
+        self.ReadBusy()
+
+        self.send_command(0x18)  # use the internal temperature sensor
+        self.send_data(0x80)
+
+        self.send_command(0x0C)  # set soft start
+        self.send_data(0xAE)
+        self.send_data(0xC7)
+        self.send_data(0xC3)
+        self.send_data(0xC0)
+        self.send_data(0x80)
+
+        self.send_command(0x01)  # drive output control
+        self.send_data((self.height - 1) % 256)  # Y
+        self.send_data((self.height - 1) // 256)  # Y
+        self.send_data(0x02)
+
+        self.send_command(0x3C)  # Border       Border setting
+        self.send_data(0x01)
+
+        self.send_command(0x11)  # data  entry  mode
+        self.send_data(0x01)  # X-mode  x+ y-
+
+        self.SetWindow(0, self.height - 1, self.width - 1, 0)
+
+        self.SetCursor(0, 0)
+        self.ReadBusy()
+
+        self.Lut()
         # EPD hardware init end
         return 0
 
     def getbuffer(self, image):
-        img = image
-        imwidth, imheight = img.size
-        if (imwidth == self.width and imheight == self.height):
-            img = img.convert('1')
-        elif (imwidth == self.height and imheight == self.width):
-            img = img.rotate(90, expand=True).convert('1')
-        else:
-            logger.warning("Wrong image dimensions: must be " + str(self.width) + "x" + str(self.height))
-            # return a blank buffer
-            return [0xff] * int(self.width * self.height / 8)
+        # logger.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()
+        # logger.debug("imwidth = %d, imheight = %d",imwidth,imheight)
+        if imwidth == self.width and imheight == self.height:
+            logger.debug("Horizontal")
+            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:
+            logger.debug("Vertical")
+            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
 
-        buf = bytearray(img.tobytes('raw'))
+    def getbuffer_4Gray(self, image):
+        # logger.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
+        # logger.debug("imwidth = %d, imheight = %d",imwidth,imheight)
+        if (imwidth == self.width and imheight == self.height):
+            logger.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):
+            logger.debug("Horizontal")
+            for x in range(imwidth):
+                for y in range(imheight):
+                    newx = y
+                    newy = self.height - x - 1
+                    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(0x4F);
-        self.send_data2([0x00, 0x00])
-        self.send_command(0x24);
-        self.send_data2(image)
-        self.send_command(0x22);
-        self.send_data(0xF7);  # Load LUT from MCU(0x32)
-        self.send_command(0x20);
-        epdconfig.delay_ms(10);
-        self.ReadBusy();
-
-    def Clear(self):
-        buf = [0xff] * int(self.width * self.height / 8)
-        self.send_command(0x4F);
-        self.send_data2([0x00, 0x00])
         self.send_command(0x24)
-        self.send_data2(buf)
+        self.send_data2(image)
+
+        self.TurnOnDisplay()
+
+    def display_Base(self, image):
+        self.send_command(0x24)
+        self.send_data2(image)
 
         self.send_command(0x26)
-        self.send_data2(buf)
+        self.send_data2(image)
 
-        self.send_command(0x22);
-        self.send_data(0xF7);  # Load LUT from MCU(0x32)
-        self.send_command(0x20);
-        epdconfig.delay_ms(10);
-        self.ReadBusy();
+        self.TurnOnDisplay()
+
+    def display_Fast(self, image):
+        self.send_command(0x24)
+        self.send_data2(image)
+
+        self.TurnOnDisplay_Fast()
+
+    def display_Partial(self, Image):
+
+        # Reset
+        self.reset()
+
+        self.send_command(0x18)  # BorderWavefrom
+        self.send_data(0x80)
+
+        self.send_command(0x3C)  # BorderWavefrom
+        self.send_data(0x80)
+
+        self.send_command(0x01)  # drive output control
+        self.send_data((self.height - 1) % 256)  # Y
+        self.send_data((self.height - 1) // 256)  # Y
+
+        self.send_command(0x11)  # data  entry  mode
+        self.send_data(0x01)  # X-mode  x+ y-
+
+        self.SetWindow(0, self.height - 1, self.width - 1, 0)
+
+        self.SetCursor(0, 0)
+
+        self.send_command(0x24)  # Write Black and White image to RAM
+        self.send_data2(Image)
+
+        self.TurnOnDisplay_Part()
+
+    def display_4Gray(self, image):
+        self.send_command(0x24)
+        for i in range(0, 48000):  # 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 |= 0x00
+                    elif (temp2 == 0x00):
+                        temp3 |= 0x01
+                    elif (temp2 == 0x80):
+                        temp3 |= 0x01
+                    else:  # 0x40
+                        temp3 |= 0x00
+                    temp3 <<= 1
+
+                    temp1 <<= 2
+                    temp2 = temp1 & 0xC0
+                    if (temp2 == 0xC0):
+                        temp3 |= 0x00
+                    elif (temp2 == 0x00):
+                        temp3 |= 0x01
+                    elif (temp2 == 0x80):
+                        temp3 |= 0x01
+                    else:  # 0x40
+                        temp3 |= 0x00
+                    if (j != 1 or k != 1):
+                        temp3 <<= 1
+                    temp1 <<= 2
+            self.send_data(temp3)
+
+        self.send_command(0x26)
+        for i in range(0, 48000):  # 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 |= 0x00
+                    elif (temp2 == 0x00):
+                        temp3 |= 0x01
+                    elif (temp2 == 0x80):
+                        temp3 |= 0x00
+                    else:  # 0x40
+                        temp3 |= 0x01
+                    temp3 <<= 1
+
+                    temp1 <<= 2
+                    temp2 = temp1 & 0xC0
+                    if (temp2 == 0xC0):
+                        temp3 |= 0x00
+                    elif (temp2 == 0x00):
+                        temp3 |= 0x01
+                    elif (temp2 == 0x80):
+                        temp3 |= 0x00
+                    else:  # 0x40
+                        temp3 |= 0x01
+                    if (j != 1 or k != 1):
+                        temp3 <<= 1
+                    temp1 <<= 2
+            self.send_data(temp3)
+
+        self.TurnOnDisplay_4GRAY()
+
+    def Clear(self):
+        self.send_command(0x24)
+        self.send_data2([0xFF] * (int(self.width / 8) * self.height))
+
+        self.send_command(0x26)
+        self.send_data2([0xFF] * (int(self.width / 8) * self.height))
+
+        self.TurnOnDisplay()
 
     def sleep(self):
-        self.send_command(0x10);
-        self.send_data(0x01);
+        self.send_command(0x10)  # DEEP_SLEEP
+        self.send_data(0x01)
 
         epdconfig.delay_ms(2000)
         epdconfig.module_exit()

pwnagotchi/ui/hw/libs/waveshare/v7in5_v2/epd7in5_V2.py

@@ -243,7 +243,7 @@ class EPD:
             else:
                 Xend = Xend // 8 * 8 + 1
 
-        Width = (Xend - Xstart) / 8
+        Width = (Xend - Xstart) // 8
         Height = Yend - Ystart
 
         self.send_command(0x50)

pwnagotchi/ui/hw/libs/waveshare/v7in5_v2/epd7in5_V2_old.py

@@ -484,7 +484,7 @@ class EPD:
             else:
                 Xend = Xend // 8 * 8 + 1
 
-        Width = (Xend - Xstart) / 8
+        Width = (Xend - Xstart) // 8
         Height = Yend - Ystart
 
         self.send_command(0x50)

pwnagotchi/ui/hw/libs/waveshare/v7in5b_HD/epd7in5b_HD.py

@@ -81,59 +81,59 @@ class EPD:
 
         self.reset()
 
-        self.send_command(0x12);  # SWRESET
-        self.ReadBusy();  # waiting for the electronic paper IC to release the idle signal
+        self.send_command(0x12)  # SWRESET
+        self.ReadBusy()  # waiting for the electronic paper IC to release the idle signal
 
-        self.send_command(0x46);  # Auto Write RAM
-        self.send_data(0xF7);
-        self.ReadBusy();  # waiting for the electronic paper IC to release the idle signal
+        self.send_command(0x46)  # Auto Write RAM
+        self.send_data(0xF7)
+        self.ReadBusy()  # waiting for the electronic paper IC to release the idle signal
 
-        self.send_command(0x47);  # Auto Write RAM
-        self.send_data(0xF7);
-        self.ReadBusy();  # waiting for the electronic paper IC to release the idle signal
+        self.send_command(0x47)  # Auto Write RAM
+        self.send_data(0xF7)
+        self.ReadBusy()  # waiting for the electronic paper IC to release the idle signal
 
-        self.send_command(0x0C);  # Soft start setting
-        self.send_data(0xAE);
-        self.send_data(0xC7);
-        self.send_data(0xC3);
-        self.send_data(0xC0);
-        self.send_data(0x40);
+        self.send_command(0x0C)  # Soft start setting
+        self.send_data(0xAE)
+        self.send_data(0xC7)
+        self.send_data(0xC3)
+        self.send_data(0xC0)
+        self.send_data(0x40)
 
-        self.send_command(0x01);  # Set MUX as 527
-        self.send_data(0xAF);
-        self.send_data(0x02);
-        self.send_data(0x01);
+        self.send_command(0x01)  # Set MUX as 527
+        self.send_data(0xAF)
+        self.send_data(0x02)
+        self.send_data(0x01)
 
-        self.send_command(0x11);  # Data entry mode
-        self.send_data(0x01);
+        self.send_command(0x11)  # Data entry mode
+        self.send_data(0x01)
 
-        self.send_command(0x44);
-        self.send_data(0x00);  # RAM x address start at 0
-        self.send_data(0x00);
-        self.send_data(0x6F);  # RAM x address end at 36Fh -> 879
-        self.send_data(0x03);
-        self.send_command(0x45);
-        self.send_data(0xAF);  # RAM y address start at 20Fh;
-        self.send_data(0x02);
-        self.send_data(0x00);  # RAM y address end at 00h;
-        self.send_data(0x00);
+        self.send_command(0x44)
+        self.send_data(0x00)  # RAM x address start at 0
+        self.send_data(0x00)
+        self.send_data(0x6F)  # RAM x address end at 36Fh -> 879
+        self.send_data(0x03)
+        self.send_command(0x45)
+        self.send_data(0xAF)  # RAM y address start at 20Fh
+        self.send_data(0x02)
+        self.send_data(0x00)  # RAM y address end at 00h
+        self.send_data(0x00)
 
-        self.send_command(0x3C);  # VBD
-        self.send_data(0x01);  # LUT1, for white
+        self.send_command(0x3C)  # VBD
+        self.send_data(0x01)  # LUT1, for white
 
-        self.send_command(0x18);
-        self.send_data(0X80);
-        self.send_command(0x22);
-        self.send_data(0XB1);  # Load Temperature and waveform setting.
-        self.send_command(0x20);
-        self.ReadBusy();  # waiting for the electronic paper IC to release the idle signal
+        self.send_command(0x18)
+        self.send_data(0X80)
+        self.send_command(0x22)
+        self.send_data(0XB1)  # Load Temperature and waveform setting.
+        self.send_command(0x20)
+        self.ReadBusy()  # waiting for the electronic paper IC to release the idle signal
 
-        self.send_command(0x4E);
-        self.send_data(0x00);
-        self.send_data(0x00);
-        self.send_command(0x4F);
-        self.send_data(0xAF);
-        self.send_data(0x02);
+        self.send_command(0x4E)
+        self.send_data(0x00)
+        self.send_data(0x00)
+        self.send_command(0x4F)
+        self.send_data(0xAF)
+        self.send_data(0x02)
 
         return 0
 
@@ -162,44 +162,44 @@ class EPD:
         return buf
 
     def display(self, imageblack, imagered):
-        self.send_command(0x4F);
-        self.send_data(0xAf);
+        self.send_command(0x4F)
+        self.send_data(0xAf)
 
         self.send_command(0x24)
         for i in range(0, int(self.width * self.height / 8)):
-            self.send_data(imageblack[i]);
+            self.send_data(imageblack[i])
 
         self.send_command(0x26)
         for i in range(0, int(self.width * self.height / 8)):
-            self.send_data(~imagered[i]);
+            self.send_data(~imagered[i])
 
-        self.send_command(0x22);
-        self.send_data(0xC7);  # Load LUT from MCU(0x32)
-        self.send_command(0x20);
-        epdconfig.delay_ms(200);  # !!!The delay here is necessary, 200uS at least!!!
-        self.ReadBusy();
+        self.send_command(0x22)
+        self.send_data(0xC7)  # Load LUT from MCU(0x32)
+        self.send_command(0x20)
+        epdconfig.delay_ms(200)  # !!!The delay here is necessary, 200uS at least!!!
+        self.ReadBusy()
 
     def Clear(self):
-        self.send_command(0x4F);
-        self.send_data(0xAf);
+        self.send_command(0x4F)
+        self.send_data(0xAf)
 
         self.send_command(0x24)
         for i in range(0, int(self.width * self.height / 8)):
-            self.send_data(0xff);
+            self.send_data(0xff)
 
         self.send_command(0x26)
         for i in range(0, int(self.width * self.height / 8)):
-            self.send_data(0x00);
+            self.send_data(0x00)
 
-        self.send_command(0x22);
-        self.send_data(0xC7);  # Load LUT from MCU(0x32)
-        self.send_command(0x20);
-        epdconfig.delay_ms(200);  # !!!The delay here is necessary, 200uS at least!!!
-        self.ReadBusy();
+        self.send_command(0x22)
+        self.send_data(0xC7)  # Load LUT from MCU(0x32)
+        self.send_command(0x20)
+        epdconfig.delay_ms(200)  # !!!The delay here is necessary, 200uS at least!!!
+        self.ReadBusy()
 
     def sleep(self):
-        self.send_command(0x10);  # deep sleep
-        self.send_data(0x01);
+        self.send_command(0x10)  # deep sleep
+        self.send_data(0x01)
 
         epdconfig.delay_ms(2000)
         epdconfig.module_exit()

pwnagotchi/ui/hw/oledhat.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class OledHat(DisplayImpl):
     def __init__(self, config):
         super(OledHat, self).__init__(config, 'oledhat')
-        self._display = None
 
     def layout(self):
         fonts.setup(8, 8, 8, 10, 10, 8)

pwnagotchi/ui/hw/papirus.py

@@ -8,7 +8,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Papirus(DisplayImpl):
     def __init__(self, config):
         super(Papirus, self).__init__(config, 'papirus')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 23, 25, 9)

pwnagotchi/ui/hw/spotpear24in.py

@@ -3,12 +3,12 @@ import logging
 import pwnagotchi.ui.fonts as fonts
 from pwnagotchi.ui.hw.base import DisplayImpl
 
-import os,time
+import time
+
 
 class Spotpear24inch(DisplayImpl):
     def __init__(self, config):
         super(Spotpear24inch, self).__init__(config, 'spotpear24inch')
-        self._display = None
 
     def layout(self):
         fonts.setup(12, 10, 12, 70, 25, 9)

pwnagotchi/ui/hw/spotpear24inch.py

@@ -3,12 +3,12 @@ import logging
 import pwnagotchi.ui.fonts as fonts
 from pwnagotchi.ui.hw.base import DisplayImpl
 
-import os,time
+import time
+
 
 class Spotpear24inch(DisplayImpl):
     def __init__(self, config):
         super(Spotpear24inch, self).__init__(config, 'spotpear24inch')
-        self._display = None
 
     def layout(self):
         fonts.setup(12, 10, 12, 70, 25, 9)

pwnagotchi/ui/hw/waveshare13in3k.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare13in3k(DisplayImpl):
     def __init__(self, config):
         super(Waveshare13in3k, self).__init__(config, 'waveshare13in3k')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare144lcd.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare144lcd(DisplayImpl):
     def __init__(self, config):
         super(Waveshare144lcd, self).__init__(config, 'waveshare144lcd')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)
@@ -42,5 +41,4 @@ class Waveshare144lcd(DisplayImpl):
         self._display.display(canvas)
 
     def clear(self):
-        pass
-        #self._display.clear()
+        self._display.clear()

pwnagotchi/ui/hw/waveshare1in02.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare1in02(DisplayImpl):
     def __init__(self, config):
         super(Waveshare1in02, self).__init__(config, 'waveshare1in02')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare1in44lcd.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare144lcd(DisplayImpl):
     def __init__(self, config):
         super(Waveshare144lcd, self).__init__(config, 'waveshare144lcd')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare1in54.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare154(DisplayImpl):
     def __init__(self, config):
         super(Waveshare154, self).__init__(config, 'waveshare1in54')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)

pwnagotchi/ui/hw/waveshare1in54_V2.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare154V2(DisplayImpl):
     def __init__(self, config):
         super(Waveshare154V2, self).__init__(config, 'waveshare1in54_v2')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)

pwnagotchi/ui/hw/waveshare1in54b.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare154inchb(DisplayImpl):
     def __init__(self, config):
         super(Waveshare154inchb, self).__init__(config, 'waveshare1in54b')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)

pwnagotchi/ui/hw/waveshare1in54b_V2.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare154bV2(DisplayImpl):
     def __init__(self, config):
         super(Waveshare154bV2, self).__init__(config, 'waveshare1in54b_v2')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)

pwnagotchi/ui/hw/waveshare1in54c.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare1in54c(DisplayImpl):
     def __init__(self, config):
         super(Waveshare1in54c, self).__init__(config, 'waveshare1in54c')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare1in64g.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare1in64g(DisplayImpl):
     def __init__(self, config):
         super(Waveshare1in64g, self).__init__(config, 'waveshare1in64g')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare2in13.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class WaveshareV1(DisplayImpl):
     def __init__(self, config):
         super(WaveshareV1, self).__init__(config, 'waveshare_1')
-        self._display = None
 
     def layout(self):
         if self.config['color'] == 'black':

pwnagotchi/ui/hw/waveshare2in13_V2.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class WaveshareV2(DisplayImpl):
     def __init__(self, config):
         super(WaveshareV2, self).__init__(config, 'waveshare_2')
-        self._display = None
 
     def layout(self):
         if self.config['color'] == 'black':

pwnagotchi/ui/hw/waveshare2in13_V3.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class WaveshareV3(DisplayImpl):
     def __init__(self, config):
         super(WaveshareV3, self).__init__(config, 'waveshare_3')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 35, 25, 9)

pwnagotchi/ui/hw/waveshare2in13_V4.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class WaveshareV4(DisplayImpl):
     def __init__(self, config):
         super(WaveshareV4, self).__init__(config, 'waveshare_4')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)

pwnagotchi/ui/hw/waveshare2in13b_V3.py

@@ -8,7 +8,6 @@ from PIL import Image
 class Waveshare2in13bV3(DisplayImpl):
     def __init__(self, config):
         super(Waveshare2in13bV3, self).__init__(config, 'waveshare2in13b_v3')
-        self._display = None
 
     def layout(self):
         if self.config['color'] == 'black':

pwnagotchi/ui/hw/waveshare2in13b_V4.py

@@ -8,7 +8,6 @@ from PIL import Image
 class Waveshare213bV4(DisplayImpl):
     def __init__(self, config):
         super(Waveshare213bV4, self).__init__(config, 'waveshare213inb_v4')
-        self._display = None
 
     def layout(self):
         if self.config['color'] == 'black':

pwnagotchi/ui/hw/waveshare2in13bc.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare213bc(DisplayImpl):
     def __init__(self, config):
         super(Waveshare213bc, self).__init__(config, 'waveshare2in13bc')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 25, 25, 9)

pwnagotchi/ui/hw/waveshare2in13d.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare213d(DisplayImpl):
     def __init__(self, config):
         super(Waveshare213d, self).__init__(config, 'waveshare2in13d')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 25, 25, 9)

pwnagotchi/ui/hw/waveshare2in13g.py

@@ -0,0 +1,45 @@
+import logging
+
+import pwnagotchi.ui.fonts as fonts
+from pwnagotchi.ui.hw.base import DisplayImpl
+
+
+class Waveshare2in13g(DisplayImpl):
+    def __init__(self, config):
+        super(Waveshare2in13g, self).__init__(config, 'waveshare2in13g')
+
+    def layout(self):
+        fonts.setup(10, 9, 10, 35, 25, 9)
+        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.status_font(fonts.Medium),
+            'max': 20
+        }
+        return self._layout
+
+    def initialize(self):
+        logging.info("initializing waveshare v2in13g display")
+        from pwnagotchi.ui.hw.libs.waveshare.v2in13g.epd2in13g 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):
+        self._display.Clear()

pwnagotchi/ui/hw/waveshare2in23g.py

@@ -1,46 +0,0 @@
-import logging
-
-import pwnagotchi.ui.fonts as fonts
-from pwnagotchi.ui.hw.base import DisplayImpl
-
-
-class Waveshare2in23g(DisplayImpl):
-    def __init__(self, config):
-        super(Waveshare2in23g, self).__init__(config, 'waveshare2in23g')
-        self._display = None
-
-    def layout(self):
-        fonts.setup(10, 8, 10, 25, 25, 9)
-        self._layout['width'] = 122
-        self._layout['height'] = 250
-        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, 122, 12]
-        self._layout['line2'] = [0, 92, 122, 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.status_font(fonts.Medium),
-            'max': 20
-        }
-        return self._layout
-
-    def initialize(self):
-        logging.info("initializing waveshare 2.23g inch display")
-        from pwnagotchi.ui.hw.libs.waveshare.v2in23g.epd2in13g 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):
-        self._display.Clear()

pwnagotchi/ui/hw/waveshare2in36g.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare2in36g(DisplayImpl):
     def __init__(self, config):
         super(Waveshare2in36g, self).__init__(config, 'waveshare2in36g')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare2in66.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare2in66(DisplayImpl):
     def __init__(self, config):
         super(Waveshare2in66, self).__init__(config, 'waveshare2in66')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare2in66b.py

@@ -0,0 +1,45 @@
+import logging
+
+import pwnagotchi.ui.fonts as fonts
+from pwnagotchi.ui.hw.base import DisplayImpl
+
+
+class Waveshare2in66b(DisplayImpl):
+    def __init__(self, config):
+        super(Waveshare2in66b, self).__init__(config, 'waveshare2in66b')
+
+    def layout(self):
+        fonts.setup(10, 8, 10, 18, 25, 9)
+        self._layout['width'] = 152
+        self._layout['height'] = 296
+        self._layout['face'] = (0, 43)
+        self._layout['name'] = (0, 14)
+        self._layout['channel'] = (0, 0)
+        self._layout['aps'] = (0, 71)
+        self._layout['uptime'] = (0, 25)
+        self._layout['line1'] = [0, 12, 152, 12]
+        self._layout['line2'] = [0, 116, 152, 116]
+        self._layout['friend_face'] = (12, 88)
+        self._layout['friend_name'] = (1, 103)
+        self._layout['shakes'] = (26, 117)
+        self._layout['mode'] = (0, 117)
+        self._layout['status'] = {
+            'pos': (65, 26),
+            'font': fonts.status_font(fonts.Small),
+            'max': 12
+        }
+        return self._layout
+
+    def initialize(self):
+        logging.info("initializing waveshare 2.66b inch lcd display")
+        from pwnagotchi.ui.hw.libs.waveshare.v2in66b.epd2in66b 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):
+        self._display.Clear()

pwnagotchi/ui/hw/waveshare2in66g.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare2in66g(DisplayImpl):
     def __init__(self, config):
         super(Waveshare2in66g, self).__init__(config, 'waveshare2in66g')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare2in7.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare27inch(DisplayImpl):
     def __init__(self, config):
         super(Waveshare27inch, self).__init__(config, 'waveshare2in7')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)

pwnagotchi/ui/hw/waveshare2in7_V2.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare27inchV2(DisplayImpl):
     def __init__(self, config):
         super(Waveshare27inchV2, self).__init__(config, 'waveshare2in7_v2')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)
@@ -42,7 +41,7 @@ class Waveshare27inchV2(DisplayImpl):
 
     def render(self, canvas):
         buf = self._display.getbuffer(canvas)
-        self._display.display_Partial(buf,0,0,176,264)
+        self._display.display_Partial(buf, 0, 0, 176, 264)
 
     def clear(self):
         # This line also removes the 0xFF

pwnagotchi/ui/hw/waveshare2in7b.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare27b(DisplayImpl):
     def __init__(self, config):
         super(Waveshare27b, self).__init__(config, 'waveshare2in7b')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)

pwnagotchi/ui/hw/waveshare2in7b_V2.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare27bV2(DisplayImpl):
     def __init__(self, config):
         super(Waveshare27bV2, self).__init__(config, 'waveshare2in7b_v2')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)

pwnagotchi/ui/hw/waveshare2in9.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare29inch(DisplayImpl):
     def __init__(self, config):
         super(Waveshare29inch, self).__init__(config, 'waveshare2in9')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)

pwnagotchi/ui/hw/waveshare2in9_V2.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare29inchV2(DisplayImpl):
     def __init__(self, config):
         super(Waveshare29inchV2, self).__init__(config, 'waveshare2in9_v2')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)

pwnagotchi/ui/hw/waveshare2in9b_V3.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare29bV3(DisplayImpl):
     def __init__(self, config):
         super(Waveshare29bV3, self).__init__(config, 'waveshare2in9b_v3')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)

pwnagotchi/ui/hw/waveshare2in9b_V4.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare29bV4(DisplayImpl):
     def __init__(self, config):
         super(Waveshare29bV4, self).__init__(config, 'waveshare2in9b_v4')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 9, 10, 35, 25, 9)

pwnagotchi/ui/hw/waveshare2in9bc.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare2in9bc(DisplayImpl):
     def __init__(self, config):
         super(Waveshare2in9bc, self).__init__(config, 'waveshare2in9bc')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare2in9d.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare2in9d(DisplayImpl):
     def __init__(self, config):
         super(Waveshare2in9d, self).__init__(config, 'waveshare2in9d')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare35lcd.py

@@ -9,7 +9,6 @@ import os, time
 class Waveshare35lcd(DisplayImpl):
     def __init__(self, config):
         super(Waveshare35lcd, self).__init__(config, 'waveshare35lcd')
-        self._display = None
 
     def layout(self):
         fonts.setup(12, 10, 12, 70, 25, 9)

pwnagotchi/ui/hw/waveshare3in0g.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare3in0g(DisplayImpl):
     def __init__(self, config):
         super(Waveshare3in0g, self).__init__(config, 'waveshare3in0g')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare3in52.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare3in52(DisplayImpl):
     def __init__(self, config):
         super(Waveshare3in52, self).__init__(config, 'waveshare3in52')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare3in5lcd.py

@@ -9,7 +9,6 @@ import os, time
 class Waveshare35lcd(DisplayImpl):
     def __init__(self, config):
         super(Waveshare35lcd, self).__init__(config, 'waveshare35lcd')
-        self._display = None
 
     def layout(self):
         fonts.setup(12, 10, 12, 70, 25, 9)

pwnagotchi/ui/hw/waveshare3in7.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare3in7(DisplayImpl):
     def __init__(self, config):
         super(Waveshare3in7, self).__init__(config, 'waveshare3in7')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)
@@ -39,7 +38,7 @@ class Waveshare3in7(DisplayImpl):
         self._display.Clear(0)
 
     def render(self, canvas):
-        self._display.display(canvas)
+        self._display.display_4Gray(canvas)
 
     def clear(self):
         self._display.Clear(0)

pwnagotchi/ui/hw/waveshare4in01f.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare4in01f(DisplayImpl):
     def __init__(self, config):
         super(Waveshare4in01f, self).__init__(config, 'waveshare4in01f')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare4in2.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare4in2(DisplayImpl):
     def __init__(self, config):
         super(Waveshare4in2, self).__init__(config, 'waveshare4in2')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare4in26.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare4in26(DisplayImpl):
     def __init__(self, config):
         super(Waveshare4in26, self).__init__(config, 'waveshare4in26')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare4in2_V2.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare4in2V2(DisplayImpl):
     def __init__(self, config):
         super(Waveshare4in2V2, self).__init__(config, 'waveshare4in2_v2')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare4in2b_V2.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare4in2bV2(DisplayImpl):
     def __init__(self, config):
         super(Waveshare4in2bV2, self).__init__(config, 'waveshare4in2b_v2')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare4in2bc.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare4in2bc(DisplayImpl):
     def __init__(self, config):
         super(Waveshare4in2bc, self).__init__(config, 'waveshare4in2bc')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)

pwnagotchi/ui/hw/waveshare4in37g.py

@@ -7,7 +7,6 @@ from pwnagotchi.ui.hw.base import DisplayImpl
 class Waveshare4in37g(DisplayImpl):
     def __init__(self, config):
         super(Waveshare4in37g, self).__init__(config, 'waveshare4in37g')
-        self._display = None
 
     def layout(self):
         fonts.setup(10, 8, 10, 18, 25, 9)