Version 2.7.3

Fix on auto-update.py

Makefile

@@ -48,15 +48,11 @@ $(PACKER):
 	rm $(PACKER).zip
 	chmod +x $@
 
-SDIST := dist/pwnagotchi-$(PWN_VERSION).tar.gz
-$(SDIST): setup.py pwnagotchi
-	python3 setup.py sdist
-
 # Building the image requires packer, but don't rebuild the image just because packer updated.
 pwnagotchi: | $(PACKER)
 
 # If the packer or ansible files are updated, rebuild the image.
-pwnagotchi: $(SDIST) builder/pwnagotchi.json.pkr.hcl builder/raspberrypi64.yml $(shell find builder/data -type f)
+pwnagotchi: builder/pwnagotchi.json.pkr.hcl builder/raspberrypi64.yml $(shell find builder/data -type f)
 
 	cd builder && $(PACKER) init pwnagotchi.json.pkr.hcl && sudo $(UNSHARE) $(PACKER) build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" pwnagotchi.json.pkr.hcl
 

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.6.9), 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.**
 

bin/pwnagotchi

@@ -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

@@ -23,21 +23,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 +57,7 @@
           - libpcap0.8-dbg
         remove:
           - avahi-daemon
+          - dhpys-swapfile
           - nfs-common
           - triggerhappy
           - wpasupplicant
@@ -73,7 +70,6 @@
           - build-essential
           - curl
           - dkms
-          - dphys-swapfile
           - fbi
           - flex
           - fonts-dejavu
@@ -161,17 +157,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 +230,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 +238,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
@@ -477,41 +506,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 +557,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.3'

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)

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/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/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/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/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):

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/waveshare2in13g.py

@@ -0,0 +1,46 @@
+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')
+        self._display = None
+
+    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.displayPartial(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/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')
+        self._display = None
+
+    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):
+        self._display.display(canvas)
+
+    def clear(self):
+        self._display.Clear()

pwnagotchi/utils.py

@@ -306,6 +306,9 @@ def load_config(args):
     elif config['ui']['display']['type'] in ('ws_213d', 'ws213d', 'waveshare2in13d', 'waveshare_213d', 'waveshare213d'):
         config['ui']['display']['type'] = 'waveshare2in13d'
 
+    elif config['ui']['display']['type'] in ('ws_213g', 'waveshare2in13g', 'waveshare213g', 'ws213g', 'waveshare_213g'):
+        config['ui']['display']['type'] = 'waveshare2in13g'
+
     elif config['ui']['display']['type'] in ('ws_213bc', 'ws213bc', 'waveshare2in13bc', 'waveshare_213bc', 'waveshare213bc'):
         config['ui']['display']['type'] = 'waveshare2in13bc'
 
@@ -339,15 +342,18 @@ def load_config(args):
     elif config['ui']['display']['type'] in 'waveshare2in13b_v3':
         config['ui']['display']['type'] = 'waveshare2in13b_v3'
 
-    elif config['ui']['display']['type'] in 'waveshare2in23g':
-        config['ui']['display']['type'] = 'waveshare2in23g'
-
     elif config['ui']['display']['type'] in 'waveshare2in36g':
         config['ui']['display']['type'] = 'waveshare2in36g'
 
     elif config['ui']['display']['type'] in 'waveshare2in66':
         config['ui']['display']['type'] = 'waveshare2in66'
 
+    elif config['ui']['display']['type'] in 'waveshare2in66b':
+        config['ui']['display']['type'] = 'waveshare2in66b'
+
+    elif config['ui']['display']['type'] in 'waveshare2in66g':
+        config['ui']['display']['type'] = 'waveshare2in66g'
+
     elif config['ui']['display']['type'] in 'waveshare3in0g':
         config['ui']['display']['type'] = 'waveshare3in0g'