update Makefile

Revert "update Makefile"
This reverts commit 9a40567d
2025-07-01 18:37:27 -04:00 · 2024-02-08 21:40:28 +01:00 · 2024-02-08 20:18:58 +01:00 · 2024-02-08 20:07:20 +01:00 · 2024-02-08 20:06:33 +01:00 · 2024-02-08 07:53:53 +01:00
19 changed files with 317 additions and 134 deletions
--- a/.github/workflows/publish.yml
+++ b/.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
--- a/.idea/misc.xml
+++ b/.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>
--- a/.idea/pwnagotchi.iml
+++ b/.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">
--- a/4
+++ b/4
@ -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 -f $(PACKER)
+	- rm -rf dist pwnagotchi.egg-info
+	- rm -f $(PACKER)
--- a/README.md
+++ b/README.md
@ -1,8 +1,9 @@
 # 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.

--- a/apt_packages.txt
+++ b/apt_packages.txt
@ -1 +0,0 @@
-hcxtools
--- a/bin/pwnagotchi
+++ b/bin/pwnagotchi
@ -60,6 +60,7 @@ def pwnagotchi_cli():
                channels = agent.get_access_points_by_channel()
                # for each channel
                for ch, aps in channels:
+                    time.sleep(0.2)  # This is to make sure it doesn't error (https://github.com/seemoo-lab/nexmon/issues/596)
                    agent.set_channel(ch)

                    if not agent.is_stale() and agent.any_activity():
--- a/builder/data/etc/update-motd.d/01-motd
+++ b/builder/data/etc/update-motd.d/01-motd
@ -30,4 +30,4 @@ echo
 echo "    You can restart me using"
 echo "    pwnkill"
 echo
-echo "    You can learn more about me at https://pwnagotchi.ai/"
+echo "    You can learn more about me at https://pwnagotchi.org/"
--- a/builder/data/usr/bin/bettercap-launcher
+++ b/builder/data/usr/bin/bettercap-launcher
@ -9,15 +9,6 @@ if is_crypted_mode; then
  done
 fi

-# check if wifi driver is bugged
-if ! check_brcm; then
-  if ! reload_brcm; then
-    echo "Could not reload wifi driver. Reboot"
-    reboot
-  fi
-  sleep 10
-fi
-
 # start mon0
 start_monitor_interface

--- a/builder/data/usr/bin/pwnlib
+++ b/builder/data/usr/bin/pwnlib
@ -13,14 +13,6 @@ blink_led() {
  sleep 0.3
 }

-# check if brcm is stuck
-check_brcm() {
-  if [[ "$(journalctl -n10 -k --since -5m | grep -c 'brcmf_cfg80211_nexmon_set_channel.*Set Channel failed')" -ge 5 ]]; then
-    return 1
-  fi
-  return 0
-}
-
 # reload mod
 reload_brcm() {
  if ! modprobe -r brcmfmac; then
--- a/builder/pwnagotchi.json.pkr.hcl
+++ b/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,6 +74,10 @@ build {
    inline = ["chmod +x /usr/bin/*"]
  }

+  provisioner "shell" {
+    inline = ["dpkg --add-architecture armhf"]
+  }
+
  provisioner "file" {
    destination = "/etc/systemd/system/"
    sources     = [
@ -82,7 +86,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"
--- a/builder/raspberrypi64.yml
+++ b/builder/raspberrypi64.yml
@ -6,8 +6,8 @@
  vars:
    kernel:
      min: "6.1"
-      full: "6.1.0-rpi7-rpi-v8"
-      full_pi5: "6.1.0-rpi7-rpi-2712"
+      full: "6.1.0-rpi8-rpi-v8"
+      full_pi5: "6.1.0-rpi8-rpi-2712"
    pwnagotchi:
      hostname: "{{ lookup('env', 'PWN_HOSTNAME') | default('pwnagotchi', true) }}"
      version: "{{ lookup('env', 'PWN_VERSION') | default('pwnagotchi-torch', true) }}"
@ -79,6 +79,11 @@
          - curl
          - dkms
          - fbi
+          - firmware-atheros
+          - firmware-brcm80211
+          - firmware-libertas
+          - firmware-misc-nonfree
+          - firmware-realtek
          - flex
          - fonts-dejavu
          - fonts-dejavu-core
@ -97,9 +102,9 @@
          - libbz2-dev
          - libc-ares-dev
          - libc6-dev
+          - libc6:armhf
          - libcap-dev
          - libcurl-ocaml-dev
-          - libssl-ocaml-dev
          - libdbus-1-dev
          - libdbus-glib-1-dev
          - libeigen3-dev
@ -112,7 +117,10 @@
          - libgmp3-dev
          - libgstreamer1.0-0
          - libhdf5-dev
+          - libisl23:armhf
          - liblapack-dev
+          - libmpc3:armhf
+          - libmpfr6:armhf
          - libncursesw5-dev
          - libnetfilter-queue-dev
          - libopenblas-dev
@ -126,34 +134,31 @@
          - libraspberrypi0
          - libsqlite3-dev
          - libssl-dev
+          - libssl-ocaml-dev
+          - libstdc++6:armhf
          - libswscale5
          - libtiff6
          - libtool
          - libusb-1.0-0-dev
          - lsof
          - make
-          - python3-yaml
          - python3-dbus
          - python3-flask
          - python3-flask-cors
          - python3-flaskext.wtf
          - python3-gast
          - python3-pil
+          - python3-pip
          - python3-pycryptodome
          - python3-requests
          - python3-scapy
+          - python3-setuptools
+          - python3-smbus
          - python3-smbus2
          - python3-spidev
          - python3-tweepy
          - python3-werkzeug
-          - firmware-atheros
-          - firmware-brcm80211
-          - firmware-libertas
-          - firmware-misc-nonfree
-          - firmware-realtek
-          - python3-pip
-          - python3-setuptools
-          - python3-smbus
+          - python3-yaml
          - qpdf
          - raspberrypi-kernel-headers
          - rsync
@ -169,7 +174,10 @@
          - xxd
          - zlib1g-dev
          - zram-tools
-
+  environment:
+    ARCHFLAGS: "-arch aarch64"
+    QEMU_UNAME: "{{ kernel.full }}"
+    
  tasks:
    # First we install packages
    - name: install packages
@ -291,9 +299,21 @@
        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/DrSchottky/nexmon.git
+        repo: https://github.com/seemoo-lab/nexmon.git
        dest: /usr/local/src/nexmon

    # FIRST WE BUILD DRIVER FOR RPi5
@ -346,7 +366,7 @@

    - name: clone nexmon repository
      git:
-        repo: https://github.com/DrSchottky/nexmon.git
+        repo: https://github.com/seemoo-lab/nexmon.git
        dest: /usr/local/src/nexmon

    - name: make firmware, RPi4
--- a/pwnagotchi/_version.py
+++ b/pwnagotchi/_version.py
@ -1 +1 @@
-__version__ = '2.8.0'
+__version__ = '2.8.2'
--- a/pwnagotchi/agent.py
+++ b/pwnagotchi/agent.py
@ -21,11 +21,12 @@ RECOVERY_DATA_FILE = '/root/.pwnagotchi-recovery'

 class Agent(Client, Automata, AsyncAdvertiser, AsyncTrainer):
    def __init__(self, view, config, keypair):
-        Client.__init__(self, config['bettercap']['hostname'],
-                        config['bettercap']['scheme'],
-                        config['bettercap']['port'],
-                        config['bettercap']['username'],
-                        config['bettercap']['password'])
+        Client.__init__(self,
+                        "127.0.0.1" if "hostname" not in config['bettercap'] else config['bettercap']['hostname'],
+                        "http" if "scheme" not in config['bettercap'] else config['bettercap']['scheme'],
+                        8081 if "port" not in config['bettercap'] else config['bettercap']['port'],
+                        "pwnagotchi" if "username" not in config['bettercap'] else config['bettercap']['username'],
+                        "pwnagotchi" if "password" not in config['bettercap'] else config['bettercap']['password'])
        Automata.__init__(self, config, view)
        AsyncAdvertiser.__init__(self, config, view, keypair)
        AsyncTrainer.__init__(self, config)
@ -362,7 +363,8 @@ class Agent(Client, Automata, AsyncAdvertiser, AsyncTrainer):
                    plugins.on('handshake', self, filename, ap_mac, sta_mac)
                else:
                    (ap, sta) = ap_and_station
-                    self._last_pwnd = ap['hostname'] if ap['hostname'] != '' and ap['hostname'] != '<hidden>' else ap_mac
+                    self._last_pwnd = ap['hostname'] if ap['hostname'] != '' and ap[
+                        'hostname'] != '<hidden>' else ap_mac
                    logging.warning(
                        "!!! captured new handshake on channel %d, %d dBm: %s (%s) -> %s [%s (%s)] !!!",
                        ap['channel'], ap['rssi'], sta['mac'], sta['vendor'], ap['hostname'], ap['mac'], ap['vendor'])
--- a/pwnagotchi/defaults.toml
+++ b/pwnagotchi/defaults.toml
@ -198,11 +198,6 @@ ui.display.enabled = false
 ui.display.rotation = 180
 ui.display.type = "waveshare_4"

-bettercap.scheme = "http"
-bettercap.hostname = "localhost"
-bettercap.port = 8081
-bettercap.username = "pwnagotchi"
-bettercap.password = "pwnagotchi"
 bettercap.handshakes = "/root/handshakes"
 bettercap.silence = [
    "ble.device.new",
--- a/pwnagotchi/plugins/default/fix_services.py
+++ b/pwnagotchi/plugins/default/fix_services.py
@ -27,10 +27,9 @@ class FixServices(plugins.Plugin):

    def __init__(self):
        self.options = dict()
-        self.pattern = re.compile(r'brcmf_cfg80211_nexmon_set_channel.*?Set Channel failed')
-        self.pattern2 = re.compile(r'wifi error while hopping to channel')
-        self.pattern3 = re.compile(r'Firmware has halted or crashed')
-        self.pattern4 = re.compile(r'error 400: could not find interface wlan0mon')
+        self.pattern1 = re.compile(r'wifi error while hopping to channel')
+        self.pattern2 = re.compile(r'Firmware has halted or crashed')
+        self.pattern3 = re.compile(r'error 400: could not find interface wlan0mon')
        self.isReloadingMon = False
        self.connection = None
        self.LASTTRY = 0
@ -46,23 +45,11 @@ class FixServices(plugins.Plugin):
        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))
+            logging.debug("[Fix_Services ip link show wlan0mon]: %s" % repr(cmd_output))
            if ",UP," in str(cmd_output):
                logging.info("wlan0mon is up.")

-            if len(self.pattern.findall(last_lines)) >= 3:
-                if hasattr(agent, 'view'):
-                    display = agent.view()
-                    display.set('status', 'Blind-Bug detected. Restarting.')
-                    display.update(force=True)
-                logging.info('[Fix_Services] Blind-Bug detected. Restarting.')
-                try:
-                    self._tryTurningItOffAndOnAgain(agent)
-                except Exception as err:
-                    logging.warning("[Fix_Services turnOffAndOn] %s" % repr(err))
-
-            else:
-                logging.info("[Fix_Services] Logs look good!")
+            logging.info("[Fix_Services] Logs look good!")

        except Exception as err:
            logging.error("[Fix_Services ip link show wlan0mon]: %s" % repr(err))
@ -121,21 +108,8 @@ class FixServices(plugins.Plugin):
            logging.debug("[Fix_Services]**** checking")

            # Look for pattern 1
-            if len(self.pattern.findall(last_lines)) >= 3:
-                logging.info("[Fix_Services]**** Should trigger a reload of the wlan0mon device:\n%s" % last_lines)
-                if hasattr(agent, 'view'):
-                    display = agent.view()
-                    display.set('status', 'Blind-Bug detected. Restarting.')
-                    display.update(force=True)
-                logging.info('[Fix_Services] Blind-Bug detected. Restarting.')
-                try:
-                    self._tryTurningItOffAndOnAgain(agent)
-                except Exception as err:
-                    logging.warning("[Fix_Services] TTOAOA: %s" % repr(err))
-
-            # Look for pattern 2
-            elif len(self.pattern2.findall(other_last_lines)) >= 5:
-                logging.info("[Fix_Services]**** Should trigger a reload of the wlan0mon device:\n%s" % last_lines)
+            if len(self.pattern1.findall(other_last_lines)) >= 5:
+                logging.debug("[Fix_Services]**** Should trigger a reload of the wlan0mon device:\n%s" % last_lines)
                if hasattr(agent, 'view'):
                    display = agent.view()
                    display.set('status', 'Wifi channel stuck. Restarting recon.')
@ -157,8 +131,8 @@ class FixServices(plugins.Plugin):
                except Exception as err:
                    logging.error("[Fix_Services wifi.recon flip] %s" % repr(err))

-            # Look for pattern 3
-            elif len(self.pattern3.findall(other_last_lines)) >= 1:
+            # Look for pattern 2
+            elif len(self.pattern2.findall(other_last_lines)) >= 1:
                logging.info("[Fix_Services] Firmware has halted or crashed. Restarting wlan0mon.")
                if hasattr(agent, 'view'):
                    display = agent.view()
@ -167,12 +141,12 @@ class FixServices(plugins.Plugin):
                try:
                    # Run the monstart command to restart wlan0mon
                    cmd_output = subprocess.check_output("monstart", shell=True)
-                    logging.info("[Fix_Services monstart]: %s" % repr(cmd_output))
+                    logging.debug("[Fix_Services monstart]: %s" % repr(cmd_output))
                except Exception as err:
                    logging.error("[Fix_Services monstart]: %s" % repr(err))

-            # Look for pattern 4
-            elif len(self.pattern4.findall(other_other_last_lines)) >= 3:
+            # Look for pattern 3
+            elif len(self.pattern3.findall(other_other_last_lines)) >= 3:
                logging.info("[Fix_Services] wlan0 is down!")
                if hasattr(agent, 'view'):
                    display = agent.view()
@ -181,7 +155,7 @@ class FixServices(plugins.Plugin):
                try:
                    # Run the monstart command to restart wlan0mon
                    cmd_output = subprocess.check_output("monstart", shell=True)
-                    logging.info("[Fix_Services monstart]: %s" % repr(cmd_output))
+                    logging.debug("[Fix_Services monstart]: %s" % repr(cmd_output))
                except Exception as err:
                    logging.error("[Fix_Services monstart]: %s" % repr(err))

@ -237,7 +211,7 @@ class FixServices(plugins.Plugin):
            # is it up?
            try:
                cmd_output = subprocess.check_output("ip link show wlan0mon", shell=True)
-                logging.info("[Fix_Services ip link show wlan0mon]: %s" % repr(cmd_output))
+                logging.debug("[Fix_Services ip link show wlan0mon]: %s" % repr(cmd_output))
                if ",UP," in str(cmd_output):
                    logging.info("wlan0mon is up. Skip reset?")
                    # not reliable, so don't skip just yet
@ -309,11 +283,9 @@ class FixServices(plugins.Plugin):
                                    # stop looping and get back to recon
                                    break
                                else:
-                                    logging.info(
-                                        "[Fix_Services set wifi.interfaceface wlan0mon] failed? %s" % repr(result))
+                                    logging.debug("[Fix_Services set wifi.interfaceface wlan0mon] failed? %s" % repr(result))
                            except Exception as err:
-                                logging.info(
-                                    "[Fix_Services set wifi.interface wlan0mon] except: %s" % repr(err))
+                                logging.debug("[Fix_Services set wifi.interface wlan0mon] except: %s" % repr(err))
                        except Exception as cerr:  #
                            if not display:
                                print("failed loading wlan0mon attempt #%s: %s" % (tries, repr(cerr)))
@ -362,7 +334,7 @@ class FixServices(plugins.Plugin):
                                                             "face": faces.HAPPY})
                    else:
                        print("I can see again")
-                    logging.info("[Fix_Services] wifi.recon on")
+                    logging.debug("[Fix_Services] wifi.recon on")
                    self.LASTTRY = time.time() + 120  # 2-minute pause until next time.
                else:
                    logging.error("[Fix_Services] wifi.recon did not start up")
@ -378,7 +350,7 @@ class FixServices(plugins.Plugin):
            try:
                logging.info("[Fix_Services] unloaded")
            except Exception as err:
-                logging.info("[Fix_Services] unload err %s " % repr(err))
+                logging.error("[Fix_Services] unload err %s " % repr(err))
            pass


--- a/pwnagotchi/ui/hw/waveshare3in52.py
+++ b/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()
--- a/pwnagotchi/ui/view.py
+++ b/pwnagotchi/ui/view.py
@ -153,8 +153,7 @@ class View(object):
        self.set('uptime', last_session.duration)
        self.set('channel', '-')
        self.set('aps', "%d" % last_session.associated)
-        self.set('shakes', '%d (%s)' % (last_session.handshakes, \
-                                        utils.total_unique_handshakes(self._config['bettercap']['handshakes'])))
+        self.set('shakes', '%d (%s)' % (last_session.handshakes, utils.total_unique_handshakes(self._config['bettercap']['handshakes'])))
        self.set_closest_peer(last_session.last_peer, last_session.peers)
        self.update()

--- a/setup.py
+++ b/setup.py
@ -30,13 +30,6 @@ def install_file(source_filename, dest_filename):


 def install_system_files():
-    f = open("apt_packages.txt", "r")
-    for x in f:
-        if x == "":
-            continue
-        os.system(f"apt-get install {x}")
-    f.close()
-
    setup_path = os.path.dirname(__file__)
    data_path = os.path.join(setup_path, "builder/data")
Author	SHA1	Message	Date
Jeroen Oudshoorn	107d366c82	update Makefile	2024-02-08 21:40:28 +01:00
Jeroen Oudshoorn	488968ba7f	Revert "update Makefile" This reverts commit `9a40567d`	2024-02-08 20:18:58 +01:00
Jayofelony	0dd8f72c95	Merge pull request #58 from jayofelony/dev dev	2024-02-08 20:07:20 +01:00
Jeroen Oudshoorn	0e274af5a0	Revert "Testing pcapng fileformat" This reverts commit `7040be2d30`.	2024-02-08 20:06:33 +01:00
Jayofelony	8627c8800d	Merge pull request #57 from jayofelony/dev Dev	2024-02-08 07:53:53 +01:00
Jayofelony	53ed6f61c6	Merge branch 'master' into dev Signed-off-by: Jayofelony <oudshoorn.jeroen@gmail.com>	2024-02-08 07:53:45 +01:00
Jeroen Oudshoorn	835523241b	update build	2024-02-08 07:51:19 +01:00
Jeroen Oudshoorn	9a40567daa	update Makefile	2024-02-06 22:12:05 +01:00
Jayofelony	eab331686d	Merge pull request #54 from crs-k/dev Add PiShrink step to the workflow (#1)	2024-02-06 22:10:12 +01:00
Chris Kerins	e1d8001fb4	Add PiShrink step to the workflow (#1 ) * Add PiShrink step to the workflow * Add environment variables for Raspberry Pi 64-bit builder * Update Makefile command to include debug information * Add source distribution target to Makefile * Remove unnecessary provisioner command * Add armhf architecture support * Remove armhf architecture provisioning * Refactor Makefile to remove unnecessary files * Update Makefile command in publish.yml * Update pwngrid URL in raspberrypi64.yml * Add permissions to publish workflow * Remove unnecessary permissions in publish.yml	2024-02-06 12:53:45 -05:00
Jeroen Oudshoorn	3cc172a526	update Makefile	2024-02-06 09:06:54 +01:00
Jeroen Oudshoorn	41afe302d9	update Makefile	2024-02-06 09:05:42 +01:00
Jeroen Oudshoorn	5bcca7e89b	update README.md	2024-02-06 08:52:16 +01:00
Jeroen Oudshoorn	4a12436942	add architecture armhf	2024-02-06 08:41:28 +01:00
Jayofelony	d8b6363d37	Merge pull request #51 Waveshare 3.52 in e-ink update	2024-02-06 08:36:21 +01:00
Chris Kerins	b3d8a44208	Update waveshare3in52.py Signed-off-by: Chris Kerins <clkerins@gmail.com>	2024-02-05 20:14:18 -05:00
ck	3fb91498cd	Enable Makefile execution and remove disk image creation	2024-02-05 17:52:51 -05:00
ck	7587f38c28	Update disk.img path in publish.yml	2024-02-05 17:46:20 -05:00
ck	d7fefa78f0	Commented out make step and added code to create .img file	2024-02-05 17:40:38 -05:00
ck	1ef3a88679	Update distDir path in publish.yml	2024-02-05 17:34:23 -05:00
Jeroen Oudshoorn	291ef39563	Update README.md to show support for Pi 5	2024-02-05 22:10:53 +01:00
Jeroen Oudshoorn	16d80a09e6	Update README.md to show support for Pi 5	2024-02-05 22:10:34 +01:00
ck	4ffad03c91	Update distDir path in publish.yml	2024-02-05 15:44:50 -05:00
ck	0638832532	Update mountpoint for boot partition	2024-02-05 13:42:59 -05:00
ck	f895b06978	Update qemu binary paths for arm64	2024-02-05 13:19:56 -05:00
ck	f410feb2bb	Add check for qemu-aarch64 in binfmt_misc	2024-02-05 13:09:36 -05:00
ck	1ffe6c4e3d	Remove Makefile2 and update build process	2024-02-05 12:34:34 -05:00
ck	dfbfd7f891	Update pwngrid to version 1.11.1	2024-02-05 12:34:09 -05:00
ck	a50695aef2	Update publish workflow and add Makefile2	2024-02-05 12:18:04 -05:00
ck	829a6962d6	Update binfmt-support and add checks for qemu-user-static package, binfmt-support service, and binfmt_misc filesystem	2024-02-05 12:17:41 -05:00
ck	ce1315b85f	Add binfmt_misc registration for qemu-aarch64	2024-02-05 12:08:07 -05:00
ck	6a2703cc27	Update QEMU in publish.yml	2024-02-05 11:34:03 -05:00
ck	502e856934	Update QEMU and restart binfmt-support	2024-02-05 11:22:39 -05:00
Jeroen Oudshoorn	dffcbbf447	Revert "Revert "Testing pcapng fileformat"" This reverts commit `d142840307`.	2024-02-05 17:16:13 +01:00
ck	333804c3bb	Remove unnecessary build configuration for Raspberry Pi 32 Pwnagotchi	2024-02-05 11:10:29 -05:00
ck	50b1ceed81	Remove unnecessary file from pwnagotchi build process	2024-02-05 11:01:49 -05:00
ck	877b9fbba3	Update Makefile and builder/pwnagotchi.json.pkr.hcl	2024-02-05 10:57:33 -05:00
ck	8724ca546d	Update packer builder-arm source URL	2024-02-05 10:51:18 -05:00
Chris Kerins	961d3a536a	Merge pull request #2 from crs-k/waveshare-352-support Waveshare 352 support	2024-02-05 10:38:39 -05:00
ck	c882d0b67a	Update arm plugin source in pwnagotchi.json.pkr.hcl	2024-02-05 10:29:01 -05:00
ck	12fd081ae0	Update required_plugins in pwnagotchi.json.pkr.hcl	2024-02-05 10:09:57 -05:00
ck	e1be0f7674	Remove unnecessary clean-up step in Makefile	2024-02-05 10:01:12 -05:00
Chris Kerins	396b30f780	Merge pull request #1 from crs-k:waveshare-352-support Add publish workflow and update display layout	2024-02-05 09:31:24 -05:00
ck	e7d8d632a0	Add publish workflow and update display layout	2024-02-05 09:30:49 -05:00
Jeroen Oudshoorn	5a6ec7b4b8	Next version will be 2.8.2	2024-02-04 18:28:09 +01:00
Jayofelony	92cd5d3fdb	Merge pull request #47 from jayofelony/dev removed blind bug check from fix_services.py	2024-02-04 18:09:33 +01:00
Jeroen Oudshoorn	99caa7a973	removed blind bug check from fix_services.py	2024-02-04 18:08:31 +01:00
Jayofelony	a94e7eef02	Merge pull request #46 from jayofelony/dev Dev to master	2024-02-04 18:04:44 +01:00
Jeroen Oudshoorn	1cefae55d1	moved the majority of logging to debug	2024-02-04 17:48:22 +01:00
Jeroen Oudshoorn	c5ee1df855	unused function	2024-02-04 17:44:05 +01:00
Jeroen Oudshoorn	d142840307	Revert "Testing pcapng fileformat" This reverts commit `7040be2d30`.	2024-02-04 17:42:56 +01:00
Jeroen Oudshoorn	e558146e28	moves the majority of logging to debug	2024-02-04 17:42:40 +01:00
Jeroen Oudshoorn	11a3330153	small fix	2024-02-04 17:42:22 +01:00
Jeroen Oudshoorn	53b2dd8628	update build for latest kernel	2024-02-04 17:42:10 +01:00
Jeroen Oudshoorn	6381f9443b	remove blind bug, as its not a blind bug anymore.	2024-02-04 17:41:57 +01:00
Jeroen Oudshoorn	fa7e87b974	remove blind bug, as its not a blind bug anymore. delayed hopping channels by .2 seconds to give firmware time to get ready for hopping.	2024-02-04 17:41:41 +01:00
Jayofelony	cca2ff2da4	Merge pull request #45 from wpa-2/patch-1 MOTD updated	2024-02-03 17:09:03 +01:00
wpa-2	78415b3137	Update 01-motd Maybe a good idea to point people to the new wiki instead. Signed-off-by: wpa-2 <9049886+wpa-2@users.noreply.github.com>	2024-02-03 15:13:44 +00:00
Jeroen Oudshoorn	34284aa1bc	Change to seemoo-lab nexmon	2024-02-01 13:50:51 +01:00
Jeroen Oudshoorn	56ebb60662	Change to seemoo-lab nexmon	2024-02-01 13:26:20 +01:00
Jeroen Oudshoorn	84f6624844	Change to seemoo-lab nexmon	2024-02-01 13:04:06 +01:00
Jeroen Oudshoorn	3bcbb0ce9a	Version 2.8.1	2024-01-29 22:52:16 +01:00
Jeroen Oudshoorn	e01e457992	Remove bettercap client settings, so you cannot mess it up.	2024-01-29 22:24:20 +01:00
Jeroen Oudshoorn	86991304a5	Merge remote-tracking branch 'origin/dev' into dev	2024-01-28 22:12:20 +01:00
Jeroen Oudshoorn	4f62759d6d	Revert grid name	2024-01-28 22:12:06 +01:00
Jeroen Oudshoorn	7b7ba02aad	Changed setup.py	2024-01-28 22:12:06 +01:00
Jeroen Oudshoorn	7040be2d30	Testing pcapng fileformat	2024-01-28 22:12:05 +01:00
Jeroen Oudshoorn	d0617ccfaf	Revert grid name	2024-01-28 22:08:17 +01:00
Jeroen Oudshoorn	a0b5078b64	Changed setup.py	2024-01-28 22:05:14 +01:00
Jeroen Oudshoorn	54c1ffd63c	Updated wiglewifi version to 1.6	2024-01-28 22:02:57 +01:00