revert back to drschottky

This reverts commit 26913016b9.

.github/FUNDING.yml

@@ -1,4 +1,3 @@
 # These are supported funding model platforms
 
-patreon: pwnagotchi_torch
 github: jayofelony

.github/workflows/publish.yml

@@ -0,0 +1,212 @@
+name: Publish
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version number'
+        required: true
+
+jobs:
+ 
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Remove unnecessary directories
+      run: |
+        sudo rm -rf /usr/share/dotnet
+        sudo rm -rf /opt/ghc
+        sudo rm -rf /usr/local/share/boost
+        sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+
+    - name: Check disk space
+      run: df -BG
+
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Validate tag
+      id: tag-setter
+      run: |
+            TAG=${{ github.event.inputs.version }}
+            if [[ $TAG =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo "Tag $TAG is valid."
+            echo "TAG=$TAG" >> $GITHUB_OUTPUT
+            else
+            echo "Tag $TAG is not a valid semantic version. Aborting."
+            exit 1
+            fi
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.9
+
+    - name: Install dependencies
+      run: | 
+           sudo apt-get update && sudo apt-get install -y libdbus-1-dev curl unzip gettext qemu-utils qemu qemu-user-static binfmt-support
+           pip install -r requirements.txt
+
+    - name: Update QEMU
+      run: |
+            sudo update-binfmts --enable qemu-aarch64
+            echo $(ls /usr/bin/qemu-aarch64-static)
+
+    - name: Restart binfmt-support
+      run: sudo service binfmt-support restart
+
+    - name: Mount binfmt_misc
+      run: |
+        if ! grep -qs '/proc/sys/fs/binfmt_misc ' /proc/mounts; then
+          echo "Mounting binfmt_misc"
+          sudo mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
+        fi
+
+    - name: Restart binfmt-support
+      run: sudo service binfmt-support restart
+        
+    - name: Update Languages
+      run: make update_langs
+    
+    - name: Compile Languages
+      run: make compile_langs
+
+    - name: Check disk space
+      run: df -BG
+
+    - name: Check qemu-user-static package
+      run: |
+        echo "Checking qemu-user-static package..."
+        dpkg -s qemu-user-static && echo "qemu-user-static is installed." || echo "qemu-user-static is NOT installed."
+    
+    - name: Check binfmt-support service
+      run: |
+        echo "Checking binfmt-support service..."
+        service binfmt-support status && echo "binfmt-support service is running." || echo "binfmt-support service is NOT running."
+    
+    - name: Check binfmt_misc filesystem
+      run: |
+        echo "Checking binfmt_misc filesystem..."
+        mount | grep binfmt_misc && echo "binfmt_misc is mounted." || echo "binfmt_misc is NOT mounted."
+        echo $(ls /proc/sys/fs/binfmt_misc | grep qemu-aarch64)
+
+    - name: Run Makefile
+      run: make
+      env: 
+        PWN_VERSION: ${{ steps.tag-setter.outputs.TAG }}
+
+    - name: PiShrink
+      run: |
+        wget https://raw.githubusercontent.com/Drewsif/PiShrink/master/pishrink.sh
+        chmod +x pishrink.sh
+        sudo mv pishrink.sh /usr/local/bin
+        find /home/runner/work/ -type f -name "*.img" -exec sudo pishrink.sh {} \;
+
+    - name: Compress .img files
+      run: |
+         find /home/runner/work/ -type f -name "*.img" -exec xz --no-warn {} \;
+    
+    - name: Create tag
+      uses: actions/github-script@v7
+      with:
+        script: |
+            const version = "${{ steps.tag-setter.outputs.TAG }}"
+            console.log(`Creating tag ${version}`)
+            await github.rest.git.createRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: `refs/tags/${version}`,
+              sha: context.sha
+            })
+
+    - name: Create Release
+      id: create_release
+      uses: actions/github-script@v7
+      with:
+        script: |
+          const tag = "${{ steps.tag-setter.outputs.TAG }}"
+          console.log(`Creating release with tag: ${tag}`)
+          const release = await github.rest.repos.createRelease({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            tag_name: tag,
+            name: tag,
+            draft: false,
+            prerelease: true,
+            generate_release_notes: true
+          })
+          console.log(`Created release with id: ${release.data.id}`)
+          return release.data.id
+
+    - name: Upload Release Asset
+      id: upload-release-asset 
+      uses: actions/github-script@v7
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        script: |
+          const fs = require('fs');
+          const path = require('path');
+          const release_id = "${{ steps.create_release.outputs.result }}";
+          const asset_content_type = 'application/octet-stream';
+          const distDir = '/home/runner/work/';
+          
+          const uploadFile = async (filePath) => {
+            if (fs.lstatSync(filePath).isDirectory()) {
+              const files = fs.readdirSync(filePath);
+              for (const file of files) {
+                await uploadFile(path.join(filePath, file));
+              }
+            } else {
+              // Check if the file has a .xz extension
+              if (path.extname(filePath) === '.xz') {
+                console.log(`Uploading ${filePath}...`);
+      
+                const asset_name = path.basename(filePath);
+                const asset_size = fs.statSync(filePath).size;
+                const asset = fs.createReadStream(filePath);
+      
+                const response = await github.rest.repos.uploadReleaseAsset({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  release_id: release_id,
+                  name: asset_name,
+                  data: asset,
+                  headers: {
+                    'content-type': asset_content_type,
+                    'content-length': asset_size
+                  }
+                });
+      
+                console.log(`Uploaded ${filePath}: ${response.data.browser_download_url}`);
+              }
+            }
+          }
+      
+          await uploadFile(distDir);
+          
+    - name: Update Release
+      uses: actions/github-script@v7
+      with:
+        script: |
+          const release_id = "${{ steps.create_release.outputs.result }}"
+          console.log(`Updating release with id: ${release_id}`)
+          github.rest.repos.updateRelease({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            release_id: release_id,
+            tag_name: "${{ steps.tag-setter.outputs.TAG }}",
+            name: "${{ steps.tag-setter.outputs.TAG }}",
+            draft: false,
+            prerelease: false
+          })
+
+    - name: Save environment variable
+      run: echo "${{ steps.tag-setter.outputs.TAG }}"  > env_var.txt
+
+    - name: Upload artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: env-var
+        path: env_var.txt

.idea/misc.xml

@@ -3,7 +3,7 @@
   <component name="Black">
     <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="ProjectRootManager" version="2" project-jdk-name="Python 3.10" project-jdk-type="Python SDK" />
   <component name="PythonCompatibilityInspectionAdvertiser">
     <option name="version" value="3" />
   </component>

.idea/pwnagotchi.iml

@@ -4,7 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.10 (pwnagotchi-torch-bookworm)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.10" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">

Makefile

@@ -1,4 +1,4 @@
-PACKER_VERSION := 1.10.0
+PACKER_VERSION := 1.10.1
 PWN_HOSTNAME := pwnagotchi
 PWN_VERSION := $(shell cut -d"'" -f2 < pwnagotchi/_version.py)
 
@@ -64,5 +64,5 @@ pwnagotchi: $(SDIST) builder/pwnagotchi.json.pkr.hcl builder/raspberrypi64.yml $
 image: pwnagotchi
 
 clean:
-	- rm -rf build dist pwnagotchi.egg-info
+	- rm -rf dist pwnagotchi.egg-info
 	- rm -f $(PACKER)

README.md

@@ -1,13 +1,14 @@
 # Pwnagotchi-Torch
 <a href="https://github.com/jayofelony/pwnagotchi-bookworm/releases/latest"><img alt="Release" src="https://img.shields.io/github/release/jayofelony/pwnagotchi-bookworm.svg"></a><br/>
-**This fork of [Pwnagotchi](https://www.pwnagotchi.ai) is only for 64-bit Raspberry Pi's. Such as the 02W, 3(b+) and 4(b) ~~and the new Raspberry Pi 5~~!!.**
+**This fork of [Pwnagotchi](https://www.pwnagotchi.ai) is only for 64-bit Raspberry Pi's. Such as the 02W, 3(b+) and 4(b) and the new Raspberry Pi 5!!.**
+
+The RPi5 can only be used headless currently. (without display.)
 
-It seems the Pi 5 is unable to run in monitor mode, will keep you updated on this.
 
 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 the latest image file [here](https://github.com/jayofelony/pwnagotchi-bookworm/releases/tag/v2.7.9), and let it auto-update from here on out.
+Download the latest image file [here](https://github.com/jayofelony/pwnagotchi-bookworm/releases/tag/v2.8.2), 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.**
   - Select `Use Custom Image`

builder/data/etc/default/zramswap

@@ -1,15 +0,0 @@
-# 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

@@ -0,0 +1,26 @@
+# /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/etc/systemd/system/pwnagotchi.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=pwnagotchi Deep Reinforcement Learning instrumenting bettercap for WiFI pwning.
-Documentation=https://pwnagotchi.ai
+Documentation=https://pwnagotchi.org
 Wants=network.target
 After=pwngrid-peer.service
 
@@ -8,6 +8,7 @@ After=pwngrid-peer.service
 Type=simple
 WorkingDirectory=~
 ExecStart=/usr/bin/pwnagotchi-launcher
+ExecStopPost=/usr/bin/bash -c "if egrep -qi  'personality.clear_on_exit[ =]*true' /etc/pwnagotchi/config.toml ; then /usr/local/bin/pwnagotchi --clear; fi"
 Restart=always
 RestartSec=30
 TasksMax=infinity

builder/pwnagotchi.json.pkr.hcl

@@ -1,11 +1,9 @@
-# This is not working quite yet
-# https://github.com/mkaczanowski/packer-builder-arm/pull/172
 packer {
   required_plugins {
-    #arm = {
-    #  version = "~> 1"
-    #  source  = "github.com/cdecoux/builder-arm"
-    #}
+    arm = {
+      version = "1.0.0"
+      source  = "github.com/cdecoux/builder-arm"
+    }
     ansible = {
       source  = "github.com/hashicorp/ansible"
       version = "~> 1"
@@ -28,8 +26,8 @@ source "arm" "rpi64-pwnagotchi" {
   file_target_extension         = "xz"
   file_unarchive_cmd            = ["unxz", "$ARCHIVE_PATH"]
   image_path                    = "../../../pwnagotchi-rpi-bookworm-${var.pwn_version}-arm64.img"
-  qemu_binary_source_path       = "/usr/bin/qemu-aarch64-static"
-  qemu_binary_destination_path  = "/usr/bin/qemu-aarch64-static"
+  qemu_binary_source_path       = "/usr/libexec/qemu-binfmt/aarch64-binfmt-P"
+  qemu_binary_destination_path  = "/usr/libexec/qemu-binfmt/aarch64-binfmt-P"
   image_build_method            = "resize"
   image_size                    = "9G"
   image_type                    = "dos"
@@ -51,6 +49,8 @@ source "arm" "rpi64-pwnagotchi" {
   }
 }
 
+
+
 # a build block invokes sources and runs provisioning steps on them. The
 # documentation for build blocks can be found here:
 # https://www.packer.io/docs/from-1.5/blocks/build
@@ -74,10 +74,6 @@ build {
     inline = ["chmod +x /usr/bin/*"]
   }
 
-  provisioner "shell" {
-    inline = ["dpkg --add-architecture armhf"]
-  }
-
   provisioner "file" {
     destination = "/etc/systemd/system/"
     sources     = [
@@ -86,7 +82,6 @@ build {
       "data/etc/systemd/system/pwngrid-peer.service",
     ]
   }
-
   provisioner "file" {
     destination = "/etc/update-motd.d/01-motd"
     source      = "data/etc/update-motd.d/01-motd"
@@ -95,11 +90,7 @@ build {
     inline = ["chmod +x /etc/update-motd.d/*"]
   }
   provisioner "shell" {
-    inline = [
-      "apt-get -y --allow-releaseinfo-change update",
-      "apt-get -y dist-upgrade",
-      "apt-get install -y --no-install-recommends ansible"
-    ]
+    inline = ["apt-get -y --allow-releaseinfo-change update", "apt-get -y dist-upgrade", "apt-get install -y --no-install-recommends ansible"]
   }
   provisioner "ansible-local" {
     command         = "ANSIBLE_FORCE_COLOR=1 PYTHONUNBUFFERED=1 PWN_VERSION=${var.pwn_version} PWN_HOSTNAME=${var.pwn_hostname} ansible-playbook"

builder/raspberrypi64.yml

@@ -27,7 +27,6 @@
         - fstrim.timer
         - pwnagotchi.service
         - pwngrid-peer.service
-        - zramswap.service
       disable:
         - apt-daily-upgrade.service
         - apt-daily-upgrade.timer
@@ -78,6 +77,7 @@
           - build-essential
           - curl
           - dkms
+          - dphys-swapfile
           - fbi
           - firmware-atheros
           - firmware-brcm80211
@@ -102,7 +102,6 @@
           - libbz2-dev
           - libc-ares-dev
           - libc6-dev
-          - libc6:armhf
           - libcap-dev
           - libcurl-ocaml-dev
           - libdbus-1-dev
@@ -117,10 +116,7 @@
           - libgmp3-dev
           - libgstreamer1.0-0
           - libhdf5-dev
-          - libisl23:armhf
           - liblapack-dev
-          - libmpc3:armhf
-          - libmpfr6:armhf
           - libncursesw5-dev
           - libnetfilter-queue-dev
           - libopenblas-dev
@@ -135,7 +131,6 @@
           - libsqlite3-dev
           - libssl-dev
           - libssl-ocaml-dev
-          - libstdc++6:armhf
           - libswscale5
           - libtiff6
           - libtool
@@ -173,7 +168,8 @@
           - wl
           - xxd
           - zlib1g-dev
-          - zram-tools
+  environment:
+    ARCHFLAGS: "-arch aarch64"
     
   tasks:
     # First we install packages
@@ -295,22 +291,9 @@
         state: absent
         path: /usr/local/src/hcxtools
 
-    # Install nexmon to fix wireless scanning (takes 2.5G of space)
-    - name: symlink 1
-      file:
-        src: "/usr/lib/arm-linux-gnueabihf/libisl.so.23.2.0"
-        dest: "/usr/lib/arm-linux-gnueabihf/libisl.so.10"
-        state: link
-
-    - name: symlink 2
-      file:
-        src: "/usr/lib/arm-linux-gnueabihf/libmpfr.so.6.2.0"
-        dest: "/usr/lib/arm-linux-gnueabihf/libmpfr.so.4"
-        state: link
-
     - name: clone nexmon repository
       git:
-        repo: https://github.com/seemoo-lab/nexmon.git
+        repo: https://github.com/DrSchottky/nexmon.git
         dest: /usr/local/src/nexmon
 
     # FIRST WE BUILD DRIVER FOR RPi5
@@ -363,7 +346,7 @@
 
     - name: clone nexmon repository
       git:
-        repo: https://github.com/seemoo-lab/nexmon.git
+        repo: https://github.com/DrSchottky/nexmon.git
         dest: /usr/local/src/nexmon
 
     - name: make firmware, RPi4

pwnagotchi/_version.py

@@ -1 +1 @@
-__version__ = '2.8.1'
+__version__ = '2.8.3'

pwnagotchi/defaults.toml

@@ -156,6 +156,8 @@ personality.bond_encounters_factor = 20000
 personality.throttle_a = 0.4
 personality.throttle_d = 0.9
 
+personality.clear_on_exit = true # clear display when shutting down cleanly
+
 ui.fps = 0.0
 ui.font.name = "DejaVuSansMono" # for japanese: fonts-japanese-gothic
 ui.font.size_offset = 0 # will be added to the font size

pwnagotchi/ui/hw/waveshare3in52.py

@@ -9,36 +9,39 @@ class Waveshare3in52(DisplayImpl):
         super(Waveshare3in52, self).__init__(config, 'waveshare3in52')
 
     def layout(self):
-        fonts.setup(10, 8, 10, 18, 25, 9)
-        self._layout['width'] = 240
-        self._layout['height'] = 360
-        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, 240, 12]
-        self._layout['line2'] = [0, 116, 240, 116]
-        self._layout['friend_face'] = (12, 88)
-        self._layout['friend_name'] = (1, 103)
-        self._layout['shakes'] = (26, 117)
-        self._layout['mode'] = (0, 117)
+        fonts.setup(16, 14, 16, 100, 31, 15)
+        self._layout['width'] = 360
+        self._layout['height'] = 240
+        self._layout['face'] = (0, 40)
+        self._layout['name'] = (0, 0)
+        self._layout['channel'] = (300, 0)
+        self._layout['aps'] = (0, 220)
+        self._layout['uptime'] = (120, 0)
+        self._layout['line1'] = [0, 24, 360, 24]
+        self._layout['line2'] = [0, 220, 360, 220]
+        self._layout['friend_face'] = (0, 195)
+        self._layout['friend_name'] = (0, 185)
+        self._layout['shakes'] = (100, 220)
+        self._layout['mode'] = (0,200)
         self._layout['status'] = {
-            'pos': (65, 26),
+            'pos': (3, 170),
             'font': fonts.status_font(fonts.Small),
-            'max': 12
+            'max': 100
         }
         return self._layout
 
     def initialize(self):
-        logging.info("initializing waveshare 3.52 inch lcd display")
+        logging.info("initializing waveshare 3.52 inch  display")
         from pwnagotchi.ui.hw.libs.waveshare.v3in52.epd3in52 import EPD
         self._display = EPD()
         self._display.init()
         self._display.Clear()
 
     def render(self, canvas):
-        self._display.display(canvas)
+        buf = self._display.getbuffer(canvas)
+        self._display.display(buf)
+        self._display.refresh()
+
 
     def clear(self):
         self._display.Clear()