From 6d2af3720335c3f3ca4a56672150e48aa20c58f8 Mon Sep 17 00:00:00 2001
From: sp3nx0r <sp3nx0r@gmail.com>
Date: Wed, 2 Oct 2019 14:05:22 -0500
Subject: [PATCH 01/32] fixing getopts, adding host specific files to backup,
refactoring
---
scripts/update_pwnagotchi.sh | 58 +++++++++++++++++++++---------------
1 file changed, 34 insertions(+), 24 deletions(-)
diff --git a/scripts/update_pwnagotchi.sh b/scripts/update_pwnagotchi.sh
index 0039e7b..f68d925 100644
--- a/scripts/update_pwnagotchi.sh
+++ b/scripts/update_pwnagotchi.sh
@@ -13,13 +13,14 @@ function usage() {
cat <<EOF
usage: $0 [OPTIONS]
-
+ Note: This should be run from the pwnagotchi itself!
+
Options:
-v # Version to update to, can be a branch or commit. (default: master)
-u # Url to clone from. (default: https://github.com/evilsocket/pwnagotchi)
-m # Mode to restart to. (Supported: ${SUPPORTED_RESTART_MODES[*]}; default: auto)
- -b # Backup the current pwnagotchi config.
- -r # Restore the current pwnagotchi config. (-b will be enabled.)
+ -b # Backup the current pwnagotchi config, then overwrite with defaults.
+ -r # Restore the current pwnagotchi config after upgrade. (-b will be enabled.)
-h # Shows this help.
EOF
@@ -36,16 +37,11 @@ function test_root() {
function test_github() {
wget -q --spider $GIT_URL
if [ $? -ne 0 ]; then
- echo "[!] Cannot reach github. This script requires internet access, ensure connection sharing is working."
+ echo "[!] Cannot reach github. This script requires internet access and DNS resolution, ensure connection sharing is working and valid DNS server in /etc/resolv.conf."
exit 2
fi
}
-
-echo "[+] Checking prerequisites."
-test_root
-test_github
-
-while getopts ":v:u:m:b:r:h" o; do
+while getopts "v:u:m:brh" o; do
case "${o}" in
v)
VERSION="${OPTARG}"
@@ -53,22 +49,22 @@ while getopts ":v:u:m:b:r:h" o; do
u)
GIT_URL="${OPTARG}"
;;
+ b)
+ BACKUPCONFIG=1
+ ;;
+ r)
+ BACKUPCONFIG=1
+ RESTORECONFIG=1
+ ;;
+ h)
+ usage
+ ;;
m)
if [[ "${SUPPORTED_RESTART_MODES[*]}" =~ ${OPTARG} ]]; then
MODE="${OPTARG}"
else
usage
- fi
- ;;
- b)
- BACKUPCONFIG=1
- ;;
- r)
- BACKUPCONFIG=1
- RESTORECONFIG=1
- ;;
- h)
- usage
+ fi
;;
*)
usage
@@ -77,29 +73,43 @@ while getopts ":v:u:m:b:r:h" o; do
done
shift $((OPTIND-1))
+echo "[+] Checking prerequisites."
+test_root
+test_github
+
# clean up old files, clone master, set checkout to commit if needed.
echo "[+] Cloning to $GIT_FOLDER..."
-rm $GIT_FOLDER -rf
+#rm $GIT_FOLDER -rf
git clone $GIT_URL $GIT_FOLDER -q
cd $GIT_FOLDER
if [ $VERSION != "master" ]; then
git checkout $VERSION -q
fi
-echo "[+] Installing $(git log -1 --format="%h")"
echo "[+] Updating..."
if [ $BACKUPCONFIG -eq 1 ]; then
echo "[+] Creating backup of config.yml"
mv /root/pwnagotchi/config.yml /root/config.yml.bak -f
+ echo "[+] Creating backup of host files"
+ mv /etc/hosts /etc/hosts.bak -f
+ mv /etc/hostname /etc/hostname.bak -f
+ mv /etc/motd /etc/motd.bak -f
fi
+
+echo "[+] Installing $(git log -1 --format="%h")"
rm /root/pwnagotchi -rf # ensures old files are removed
rsync -aPq $GIT_FOLDER/sdcard/boot/* /boot/
rsync -aPq $GIT_FOLDER/sdcard/rootfs/* /
cd /tmp
rm $GIT_FOLDER -rf
+
if [ $RESTORECONFIG -eq 1 ]; then
echo "[+] Restoring backup of config.yml"
mv /root/config.yml.bak /root/pwnagotchi/config.yml -f
+ echo "[+] Restoring backup of host files"
+ mv /etc/hosts.bak /etc/hosts -f
+ mv /etc/hostname.bak /etc/hostname -f
+ mv /etc/motd.bak /etc/motd -f
fi
echo "[+] Restarting pwnagotchi in $MODE mode. $( screen -X -S pwnagotchi quit)"
@@ -108,4 +118,4 @@ if [ $MODE == "auto" ]; then
elif [ $MODE == "manual" ]; then
sudo -H -u root /usr/bin/screen -dmS pwnagotchi -c /root/pwnagotchi/data/screenrc.manual
fi
-echo "[+] Finished"
\ No newline at end of file
+echo "[+] Finished"
From 66ef818ec858be8e33e591c2c808c28c6fef9dc0 Mon Sep 17 00:00:00 2001
From: sp3nx0r <sp3nx0r@gmail.com>
Date: Wed, 2 Oct 2019 16:11:51 -0500
Subject: [PATCH 02/32] fixing perms on script and uncommenting line from
debugging
---
scripts/update_pwnagotchi.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
mode change 100644 => 100755 scripts/update_pwnagotchi.sh
diff --git a/scripts/update_pwnagotchi.sh b/scripts/update_pwnagotchi.sh
old mode 100644
new mode 100755
index f68d925..eaca8a5
--- a/scripts/update_pwnagotchi.sh
+++ b/scripts/update_pwnagotchi.sh
@@ -79,7 +79,7 @@ test_github
# clean up old files, clone master, set checkout to commit if needed.
echo "[+] Cloning to $GIT_FOLDER..."
-#rm $GIT_FOLDER -rf
+rm $GIT_FOLDER -rf
git clone $GIT_URL $GIT_FOLDER -q
cd $GIT_FOLDER
if [ $VERSION != "master" ]; then
From 690f59a846a7e38a20a093106f501deeb7c7d854 Mon Sep 17 00:00:00 2001
From: sp3nx0r <sp3nx0r@gmail.com>
Date: Wed, 2 Oct 2019 16:16:43 -0500
Subject: [PATCH 03/32] adding /etc/network/interfaces from PR#71
---
scripts/update_pwnagotchi.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts/update_pwnagotchi.sh b/scripts/update_pwnagotchi.sh
index eaca8a5..b7bce08 100755
--- a/scripts/update_pwnagotchi.sh
+++ b/scripts/update_pwnagotchi.sh
@@ -94,6 +94,7 @@ if [ $BACKUPCONFIG -eq 1 ]; then
mv /etc/hosts /etc/hosts.bak -f
mv /etc/hostname /etc/hostname.bak -f
mv /etc/motd /etc/motd.bak -f
+ mv /etc/network/interfaces /etc/network/interfaces.bak -f
fi
echo "[+] Installing $(git log -1 --format="%h")"
@@ -110,6 +111,7 @@ if [ $RESTORECONFIG -eq 1 ]; then
mv /etc/hosts.bak /etc/hosts -f
mv /etc/hostname.bak /etc/hostname -f
mv /etc/motd.bak /etc/motd -f
+ mv /etc/network/interfaces.bak /etc/network/interfaces -f
fi
echo "[+] Restarting pwnagotchi in $MODE mode. $( screen -X -S pwnagotchi quit)"
From 540eb69eada91cdb18ca54c7e2af333b2a345c67 Mon Sep 17 00:00:00 2001
From: sp3nx0r <sp3nx0r@gmail.com>
Date: Thu, 3 Oct 2019 06:49:18 -0500
Subject: [PATCH 04/32] resolve conflict, adjust getopts args, add /etc/motd to
backup
---
scripts/update_pwnagotchi.sh | 42 +++++++++++++++++-------------------
1 file changed, 20 insertions(+), 22 deletions(-)
diff --git a/scripts/update_pwnagotchi.sh b/scripts/update_pwnagotchi.sh
index b7bce08..734ed4c 100755
--- a/scripts/update_pwnagotchi.sh
+++ b/scripts/update_pwnagotchi.sh
@@ -19,8 +19,8 @@ function usage() {
-v # Version to update to, can be a branch or commit. (default: master)
-u # Url to clone from. (default: https://github.com/evilsocket/pwnagotchi)
-m # Mode to restart to. (Supported: ${SUPPORTED_RESTART_MODES[*]}; default: auto)
- -b # Backup the current pwnagotchi config, then overwrite with defaults.
- -r # Restore the current pwnagotchi config after upgrade. (-b will be enabled.)
+ -b # Backup the current pwnagotchi config and hostname references, then overwrite with defaults.
+ -r # Restore the current pwnagotchi config and hostname references after upgrade. (-b will be enabled.)
-h # Shows this help.
EOF
@@ -37,10 +37,11 @@ function test_root() {
function test_github() {
wget -q --spider $GIT_URL
if [ $? -ne 0 ]; then
- echo "[!] Cannot reach github. This script requires internet access and DNS resolution, ensure connection sharing is working and valid DNS server in /etc/resolv.conf."
+ echo "[!] Cannot reach github. This script requires internet access, ensure connection sharing is working."
exit 2
fi
}
+
while getopts "v:u:m:brh" o; do
case "${o}" in
v)
@@ -49,6 +50,13 @@ while getopts "v:u:m:brh" o; do
u)
GIT_URL="${OPTARG}"
;;
+ m)
+ if [[ "${SUPPORTED_RESTART_MODES[*]}" =~ ${OPTARG} ]]; then
+ MODE="${OPTARG}"
+ else
+ usage
+ fi
+ ;;
b)
BACKUPCONFIG=1
;;
@@ -59,13 +67,6 @@ while getopts "v:u:m:brh" o; do
h)
usage
;;
- m)
- if [[ "${SUPPORTED_RESTART_MODES[*]}" =~ ${OPTARG} ]]; then
- MODE="${OPTARG}"
- else
- usage
- fi
- ;;
*)
usage
;;
@@ -86,15 +87,13 @@ if [ $VERSION != "master" ]; then
git checkout $VERSION -q
fi
-echo "[+] Updating..."
if [ $BACKUPCONFIG -eq 1 ]; then
- echo "[+] Creating backup of config.yml"
- mv /root/pwnagotchi/config.yml /root/config.yml.bak -f
- echo "[+] Creating backup of host files"
- mv /etc/hosts /etc/hosts.bak -f
- mv /etc/hostname /etc/hostname.bak -f
+ echo "[+] Creating backup of config.yml and hostname references"
+ mv /root/pwnagotchi/config.yml /root/config.bak -f
+ mv /etc/hosts /root/hosts.bak -f
+ mv /etc/hostname /root/hostname.bak -f
mv /etc/motd /etc/motd.bak -f
- mv /etc/network/interfaces /etc/network/interfaces.bak -f
+ mv /etc/network/interfaces /root/interfaces.bak -f
fi
echo "[+] Installing $(git log -1 --format="%h")"
@@ -105,13 +104,12 @@ cd /tmp
rm $GIT_FOLDER -rf
if [ $RESTORECONFIG -eq 1 ]; then
- echo "[+] Restoring backup of config.yml"
+ echo "[+] Restoring backup of config.yml and hostname references"
mv /root/config.yml.bak /root/pwnagotchi/config.yml -f
- echo "[+] Restoring backup of host files"
- mv /etc/hosts.bak /etc/hosts -f
- mv /etc/hostname.bak /etc/hostname -f
+ mv /root/hosts.bak /etc/hosts -f
+ mv /root/hostname.bak /etc/hostname -f
+ mv /root/interfaces.bak /etc/network/interfaces -f
mv /etc/motd.bak /etc/motd -f
- mv /etc/network/interfaces.bak /etc/network/interfaces -f
fi
echo "[+] Restarting pwnagotchi in $MODE mode. $( screen -X -S pwnagotchi quit)"
From af42ac615ec009bd870eb63225c11c97c960f5a0 Mon Sep 17 00:00:00 2001
From: Alex Muthmann <deveth0@users.noreply.github.com>
Date: Thu, 3 Oct 2019 14:18:51 +0200
Subject: [PATCH 05/32] Describe issue with rebooting after changing the
display
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 30ec48b..5fcd98b 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ The supported models are:
The only kind of displays supported are the ones listed above, but we are always happy to receive pull requests supporting new displays.
-You need to configure the display type in `config.yml` where you can find `ui.display.type`.
+You need to configure the display type in `config.yml` where you can find `ui.display.type`. If your display does not work after changing this setting, you might need to complete remove power from the Raspberry and make a clean boot.
One thing to note, not all displays are created equaly, TFT displays for example work similar to an HDMI display, and they are not supported, currently all the displays supported are I2C displays.
From d78a5aecba3beb705d53e635ce836d73dcc35f48 Mon Sep 17 00:00:00 2001
From: Cassiano Aquino <caquino@users.noreply.github.com>
Date: Thu, 3 Oct 2019 13:24:48 +0100
Subject: [PATCH 06/32] Removed tagging from travis-ci
As we are adding tags on the repository itself, it's not required to add tags via travis-ci.
This makes our build process fail.
---
.travis.yml | 7 -------
1 file changed, 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 6a7249e..a621a43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,10 +43,3 @@ script:
- sudo make clean
- sudo -E env "PATH=$PATH" make install
- sudo make image -e PWN_HOSTNAME=pwnagotchi VERSION=$TRAVIS_TAG
-
-before_deploy:
- # Set up git user name and tag this commit
- - git config --local user.name "evilsocket"
- - git config --local user.email "evilsocket@gmail.com"
- - export TRAVIS_TAG=${TRAVIS_TAG:-$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)}
- - git tag $TRAVIS_TAG
From 024bd8c6dc2c2bfd70ea036a1cc3a7051f34944d Mon Sep 17 00:00:00 2001
From: Simone Margaritelli <evilsocket@gmail.com>
Date: Thu, 3 Oct 2019 14:30:06 +0200
Subject: [PATCH 07/32] integration travis-ci with slack
---
.travis.yml | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 6a7249e..7caf1de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,52 +1,46 @@
dist: bionic
language: go
-
go:
- 1.x
-
env:
global:
- LANG=C
- LC_ALL=C
-
deploy:
provider: releases
api_key:
- secure: "vBUokTv94n8s65STUgTiD6I0Iy8KXbBRvQUrAof8XG+U4ZMsH5PmDTpS+wz+SaxI6o0PRkfyOiPVdARhiKAFnfatG3q9EHllMQwqRR2YIju51A3aCxgEJ5uWDoybwQdipERUMMYwUO/8XZaRRpwFD2bdQBFWkBtQyMcAkrEL8BXckwQQ531oDN2hK5gAiTllqsOswV2idwUlBRU9jOtStzff+UgUYsp/ZebsRodyOYkEB2Ev15yARo2HTXbyZ2icwHPtMbx5zmNUSRtxs9a4hfzaK3m6ctK8qLYYUdQvXub/ruuACapdw4Ez88LY1agTecbZhFYmJzv8oANH1e4VUI4owuHnZCpU6LRutS4wOhglrkOrGo6lSUlJeA+RtQjyjBugjej9DDtDyyIlRU1ZaBF3qWR9N5EXKuquf0olOfmUR67ap1NykE9VUpzkYjkoVRTiPs/e2onM/nRNOvAQcIt75FD13u+Y/DcYQ8r7KpMIu1HNdtbVx8gMeq76bRhP1YdDg2jm+DdJ21KWjf5QHsbyoXDfJzdKlCloLIlAU3EPJhMoXsnNzre0/FXeUl6dfteR1axNS6U7e/vKsQ9rlUFZWIQaeVPjfXmFKblNNVQ5uFrrsB/EGHcJl7IUx5fvcRT5hMMNwC660YxVkBXDbRb5fxMW5/+K0BOi9cP6en8="
+ secure: vBUokTv94n8s65STUgTiD6I0Iy8KXbBRvQUrAof8XG+U4ZMsH5PmDTpS+wz+SaxI6o0PRkfyOiPVdARhiKAFnfatG3q9EHllMQwqRR2YIju51A3aCxgEJ5uWDoybwQdipERUMMYwUO/8XZaRRpwFD2bdQBFWkBtQyMcAkrEL8BXckwQQ531oDN2hK5gAiTllqsOswV2idwUlBRU9jOtStzff+UgUYsp/ZebsRodyOYkEB2Ev15yARo2HTXbyZ2icwHPtMbx5zmNUSRtxs9a4hfzaK3m6ctK8qLYYUdQvXub/ruuACapdw4Ez88LY1agTecbZhFYmJzv8oANH1e4VUI4owuHnZCpU6LRutS4wOhglrkOrGo6lSUlJeA+RtQjyjBugjej9DDtDyyIlRU1ZaBF3qWR9N5EXKuquf0olOfmUR67ap1NykE9VUpzkYjkoVRTiPs/e2onM/nRNOvAQcIt75FD13u+Y/DcYQ8r7KpMIu1HNdtbVx8gMeq76bRhP1YdDg2jm+DdJ21KWjf5QHsbyoXDfJzdKlCloLIlAU3EPJhMoXsnNzre0/FXeUl6dfteR1axNS6U7e/vKsQ9rlUFZWIQaeVPjfXmFKblNNVQ5uFrrsB/EGHcJl7IUx5fvcRT5hMMNwC660YxVkBXDbRb5fxMW5/+K0BOi9cP6en8=
skip_cleanup: true
file_glob: true
file: pwnagotchi-*.zip
on:
tags: true
repo: evilsocket/pwnagotchi
-
branches:
only:
- - /^v[0-9]+\.[0-9]+\.[0-9]+[A-Za-z0-9]+?$/
-
+ - "/^v[0-9]+\\.[0-9]+\\.[0-9]+[A-Za-z0-9]+?$/"
cache:
apt: true
-
before_script:
- wget https://download.qemu.org/qemu-4.1.0.tar.xz
- tar xvJf qemu-4.1.0.tar.xz
- cd qemu-4.1.0
- - ./configure --target-list=arm-softmmu
+ - "./configure --target-list=arm-softmmu"
- make -j$(nproc)
- sudo make install
- cd $TRAVIS_BUILD_DIR
- sudo apt-get -y update
- sudo apt-get -y install qemu-user-static binfmt-support bmap-tools kpartx
- sudo update-binfmts --display
-
script:
- sudo make clean
- sudo -E env "PATH=$PATH" make install
- sudo make image -e PWN_HOSTNAME=pwnagotchi VERSION=$TRAVIS_TAG
-
before_deploy:
- # Set up git user name and tag this commit
- git config --local user.name "evilsocket"
- git config --local user.email "evilsocket@gmail.com"
- export TRAVIS_TAG=${TRAVIS_TAG:-$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)}
- git tag $TRAVIS_TAG
+notifications:
+ slack:
+ secure: aovN87lswg+TTLobxJpevC0p2F4omTAlsOzeKqLysRW55o5rRhRC1SgwRkWUl19yr49nsyffwmv/b7OcyQiWIVnz1bxxE9XOKP8zgRMA/bKKcyAcPktPqHXsALIQDseXyl0kz7fwdkRWg0UC2HpKqi5koAhmBYTX/fbzieyeHCbcQ7lbFfVFIepE1401y9m1IqUHcHuGfFhMvTaSDIpXrDXnWdA8+gDAl0HKJv41MIsgmffbh/QhD2jLBWzItjxFC3llmNfy88pnzCk0+HBMY/4272LXb0czX7et5HJeM74oxPqkb3aKXFxZgNaDl7cYdV+kzj9dfKUk47hAqwbxlirit5WvHI1Br1VyA90+PFvcC/p41J8gCv0IlcB5vjWN8NKWA1J+Y1F+KvrujMvGtgd0foHZvaSutuRODhI1cBh5rYAiLCroRSlvKMw3IJRyCRstYgUlMIJ3cI2Ova/kU44KtDVmjT9VE/pPkhkHBPvcYThL6skZTdl19E/RlormLu3XObG1aHLZ+Znxe/aL7tWHi0KMOlpy+TMDdps4go7URnJ8yitHtIvU/zMtBrztIwN0Oy2JLKXrS5qIijmRAkBLxe0NxuG01DYFzEO3KtnRirP4uSe3QcrjyP4sqPrVhrjl3TR6gwg8V1juvDXB4e2h8yCpaUW5AdSBOlx9riY=
From f6605640b30585fcca7e8e5579cc8f1db8220c14 Mon Sep 17 00:00:00 2001
From: Simone Margaritelli <evilsocket@gmail.com>
Date: Thu, 3 Oct 2019 14:45:39 +0200
Subject: [PATCH 08/32] custom config override file
---
sdcard/rootfs/root/pwnagotchi/config.yml | 2 +-
sdcard/rootfs/root/pwnagotchi/scripts/main.py | 78 ++++++++++---------
.../scripts/pwnagotchi/mesh/utils.py | 6 +-
.../pwnagotchi/scripts/pwnagotchi/utils.py | 24 ++++++
4 files changed, 70 insertions(+), 40 deletions(-)
create mode 100644 sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/utils.py
diff --git a/sdcard/rootfs/root/pwnagotchi/config.yml b/sdcard/rootfs/root/pwnagotchi/config.yml
index cc2ea20..b71ddde 100644
--- a/sdcard/rootfs/root/pwnagotchi/config.yml
+++ b/sdcard/rootfs/root/pwnagotchi/config.yml
@@ -95,7 +95,7 @@ ui:
# IMPORTANT: The lifespan of an eINK display depends on the cumulative amount of refreshes. If you want to
# preserve your display over time, you should set this value to 0.0 so that the display will be refreshed only
# if any of the important data fields changed (the uptime and blinking cursor won't trigger a refresh).
- fps: 0.3
+ fps: 0.0
display:
enabled: true
rotation: 180
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/main.py b/sdcard/rootfs/root/pwnagotchi/scripts/main.py
index 09f6ec3..3bf19c7 100755
--- a/sdcard/rootfs/root/pwnagotchi/scripts/main.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/main.py
@@ -1,11 +1,16 @@
#!/usr/bin/python3
+import os
import argparse
-import yaml
import time
import traceback
+import yaml
+
import core
-import pwnagotchi, pwnagotchi.plugins as plugins
+import pwnagotchi
+import pwnagotchi.utils as utils
+import pwnagotchi.version as version
+import pwnagotchi.plugins as plugins
from pwnagotchi.log import SessionParser
from pwnagotchi.voice import Voice
@@ -14,53 +19,52 @@ from pwnagotchi.ui.display import Display
parser = argparse.ArgumentParser()
-parser.add_argument('-C', '--config', action='store', dest='config', default='/root/pwnagotchi/config.yml')
+parser.add_argument('-C', '--config', action='store', dest='config', default='/root/pwnagotchi/config.yml',
+ help='Main configuration file.')
+parser.add_argument('-U', '--user-config', action='store', dest='user_config', default='/root/pwnagotchi.yml',
+ help='If this file exists, configuration will be merged and this will override default values.')
parser.add_argument('--manual', dest="do_manual", action="store_true", default=False, help="Manual mode.")
parser.add_argument('--clear', dest="do_clear", action="store_true", default=False,
help="Clear the ePaper display and exit.")
args = parser.parse_args()
+config = utils.load_config(args)
if args.do_clear:
print("clearing the display ...")
- with open(args.config, 'rt') as fp:
- config = yaml.safe_load(fp)
- cleardisplay = config['ui']['display']['type']
- if cleardisplay in ('inkyphat', 'inky'):
- print("inky display")
- from inky import InkyPHAT
+ cleardisplay = config['ui']['display']['type']
+ if cleardisplay in ('inkyphat', 'inky'):
+ print("inky display")
+ from inky import InkyPHAT
- epd = InkyPHAT(config['ui']['display']['color'])
- epd.set_border(InkyPHAT.BLACK)
- self._render_cb = self._inky_render
- elif cleardisplay in ('papirus', 'papi'):
- print("papirus display")
- from pwnagotchi.ui.papirus.epd import EPD
+ epd = InkyPHAT(config['ui']['display']['color'])
+ epd.set_border(InkyPHAT.BLACK)
+ self._render_cb = self._inky_render
+ elif cleardisplay in ('papirus', 'papi'):
+ print("papirus display")
+ from pwnagotchi.ui.papirus.epd import EPD
- os.environ['EPD_SIZE'] = '2.0'
- epd = EPD()
- epd.clear()
- elif cleardisplay in ('waveshare_1', 'ws_1', 'waveshare1', 'ws1'):
- print("waveshare v1 display")
- from pwnagotchi.ui.waveshare.v1.epd2in13 import EPD
+ os.environ['EPD_SIZE'] = '2.0'
+ epd = EPD()
+ epd.clear()
+ elif cleardisplay in ('waveshare_1', 'ws_1', 'waveshare1', 'ws1'):
+ print("waveshare v1 display")
+ from pwnagotchi.ui.waveshare.v1.epd2in13 import EPD
- epd = EPD()
- epd.init(epd.lut_full_update)
- epd.Clear(0xFF)
- elif cleardisplay in ('waveshare_2', 'ws_2', 'waveshare2', 'ws2'):
- print("waveshare v2 display")
- from pwnagotchi.ui.waveshare.v2.waveshare import EPD
+ epd = EPD()
+ epd.init(epd.lut_full_update)
+ epd.Clear(0xFF)
+ elif cleardisplay in ('waveshare_2', 'ws_2', 'waveshare2', 'ws2'):
+ print("waveshare v2 display")
+ from pwnagotchi.ui.waveshare.v2.waveshare import EPD
- epd = EPD()
- epd.init(epd.FULL_UPDATE)
- epd.Clear(0xff)
- else:
- print("unknown display type %s" % cleardisplay)
- quit()
-
-with open(args.config, 'rt') as fp:
- config = yaml.safe_load(fp)
+ epd = EPD()
+ epd.init(epd.FULL_UPDATE)
+ epd.Clear(0xff)
+ else:
+ print("unknown display type %s" % cleardisplay)
+ quit()
plugins.load_from_path(plugins.default_path)
if 'plugins' in config['main'] and config['main']['plugins'] is not None:
@@ -71,7 +75,7 @@ plugins.on('loaded')
display = Display(config=config, state={'name': '%s>' % pwnagotchi.name()})
agent = Agent(view=display, config=config)
-core.log("%s@%s (v%s)" % (pwnagotchi.name(), agent._identity, pwnagotchi.version))
+core.log("%s@%s (v%s)" % (pwnagotchi.name(), agent._identity, version.version))
# for key, value in config['personality'].items():
# core.log(" %s: %s" % (key, value))
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/utils.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/utils.py
index 8c84b94..92e4939 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/utils.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/utils.py
@@ -1,7 +1,9 @@
import _thread
import core
-import pwnagotchi, pwnagotchi.plugins as plugins
+import pwnagotchi
+import pwnagotchi.version as version
+import pwnagotchi.plugins as plugins
from pwnagotchi.mesh import get_identity
@@ -22,7 +24,7 @@ class AsyncAdvertiser(object):
self._advertiser = Advertiser(
self._config['main']['iface'],
pwnagotchi.name(),
- pwnagotchi.version,
+ version.version,
self._identity,
period=0.3,
data=self._config['personality'])
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/utils.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/utils.py
new file mode 100644
index 0000000..358b2fe
--- /dev/null
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/utils.py
@@ -0,0 +1,24 @@
+import yaml
+import os
+
+# https://stackoverflow.com/questions/823196/yaml-merge-in-python
+def merge_config(user, default):
+ if isinstance(user, dict) and isinstance(default, dict):
+ for k, v in default.items():
+ if k not in user:
+ user[k] = v
+ else:
+ user[k] = merge_config(user[k], v)
+ return user
+
+
+def load_config(args):
+ with open(args.config, 'rt') as fp:
+ config = yaml.safe_load(fp)
+
+ if os.path.exists(args.user_config):
+ with open(args.user_config, 'rt') as fp:
+ user_config = yaml.safe_load(fp)
+ config = merge_config(user_config, config)
+
+ return config
\ No newline at end of file
From c0d05257124be7aae73e13ddd5e616ab25bb2471 Mon Sep 17 00:00:00 2001
From: Simone Margaritelli <evilsocket@gmail.com>
Date: Thu, 3 Oct 2019 14:46:42 +0200
Subject: [PATCH 09/32] releasing v1.0.0plz
---
sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/version.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/version.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/version.py
index c273c83..afa9429 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/version.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/version.py
@@ -1 +1 @@
-version = '1.0.0travistest'
+version = '1.0.0plz'
From 95b9d0ee1e9cdde176b2ba667ed3e1a64d78dec7 Mon Sep 17 00:00:00 2001
From: Simone Margaritelli <evilsocket@gmail.com>
Date: Thu, 3 Oct 2019 15:02:08 +0200
Subject: [PATCH 10/32] readme config override
---
README.md | 2 ++
scripts/backup.sh | 0
2 files changed, 2 insertions(+)
create mode 100644 scripts/backup.sh
diff --git a/README.md b/README.md
index 5fcd98b..c568b0b 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,7 @@ For hackers to learn reinforcement learning, WiFi networking and have an excuse
**THIS IS STILL ALPHA STAGE SOFTWARE, IF YOU DECIDE TO TRY TO USE IT, YOU ARE ON YOUR OWN, NO SUPPORT WILL BE PROVIDED, NEITHER FOR INSTALLATION OR FOR BUGS**
However, there's [a Slack channel](https://join.slack.com/t/pwnagotchi/shared_invite/enQtNzc4NzY3MDE2OTAzLTg5NmNmNDJiMDM3ZWFkMWUwN2Y5NDk0Y2JlZWZjODlhMmRhNDZiOGMwYjJhM2UzNzA3YjA5NjJmZGY5NGI5NmI).
+
### Hardware
- Raspberry Pi Zero W
@@ -235,6 +236,7 @@ def on_handshake(agent, filename, access_point, client_station):
- checkout the `ui.video` section of the `config.yml` - if you don't want to use a display, you can connect to it with the browser and a cable.
- If you get `[FAILED] Failed to start Remount Root and Kernel File Systems.` while booting pwnagotchi, make sure
the `PARTUUID`s for `rootfs` and `boot` partitions are the same in `/etc/fstab`. Use `sudo blkid` to find those values when you are using `create_sibling.sh`.
+- You can create a `/root/pwnagotchi.yml` configuration file to override the defaults.
## License
diff --git a/scripts/backup.sh b/scripts/backup.sh
new file mode 100644
index 0000000..e69de29
From 335e6b1311e00edfecf386be2538b4f3eda06905 Mon Sep 17 00:00:00 2001
From: Simone Margaritelli <evilsocket@gmail.com>
Date: Thu, 3 Oct 2019 15:55:03 +0200
Subject: [PATCH 11/32] backups
---
README.md | 10 ++++-
scripts/backup.sh | 42 +++++++++++++++++++
sdcard/rootfs/root/pwnagotchi/scripts/main.py | 2 +-
3 files changed, 52 insertions(+), 2 deletions(-)
mode change 100644 => 100755 scripts/backup.sh
diff --git a/README.md b/README.md
index c568b0b..095c7eb 100644
--- a/README.md
+++ b/README.md
@@ -116,6 +116,14 @@ usage: ./update_pwnagitchi.sh [OPTIONS]
```
+#### Backup your pwnagotchi
+
+You can use the `scripts/backup.sh` script to backup the important files of your unit.
+
+```shell
+usage: ./scripts/backup.sh HOSTNAME backup.zip
+```
+
### UI
The UI is available either via display if installed, or via http://pwnagotchi.local:8080/ if you connect to the unit via `usb0` and set a static address on the network interface (change `pwnagotchi` with the hostname of your unit).
@@ -236,7 +244,7 @@ def on_handshake(agent, filename, access_point, client_station):
- checkout the `ui.video` section of the `config.yml` - if you don't want to use a display, you can connect to it with the browser and a cable.
- If you get `[FAILED] Failed to start Remount Root and Kernel File Systems.` while booting pwnagotchi, make sure
the `PARTUUID`s for `rootfs` and `boot` partitions are the same in `/etc/fstab`. Use `sudo blkid` to find those values when you are using `create_sibling.sh`.
-- You can create a `/root/pwnagotchi.yml` configuration file to override the defaults.
+- You can create a `/root/custom.yml` configuration file to override the defaults.
## License
diff --git a/scripts/backup.sh b/scripts/backup.sh
old mode 100644
new mode 100755
index e69de29..8ebf274
--- a/scripts/backup.sh
+++ b/scripts/backup.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+# name of the ethernet gadget interface on the host
+UNIT_HOSTNAME=${1:-10.0.0.2}
+# output backup zip file
+OUTPUT=${2:-pwnagotchi-backup.zip}
+# temporary folder
+TEMP_BACKUP_FOLDER=/tmp/pwnagotchi_backup
+# what to backup
+FILES_TO_BACKUP=(
+ /root/brain.nn
+ /root/brain.json
+ /root/custom.yaml
+ /root/handshakes
+ /etc/ssh
+ /etc/hostname
+ /etc/hosts
+ /etc/motd
+ /var/log/pwnagotchi.log
+)
+
+ping -c 1 $UNIT_HOSTNAME >/dev/null || {
+ echo "@ unit $UNIT_HOSTNAME can't be reached, make sure it's connected and a static IP assigned to the USB interface."
+ exit 1
+}
+
+echo "@ backing up $UNIT_HOSTNAME to $OUTPUT ..."
+
+rm -rf "$TEMP_BACKUP_FOLDER"
+
+for file in "${FILES_TO_BACKUP[@]}"; do
+ dir=$(dirname $file)
+ echo " $file -> $TEMP_BACKUP_FOLDER$dir/"
+ mkdir -p "$TEMP_BACKUP_FOLDER/$dir"
+ scp -Cr root@$UNIT_HOSTNAME:$file "$TEMP_BACKUP_FOLDER$dir/"
+done
+
+ZIPFILE="$PWD/$OUTPUT"
+pushd $PWD
+cd "$TEMP_BACKUP_FOLDER"
+zip -r -9 -q "$ZIPFILE" .
+popd
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/main.py b/sdcard/rootfs/root/pwnagotchi/scripts/main.py
index 3bf19c7..2327955 100755
--- a/sdcard/rootfs/root/pwnagotchi/scripts/main.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/main.py
@@ -21,7 +21,7 @@ parser = argparse.ArgumentParser()
parser.add_argument('-C', '--config', action='store', dest='config', default='/root/pwnagotchi/config.yml',
help='Main configuration file.')
-parser.add_argument('-U', '--user-config', action='store', dest='user_config', default='/root/pwnagotchi.yml',
+parser.add_argument('-U', '--user-config', action='store', dest='user_config', default='/root/custom.yml',
help='If this file exists, configuration will be merged and this will override default values.')
parser.add_argument('--manual', dest="do_manual", action="store_true", default=False, help="Manual mode.")
From 50b49a52121324ad4ea4efe7402a35f8d3d4056b Mon Sep 17 00:00:00 2001
From: dadav <33197631+dadav@users.noreply.github.com>
Date: Thu, 3 Oct 2019 16:01:42 +0200
Subject: [PATCH 12/32] Fix psql repo fail
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 7caf1de..eb85649 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ before_script:
- make -j$(nproc)
- sudo make install
- cd $TRAVIS_BUILD_DIR
- - sudo apt-get -y update
+ - sudo apt-get -y update || true
- sudo apt-get -y install qemu-user-static binfmt-support bmap-tools kpartx
- sudo update-binfmts --display
script:
From 3925c5675d1c7abb2c3a3f7483f6da5c9d61e009 Mon Sep 17 00:00:00 2001
From: Cassiano Aquino <cassianoaquino@me.com>
Date: Thu, 3 Oct 2019 15:08:22 +0100
Subject: [PATCH 13/32] remove tagging from travis
---
.travis.yml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index eb85649..0826bfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,11 +36,6 @@ script:
- sudo make clean
- sudo -E env "PATH=$PATH" make install
- sudo make image -e PWN_HOSTNAME=pwnagotchi VERSION=$TRAVIS_TAG
-before_deploy:
- - git config --local user.name "evilsocket"
- - git config --local user.email "evilsocket@gmail.com"
- - export TRAVIS_TAG=${TRAVIS_TAG:-$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)}
- - git tag $TRAVIS_TAG
notifications:
slack:
secure: aovN87lswg+TTLobxJpevC0p2F4omTAlsOzeKqLysRW55o5rRhRC1SgwRkWUl19yr49nsyffwmv/b7OcyQiWIVnz1bxxE9XOKP8zgRMA/bKKcyAcPktPqHXsALIQDseXyl0kz7fwdkRWg0UC2HpKqi5koAhmBYTX/fbzieyeHCbcQ7lbFfVFIepE1401y9m1IqUHcHuGfFhMvTaSDIpXrDXnWdA8+gDAl0HKJv41MIsgmffbh/QhD2jLBWzItjxFC3llmNfy88pnzCk0+HBMY/4272LXb0czX7et5HJeM74oxPqkb3aKXFxZgNaDl7cYdV+kzj9dfKUk47hAqwbxlirit5WvHI1Br1VyA90+PFvcC/p41J8gCv0IlcB5vjWN8NKWA1J+Y1F+KvrujMvGtgd0foHZvaSutuRODhI1cBh5rYAiLCroRSlvKMw3IJRyCRstYgUlMIJ3cI2Ova/kU44KtDVmjT9VE/pPkhkHBPvcYThL6skZTdl19E/RlormLu3XObG1aHLZ+Znxe/aL7tWHi0KMOlpy+TMDdps4go7URnJ8yitHtIvU/zMtBrztIwN0Oy2JLKXrS5qIijmRAkBLxe0NxuG01DYFzEO3KtnRirP4uSe3QcrjyP4sqPrVhrjl3TR6gwg8V1juvDXB4e2h8yCpaUW5AdSBOlx9riY=
From 43c476c36f6c58de134ff431938515846caac862 Mon Sep 17 00:00:00 2001
From: Cassiano Aquino <cassianoaquino@me.com>
Date: Thu, 3 Oct 2019 15:50:51 +0100
Subject: [PATCH 14/32] add templates and CONTRIBUTING.md
---
.github/CODEOWNERS | 1 +
.github/ISSUE_TEMPLATE.md | 36 ++++++++++++++++
.github/PULL_REQUEST_TEMPLATE.md | 30 ++++++++++++++
CONTRIBUTING.md | 71 ++++++++++++++++++++++++++++++++
4 files changed, 138 insertions(+)
create mode 100644 .github/CODEOWNERS
create mode 100644 .github/ISSUE_TEMPLATE.md
create mode 100644 .github/PULL_REQUEST_TEMPLATE.md
create mode 100644 CONTRIBUTING.md
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..fe56504
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+evilsocket
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..337f961
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,36 @@
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Expected Behaviour
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->
+
+## Current Behaviour
+<!--- If describing a bug, tell us what happens instead of the expected behavior -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for bugs)
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+## Context
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Your Environment
+
+- [ ] You're using the official images
+
+- [ ] You're using a raspberry pi 0
+
+- [ ] You're using a supported LCD
+
+
+<!--- Include as many relevant details about the environment you experienced the bug in -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..60efcd4
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,30 @@
+<!--- Provide a general summary of your changes in the Title above -->
+
+## Description
+<!--- Describe your changes in detail -->
+
+## Motivation and Context
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+- [ ] I have raised an issue to propose this change ([required](https://github.com/evilsocket/pwnagotchi/blob/master/CONTRIBUTING.md))
+
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+## Types of changes
+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+
+## Checklist:
+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+- [ ] My code follows the code style of this project.
+- [ ] My change requires a change to the documentation.
+- [ ] I have updated the documentation accordingly.
+- [ ] I've read the [CONTRIBUTION](https://github.com/evilsocket/pwnagotchi/blob/master/CONTRIBUTING.md) guide
+- [ ] I have signed-off my commits with `git commit -s`
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..08e2284
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,71 @@
+## Contributing
+
+### Guidelines
+
+Here are a few guidelines for contributing:
+
+* If you would like to contribute to the codebase **please raise an issue to propose the change**
+* Do not mix feature changes or fixes with refactoring - it makes the code harder to review and means there is more for the maintainers (with limited time) to test
+
+* If you have found a bug please raise an issue and fill out the whole template.
+* If the documentation can be improved / translated etc please raise an issue to discuss.
+* Please always provide a summary of what you changed, how you did it and how it can be tested.
+
+### License
+
+This project is licensed under the GPL3 License.
+
+#### Sign your work
+
+The sign-off is a simple line at the end of the explanation for a patch. Your
+signature certifies that you wrote the patch or otherwise have the right to pass
+it on as an open-source patch. The rules are pretty simple: if you can certify
+the below (from [developercertificate.org](http://developercertificate.org/)):
+
+```
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+1 Letterman Drive
+Suite D4700
+San Francisco, CA, 94129
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+ have the right to submit it under the open source license
+ indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+ of my knowledge, is covered under an appropriate open source
+ license and I have the right under that license to submit that
+ work with modifications, whether created in whole or in part
+ by me, under the same open source license (unless I am
+ permitted to submit under a different license), as indicated
+ in the file; or
+
+(c) The contribution was provided directly to me by some other
+ person who certified (a), (b) or (c) and I have not modified
+ it.
+
+(d) I understand and agree that this project and the contribution
+ are public and that a record of the contribution (including all
+ personal information I submit with it, including my sign-off) is
+ maintained indefinitely and may be redistributed consistent with
+ this project or the open source license(s) involved.
+```
+
+Then you just add a line to every git commit message:
+
+ Signed-off-by: Joe Smith <joe.smith@email.com>
+
+If you set your `user.name` and `user.email` git configs, you can sign your
+commit automatically with `git commit -s`.
+
+* Please sign your commits with `git commit -s` so that commits are traceable.
From f0a0bd2feab8d5da8ab8577795961d24149274a9 Mon Sep 17 00:00:00 2001
From: dadav <33197631+dadav@users.noreply.github.com>
Date: Thu, 3 Oct 2019 16:59:19 +0200
Subject: [PATCH 15/32] Fix all languages
---
.gitignore | 4 +-
scripts/language.sh | 2 +-
.../pwnagotchi/locale/de/LC_MESSAGES/voice.po | 50 +------
.../pwnagotchi/locale/el/LC_MESSAGES/voice.mo | Bin 4665 -> 4713 bytes
.../pwnagotchi/locale/el/LC_MESSAGES/voice.po | 116 ++++-----------
.../pwnagotchi/locale/fr/LC_MESSAGES/voice.mo | Bin 400 -> 3922 bytes
.../pwnagotchi/locale/fr/LC_MESSAGES/voice.po | 137 ++++++------------
.../pwnagotchi/locale/it/LC_MESSAGES/voice.mo | Bin 3679 -> 3759 bytes
.../pwnagotchi/locale/it/LC_MESSAGES/voice.po | 54 +------
.../pwnagotchi/locale/mk/LC_MESSAGES/voice.mo | Bin 2457 -> 4609 bytes
.../pwnagotchi/locale/mk/LC_MESSAGES/voice.po | 118 ++++-----------
.../pwnagotchi/locale/nl/LC_MESSAGES/voice.mo | Bin 3875 -> 3998 bytes
.../pwnagotchi/locale/nl/LC_MESSAGES/voice.po | 53 +------
.../scripts/pwnagotchi/locale/voice.pot | 50 +------
14 files changed, 117 insertions(+), 467 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7d065ae..3833e98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,12 @@
*.img
*.img.bmap
*.pcap
+*.po~
__pycache__
_backups
_emulation
_utils
config.laptop.yml
.idea
-tmp
+packer_cache
+output-pwnagotchi
diff --git a/scripts/language.sh b/scripts/language.sh
index cf653f5..247911f 100755
--- a/scripts/language.sh
+++ b/scripts/language.sh
@@ -51,7 +51,7 @@ function comp_lang() {
}
function update_lang() {
- xgettext -d voice -o "$LOCALE_DIR/voice.pot" "$VOICE_FILE"
+ xgettext --no-location -d voice -o "$LOCALE_DIR/voice.pot" "$VOICE_FILE"
msgmerge --update "$LOCALE_DIR/$1/LC_MESSAGES/voice.po" "$LOCALE_DIR/voice.pot"
}
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/de/LC_MESSAGES/voice.po b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/de/LC_MESSAGES/voice.po
index 676a8bb..8cf48b4 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/de/LC_MESSAGES/voice.po
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/de/LC_MESSAGES/voice.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 12:22+0200\n"
+"POT-Creation-Date: 2019-10-03 16:42+0200\n"
"PO-Revision-Date: 2019-09-29 14:00+0200\n"
"Last-Translator: dadav <33197631+dadav@users.noreply.github.com>\n"
"Language-Team: DE <33197631+dadav@users.noreply.github.com>\n"
@@ -16,217 +16,169 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: voice.py:18
msgid "ZzzzZZzzzzZzzz"
msgstr ""
-#: voice.py:22
msgid "Hi, I'm Pwnagotchi! Starting ..."
msgstr "Hi, ich bin ein Pwnagotchi! Starte ..."
-#: voice.py:23
msgid "New day, new hunt, new pwns!"
msgstr "Neuer Tag, neue Jagd, neue Pwns!"
-#: voice.py:24
msgid "Hack the Planet!"
msgstr "Hack den Planet!"
-#: voice.py:28
msgid "AI ready."
msgstr "KI bereit."
-#: voice.py:29
msgid "The neural network is ready."
msgstr "Das neurale Netz ist bereit."
-#: voice.py:37
#, python-brace-format
msgid "Hey, channel {channel} is free! Your AP will say thanks."
msgstr "Hey, Channel {channel} ist frei! Dein AP wir des dir danken."
-#: voice.py:41
msgid "I'm bored ..."
msgstr "Mir ist langweilig..."
-#: voice.py:42
msgid "Let's go for a walk!"
msgstr "Lass uns laufen gehen!"
-#: voice.py:45
msgid "This is the best day of my life!"
msgstr "Das ist der beste Tag meines Lebens."
-#: voice.py:48
msgid "Shitty day :/"
msgstr "Scheis Tag :/"
-#: voice.py:52
msgid "I'm extremely bored ..."
msgstr "Mir ist sau langweilig..."
-#: voice.py:53
msgid "I'm very sad ..."
msgstr "Ich bin sehr traurig..."
-#: voice.py:54
msgid "I'm sad"
msgstr "Ich bin traurig"
-#: voice.py:59
msgid "I'm living the life!"
msgstr "Ich lebe das Leben!"
-#: voice.py:60
msgid "I pwn therefore I am."
msgstr "Ich pwne, also bin ich."
-#: voice.py:61
msgid "So many networks!!!"
msgstr "So viele Netwerke!!!"
-#: voice.py:62
msgid "I'm having so much fun!"
msgstr "Ich habe sooo viel Spaß!"
-#: voice.py:63
msgid "My crime is that of curiosity ..."
msgstr "Mein Verbrechen ist das der Neugier ..."
-#: voice.py:67
#, python-brace-format
msgid "Hello {name}! Nice to meet you. {name}"
msgstr "Hallo {name}, nett Dich kennenzulernen."
-#: voice.py:68
#, python-brace-format
msgid "Unit {name} is nearby! {name}"
msgstr "Gerät {name} ist in der nähe!!"
-#: voice.py:72
#, python-brace-format
msgid "Uhm ... goodbye {name}"
msgstr "Uhm ...tschüß {name}"
-#: voice.py:73
#, python-brace-format
msgid "{name} is gone ..."
msgstr "{name} ist weg ..."
-#: voice.py:77
#, python-brace-format
msgid "Whoops ... {name} is gone."
msgstr "Whoops ...{name} ist weg."
-#: voice.py:78
#, python-brace-format
msgid "{name} missed!"
msgstr "{name} verpasst!"
-#: voice.py:79
msgid "Missed!"
msgstr "Verpasst!"
-#: voice.py:83
msgid "Nobody wants to play with me ..."
msgstr "Niemand will mit mir spielen ..."
-#: voice.py:84
msgid "I feel so alone ..."
msgstr "Ich fühl michso alleine ..."
-#: voice.py:85
msgid "Where's everybody?!"
msgstr "Wo sind denn alle?"
-#: voice.py:89
#, python-brace-format
msgid "Napping for {secs}s ..."
msgstr "Schlafe für {secs}s"
-#: voice.py:90
msgid "Zzzzz"
msgstr ""
-#: voice.py:91
#, python-brace-format
msgid "ZzzZzzz ({secs}s)"
msgstr ""
-#: voice.py:98
#, python-brace-format
msgid "Waiting for {secs}s ..."
msgstr "Warte für {secs}s ..."
-#: voice.py:100
#, python-brace-format
msgid "Looking around ({secs}s)"
msgstr "Schaue mich um ({secs}s)"
-#: voice.py:106
#, python-brace-format
msgid "Hey {what} let's be friends!"
msgstr "Hey {what}, lass uns Freunde sein!"
-#: voice.py:107
#, python-brace-format
msgid "Associating to {what}"
msgstr "Verbinde mit {what}"
-#: voice.py:108
#, python-brace-format
msgid "Yo {what}!"
msgstr ""
-#: voice.py:112
#, python-brace-format
msgid "Just decided that {mac} needs no WiFi!"
msgstr "Ich denke, dass {mac} kein WiFi brauch!"
-#: voice.py:113
#, python-brace-format
msgid "Deauthenticating {mac}"
msgstr "Deauthentifiziere {mac}"
-#: voice.py:114
#, python-brace-format
msgid "Kickbanning {mac}!"
msgstr "Kicke {mac}!"
-#: voice.py:118
#, python-brace-format
msgid "Cool, we got {num} new handshake{plural}!"
msgstr "Cool, wir haben {num} neue Handshake{plural}!"
-#: voice.py:121
msgid "Ops, something went wrong ... Rebooting ..."
msgstr "Ops, da ist etwas schief gelaufen ...Starte neu ..."
-#: voice.py:124
#, python-brace-format
msgid "Kicked {num} stations\n"
msgstr "{num} Stationen gekicked\n"
-#: voice.py:125
#, python-brace-format
msgid "Made {num} new friends\n"
msgstr "{num} Freunde gefunden\n"
-#: voice.py:126
#, python-brace-format
msgid "Got {num} handshakes\n"
msgstr "{num} Handshakes aufgez.\n"
-#: voice.py:128
msgid "Met 1 peer"
msgstr "1 Peer getroffen."
-#: voice.py:130
#, python-brace-format
msgid "Met {num} peers"
msgstr "{num} Peers getroffen"
-#: voice.py:135
#, python-brace-format
msgid ""
"I've been pwning for {duration} and kicked {deauthed} clients! I've also met "
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/el/LC_MESSAGES/voice.mo b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/el/LC_MESSAGES/voice.mo
index f5c4d5ab44ea631b1351cf0ff020ead2f8a11390..45509da4e1ffe7ffa9d8736549e878f5ba798a69 100644
GIT binary patch
delta 1509
zcmX}rUuauZ9Ki9DwP~_scFlCFYdib9HEYzyFy=Og+lukeXy?CKl`#|~O|Q+R$-R)I
zWTBJ@{^=f+h*uQK9%Q%&g$kn#wt?u2Ltkzf_%?j-LDW|TUk1+aFTLp@_k8X>_ndQo
z=XXwSr2k5Pl5OoZ#@y{Q=21-b8?z5jptjH95SDNfn>dDF;&J>A1^>nSaX7j)ZVK<?
zIgi8mO6Vd!z;g>@_*vAnx*xbi!%Z4CP(M@}FlG<7Q3JY+I`9TQhym)ve_#Ud;ciSY
zt4=&ZW#I&BzvoZ`e+vbhIECx6)>fpqXwVh>5_bGE>==!21u%&Rcz+6Y!Z%U-*Kh>a
zPy@M)8u$hd;t%*##F$Rlo}kmiv>(8iFyG?lA#U0@f#0G=ejD@n4?d1Zlg2Dz5vQ?(
zX&l^T%s4)QnxWTl5=*FowL`zbQJ#OqNANfN4_gT~N+a1xxSFDKsDac`@Qd*II_ep@
zgZnW`zBSNs)H9ODS)9Wuyo87GC)9=9#WQ${&ib8;NG4k53O6Td_!)I&1F5Y@pT{FS
z7f@67Ici`xQ78Tt58@E{)|DPZ-I`Z1f?9N(_R%xbD;hjQ!@~Y++O+8Yvbb&`*zLmB
zbyH2ox~c6${dZ{EwdnRe#-#^U1JUi;$;DYVSuPD)3p>^=nnf*|r9DsU9Yyy<)5$^Z
z9wc_9yI&d9vV%+0#y_pQN|I%AT;l)UmmZasMyXI=HP3opIV%lY7QMQxxXYDQ@hAE-
z5%FjH4^PulsMxEPyzCThse4kf?YcC*<y`p2%-GFvDk<CbOiku(d8g{w?n2G-*ZW6~
z@MPPTocETil0PdAr(Bj=p(*uJ!Ck85%#4$j*-S;wHrxU+6ibdJpGG|b@S^u7WTjFl
zu8M2h3pH^)Ip>^qEc1d>T$(SquH!C>|M9>&oinlH)NjZ3Q(uUU53wY-E{&>3ms~C<
z{*~A>W8&1LY8MuoIrDmndw%tjO~|#n_>uVV7+LTZ=9_kJb#J(iW<_%#{-OBHvEBnC
z7d_X`ne$$_e9MIW!dLp$Ueo5+@oI#?MiWm`&n1phuO-^Mf@@YdIxGH1Nz31xEc+YD
zbVN39Cr|8%g{${dgN)cbJ@~Fpa%=Ym>gl1ssSl<0#d{(7FQ(cw-ANrhxgApQRq%c9
heX!B_u=7E%8C>gz7F_JC1y?)o1y`l>{&p|R{15$V{Cofa
delta 1461
zcmY+@UuauZ9Ki9@u4!V@|8}~@YR|3NI&IA8V5=J{Zc}Kn)4l9rf=Jfhw$~>2YLc48
zT2iKN_QB0^9D;k<)Ca*03|T>Cqw~qP8=3gvgTBZFMTPk!Oq}0e?ycZ~o6kA-o<G0y
zJ14)SzDT{BuJ$XXZf{X)C-$@{wH5b;K8HQDZA{^-xEIf35^vxT{*HHJXCxSJVJGcz
zyceIwd+-I6^-37U)rhJ#7g*!Pm%R88Q_`_rsa`yZGVnc=fuG_wypA&Q_ZY`p*o}Xq
zOx(eb#(tE3d+<Iyj1sVe58-OG8bn&>h3w#~u;X`O$6F{1_r`(=cA!jn5T*a~C;_>6
z7oJ85d<`W7AL0HMrE1tm`!_lb;~kvB;VR+ZPsKy|@D5t|86LnJxPbi$rABcDAID25
znfeuFN8KGkpu2Df?Wa(VXd(0zN(L_CPP~TyVD)Dz&rrEZxYA*)D+uH;YT7S{?KPB?
zUBLnT5hc*SQ0_>Q{7>R2j^ZMY;YE~<d>ek>O6Nh^FXDr&uU@C}7%wj16Ziv4<b&jK
zH;yA6)k`QDI)h_aL&?BTC;`RDuiTYkY(Xh9PJ)&rl0w#-g&}IBS>ycWeA7H~3{tp*
z&C4Wp*&!QLnukRFS2ENj?VCjclOQB;xgYGI8O(N+bU(l&<q;k^9x0rh>U)wO{ymEO
z(JWkG#lNw6dE_`YODh#g+rvEa7nPlJHPooNxg|BQRG!b4menE8%cXVM)^lD-FS(2P
zWs_<fF;i{3hnC!I-d?tzb*61y@^s#|OS<AMX6Pm#%+<E!)NH}FEq%;eEa(GAblJ(}
zirI=T&1c<(Vn$8am0+2iT^cFs<F=kHIJP@ewA6%?){`T7eWdJWS$cZju}nPTnb#tB
zB1`$~^s-rLPnz@XADF$-M~xR9Fssp_uCncxbh+TUb2^jBn9rjJ&FyG%*9>cVvpQeV
zIcL_k)Y198e4q2Ynd22Z2v;3-ol+S2WNczAs5(V9?%El3%nKs5)c-!nG~t{2*Rev2
z*&iQ|`Pcl*{(9r2x!&1t&cp}IC-Jk!PAnwO`Ri6NP1+nvSmv8Vs?|SdUg_CZ@9wZ#
z!;Ou1?WyOxR$9y--6zak&!2-~fd2d1zv^!=`z8O1UkhVB(R<d!`nK=e4A1}A-w02@
hzuY+0c+0Q*>&-Czw;QMZTH_7BrW<ei8^L%>{R<r{27~|r
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/el/LC_MESSAGES/voice.po b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/el/LC_MESSAGES/voice.po
index 46f90c2..fe6d817 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/el/LC_MESSAGES/voice.po
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/el/LC_MESSAGES/voice.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 12:22+0200\n"
+"POT-Creation-Date: 2019-10-03 16:44+0200\n"
"PO-Revision-Date: 2019-10-03 08:00+0000\n"
"Last-Translator: Periklis Fregkos <fregkos@gmail.com>\n"
"Language-Team: pwnagotchi <33197631+dadav@users.noreply.github.com>\n"
@@ -17,225 +17,169 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: voice.py:18
msgid "ZzzzZZzzzzZzzz"
msgstr ""
-#: voice.py:22
-#, fuzzy
msgid "Hi, I'm Pwnagotchi! Starting ..."
-msgstr "Γειά, είμαι το Pwnagotchi!Εκκινούμαι ..."
+msgstr "Γειά, είμαι το Pwnagotchi! Εκκινούμαι ..."
-#: voice.py:23
-#, fuzzy
msgid "New day, new hunt, new pwns!"
-msgstr "Νέα μέρα, νέο κυνήγι,νέα pwns!"
+msgstr "Νέα μέρα, νέο κυνήγι, νέα pwns!"
-#: voice.py:24
msgid "Hack the Planet!"
msgstr "Hackαρε τον πλανήτη!"
-#: voice.py:28
msgid "AI ready."
msgstr "ΤΝ έτοιμη."
-#: voice.py:29
-#, fuzzy
msgid "The neural network is ready."
msgstr "Το νευρωνικό δίκτυοείναι έτοιμο."
-#: voice.py:37
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Hey, channel {channel} is free! Your AP will say thanks."
msgstr "Ε, το κανάλι {channel} είναιελεύθερο! Το AP σου θαείναι ευγνώμων."
-#: voice.py:41
msgid "I'm bored ..."
msgstr "Βαριέμαι ..."
-#: voice.py:42
msgid "Let's go for a walk!"
msgstr "Ας πάμε μια βόλτα!"
-#: voice.py:45
-#, fuzzy
msgid "This is the best day of my life!"
msgstr "Είναι η καλύτερημέρα της ζωής μου!"
-#: voice.py:48
msgid "Shitty day :/"
msgstr "Σκατένια μέρα :/"
-#: voice.py:52
msgid "I'm extremely bored ..."
msgstr "Βαριέμαι πάρα πολύ ..."
-#: voice.py:53
msgid "I'm very sad ..."
msgstr "Είμαι πολύ λυπημένο ..."
-#: voice.py:54
msgid "I'm sad"
msgstr "Είμαι λυπημένο"
-#: voice.py:59
msgid "I'm living the life!"
msgstr "Ζω την ζωή μου!"
-#: voice.py:60
msgid "I pwn therefore I am."
msgstr "Pwnάρω, άρα υπάρχω."
-#: voice.py:61
msgid "So many networks!!!"
msgstr "Τόσα πολλά δίκτυα!!!"
-#: voice.py:62
-#, fuzzy
msgid "I'm having so much fun!"
msgstr "Περνάω τέλεια!"
-#: voice.py:63
-#, fuzzy
msgid "My crime is that of curiosity ..."
msgstr "Η περιέργεια είναιτο μόνο έγκλημά μου ..."
-#: voice.py:67
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Hello {name}! Nice to meet you. {name}"
msgstr "Γειά {name}!Χάρηκα για τη γνωριμία. {name}"
-#: voice.py:68
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Unit {name} is nearby! {name}"
-msgstr "Η μονάδα{name}είναι κοντά! {name}"
+msgstr "Η μονάδα {name} είναι κοντά! {name}"
-#: voice.py:72
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Uhm ... goodbye {name}"
-msgstr "Εμμ ...αντίο{name}"
+msgstr "Εμμ ...αντίο {name}"
-#: voice.py:73
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "{name} is gone ..."
-msgstr "Το {name}έφυγε ..."
+msgstr "Το {name} έφυγε ..."
-#: voice.py:77
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Whoops ... {name} is gone."
-msgstr "Ουπς ... Εξαφανίστηκε το{name}."
+msgstr "Ουπς ... Εξαφανίστηκε το {name}."
-#: voice.py:78
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "{name} missed!"
-msgstr "Έχασα το{name}!"
+msgstr "Έχασα το {name}!"
-#: voice.py:79
msgid "Missed!"
msgstr "Το έχασα!"
-#: voice.py:83
-#, fuzzy
msgid "Nobody wants to play with me ..."
msgstr "Κανείς δε θέλει ναπαίξει μαζί μου ..."
-#: voice.py:84
msgid "I feel so alone ..."
msgstr "Νιώθω μοναχός μου ..."
-#: voice.py:85
msgid "Where's everybody?!"
msgstr "Μα, πού πήγαν όλοι;!"
-#: voice.py:89
#, python-brace-format
msgid "Napping for {secs}s ..."
msgstr "Ξεκουράζομαι για {secs}s ..."
-#: voice.py:90
msgid "Zzzzz"
msgstr ""
-#: voice.py:91
#, python-brace-format
msgid "ZzzZzzz ({secs}s)"
msgstr ""
-#: voice.py:98
#, python-brace-format
msgid "Waiting for {secs}s ..."
msgstr "Περιμένω για {secs}s ..."
-#: voice.py:100
#, python-brace-format
msgid "Looking around ({secs}s)"
msgstr "Ψάχνω τριγύρω ({secs})"
-#: voice.py:106
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Hey {what} let's be friends!"
-msgstr "Εε!{what},ας γίνουμε φίλοι!"
+msgstr "Εε! {what}, ας γίνουμε φίλοι!"
-#: voice.py:107
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Associating to {what}"
-msgstr "Συνδέομαι με το{what}"
+msgstr "Συνδέομαι με το {what}"
-#: voice.py:108
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Yo {what}!"
-msgstr "Που'σαι ρε τρελέ{what}!"
+msgstr "Που'σαι ρε τρελέ {what}!"
-#: voice.py:112
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Just decided that {mac} needs no WiFi!"
-msgstr "Μόλις αποφάσισα ότι η{mac}δε χρείαζεται WiFi!"
+msgstr "Μόλις αποφάσισα ότι η {mac} δε χρείαζεται WiFi!"
-#: voice.py:113
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Deauthenticating {mac}"
-msgstr "Πετάω έξω την{mac}"
+msgstr "Πετάω έξω την {mac}"
-#: voice.py:114
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Kickbanning {mac}!"
-msgstr "Μπανάρω την{mac}!"
+msgstr "Μπανάρω την {mac}!"
-#: voice.py:118
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Cool, we got {num} new handshake{plural}!"
-msgstr "Τέλεια δικέ μου, πήραμε {num}νέες χειραψίες!"
+msgstr "Τέλεια δικέ μου, πήραμε {num} νέες χειραψίες!"
-#: voice.py:121
-#, fuzzy
msgid "Ops, something went wrong ... Rebooting ..."
-msgstr "Ουπς, κάτιπήγε λάθος ...Επανεκκινούμαι ..."
+msgstr "Ουπς, κάτιπήγε λάθος ... Επανεκκινούμαι ..."
-#: voice.py:124
#, python-brace-format
msgid "Kicked {num} stations\n"
msgstr "Έριξα {num} σταθμούς\n"
-#: voice.py:125
#, python-brace-format
msgid "Made {num} new friends\n"
msgstr "Έκανα {num} νέους φίλους\n"
-#: voice.py:126
#, python-brace-format
msgid "Got {num} handshakes\n"
msgstr "Πήρα {num} χειραψίες\n"
-#: voice.py:128
msgid "Met 1 peer"
msgstr "Γνώρισα 1 φίλο"
-#: voice.py:130
#, python-brace-format
msgid "Met {num} peers"
msgstr "Γνώρισα {num} φίλους"
-#: voice.py:135
#, python-brace-format
msgid ""
"I've been pwning for {duration} and kicked {deauthed} clients! I've also met "
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/fr/LC_MESSAGES/voice.mo b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/fr/LC_MESSAGES/voice.mo
index f62832735e4ead2a800789b858dedcd337e34178..2ff57511228209251c6d8f3e3f1de75b9ff0d139 100644
GIT binary patch
literal 3922
zcmbuBO^h5z701ho`N;6?gpcr**D++0cxOE0wc_<AINsPvyk^&4*6Xa0BB9#unwj!;
zS53OAXFLqUAyN(zM--%-;E;nC0TM@$q8x?;<PZ)>91wy?91zNZGZI4lUv<ySuH^#~
zEzSJ8YpP$pkAKyhznnP!hQPIi&zJG}-Z3Gb2LF5?zHt5aejy$Je+PaR`~&y|_z&=N
z;Dg7@@h8Dg<M|@^82Bxa?cD}fz&Ahw-vb{6{|U0a`#&VaC%}in&x7@f&w>x(c^CW$
zn1XEIgTDq}19_c`A1?jqf;|8G;1|Fjf^6?+U=92Y_$l!BAlv&Z7=eEWdENsUWPc-&
zzzg6h@H-&;_XCjqeiP(*KL-hX7vwyA0Dc9$@1vzX0(t%l_(gC7JOOsWPlDeCUpgkl
z>md90K9bD&_y9Zu9>XBpJ6mxZ{0yG^U=w^5<T!r`o(JCr+27+IEB$GKoR1elj{9Yh
z{Z2t%=XH?%_;JNwfNbw=@E!1v;5qO|A202^2l9J=19{%Rz=y#TNDlk81aclOfJmvh
z2|f<K3_c3J2DZUF;7RaLAp89vko{bNGi-ko{3;lOT%T7#UhgfC?Ys?s349;qy8RpE
z{62&r+0JPYCdFkC=?(7?2)Tv)0O5D`f$g)VI1YZ7b<Gz-6OdQ9xMnDAh!H8CUr*xh
zYxtmi;re<-2K&W1z!nMD623Y2oFA?!>w<meI5_4yJ}7&r6Vfht>v0Yq!G~k#Jl=gF
z>~K9c`(bUJawU^dQ>-~>V=cWlUGkR3!=CgLamm_riH3^0*3;M&*@TQ5Qcs%1_2j-9
z_tPSm=_C@Dl`MQu8L#8g$T*YnM7%hEZ~l&}i7PVRC(Nd;R2t<YaYdym7Bw<clZdYA
zSg{kCQl3V(XjZ>q+Nko3QswK8_7rt;t>6vY7%fqZWsFK`T-{7aJ4{h3qHo(Gr?o8_
z>NF)MM{q!zeb*FM^b)PtGuj#&i8$k)j_8J$dB{bx*%a&4QLyPO$<!J}<ye1cIEGwx
zY_4dXWQLhAvxmo|oP#HI+vh4%>FBQUo*ZzhVKXb@9(4*6g||~3#yL5u?x=Fm$t3(Z
zQ27Y1&#Vs=5}*vh6Sf6EXq=!PURyIE)QI+Vybou_Nm-p_LUD?8c^4sKye?CA09hW(
zs{RUdxWrXjgB9r&jTiNsEb0$CC$V~!ws4=?Zb^7gCwr(gV(EuE(@D2KLcPV+!g)$m
ztP?ngGGKjH3l>(1BV%b-zn~-W&C2_rJLf}OP|rpveb<J7B@Jb|ABhcX_c;kNw*>-!
zeC$;0ChiHbDHC`<mu?kTO>83SHuaUt!)-Z(AD!6L&Z#64n<I*IohjB(@X~fDE^=+1
z_M=eYYqH;;r@maV97hHd2|b40QW#&}Ayp9SHM?h%5&T9SSmsC$p0w|w65;LZeYXT<
zpe{W&K19K2m|NUJd9<zetetD~Mo)V<gT-j|w77w4N;AT;erWT37e$fSfs~BmZ8{s~
zc&cr`)5CoTkF~^AfgyyMjVk%w>}6rquC>YDh%?E1RNOS04+OsF*Nu|--YA;=x+`^X
zFevg+T6TH6VB0DdGAH5LNbL5k?YpqX!d@5KtSOE@htyO<SyiE}+}={LZ>%ScmryzA
zewA9yR<m8(R(+fM#-{7)r14zQb&VanO0}))jcqm1JhO2bx?ZI-t@imwyVYndQ@gdg
zeD+l9OsiGfkj^)Da%o&Dz0FtYl>+4|GS^e8PtTk?bFO{%{8Oh6k6tVsTxc3>|9(1Z
zc2Uq`uNm9y0<4*CA-k%vqhz+q`*pTso>^XQpFj81a{E*w6FK-FY^?HeX5wCLbA9vq
zMbzzPt9Hp653MwIMtub4arB&qwzPSgkHy?6|Bb?T8Y_!=9A8J}jpt2l6G&~9R`#^7
ziS;$==hL5h)L`BhtfA>oj`js(3rBKbjYHu>Z?MGxC(Z4}0dc57Ob^_wMRY=wfJNS#
zp-*g258|RfJ;<jAm952jQ}v5f@=h_+J07RvbJpDA^SsnUMB6w{9h<{Z#pyvNa+Tks
zaqz|(vBwe`s+vZs?$I}RGo*SiN9Wjqr)V4lNeLFoR37W*%!4JmrN|W+-<nr7qRZ2R
zOy)UC9#nf(@z!<<%Q_7f>1-HMpv0PZW~C{3Ze1Bu=*7FU=jj2|mBBWj2;7CjWSK#E
z2s};EXbie3MmZZu*gzv!cnl8uTsyB0Jx=f7{0W1lvAWc(P2wJc1rGHRoR!>4?%7DL
z@@ukih-{X5F5;1fGSdYoJ+u^@QeB?4sPg~cRgiRa6j+5$)4De37>MGPqS6?dIus=N
zPlK~MXs>KDrFLiiB?MX%YxqNga&@Feb1%^8p|(hDtFFwUG6<Q~x9Bo2;KaLo6L7FK
zQTCWasS$@-4TghMu{XrF^wR@09f+;$I;_B0rG;i)qnNYSg9y3ySTfYuX-rh;WF`q!
zJ9OS&<Ge!_#Cyd|4;0$aYzRjJx?D9N3obnN!xoM(i+@l!(P^Lx&u^+6n_R_|SsfO>
zUT}XxUQ^C(+_O-htFyNmdJHn`N)OSgP>mz|pmKu)!ZyM;de&MI>VyYue#gfLcdd>2
zV`yI1z%(xr&ZVZf6xKsznZn;Wbhi*<uv@AAN>Mg0gqEv;)w8ogY}5-hFBV_fzDlb$
z?qR2wLt@S29K}D8d*$@{^jE<V2ml8J9Iz%)=wqA}PR|ju{3mkW$HGE960%sWj(=-h
G_5T8SSxadE
delta 66
xcmca4H-XvWo)F7a1|VPrVi_P-0b*t#)&XJ=umIvPprj>`2C0F8%^e&Oi~#u61{weW
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/fr/LC_MESSAGES/voice.po b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/fr/LC_MESSAGES/voice.po
index 17d03f3..7110512 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/fr/LC_MESSAGES/voice.po
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/fr/LC_MESSAGES/voice.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 12:22+0200\n"
+"POT-Creation-Date: 2019-10-03 16:47+0200\n"
"PO-Revision-Date: 2019-10-03 10:34+0200\n"
"Last-Translator: quantumsheep <7271496+quantumsheep@users.noreply.github."
"com>\n"
@@ -18,220 +18,175 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: voice.py:18
msgid "ZzzzZZzzzzZzzz"
msgstr ""
-#: voice.py:22
msgid "Hi, I'm Pwnagotchi! Starting ..."
-msgstr ""
+msgstr "Bonjour, je suis Pwnagotchi! Démarrage ..."
-#: voice.py:23
msgid "New day, new hunt, new pwns!"
-msgstr ""
+msgstr "Nouvelle journée, nouvelle chasse, nouveau pwns!"
-#: voice.py:24
msgid "Hack the Planet!"
-msgstr ""
+msgstr "Hack la planète!"
-#: voice.py:28
msgid "AI ready."
-msgstr ""
+msgstr "IA prête."
-#: voice.py:29
msgid "The neural network is ready."
-msgstr ""
+msgstr "Le réseau neuronal est prêt."
-#: voice.py:37
#, python-brace-format
msgid "Hey, channel {channel} is free! Your AP will say thanks."
-msgstr ""
+msgstr "Hey, le channel {channel} est libre! Ton AP va dis merci."
-#: voice.py:41
msgid "I'm bored ..."
-msgstr ""
+msgstr "Je m'ennuie ..."
-#: voice.py:42
msgid "Let's go for a walk!"
-msgstr ""
+msgstr "Allons faire un tour!"
-#: voice.py:45
msgid "This is the best day of my life!"
-msgstr ""
+msgstr "C'est le meilleur jour de ma vie!"
-#: voice.py:48
msgid "Shitty day :/"
-msgstr ""
+msgstr "Journée de merde :/"
-#: voice.py:52
msgid "I'm extremely bored ..."
-msgstr ""
+msgstr "Je m'ennuie énormément ..."
-#: voice.py:53
msgid "I'm very sad ..."
-msgstr ""
+msgstr "Je suis très triste ..."
-#: voice.py:54
msgid "I'm sad"
-msgstr ""
+msgstr "Je suis triste"
-#: voice.py:59
msgid "I'm living the life!"
-msgstr ""
+msgstr "Je vis la vie!"
-#: voice.py:60
msgid "I pwn therefore I am."
-msgstr ""
+msgstr "Je pwn donc je suis."
-#: voice.py:61
msgid "So many networks!!!"
-msgstr ""
+msgstr "Autant de réseaux!!!"
-#: voice.py:62
msgid "I'm having so much fun!"
-msgstr ""
+msgstr "Je m'amuse tellement!"
-#: voice.py:63
msgid "My crime is that of curiosity ..."
-msgstr ""
+msgstr "Mon crime est celui de la curiosité ..."
-#: voice.py:67
#, python-brace-format
msgid "Hello {name}! Nice to meet you. {name}"
-msgstr ""
+msgstr "Bonjour {name}! Ravis de te rencontrer. {name}"
-#: voice.py:68
#, python-brace-format
msgid "Unit {name} is nearby! {name}"
-msgstr ""
+msgstr "L'unité {name} est proche! {name}"
-#: voice.py:72
#, python-brace-format
msgid "Uhm ... goodbye {name}"
-msgstr ""
+msgstr "Hum ... au revoir {name}"
-#: voice.py:73
#, python-brace-format
msgid "{name} is gone ..."
-msgstr ""
+msgstr "{name} est parti ..."
-#: voice.py:77
#, python-brace-format
msgid "Whoops ... {name} is gone."
-msgstr ""
+msgstr "Oups ... {name} est parti."
-#: voice.py:78
#, python-brace-format
msgid "{name} missed!"
-msgstr ""
+msgstr "{name} raté!"
-#: voice.py:79
msgid "Missed!"
-msgstr ""
+msgstr "Raté!"
-#: voice.py:83
msgid "Nobody wants to play with me ..."
-msgstr ""
+msgstr "Personne ne veut jouer avec moi ..."
-#: voice.py:84
msgid "I feel so alone ..."
-msgstr ""
+msgstr "Je me sens si seul ..."
-#: voice.py:85
msgid "Where's everybody?!"
-msgstr ""
+msgstr "Où est tout le monde?!"
-#: voice.py:89
#, python-brace-format
msgid "Napping for {secs}s ..."
-msgstr ""
+msgstr "Fais la sieste pendant {secs}s ..."
-#: voice.py:90
msgid "Zzzzz"
msgstr ""
-#: voice.py:91
#, python-brace-format
msgid "ZzzZzzz ({secs}s)"
msgstr ""
-#: voice.py:98
#, python-brace-format
msgid "Waiting for {secs}s ..."
-msgstr ""
+msgstr "Attends pendant {secs}s ..."
-#: voice.py:100
#, python-brace-format
msgid "Looking around ({secs}s)"
-msgstr ""
+msgstr "Regarde autour ({secs}s)"
-#: voice.py:106
#, python-brace-format
msgid "Hey {what} let's be friends!"
-msgstr ""
+msgstr "Hey {what}, soyons amis!"
-#: voice.py:107
#, python-brace-format
msgid "Associating to {what}"
-msgstr ""
+msgstr "Association à {what}"
-#: voice.py:108
#, python-brace-format
msgid "Yo {what}!"
msgstr ""
-#: voice.py:112
#, python-brace-format
msgid "Just decided that {mac} needs no WiFi!"
-msgstr ""
+msgstr "Décidé à l'instant que {mac} n'a pas besoin de WiFi!"
-#: voice.py:113
#, python-brace-format
msgid "Deauthenticating {mac}"
-msgstr ""
+msgstr "Désauthentification de {mac}"
-#: voice.py:114
#, python-brace-format
msgid "Kickbanning {mac}!"
msgstr ""
-#: voice.py:118
#, python-brace-format
msgid "Cool, we got {num} new handshake{plural}!"
-msgstr ""
+msgstr "Cool, nous avons {num} nouveaux handshake{plural}!"
-#: voice.py:121
msgid "Ops, something went wrong ... Rebooting ..."
-msgstr ""
+msgstr "Oups, quelque chose s'est mal passé ... Redémarrage ..."
-#: voice.py:124
#, python-brace-format
msgid "Kicked {num} stations\n"
-msgstr ""
+msgstr "{num} stations kick\n"
-#: voice.py:125
#, python-brace-format
msgid "Made {num} new friends\n"
-msgstr ""
+msgstr "Fait {num} nouveaux amis\n"
-#: voice.py:126
#, python-brace-format
msgid "Got {num} handshakes\n"
-msgstr ""
+msgstr "Récupéré {num} handshakes\n"
-#: voice.py:128
msgid "Met 1 peer"
-msgstr ""
+msgstr "1 peer rencontré"
-#: voice.py:130
#, python-brace-format
msgid "Met {num} peers"
-msgstr ""
+msgstr "{num} peers recontrés"
-#: voice.py:135
#, 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 ""
+"J'ai pwn durant {duration} et kick {deauthed} clients! J'ai aussi rencontré "
+"{associated} nouveaux amis and mangé {handshakes} handshakes! #pwnagotchi "
+"#pwnlog #pwnlife #hacktheplanet #skynet"
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/it/LC_MESSAGES/voice.mo b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/it/LC_MESSAGES/voice.mo
index be9d4b19c95c5d6754d793353e8f3454c26e3c9e..bcc0f8f597bfdf13fdedec2cdc8538dde349aaf5 100644
GIT binary patch
delta 943
zcmY+?KTK0m6vy#X9+VaVv5J5cxlb%uN=i&jH1SW+Xq;GBhyz0nV2Q~qTK<H^4n%Qt
zXe2lpqZ5lmH7ZVE9E_Sc8FBDW;%d;zfyD6rwT+24dHvk??w@n+>HQji+*SAztG#Qq
z6i=LICS-OJ-_`I#d+wP<@ddWxD@@{M_1&vA>*c)zwSEXs;21hw#=ZCqwf-$O;dg8^
zE7(@0WA$}r`xxlPdOU_Lcna5W7!@cIHjCjP?#FYeb(gRm17u@c!UnvLyKxn@?^<<y
z1LMTE&vYCEe^6CuXO=QNkIH-mb+SoxxQGh;2)pnlD&Qt+{%<^hb&*N}4wY~UoAC@r
zsq(PKiEpFSw+Am{8gHRCe2RzgJu1*IRB4+zRuV6w61j#-_%=4;G9JW-sC65tz~68e
zZlNl+jfK~ATKIYtKcY?=VHYKkz-~N^eK>|X$xYmYE2soktFB{$_fM$A|Dx9WWT%6j
zMXjGk-G#*_>aSAW<HI06L2d8@eQY3Ym2?0Va0nfaAjw-EJMac7krkw}<vFSVSIhc&
zR4tucdnzHOmG4T-xW#?NpEYd>h1E6TPx;r5(9=1%80FSeOnRN6RPlm$JfXs>M!l7x
z|9&}kxg9P&@cO;ZiFr4kSr~8uo$PEdQ|V352YJ8rCL9g>v$?sPyE2u#9^}&LbinJB
V%VvV{d^U4+BJcZt=|kh4&<<9<U%~(Y
delta 877
zcmZ9~KTK0m6vy#X9<;Vv`6E&-MIJ2=Z8cam1RBD|U<XGDgoKHO=u9Wl&A6yT+r`OE
z5E7$r116LK2a;|i5*xzkBI#f!<M;O{4&LPTb8qjv_ndp){W#P}m4Ebg){K_pN%1@n
znN8zv2S2oR$1I8)cpZJr;z4`d#4*Ov&hzzooMQY0U3`Jp@I7k%4#u&L3A3^_&O7!S
z`<dwOGK=6S_TW9-#u-$g7WUzA*lYkFqSh7h1}-5RTM1+M2D|YsYTpm-`OoMQ-@ehg
z%fwGqW(nR>#vZC71$1!^6|jUu_!<>x3-$h2OyUtLa1)j2AH0gam#7leby4#<%9<g*
zP0$&~1=NNwF^%s~fxe(hdV*O@vRaAEq7q)jE4YHUa22(#h6?QCW!ytm>Jazw6w43j
zY%r^nen%zH!eQ)T*V~v!on#(+@fj+CwYF9C7;mE1)lmmJL#=bkQs4d&szOD)kIQlD
zuZ30q7{P5+DUVTsexZvU9D`&ngEw&;mB3@9qCrrdm@5=i=nm?{E{`h0Yr)-6G8awz
zC9M*3V%{iST@gOazov65B`!tK(v^ZU7|K<iI+NZQ|ENw%{r|?1gO>3>IXTB~g(G1<
I9e)-23(ST|O8@`>
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/it/LC_MESSAGES/voice.po b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/it/LC_MESSAGES/voice.po
index 7ef4d8d..d738a47 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/it/LC_MESSAGES/voice.po
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/it/LC_MESSAGES/voice.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 13:10+0200\n"
+"POT-Creation-Date: 2019-10-03 16:43+0200\n"
"PO-Revision-Date: 2019-10-02 17:20+0000\n"
"Language-Team: pwnagotchi <33197631+dadav@users.noreply.github.com>\n"
"Language: italian\n"
@@ -15,219 +15,169 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: voice.py:18
msgid "ZzzzZZzzzzZzzz"
msgstr ""
-#: voice.py:22
msgid "Hi, I'm Pwnagotchi! Starting ..."
msgstr "Ciao! Piacere Pwnagotchi! Caricamento ..."
-#: voice.py:23
-#, fuzzy
msgid "New day, new hunt, new pwns!"
msgstr "Nuovo giorno...nuovi handshakes!!!"
-#: voice.py:24
msgid "Hack the Planet!"
msgstr ""
-#: voice.py:28
msgid "AI ready."
msgstr "IA pronta."
-#: voice.py:29
msgid "The neural network is ready."
msgstr "La rete neurale è pronta."
-#: voice.py:37
#, python-brace-format
msgid "Hey, channel {channel} is free! Your AP will say thanks."
msgstr "Hey, il canale {channel} è libero! Il tuo AP ringrazia."
-#: voice.py:41
msgid "I'm bored ..."
msgstr "Che noia ..."
-#: voice.py:42
msgid "Let's go for a walk!"
-msgstr ""
-"Andiamo a fare una passeggiata!"
+msgstr "Andiamo a fare una passeggiata!"
-#: voice.py:45
msgid "This is the best day of my life!"
msgstr "Questo è il più bel giorno della mia vita!!!!"
-#: voice.py:48
msgid "Shitty day :/"
msgstr "Giorno di merda :/"
-#: voice.py:52
msgid "I'm extremely bored ..."
msgstr "Sono estremamente annoiato ..."
-#: voice.py:53
msgid "I'm very sad ..."
msgstr "Sono molto triste..."
-#: voice.py:54
msgid "I'm sad"
msgstr "Sono triste"
-#: voice.py:59
msgid "I'm living the life!"
msgstr "Mi sento vivo!"
-#: voice.py:60
msgid "I pwn therefore I am."
msgstr "Pwn ergo sum."
-#: voice.py:61
msgid "So many networks!!!"
msgstr "Qui è pieno di reti!"
-#: voice.py:62
msgid "I'm having so much fun!"
msgstr "Mi sto divertendo tantissimo!"
-#: voice.py:63
msgid "My crime is that of curiosity ..."
msgstr ""
-#: voice.py:67
#, python-brace-format
msgid "Hello {name}! Nice to meet you. {name}"
msgstr "Ciao {name}! E' un piacere. {name}"
-#: voice.py:68
#, python-brace-format
msgid "Unit {name} is nearby! {name}"
msgstr "L'Unità {name} è vicina! {name}"
-#: voice.py:72
#, python-brace-format
msgid "Uhm ... goodbye {name}"
msgstr "Uhm ... addio {name}, mi mancherai..."
-#: voice.py:73
#, python-brace-format
msgid "{name} is gone ..."
msgstr "{name} se n'è andato ..."
-#: voice.py:77
#, python-brace-format
msgid "Whoops ... {name} is gone."
msgstr "Whoops ...{name} se n'è andato."
-#: voice.py:78
#, python-brace-format
msgid "{name} missed!"
msgstr "{name} è scomparso..."
-#: voice.py:79
msgid "Missed!"
msgstr "Ehi! Dove sei andato!?"
-#: voice.py:83
msgid "Nobody wants to play with me ..."
msgstr "Nessuno vuole giocare con me..."
-#: voice.py:84
msgid "I feel so alone ..."
msgstr "Mi sento così solo..."
-#: voice.py:85
msgid "Where's everybody?!"
msgstr "Dove sono tutti?!"
-#: voice.py:89
#, python-brace-format
msgid "Napping for {secs}s ..."
msgstr "Schiaccio un pisolino per {secs}s ..."
-#: voice.py:90
msgid "Zzzzz"
msgstr ""
-#: voice.py:91
#, python-brace-format
msgid "ZzzZzzz ({secs}s)"
msgstr ""
-#: voice.py:98
#, python-brace-format
msgid "Waiting for {secs}s ..."
msgstr "Aspetto {secs}s ..."
-#: voice.py:100
#, python-brace-format
msgid "Looking around ({secs}s)"
msgstr "Do uno sguardo qui intorno... ({secs}s)"
-#: voice.py:106
#, python-brace-format
msgid "Hey {what} let's be friends!"
msgstr "Hey {what}! Diventiamo amici!"
-#: voice.py:107
#, python-brace-format
msgid "Associating to {what}"
msgstr "Collegamento con {what} in corso..."
-#: voice.py:108
#, python-brace-format
msgid "Yo {what}!"
msgstr "Yo {what}!"
-#: voice.py:112
#, python-brace-format
msgid "Just decided that {mac} needs no WiFi!"
msgstr "Ho appena deciso che {mac} non necessita di WiFi!"
-#: voice.py:113
#, python-brace-format
msgid "Deauthenticating {mac}"
msgstr ""
-#: voice.py:114
#, python-brace-format
msgid "Kickbanning {mac}!"
msgstr "Sto prendendo a calci {mac}!"
-#: voice.py:118
#, python-brace-format
msgid "Cool, we got {num} new handshake{plural}!"
msgstr "Bene, abbiamo {num} handshake{plural} in più!"
-#: voice.py:121
msgid "Ops, something went wrong ... Rebooting ..."
msgstr "Ops, qualcosa è andato storto ... Riavvio ..."
-#: voice.py:124
#, python-brace-format
msgid "Kicked {num} stations\n"
msgstr "{num} stazioni pestate\n"
-#: voice.py:125
#, python-brace-format
msgid "Made {num} new friends\n"
msgstr "{num} nuovi amici\n"
-#: voice.py:126
#, python-brace-format
msgid "Got {num} handshakes\n"
msgstr "{num} handshakes presi\n"
-#: voice.py:128
msgid "Met 1 peer"
msgstr "1 peer incontrato"
-#: voice.py:130
#, python-brace-format
msgid "Met {num} peers"
msgstr "{num} peers incontrati"
-#: voice.py:135
#, python-brace-format
msgid ""
"I've been pwning for {duration} and kicked {deauthed} clients! I've also met "
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/mk/LC_MESSAGES/voice.mo b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/mk/LC_MESSAGES/voice.mo
index 8a736612f9b685251c638e5b14174decfa3641ea..e1fab68f574c7c0ae58ca1a60923c5556b9fdb92 100644
GIT binary patch
literal 4609
zcmbW4TWlOx8OJBkQZTeYNz1LkSwczDcsJ{WLTY*oX=y{_B+7*-eL>^hWAD_vGuF;*
z%*HaR6G{W*flI4~sHLPA0WaV<abm@eqxPkb%<xhPRY)L&P=v%&A9&;UKQrrW(mpZq
z?0?Rg?|hg4_kHI~{(AdO&wE@$+;?%mw#M^zfP)|8hiltSp7#;(KJX532e=VD4BiPI
zFXm5!pI|%(eieKJl)is~+rXP|_B;bV2!0Cu9w>b=cq{m0@YCQ61^y9S%lIwu7VsTV
z`u_o50^bE?XYNCucRTntD1WYkTDOKpp8@X#rFSzp06qqO9NY);=Z*4H0-pjUcM^0w
zfQIoK;3n|zp!~e;!@2)=fs(6&1{?upKLo!3J_AbMtDxdt0zU`-36vjK!B2wkg13RU
zKr$hDcY=!NE>QEE!L@7Pt(f1>;&sfAf!_ds0<H(&1iuVk1!ecvkCH?1Zm<IG0}q0;
z;Qip+p!i?=v0UyRQ2rkR<$nl@my@7)`~!$;?=A4N;Ge<&fd2-S-*+HKao&N`Uja9Q
z(zCl5Hw*kZDE}{j8^OPT%EwLoJOHi*4Y&`y7mPvq`+IN?_)k#z{W`@U|DFK1f-UeN
z@C>N<{{~jT{}$s7kgYf#2Ib#j5ZApQfQsj*pz`^8G5;p$@&&rO0!f2My4>|8e#Q47
zx9U(igHq>{<fTje8gB7c<(9rp+{&}K5<ef{)`gqiX6_*kxa8C4-BbP}pLLaUaKE_Z
zVik{yO&9cdw7}{mu2r|XXhm1^;%@`@7rAw*e#BML@~+=Cuj?Le@kE-uySZ1d?K@4|
z`t@$b+aAYJE%1{d95+d1rl%TyGUM%tqUNBPvSvI=%yigk&6v<mnT8+M<Ay(Brze}8
zw%?p7d5>7XlQe9Y1hrhrbjz>Jc#o~FTU`?mc#r$F34^rR+w?=5l)T4nvx(8rZ`qlW
z*&WoZoM>5_m~Pam6mJmg7M_`=P1eU|)S9t&VDUyex`U>Mnb0=Pbn!4_f*28NOXhIY
zX`AhP%~a5An%M8+fFDl874Pw2(Cl2_GJB^&pEzrcpk($Ze%o<TsZ_k3X3U~9j*Q=o
zLTmE5$*E8=wCz~bwq~dCTS%g2lwm!WVPwCbv~9~ayEn`?{3D_oovlu-Va7UP$*pb%
zZeHXxgE5;=#(v$sJYw5jT<>W=Vj;kW22Z35Kg@KUd?Y~>&KPoJCW6`o&P><y?9^vW
ztqEO8Tq0tY`%O6j%hP_5e~XM#T+r&Y_=z>s*YY=WE&u3QhxLLs_uP!ebHsbIu0f`W
zWzyx@tcxeQ<lFmBCr(V=)`B|Dkp}FmS}<(uu?Zt{DEM|z@}9u^QSzzaoIpOMfLtlY
zi3^p2+U2TYJaQcPX3B3)l)PP0G@+$_JL<s2hUwVW;+c4(H{#a`XtkP)PzSsbh!`@H
z*0$YaE}>!UjRbLQ>m_fbYijMFWmQ(r@o3D{I_)5egQV+{zT2OiT+K#qF`tLjx=)F^
z2I_=K{seo}?(S$bs(105)Tr{|i&2m?NRC^*XEGk7SV&bv%BRSonQBKoQjBJw9gU*Z
za^2qu5}d)98Q$#eC&7N$#cVPawI||IspK7?x<aeY?M*A5VkbDz;Ms+z@=~HuM3}8^
zQIQ85EoXH+it3|XF{!ro4u*mD2t8|gX#MtRx72%k$Pb)@u1Nc6IiwDvldWo7Bs^5|
z4mF}^GIlnu=^Ll>D&FDV)>QJIJbIMBqkVbR@Jao+7ZNyn)Vp4TBeR%l6*=A8j-Il$
zq`b3U{w}$ud4^53QmqUP?6Z?mJ1LLE<3YXrt<HE{J`fF?fxUam`|OcGlI2Hej$yN<
zI&@#TdS7{K)oj^1eDBsx)h*TPz%D;d$_Lth7&rYSY7d)<=!j3V-@j$c(ATQfdpG6d
zspR2KjNwYi&N12SR>nzuXS7m_S`VTl9Pjw!wtT?)Eo}G3!=^PcFtT&x(Q7^rRjLC!
zqA;O0$_KiWxRtQ`Y^Iii@SEBh+p$d^=p<w1ZP(=F-I#5c9}R0!ozfaM+eU+Az~f}d
zX45O#)9FIGoL){>DqeafT`=jzbS}M=&SlSL$J2S9mkn>{dIv^&n(3uMll>5pW9cFy
z%dE;<Notr_G-yRht{^*|&Xv6Mm+6X0&tq&ZooC@fdRfb}A8|`~Io|-h^tGPeLg$UD
z2E6ojDMy(}Urv{JzML*($1w3idfrLTrz?2{luY^}E-uORGH#^{t0ztRe0HjL)L`+H
zT$6uuVnt8c)3|?u)r5y`#0QOd5gF2$9qT)Ta9~!G=~-?CdAY<%M1U(Mdl7YxDJ{OB
z0o2KF2=DV4N>Aa)EcP+HeBEJ1oGaP0FxJb64yg1MY%Pgpxhw|V>>0&*j<NDc?k>t<
z7BhPVEwge;meOTZJf|6+&%4a6;I7m0YPysi6P045Pa=PNB0HWv!+kujm9wm$&(}k+
zBkRR<8Hs0%<Bx2h>{<8X6=W|+)*~@0mUHs{Sa0_IBbbL>k=S?iDVjw>!?r3Yo$o&Z
z$<h*YMTJoVFQA{;b1Ed;e-=77RI^3Op^ntUm+BTPMyX=C($3QUQ}V{r{Qu5M+>`Ew
z?1afqC_B^{6UB+iBh|R<Xu{rtLM~3v^fXak(nNZ>cYLO&u4l!afiCGPT-R<i(9g2|
zdOxA|k)5K{e<ub|nm0bYT~eXpL2<xlvm4oT^{L3Byx-rCJM7#@{17#W>P5_J^H@li
z-YZjRzCkWs^wO7Ex`K~$*@<+Kmiz_b=MIqSUfblYpoXXZvtQ9MYRN0uREVzr^C~+j
zUbSE3+n>VCzaMBp*90#qHZ=g+T}s?gO+HVrx~`s8dE~v;+b3RfIibTu4!y4KqVc7N
z=9c^-MX%Ok<hCW$BUtp^m2B48q8d~Rxe`1e1x0nxF3xGy0gFuf8*M%at8BHS=Bab~
z&S;RGc9AL!eJ;>=%lfCythawqU*dt?P9G2HOFYjrv%-!uEAORUMVJdwt8)I@(V?B}
z*E%bZQG^hyJx4Xhj>xJ-Z2<+920`M|&gymsy~5_}&L_O4_2v-BH*o2_!kBKzzdNMc
ztv~B}{32Q~wfYf~{?>8z-el6t%B1{uKPra>zC_YjsSrqaRQ7C~6WOy$3r;Dx6LQG?
shlv%>IT{>?u-MlV#T&LjI4)T3;dRUC9`_MN>GT_NHPCw{cKeF`f8&k^>;M1&
delta 733
zcmX}qKWI}?6vy$Kntx5x{Am)~+6rl#Vk^?cAwxt68KiU)6-WE9LPbo`R#1w@4sIDF
zhYSv`3N9kSrFL_(8H$Tef`W^s6rrVK`~AH<J#h1R_rCk?J@?#flwRc;KZe3>M~u<N
zX$Q1vS~tWGvDoKaKYCcedziru%wa1Se}jYcw{RH0U><*A43ALX9pffuPC0klxrW>3
z!JmjDnuuB;6Lv0vGnmGUsD)~%_Y0^EZ=(`<5RAVF`mZs|_y<hkXN=%i%yYQ!IK=*L
zkI_k9xM*+TDbz_Tcmb~>nYw3q7Tc&qJE#P^IEvqJAOB(rf0C`{N8`PIDR3UA7_Z|j
z`@0qoI^h-;v5Tt69!_8%_1B3@sEse7HoSqlvK35X6N6iGRM|hh4#KcMUscfe3RO(i
zY)}P1NZJo2qR?GwQ-w~+tx&GsMk+hG{SW<jRN6B%CH^l|wE=ai^TmgEyrm~|?#jwq
zalQWN{?p>JS6^CPws+xSyA`=^+mYY)C;Hr)u@OtfC&M?ryKD9`mbXvwydB2RbuRbM
rhHN)cu|o23=Y4W6Wam@6b}c<&<xDy9cIV^Hrg`a{RkNek%+^i-c9~U8
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/mk/LC_MESSAGES/voice.po b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/mk/LC_MESSAGES/voice.po
index f2fe8fc..61d6a3f 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/mk/LC_MESSAGES/voice.po
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/mk/LC_MESSAGES/voice.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 12:44+0200\n"
+"POT-Creation-Date: 2019-10-03 16:35+0200\n"
"PO-Revision-Date: 2019-09-30 23:53+0200\n"
"Last-Translator: kovach <2214005+kovachwt@users.noreply.github.com>\n"
"Language-Team: \n"
@@ -17,225 +17,169 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: voice.py:18
msgid "ZzzzZZzzzzZzzz"
msgstr "ДреееММмммМммм"
-#: voice.py:22
-#, fuzzy
msgid "Hi, I'm Pwnagotchi! Starting ..."
-msgstr "Здраво, јас сум Pwnagotchi!Почнувам ..."
+msgstr "Здраво, јас сум Pwnagotchi! Почнувам ..."
-#: voice.py:23
-#, fuzzy
msgid "New day, new hunt, new pwns!"
-msgstr "Нов ден, нов лов,ќе си газиме!"
+msgstr "Нов ден, нов лов, ќе си газиме!"
-#: voice.py:24
msgid "Hack the Planet!"
msgstr "Хак д Планет!"
-#: voice.py:28
msgid "AI ready."
msgstr "AI спремно."
-#: voice.py:29
-#, fuzzy
msgid "The neural network is ready."
msgstr "Невронската мрежае спремна."
-#: voice.py:37
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Hey, channel {channel} is free! Your AP will say thanks."
msgstr "Еј, каналот {channel} еслободен! APто ќе тикаже фала."
-#: voice.py:41
msgid "I'm bored ..."
msgstr "Досаднооо ..."
-#: voice.py:42
msgid "Let's go for a walk!"
msgstr "Ајде да шетнеме!"
-#: voice.py:45
-#, fuzzy
msgid "This is the best day of my life!"
msgstr "Ова ми е најдобриот ден во животот!"
-#: voice.py:48
msgid "Shitty day :/"
msgstr "Срање ден :/"
-#: voice.py:52
msgid "I'm extremely bored ..."
msgstr "Ултра досадно ..."
-#: voice.py:53
msgid "I'm very sad ..."
msgstr "Многу тажно ..."
-#: voice.py:54
msgid "I'm sad"
msgstr "Тажно"
-#: voice.py:59
msgid "I'm living the life!"
msgstr "Ммхх животче!"
-#: voice.py:60
msgid "I pwn therefore I am."
msgstr "Си газам значи постојам."
-#: voice.py:61
msgid "So many networks!!!"
msgstr "Мммм колку мрежи!!!"
-#: voice.py:62
-#, fuzzy
msgid "I'm having so much fun!"
msgstr "Јухуу забавноо ее!"
-#: voice.py:63
-#, fuzzy
msgid "My crime is that of curiosity ..."
msgstr "Виновен сум само заљубопитност ..."
-#: voice.py:67
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Hello {name}! Nice to meet you. {name}"
-msgstr "Здраво{name}!Мило ми е. {name}"
+msgstr "Здраво{name}! Мило ми е. {name}"
-#: voice.py:68
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Unit {name} is nearby! {name}"
-msgstr "Опаа{name}е во близина! {name}"
+msgstr "Опаа {name} е во близина! {name}"
-#: voice.py:72
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Uhm ... goodbye {name}"
-msgstr "Хмм ...чао{name}"
+msgstr "Хмм ...чао {name}"
-#: voice.py:73
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "{name} is gone ..."
-msgstr "{name}го снема ..."
+msgstr "{name} го снема ..."
-#: voice.py:77
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Whoops ... {name} is gone."
-msgstr "Уупс ...{name}го снема."
+msgstr "Уупс ... {name} го снема."
-#: voice.py:78
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "{name} missed!"
-msgstr "{name}промаши!"
+msgstr "{name} промаши!"
-#: voice.py:79
msgid "Missed!"
msgstr "Промаши!"
-#: voice.py:83
-#, fuzzy
msgid "Nobody wants to play with me ..."
msgstr "Никој не сака даси игра со мене ..."
-#: voice.py:84
msgid "I feel so alone ..."
msgstr "Толку сам ..."
-#: voice.py:85
msgid "Where's everybody?!"
msgstr "Каде се сите?!"
-#: voice.py:89
#, python-brace-format
msgid "Napping for {secs}s ..."
msgstr "Ќе дремнам {secs}с ..."
-#: voice.py:90
msgid "Zzzzz"
msgstr "Дреммм"
-#: voice.py:91
#, python-brace-format
msgid "ZzzZzzz ({secs}s)"
msgstr "Дремммм ({secs}с)"
-#: voice.py:98
#, python-brace-format
msgid "Waiting for {secs}s ..."
msgstr "Чекам {secs}с ..."
-#: voice.py:100
#, python-brace-format
msgid "Looking around ({secs}s)"
msgstr "Шарам наоколу ({secs}с)"
-#: voice.py:106
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Hey {what} let's be friends!"
-msgstr "Еј{what}ајде да се дружиме!"
+msgstr "Еј {what} ајде да се дружиме!"
-#: voice.py:107
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Associating to {what}"
-msgstr "Се закачувам на{what}"
+msgstr "Се закачувам на {what}"
-#: voice.py:108
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Yo {what}!"
-msgstr "Јо{what}!"
+msgstr "Јо {what}!"
-#: voice.py:112
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Just decided that {mac} needs no WiFi!"
-msgstr "Знаеш што, на{mac}не му треба WiFi!"
+msgstr "Знаеш што, на {mac} не му треба WiFi!"
-#: voice.py:113
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Deauthenticating {mac}"
-msgstr "Го деавтентицирам{mac}"
+msgstr "Го деавтентицирам {mac}"
-#: voice.py:114
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Kickbanning {mac}!"
-msgstr "Кикбан{mac}!"
+msgstr "Кикбан {mac}!"
-#: voice.py:118
-#, fuzzy, python-brace-format
+#, python-brace-format
msgid "Cool, we got {num} new handshake{plural}!"
-msgstr "Кул, фативме {num}нови ракувања!"
+msgstr "Кул, фативме {num} нови ракувања!"
-#: voice.py:121
-#, fuzzy
msgid "Ops, something went wrong ... Rebooting ..."
-msgstr "Упс, нешто не еко што треба ...Рестартирам ..."
+msgstr "Упс, нешто не еко што треба ... Рестартирам ..."
-#: voice.py:124
#, python-brace-format
msgid "Kicked {num} stations\n"
msgstr "Избацив {num} станици\n"
-#: voice.py:125
#, python-brace-format
msgid "Made {num} new friends\n"
msgstr "{num} нови другарчиња\n"
-#: voice.py:126
#, python-brace-format
msgid "Got {num} handshakes\n"
msgstr "Фатив {num} ракувања\n"
-#: voice.py:128
msgid "Met 1 peer"
msgstr "Запознав 1 пријател"
-#: voice.py:130
#, python-brace-format
msgid "Met {num} peers"
msgstr "Запознав {num} пријатели"
-#: voice.py:135
#, python-brace-format
msgid ""
"I've been pwning for {duration} and kicked {deauthed} clients! I've also met "
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/nl/LC_MESSAGES/voice.mo b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/nl/LC_MESSAGES/voice.mo
index b4db747197b3123cda75e98a56305f862afe0370..a5dd1d8a654b4e8b97d99c40157ffc3d5a0c33d2 100644
GIT binary patch
delta 1156
zcmZA0J7`l;9LMn!(<VL|Q{yY~k)GI^YHQOX6m$wyC!vD6h#)BGO?pa`LXuLdLn?J~
zX*;NkAeMj*4jnou;-noUE**4m@i92s!NDn@-{1A(;DM9Rz2}~s^Z)<Pz0LIFp2p`y
z#{)wfrXQi-4;ga~yTbg?k{!nEz!dJsUOb6s@c<Tr@mtu<{R(Dr6}8?wJcHlSV!G3q
zy_iSVYnUrs#29dR5a$AyaUb{3Fp95H8*Jb!{D|6UC1OkhU!VeNq5k&`llTj@Zk$DS
zVn4?5G)CFqjB$}+-~wvmG%E7DXmJ$>@eL}_EmQ_=)V%KPf9DOM0=S4r(L=4bh?@Th
z58)c_#uj$6zxl+4GWZfa_=#g2Lx{R}F@Bz~mC+^CF%^URho}snqcYmS0sMe{_!~#D
zZ<jI0@fs?D1yo>5*x19x(_r8wYN1W+!LO+2ib5MDa1#en??5{k&$6nX=TRA6MZGIE
zR7LKgGJb-p#2QjO^EO8PN4R*;z+r4-7L&|Y3G=APuOrErMN}o0Q1hDDi!D?}Td2Sz
zWTAkvsLJLsg_n^jW*T{Y%<VY!XHRn{c(9CA-f#kb(_+VhYi+2-D2o5SC^MbEGPQIC
zn4_x#gLG}6Y?a71x|&|#A^NaxXesvhGxzWK(YgKKbOg#yC0ABz#A$f3|20)XiKy|V
z`Q=rmPSDeIwSM|3dhliYpS6PX+W@~Dr(YhG+;8hY!lU8L_`EGtUD>m)X6utT>vpDS
z3$s->Q*-rso6F_aGtnE7k#RRwv0lZMJX?0PiK?3_>K|ndSDZIHS1UQM>PnNIoACd&
I5Nn410ClfyE&u=k
delta 1043
zcmXxjO>7Kd9LMp0b?sK!zHCcrs~ttPyVObJB_b6UiKOAcMIudX^dJsg)MdFiAn8S&
z5Ge<V^wJGN;?{_hxJg7LIJoM815NmTXQxm4%xCuL%rpPz_sl#Td^}M5Qp(K*ZH(Se
zzta?P7+2PCp#5x)Scl8F5&z;ScIF~B;URSV6n5Y=4&w|u-y__QZ!p2%*o8f7)B9>s
z;iSmG1oq%$<^}BLcMS`87k$8ee2oj}gQoKlC7eYInn&+@g`4p`I`0o`#edk2txQ^o
zT0}1=UND4Kd=L{ngB84r7Wf3Md=b6wEhhLKeQ>TNVk`Ec^Bq91KZ(6q#WuW-)E=`~
z;`uR`{o^SfCH|MVf$=}&?n(-jy%+n@-zU(OO`$8fhGo2kJMcN~!%w&qJJvTAFpd^>
z3_I~G)*QIRi4)z#LA;k;@B)3%JN$rO(Y;@!I>$d}{z6ySMohj7qi7;W&=sFXlc*wL
z#SHf0jUxFEbMk-zqgz5N{)QAEE!^#jyU^=Ka63+-g<nAnzKs_241E`ta0`A!{$iPf
zk-JK!jyyWv-A?`_p0**5#^*$<%}I=EwONeKVx7Qda+UOqg3$uqJ{uoPn#e%<tFbr}
zG#wM$<NmYFjp}e4-A2-B8_6uAE3@sQCv;xqG$mJLoF=rJ?w9Ke%9oa=<X1CBHz~Kl
bEr^NZ$>r+Q`FfHoH`gx~&gJVX#rdZHi?vQU
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/nl/LC_MESSAGES/voice.po b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/nl/LC_MESSAGES/voice.po
index ce55a63..72484e2 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/nl/LC_MESSAGES/voice.po
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/nl/LC_MESSAGES/voice.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 12:44+0200\n"
+"POT-Creation-Date: 2019-10-03 16:43+0200\n"
"PO-Revision-Date: 2019-09-29 14:00+0200\n"
"Last-Translator: Justin-P <justin-p@users.noreply.github.com>\n"
"Language-Team: pwnagotchi <33197631+dadav@users.noreply.github.com>\n"
@@ -16,218 +16,169 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: voice.py:18
msgid "ZzzzZZzzzzZzzz"
msgstr "ZzzzZZzzzzZzzz"
-#: voice.py:22
msgid "Hi, I'm Pwnagotchi! Starting ..."
msgstr "Hoi, Ik ben Pwnagotchi! Opstarten ..."
-#: voice.py:23
msgid "New day, new hunt, new pwns!"
msgstr "Nieuwe dag, nieuwe jacht, nieuwe pwns!"
-#: voice.py:24
msgid "Hack the Planet!"
msgstr "Hack de Wereld!"
-#: voice.py:28
msgid "AI ready."
msgstr "AI is klaar."
-#: voice.py:29
msgid "The neural network is ready."
msgstr "Neuronen netwerkis klaar voor gebruik."
-#: voice.py:37
#, python-brace-format
msgid "Hey, channel {channel} is free! Your AP will say thanks."
msgstr "Hey, kanaal {channel} is vrij! Je AP zal je bedanken."
-#: voice.py:41
msgid "I'm bored ..."
msgstr "Ik verveel me ..."
-#: voice.py:42
msgid "Let's go for a walk!"
msgstr "Laten we een rondje lopen!"
-#: voice.py:45
msgid "This is the best day of my life!"
msgstr "Dit is de beste dag van mijn leven!"
-#: voice.py:48
msgid "Shitty day :/"
msgstr "Ruk dag :/"
-#: voice.py:52
msgid "I'm extremely bored ..."
msgstr "Ik verveel me kapot ..."
-#: voice.py:53
msgid "I'm very sad ..."
msgstr "Ik ben ergverdrietig ..."
-#: voice.py:54
msgid "I'm sad"
msgstr "Ik ben verdrietig"
-#: voice.py:59
msgid "I'm living the life!"
msgstr "Beter kan het levenniet worden!"
-#: voice.py:60
msgid "I pwn therefore I am."
msgstr "Ik pwn daarom besta ik."
-#: voice.py:61
msgid "So many networks!!!"
msgstr "Zo veel netwerken!!!"
-#: voice.py:62
msgid "I'm having so much fun!"
msgstr "Dit is zo leuk!"
-#: voice.py:63
-#, fuzzy
msgid "My crime is that of curiosity ..."
-msgstr "Mijn enige misdrijfis mijn nieuwsgierigheid ..."
+msgstr "Mijn enige misdrijf is mijn nieuwsgierigheid ..."
-#: voice.py:67
#, python-brace-format
msgid "Hello {name}! Nice to meet you. {name}"
msgstr "Hallo {name}! Leuk je te ontmoeten. {name}"
-#: voice.py:68
#, python-brace-format
msgid "Unit {name} is nearby! {name}"
msgstr "Unit {name} is dichtbij! {name}"
-#: voice.py:72
#, python-brace-format
msgid "Uhm ... goodbye {name}"
msgstr "Uhm ...tot ziens {name}"
-#: voice.py:73
#, python-brace-format
msgid "{name} is gone ..."
msgstr "{name} is weg"
-#: voice.py:77
#, python-brace-format
msgid "Whoops ... {name} is gone."
msgstr "Whoopsie ...{name} is weg"
-#: voice.py:78
#, python-brace-format
msgid "{name} missed!"
msgstr "{name} gemist!"
-#: voice.py:79
msgid "Missed!"
msgstr "Gemist!"
-#: voice.py:83
msgid "Nobody wants to play with me ..."
msgstr "Niemand wil metmij spelen ..."
-#: voice.py:84
msgid "I feel so alone ..."
msgstr "Zo alleen ..."
-#: voice.py:85
msgid "Where's everybody?!"
msgstr "Waar is iedereen?!"
-#: voice.py:89
#, python-brace-format
msgid "Napping for {secs}s ..."
msgstr "Dutje doen voor {secs}s ..."
-#: voice.py:90
msgid "Zzzzz"
msgstr "Zzzzz"
-#: voice.py:91
#, python-brace-format
msgid "ZzzZzzz ({secs}s)"
msgstr ""
-#: voice.py:98
#, python-brace-format
msgid "Waiting for {secs}s ..."
msgstr "Even {secs}s wachten ..."
-#: voice.py:100
#, python-brace-format
msgid "Looking around ({secs}s)"
msgstr "Rond kijken ({secs}s)"
-#: voice.py:106
#, python-brace-format
msgid "Hey {what} let's be friends!"
msgstr "Hey {what}, laten we vriendenworden!"
-#: voice.py:107
#, python-brace-format
msgid "Associating to {what}"
msgstr "Verbinden met {what}"
-#: voice.py:108
#, python-brace-format
msgid "Yo {what}!"
msgstr ""
-#: voice.py:112
#, python-brace-format
msgid "Just decided that {mac} needs no WiFi!"
msgstr "Ik vind dat {mac} genoeg WiFiheeft gehad!"
-#: voice.py:113
#, python-brace-format
msgid "Deauthenticating {mac}"
msgstr "De-autoriseren {mac}"
-#: voice.py:114
#, python-brace-format
msgid "Kickbanning {mac}!"
msgstr "Ik ga {mac} even kicken!"
-#: voice.py:118
#, python-brace-format
msgid "Cool, we got {num} new handshake{plural}!"
msgstr "Gaaf, we hebben {num} nieuwe handshake{plural}!"
-#: voice.py:121
msgid "Ops, something went wrong ... Rebooting ..."
msgstr "Oops, iets ging fout ...Rebooting ..."
-#: voice.py:124
#, python-brace-format
msgid "Kicked {num} stations\n"
msgstr "{num} stations gekicked\n"
-#: voice.py:125
#, python-brace-format
msgid "Made {num} new friends\n"
msgstr "{num} nieuwe vrienden\n"
-#: voice.py:126
#, python-brace-format
msgid "Got {num} handshakes\n"
msgstr "{num} nieuwe handshakes\n"
-#: voice.py:128
msgid "Met 1 peer"
msgstr "1 peer ontmoet"
-#: voice.py:130
#, python-brace-format
msgid "Met {num} peers"
msgstr "{num} peers ontmoet"
-#: voice.py:135
#, python-brace-format
msgid ""
"I've been pwning for {duration} and kicked {deauthed} clients! I've also met "
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/voice.pot b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/voice.pot
index 53f3557..fbeba17 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/voice.pot
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/voice.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 13:10+0200\n"
+"POT-Creation-Date: 2019-10-03 16:47+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,217 +17,169 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: voice.py:18
msgid "ZzzzZZzzzzZzzz"
msgstr ""
-#: voice.py:22
msgid "Hi, I'm Pwnagotchi! Starting ..."
msgstr ""
-#: voice.py:23
msgid "New day, new hunt, new pwns!"
msgstr ""
-#: voice.py:24
msgid "Hack the Planet!"
msgstr ""
-#: voice.py:28
msgid "AI ready."
msgstr ""
-#: voice.py:29
msgid "The neural network is ready."
msgstr ""
-#: voice.py:37
#, python-brace-format
msgid "Hey, channel {channel} is free! Your AP will say thanks."
msgstr ""
-#: voice.py:41
msgid "I'm bored ..."
msgstr ""
-#: voice.py:42
msgid "Let's go for a walk!"
msgstr ""
-#: voice.py:45
msgid "This is the best day of my life!"
msgstr ""
-#: voice.py:48
msgid "Shitty day :/"
msgstr ""
-#: voice.py:52
msgid "I'm extremely bored ..."
msgstr ""
-#: voice.py:53
msgid "I'm very sad ..."
msgstr ""
-#: voice.py:54
msgid "I'm sad"
msgstr ""
-#: voice.py:59
msgid "I'm living the life!"
msgstr ""
-#: voice.py:60
msgid "I pwn therefore I am."
msgstr ""
-#: voice.py:61
msgid "So many networks!!!"
msgstr ""
-#: voice.py:62
msgid "I'm having so much fun!"
msgstr ""
-#: voice.py:63
msgid "My crime is that of curiosity ..."
msgstr ""
-#: voice.py:67
#, python-brace-format
msgid "Hello {name}! Nice to meet you. {name}"
msgstr ""
-#: voice.py:68
#, python-brace-format
msgid "Unit {name} is nearby! {name}"
msgstr ""
-#: voice.py:72
#, python-brace-format
msgid "Uhm ... goodbye {name}"
msgstr ""
-#: voice.py:73
#, python-brace-format
msgid "{name} is gone ..."
msgstr ""
-#: voice.py:77
#, python-brace-format
msgid "Whoops ... {name} is gone."
msgstr ""
-#: voice.py:78
#, python-brace-format
msgid "{name} missed!"
msgstr ""
-#: voice.py:79
msgid "Missed!"
msgstr ""
-#: voice.py:83
msgid "Nobody wants to play with me ..."
msgstr ""
-#: voice.py:84
msgid "I feel so alone ..."
msgstr ""
-#: voice.py:85
msgid "Where's everybody?!"
msgstr ""
-#: voice.py:89
#, python-brace-format
msgid "Napping for {secs}s ..."
msgstr ""
-#: voice.py:90
msgid "Zzzzz"
msgstr ""
-#: voice.py:91
#, python-brace-format
msgid "ZzzZzzz ({secs}s)"
msgstr ""
-#: voice.py:98
#, python-brace-format
msgid "Waiting for {secs}s ..."
msgstr ""
-#: voice.py:100
#, python-brace-format
msgid "Looking around ({secs}s)"
msgstr ""
-#: voice.py:106
#, python-brace-format
msgid "Hey {what} let's be friends!"
msgstr ""
-#: voice.py:107
#, python-brace-format
msgid "Associating to {what}"
msgstr ""
-#: voice.py:108
#, python-brace-format
msgid "Yo {what}!"
msgstr ""
-#: voice.py:112
#, python-brace-format
msgid "Just decided that {mac} needs no WiFi!"
msgstr ""
-#: voice.py:113
#, python-brace-format
msgid "Deauthenticating {mac}"
msgstr ""
-#: voice.py:114
#, python-brace-format
msgid "Kickbanning {mac}!"
msgstr ""
-#: voice.py:118
#, python-brace-format
msgid "Cool, we got {num} new handshake{plural}!"
msgstr ""
-#: voice.py:121
msgid "Ops, something went wrong ... Rebooting ..."
msgstr ""
-#: voice.py:124
#, python-brace-format
msgid "Kicked {num} stations\n"
msgstr ""
-#: voice.py:125
#, python-brace-format
msgid "Made {num} new friends\n"
msgstr ""
-#: voice.py:126
#, python-brace-format
msgid "Got {num} handshakes\n"
msgstr ""
-#: voice.py:128
msgid "Met 1 peer"
msgstr ""
-#: voice.py:130
#, python-brace-format
msgid "Met {num} peers"
msgstr ""
-#: voice.py:135
#, python-brace-format
msgid ""
"I've been pwning for {duration} and kicked {deauthed} clients! I've also met "
From 4cf28667378970b31a1ec9f968180ca2869f0831 Mon Sep 17 00:00:00 2001
From: Simone Margaritelli <evilsocket@gmail.com>
Date: Thu, 3 Oct 2019 17:06:40 +0200
Subject: [PATCH 16/32] new: integrated python standard logger (closes #84)
---
README.md | 8 +-
scripts/preview.py | 10 +--
.../pwnagotchi/scripts/bettercap/client.py | 7 +-
.../root/pwnagotchi/scripts/core/__init__.py | 17 ----
sdcard/rootfs/root/pwnagotchi/scripts/main.py | 36 ++++-----
.../pwnagotchi/scripts/pwnagotchi/agent.py | 77 ++++++++++---------
.../scripts/pwnagotchi/ai/__init__.py | 14 ++--
.../pwnagotchi/scripts/pwnagotchi/ai/epoch.py | 7 +-
.../pwnagotchi/scripts/pwnagotchi/ai/gym.py | 23 +++---
.../pwnagotchi/scripts/pwnagotchi/ai/train.py | 23 +++---
.../root/pwnagotchi/scripts/pwnagotchi/log.py | 2 +
.../scripts/pwnagotchi/mesh/advertise.py | 15 ++--
.../scripts/pwnagotchi/mesh/peer.py | 6 +-
.../scripts/pwnagotchi/mesh/utils.py | 4 +-
.../pwnagotchi/plugins/default/example.py | 7 +-
.../scripts/pwnagotchi/plugins/default/gps.py | 10 +--
.../scripts/pwnagotchi/ui/display.py | 49 ++++++------
.../pwnagotchi/scripts/pwnagotchi/ui/view.py | 9 ++-
.../pwnagotchi/scripts/pwnagotchi/utils.py | 20 ++++-
19 files changed, 171 insertions(+), 173 deletions(-)
diff --git a/README.md b/README.md
index 095c7eb..14e415c 100644
--- a/README.md
+++ b/README.md
@@ -202,14 +202,14 @@ running = False
def on_loaded():
- core.log("GPS plugin loaded for %s" % device)
+ logging.info("GPS plugin loaded for %s" % device)
def on_ready(agent):
global running
if os.path.exists(device):
- core.log("enabling GPS bettercap's module for %s" % device)
+ logging.info("enabling GPS bettercap's module for %s" % device)
try:
agent.run('gps off')
except:
@@ -220,7 +220,7 @@ def on_ready(agent):
agent.run('gps on')
running = True
else:
- core.log("no GPS detected")
+ logging.info("no GPS detected")
def on_handshake(agent, filename, access_point, client_station):
@@ -229,7 +229,7 @@ def on_handshake(agent, filename, access_point, client_station):
gps = info['gps']
gps_filename = filename.replace('.pcap', '.gps.json')
- core.log("saving GPS to %s (%s)" % (gps_filename, gps))
+ logging.info("saving GPS to %s (%s)" % (gps_filename, gps))
with open(gps_filename, 'w+t') as fp:
json.dump(gps, fp)
```
diff --git a/scripts/preview.py b/scripts/preview.py
index 261448e..2b45933 100755
--- a/scripts/preview.py
+++ b/scripts/preview.py
@@ -6,6 +6,7 @@ import time
import argparse
from http.server import HTTPServer
import shutil
+import logging
import yaml
sys.path.insert(0,
@@ -13,7 +14,6 @@ sys.path.insert(0,
'../sdcard/rootfs/root/pwnagotchi/scripts/'))
from pwnagotchi.ui.display import Display, VideoHandler
-import core
class CustomDisplay(Display):
@@ -22,11 +22,11 @@ class CustomDisplay(Display):
if self._video_address is not None:
self._httpd = HTTPServer((self._video_address, self._video_port),
CustomVideoHandler)
- core.log("ui available at http://%s:%d/" % (self._video_address,
+ logging.info("ui available at http://%s:%d/" % (self._video_address,
self._video_port))
self._httpd.serve_forever()
else:
- core.log("could not get ip of usb0, video server not starting")
+ logging.info("could not get ip of usb0, video server not starting")
def _on_view_rendered(self, img):
CustomVideoHandler.render(img)
@@ -45,7 +45,7 @@ class CustomVideoHandler(VideoHandler):
try:
img.save("/tmp/pwnagotchi-{rand}.png".format(rand=id(CustomVideoHandler)), format='PNG')
except BaseException:
- core.log("could not write preview")
+ logging.exception("could not write preview")
def do_GET(self):
if self.path == '/':
@@ -69,7 +69,7 @@ class CustomVideoHandler(VideoHandler):
with open("/tmp/pwnagotchi-{rand}.png".format(rand=id(CustomVideoHandler)), 'rb') as fp:
shutil.copyfileobj(fp, self.wfile)
except BaseException:
- core.log("could not open preview")
+ logging.exception("could not open preview")
else:
self.send_response(404)
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/bettercap/client.py b/sdcard/rootfs/root/pwnagotchi/scripts/bettercap/client.py
index 98c71c2..d55fc33 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/bettercap/client.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/bettercap/client.py
@@ -1,8 +1,7 @@
+import logging
import requests
from requests.auth import HTTPBasicAuth
-import core
-
class Client(object):
def __init__(self, hostname='localhost', scheme='http', port=8081, username='user', password='pass'):
@@ -19,11 +18,11 @@ class Client(object):
return r.json()
except Exception as e:
if r.status_code == 200:
- core.log("error while decoding json: error='%s' resp='%s'" % (e, r.text))
+ logging.error("error while decoding json: error='%s' resp='%s'" % (e, r.text))
else:
err = "error %d: %s" % (r.status_code, r.text.strip())
if verbose_errors:
- core.log(err)
+ logging.info(err)
raise Exception(err)
return r.text
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/core/__init__.py b/sdcard/rootfs/root/pwnagotchi/scripts/core/__init__.py
index 4321676..eb718d3 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/core/__init__.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/core/__init__.py
@@ -1,24 +1,7 @@
-import sys
import glob
import os
import time
import subprocess
-from threading import Lock
-from datetime import datetime
-
-logfile = None
-loglock = Lock()
-
-
-def log(msg):
- tstamp = str(datetime.now())
- line = "[%s] %s" % (tstamp, msg.rstrip())
- print(line)
- sys.stdout.flush()
- if logfile is not None:
- with loglock:
- with open(logfile, 'a+t') as fp:
- fp.write("%s\n" % line)
def secs_to_hhmmss(secs):
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/main.py b/sdcard/rootfs/root/pwnagotchi/scripts/main.py
index 2327955..7caa81e 100755
--- a/sdcard/rootfs/root/pwnagotchi/scripts/main.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/main.py
@@ -2,11 +2,10 @@
import os
import argparse
import time
-import traceback
+import logging
import yaml
-import core
import pwnagotchi
import pwnagotchi.utils as utils
import pwnagotchi.version as version
@@ -28,8 +27,12 @@ parser.add_argument('--manual', dest="do_manual", action="store_true", default=F
parser.add_argument('--clear', dest="do_clear", action="store_true", default=False,
help="Clear the ePaper display and exit.")
+parser.add_argument('--debug', dest="debug", action="store_true", default=False,
+ help="Enable debug logs.")
+
args = parser.parse_args()
config = utils.load_config(args)
+utils.setup_logging(args, config)
if args.do_clear:
print("clearing the display ...")
@@ -75,19 +78,18 @@ plugins.on('loaded')
display = Display(config=config, state={'name': '%s>' % pwnagotchi.name()})
agent = Agent(view=display, config=config)
-core.log("%s@%s (v%s)" % (pwnagotchi.name(), agent._identity, version.version))
+logging.info("%s@%s (v%s)" % (pwnagotchi.name(), agent._identity, version.version))
# for key, value in config['personality'].items():
-# core.log(" %s: %s" % (key, value))
+# logging.info(" %s: %s" % (key, value))
for _, plugin in plugins.loaded.items():
- core.log("plugin '%s' v%s loaded from %s" % (plugin.__name__, plugin.__version__, plugin.__file__))
+ logging.info("plugin '%s' v%s loaded from %s" % (plugin.__name__, plugin.__version__, plugin.__file__))
if args.do_manual:
- core.log("entering manual mode ...")
+ logging.info("entering manual mode ...")
log = SessionParser(config['main']['log'])
-
- core.log("the last session lasted %s (%d completed epochs, trained for %d), average reward:%s (min:%s max:%s)" % (
+ logging.info("the last session lasted %s (%d completed epochs, trained for %d), average reward:%s (min:%s max:%s)" % (
log.duration_human,
log.epochs,
log.train_epochs,
@@ -98,17 +100,18 @@ if args.do_manual:
while True:
display.on_manual_mode(log)
time.sleep(1)
+
if config['twitter']['enabled'] and log.is_new() and Agent.is_connected() and log.handshakes > 0:
import tweepy
- core.log("detected a new session and internet connectivity!")
+ logging.info("detected a new session and internet connectivity!")
picture = '/dev/shm/pwnagotchi.png'
- display.update()
+ display.update(force=True)
display.image().save(picture, 'png')
display.set('status', 'Tweeting...')
- display.update()
+ display.update(force=True)
try:
auth = tweepy.OAuthHandler(config['twitter']['consumer_key'], config['twitter']['consumer_secret'])
@@ -119,14 +122,12 @@ if args.do_manual:
api.update_with_media(filename=picture, status=tweet)
log.save_session_id()
- core.log("tweeted: %s" % tweet)
+ logging.info("tweeted: %s" % tweet)
except Exception as e:
- core.log("error: %s" % e)
+ logging.exception("error while tweeting")
quit()
-core.logfile = config['main']['log']
-
agent.start_ai()
agent.setup_events()
agent.set_starting()
@@ -151,7 +152,7 @@ while True:
agent.set_channel(ch)
if not agent.is_stale() and agent.any_activity():
- core.log("%d access points on channel %d" % (len(aps), ch))
+ logging.info("%d access points on channel %d" % (len(aps), ch))
# for each ap on this channel
for ap in aps:
@@ -170,5 +171,4 @@ while True:
# affect ours ... neat ^_^
agent.next_epoch()
except Exception as e:
- core.log("main loop exception: %s" % e)
- core.log("%s" % traceback.format_exc())
+ logging.exception("main loop exception")
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/agent.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/agent.py
index 9dcb7fb..578e380 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/agent.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/agent.py
@@ -4,6 +4,7 @@ import os
import re
import socket
from datetime import datetime
+import logging
import _thread
import core
@@ -82,7 +83,7 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
plugins.on('rebooting', self)
def setup_events(self):
- core.log("connecting to %s ..." % self.url)
+ logging.info("connecting to %s ..." % self.url)
for tag in self._config['bettercap']['silence']:
try:
@@ -109,30 +110,30 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
s = self.session()
for iface in s['interfaces']:
if iface['name'] == mon_iface:
- core.log("found monitor interface: %s" % iface['name'])
+ logging.info("found monitor interface: %s" % iface['name'])
has_mon = True
break
if has_mon is False:
if mon_start_cmd is not None and mon_start_cmd != '':
- core.log("starting monitor interface ...")
+ logging.info("starting monitor interface ...")
self.run('!%s' % mon_start_cmd)
else:
- core.log("waiting for monitor interface %s ..." % mon_iface)
+ logging.info("waiting for monitor interface %s ..." % mon_iface)
time.sleep(1)
- core.log("supported channels: %s" % self._supported_channels)
- core.log("handshakes will be collected inside %s" % self._config['bettercap']['handshakes'])
+ logging.info("supported channels: %s" % self._supported_channels)
+ logging.info("handshakes will be collected inside %s" % self._config['bettercap']['handshakes'])
self._reset_wifi_settings()
wifi_running = self.is_module_running('wifi')
if wifi_running and restart:
- core.log("restarting wifi module ...")
+ logging.debug("restarting wifi module ...")
self.restart('wifi.recon')
self.run('wifi.clear')
elif not wifi_running:
- core.log("starting wifi module ...")
+ logging.debug("starting wifi module ...")
self.start('wifi.recon')
self.start_advertising()
@@ -150,13 +151,13 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
for ch in self._epoch.non_overlapping_channels:
if ch not in busy_channels:
self._epoch.non_overlapping_channels[ch] += 1
- core.log("channel %d is free from %d epochs" % (ch, self._epoch.non_overlapping_channels[ch]))
+ logging.info("channel %d is free from %d epochs" % (ch, self._epoch.non_overlapping_channels[ch]))
elif self._epoch.non_overlapping_channels[ch] > 0:
self._epoch.non_overlapping_channels[ch] -= 1
# report any channel that has been free for at least 3 epochs
for ch, num_epochs_free in self._epoch.non_overlapping_channels.items():
if num_epochs_free >= 3:
- core.log("channel %d has been free for %d epochs" % (ch, num_epochs_free))
+ logging.info("channel %d has been free for %d epochs" % (ch, num_epochs_free))
self.set_free_channel(ch)
def recon(self):
@@ -172,14 +173,14 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
if not channels:
self._current_channel = 0
- # core.log("RECON %ds" % recon_time)
+ logging.debug("RECON %ds" % recon_time)
self.run('wifi.recon.channel clear')
else:
- # core.log("RECON %ds ON CHANNELS %s" % (recon_time, ','.join(map(str, channels))))
+ logging.debug("RECON %ds ON CHANNELS %s" % (recon_time, ','.join(map(str, channels))))
try:
self.run('wifi.recon.channel %s' % ','.join(map(str, channels)))
except Exception as e:
- core.log("error: %s" % e)
+ logging.exception("error")
self.wait_for(recon_time, sleeping=False)
@@ -204,7 +205,7 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
if self._filter_included(ap):
aps.append(ap)
except Exception as e:
- core.log("error: %s" % e)
+ logging.exception("error")
aps.sort(key=lambda ap: ap['channel'])
return self.set_access_points(aps)
@@ -289,7 +290,7 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
self._view.set_closest_peer(peer)
def _save_recovery_data(self):
- core.log("writing recovery data to %s ..." % RECOVERY_DATA_FILE)
+ logging.warning("writing recovery data to %s ..." % RECOVERY_DATA_FILE)
with open(RECOVERY_DATA_FILE, 'w') as fp:
data = {
'started_at': self._started_at,
@@ -304,7 +305,7 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
try:
with open(RECOVERY_DATA_FILE, 'rt') as fp:
data = json.load(fp)
- core.log("found recovery data: %s" % data)
+ logging.info("found recovery data: %s" % data)
self._started_at = data['started_at']
self._epoch.epoch = data['epoch']
self._handshakes = data['handshakes']
@@ -312,7 +313,7 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
self._last_pwnd = data['last_pwnd']
if delete:
- core.log("deleting %s" % RECOVERY_DATA_FILE)
+ logging.info("deleting %s" % RECOVERY_DATA_FILE)
os.unlink(RECOVERY_DATA_FILE)
except:
if not no_exceptions:
@@ -323,7 +324,7 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
self.run('events.clear')
- core.log("event polling started ...")
+ logging.debug("event polling started ...")
while True:
time.sleep(1)
@@ -349,21 +350,21 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
new_shakes += 1
ap_and_station = self._find_ap_sta_in(sta_mac, ap_mac, s)
if ap_and_station is None:
- core.log("!!! captured new handshake: %s !!!" % key)
+ logging.warning("!!! captured new handshake: %s !!!" % key)
self._last_pwnd = ap_mac
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
- core.log("!!! captured new handshake on channel %d: %s (%s) -> %s [%s (%s)] !!!" % ( \
+ logging.warning("!!! captured new handshake on channel %d: %s (%s) -> %s [%s (%s)] !!!" % ( \
ap['channel'],
sta['mac'], sta['vendor'],
ap['hostname'], ap['mac'], ap['vendor']))
plugins.on('handshake', self, filename, ap, sta)
except Exception as e:
- core.log("error: %s" % e)
+ logging.exception("error")
finally:
self._update_handshakes(new_shakes)
@@ -404,7 +405,7 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
return self._history[who] < self._config['personality']['max_interactions']
def _on_miss(self, who):
- core.log("it looks like %s is not in range anymore :/" % who)
+ logging.info("it looks like %s is not in range anymore :/" % who)
self._epoch.track(miss=True)
self._view.on_miss(who)
@@ -416,18 +417,18 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
if 'is an unknown BSSID' in error:
self._on_miss(who)
else:
- core.log("error: %s" % e)
+ logging.error("%s" % e)
def associate(self, ap, throttle=0):
if self.is_stale():
- core.log("recon is stale, skipping assoc(%s)" % ap['mac'])
+ logging.debug("recon is stale, skipping assoc(%s)" % ap['mac'])
return
if self._config['personality']['associate'] and self._should_interact(ap['mac']):
self._view.on_assoc(ap)
try:
- core.log("sending association frame to %s (%s %s) on channel %d [%d clients]..." % ( \
+ logging.info("sending association frame to %s (%s %s) on channel %d [%d clients]..." % ( \
ap['hostname'], ap['mac'], ap['vendor'], ap['channel'], len(ap['clients'])))
self.run('wifi.assoc %s' % ap['mac'])
self._epoch.track(assoc=True)
@@ -441,14 +442,14 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
def deauth(self, ap, sta, throttle=0):
if self.is_stale():
- core.log("recon is stale, skipping deauth(%s)" % sta['mac'])
+ logging.debug("recon is stale, skipping deauth(%s)" % sta['mac'])
return
if self._config['personality']['deauth'] and self._should_interact(sta['mac']):
self._view.on_deauth(sta)
try:
- core.log("deauthing %s (%s) from %s (%s %s) on channel %d ..." % (
+ logging.info("deauthing %s (%s) from %s (%s %s) on channel %d ..." % (
sta['mac'], sta['vendor'], ap['hostname'], ap['mac'], ap['vendor'], ap['channel']))
self.run('wifi.deauth %s' % sta['mac'])
self._epoch.track(deauth=True)
@@ -462,7 +463,7 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
def set_channel(self, channel, verbose=True):
if self.is_stale():
- core.log("recon is stale, skipping set_channel(%d)" % channel)
+ logging.debug("recon is stale, skipping set_channel(%d)" % channel)
return
# if in the previous loop no client stations has been deauthenticated
@@ -478,10 +479,12 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
if channel != self._current_channel:
if self._current_channel != 0 and wait > 0:
if verbose:
- core.log("waiting for %ds on channel %d ..." % (wait, self._current_channel))
+ logging.info("waiting for %ds on channel %d ..." % (wait, self._current_channel))
+ else:
+ logging.debug("waiting for %ds on channel %d ..." % (wait, self._current_channel))
self.wait_for(wait)
if verbose and self._epoch.any_activity:
- core.log("CHANNEL %d" % channel)
+ logging.info("CHANNEL %d" % channel)
try:
self.run('wifi.recon.channel %d' % channel)
self._current_channel = channel
@@ -491,7 +494,7 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
plugins.on('channel_hop', self, channel)
except Exception as e:
- core.log("error: %s" % e)
+ logging.error("error: %s" % e)
def is_stale(self):
return self._epoch.num_missed > self._config['personality']['max_misses_for_recon']
@@ -502,7 +505,7 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
def _reboot(self):
self.set_rebooting()
self._save_recovery_data()
- core.log("rebooting the system ...")
+ logging.warning("rebooting the system ...")
os.system("/usr/bin/sync")
os.system("/usr/sbin/shutdown -r now")
@@ -514,24 +517,24 @@ class Agent(Client, AsyncAdvertiser, AsyncTrainer):
# after X misses during an epoch, set the status to lonely
if was_stale:
- core.log("agent missed %d interactions -> lonely" % did_miss)
+ logging.warning("agent missed %d interactions -> lonely" % did_miss)
self.set_lonely()
# after X times being bored, the status is set to sad
elif self._epoch.inactive_for >= self._config['personality']['sad_num_epochs']:
- core.log("%d epochs with no activity -> sad" % self._epoch.inactive_for)
+ logging.warning("%d epochs with no activity -> sad" % self._epoch.inactive_for)
self.set_sad()
# after X times being inactive, the status is set to bored
elif self._epoch.inactive_for >= self._config['personality']['bored_num_epochs']:
- core.log("%d epochs with no activity -> bored" % self._epoch.inactive_for)
+ logging.warning("%d epochs with no activity -> bored" % self._epoch.inactive_for)
self.set_bored()
# after X times being active, the status is set to happy / excited
elif self._epoch.active_for >= self._config['personality']['excited_num_epochs']:
- core.log("%d epochs with activity -> excited" % self._epoch.active_for)
+ logging.warning("%d epochs with activity -> excited" % self._epoch.active_for)
self.set_excited()
plugins.on('epoch', self, self._epoch.epoch - 1, self._epoch.data())
if self._epoch.blind_for >= self._config['main']['mon_max_blind_epochs']:
- core.log("%d epochs without visible access points -> rebooting ..." % self._epoch.blind_for)
+ logging.critical("%d epochs without visible access points -> rebooting ..." % self._epoch.blind_for)
self._reboot()
self._epoch.blind_for = 0
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ai/__init__.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ai/__init__.py
index 42b857f..359a38c 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ai/__init__.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ai/__init__.py
@@ -7,16 +7,16 @@ import warnings
# https://stackoverflow.com/questions/15777951/how-to-suppress-pandas-future-warning
warnings.simplefilter(action='ignore', category=FutureWarning)
-import core
+import logging
def load(config, agent, epoch, from_disk=True):
config = config['ai']
if not config['enabled']:
- core.log("ai disabled")
+ logging.info("ai disabled")
return False
- core.log("[ai] bootstrapping dependencies ...")
+ logging.info("[ai] bootstrapping dependencies ...")
from stable_baselines import A2C
from stable_baselines.common.policies import MlpLstmPolicy
@@ -27,16 +27,16 @@ def load(config, agent, epoch, from_disk=True):
env = wrappers.Environment(agent, epoch)
env = DummyVecEnv([lambda: env])
- core.log("[ai] bootstrapping model ...")
+ logging.info("[ai] bootstrapping model ...")
a2c = A2C(MlpLstmPolicy, env, **config['params'])
if from_disk and os.path.exists(config['path']):
- core.log("[ai] loading %s ..." % config['path'])
+ logging.info("[ai] loading %s ..." % config['path'])
a2c.load(config['path'], env)
else:
- core.log("[ai] model created:")
+ logging.info("[ai] model created:")
for key, value in config['params'].items():
- core.log(" %s: %s" % (key, value))
+ logging.info(" %s: %s" % (key, value))
return a2c
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ai/epoch.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ai/epoch.py
index 8508eb9..0ef7869 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ai/epoch.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ai/epoch.py
@@ -1,5 +1,6 @@
import time
import threading
+import logging
import core
import pwnagotchi
@@ -87,13 +88,13 @@ class Epoch(object):
aps_per_chan[ch_idx] += 1.0
sta_per_chan[ch_idx] += len(ap['clients'])
except IndexError as e:
- core.log("got data on channel %d, we can store %d channels" % (ap['channel'], wifi.NumChannels))
+ logging.error("got data on channel %d, we can store %d channels" % (ap['channel'], wifi.NumChannels))
for peer in peers:
try:
peers_per_chan[peer.last_channel - 1] += 1.0
except IndexError as e:
- core.log(
+ logging.error(
"got peer data on channel %d, we can store %d channels" % (peer.last_channel, wifi.NumChannels))
# normalize
@@ -172,7 +173,7 @@ class Epoch(object):
self._epoch_data['reward'] = self._reward(self.epoch + 1, self._epoch_data)
self._epoch_data_ready.set()
- core.log("[epoch %d] duration=%s slept_for=%s blind=%d inactive=%d active=%d hops=%d missed=%d "
+ logging.info("[epoch %d] duration=%s slept_for=%s blind=%d inactive=%d active=%d hops=%d missed=%d "
"deauths=%d assocs=%d handshakes=%d cpu=%d%% mem=%d%% temperature=%dC reward=%s" % (
self.epoch,
core.secs_to_hhmmss(self.epoch_duration),
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ai/gym.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ai/gym.py
index 0e713a1..22e6441 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ai/gym.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ai/gym.py
@@ -1,8 +1,8 @@
+import logging
import gym
from gym import spaces
import numpy as np
-import core
import pwnagotchi.ai.featurizer as featurizer
import pwnagotchi.ai.reward as reward
from pwnagotchi.ai.parameter import Parameter
@@ -83,7 +83,7 @@ class Environment(gym.Env):
return params
def _next_epoch(self):
- # core.log("[ai] waiting for epoch to finish ...")
+ logging.debug("[ai] waiting for epoch to finish ...")
return self._epoch.wait_for_epoch_data()
def _apply_policy(self, policy):
@@ -110,7 +110,7 @@ class Environment(gym.Env):
return self.last['state_v'], self.last['reward'], not self._agent.is_training(), {}
def reset(self):
- # core.log("[ai] resetting environment ...")
+ # logging.info("[ai] resetting environment ...")
self._epoch_num = 0
state = self._next_epoch()
self.last['state'] = state
@@ -120,7 +120,7 @@ class Environment(gym.Env):
def _render_histogram(self, hist):
for ch in range(featurizer.histogram_size):
if hist[ch]:
- core.log(" CH %d: %s" % (ch + 1, hist[ch]))
+ logging.info(" CH %d: %s" % (ch + 1, hist[ch]))
def render(self, mode='human', close=False, force=False):
# when using a vectorialized environment, render gets called twice
@@ -133,18 +133,13 @@ class Environment(gym.Env):
self._last_render = self._epoch_num
- core.log("[ai] --- training epoch %d/%d ---" % (self._epoch_num, self._agent.training_epochs()))
- core.log("[ai] REWARD: %f" % self.last['reward'])
+ logging.info("[ai] --- training epoch %d/%d ---" % (self._epoch_num, self._agent.training_epochs()))
+ logging.info("[ai] REWARD: %f" % self.last['reward'])
- # core.log("[ai] policy: %s" % ', '.join("%s:%s" % (name, value) for name, value in self.last['params'].items()))
+ logging.debug("[ai] policy: %s" % ', '.join("%s:%s" % (name, value) for name, value in self.last['params'].items()))
- core.log("[ai] observation:")
+ logging.info("[ai] observation:")
for name, value in self.last['state'].items():
if 'histogram' in name:
- core.log(" %s" % name.replace('_histogram', ''))
+ logging.info(" %s" % name.replace('_histogram', ''))
self._render_histogram(value)
-
- # core.log("[ai] outcome:")
- # for name, value in self.last['state'].items():
- # if 'histogram' not in name:
- # core.log(" %s: %s" % (name, value))
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ai/train.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ai/train.py
index 34140dd..96e6789 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ai/train.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ai/train.py
@@ -4,8 +4,7 @@ import time
import random
import os
import json
-
-import core
+import logging
import pwnagotchi.plugins as plugins
import pwnagotchi.ai as ai
@@ -56,7 +55,7 @@ class Stats(object):
def load(self):
with self._lock:
if os.path.exists(self.path) and os.path.getsize(self.path) > 0:
- core.log("[ai] loading %s" % self.path)
+ logging.info("[ai] loading %s" % self.path)
with open(self.path, 'rt') as fp:
obj = json.load(fp)
@@ -66,7 +65,7 @@ class Stats(object):
def save(self):
with self._lock:
- core.log("[ai] saving %s" % self.path)
+ logging.info("[ai] saving %s" % self.path)
data = json.dumps({
'born_at': self.born_at,
@@ -114,7 +113,7 @@ class AsyncTrainer(object):
_thread.start_new_thread(self._ai_worker, ())
def _save_ai(self):
- core.log("[ai] saving model to %s ..." % self._nn_path)
+ logging.info("[ai] saving model to %s ..." % self._nn_path)
temp = "%s.tmp" % self._nn_path
self._model.save(temp)
os.replace(temp, self._nn_path)
@@ -133,15 +132,15 @@ class AsyncTrainer(object):
def on_ai_policy(self, new_params):
plugins.on('ai_policy', self, new_params)
- core.log("[ai] setting new policy:")
+ logging.info("[ai] setting new policy:")
for name, value in new_params.items():
if name in self._config['personality']:
curr_value = self._config['personality'][name]
if curr_value != value:
- core.log("[ai] ! %s: %s -> %s" % (name, curr_value, value))
+ logging.info("[ai] ! %s: %s -> %s" % (name, curr_value, value))
self._config['personality'][name] = value
else:
- core.log("[ai] param %s not in personality configuration!" % name)
+ logging.error("[ai] param %s not in personality configuration!" % name)
self.run('set wifi.ap.ttl %d' % self._config['personality']['ap_ttl'])
self.run('set wifi.sta.ttl %d' % self._config['personality']['sta_ttl'])
@@ -152,12 +151,12 @@ class AsyncTrainer(object):
plugins.on('ai_ready', self)
def on_ai_best_reward(self, r):
- core.log("[ai] best reward so far: %s" % r)
+ logging.info("[ai] best reward so far: %s" % r)
self._view.on_motivated(r)
plugins.on('ai_best_reward', self, r)
def on_ai_worst_reward(self, r):
- core.log("[ai] worst reward so far: %s" % r)
+ logging.info("[ai] worst reward so far: %s" % r)
self._view.on_demotivated(r)
plugins.on('ai_worst_reward', self, r)
@@ -174,12 +173,12 @@ class AsyncTrainer(object):
self._model.env.render()
# enter in training mode?
if random.random() > self._config['ai']['laziness']:
- core.log("[ai] learning for %d epochs ..." % epochs_per_episode)
+ logging.info("[ai] learning for %d epochs ..." % epochs_per_episode)
try:
self.set_training(True, epochs_per_episode)
self._model.learn(total_timesteps=epochs_per_episode, callback=self.on_ai_training_step)
except Exception as e:
- core.log("[ai] error while training: %s" % e)
+ logging.exception("[ai] error while training")
finally:
self.set_training(False)
obs = self._model.env.reset()
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/log.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/log.py
index edf66ed..8648521 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/log.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/log.py
@@ -37,6 +37,8 @@ class SessionParser(object):
self.last_saved_session_id = self.last_session_id
def _parse_datetime(self, dt):
+ dt = dt.split('.')[0]
+ dt = dt.split(',')[0]
dt = datetime.strptime(dt.split('.')[0], '%Y-%m-%d %H:%M:%S')
return time.mktime(dt.timetuple())
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/advertise.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/advertise.py
index 9d5c788..90374c6 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/advertise.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/advertise.py
@@ -2,9 +2,9 @@ import time
import json
import _thread
import threading
+import logging
from scapy.all import Dot11, Dot11FCS, Dot11Elt, RadioTap, sendp, sniff
-import core
import pwnagotchi.ui.faces as faces
import pwnagotchi.mesh.wifi as wifi
@@ -54,7 +54,6 @@ class Advertiser(object):
self._lost_peer_cb = lost_cb
def on_face_change(self, old, new):
- # core.log("face change: %s -> %s" % (old, new))
self.update({'face': new})
def start(self):
@@ -84,12 +83,12 @@ class Advertiser(object):
self._stopped.set()
def _sender(self):
- core.log("started advertiser thread (period:%s sid:%s) ..." % (str(self._period), self._me.session_id))
+ logging.info("started advertiser thread (period:%s sid:%s) ..." % (str(self._period), self._me.session_id))
while self._running:
try:
sendp(self._frame, iface=self._iface, verbose=False, count=5, inter=self._period)
except Exception as e:
- core.log("error: %s" % e)
+ logging.exception("error")
time.sleep(self._period)
def _on_advertisement(self, src_session_id, channel, rssi, adv):
@@ -97,7 +96,7 @@ class Advertiser(object):
with self._peers_lock:
if ident not in self._peers:
peer = Peer(src_session_id, channel, rssi, adv)
- core.log("detected unit %s (v%s) on channel %d (%s dBm) [sid:%s pwnd_tot:%d uptime:%d]" % ( \
+ logging.info("detected unit %s (v%s) on channel %d (%s dBm) [sid:%s pwnd_tot:%d uptime:%d]" % ( \
peer.full_name(),
peer.version(),
channel,
@@ -158,10 +157,10 @@ class Advertiser(object):
raise Exception("unknown frame id %d" % dot11elt.ID)
except Exception as e:
- core.log("error decoding packet from %s: %s" % (dot11.addr3, e))
+ logging.exception("error decoding packet from %s" % dot11.addr3)
def _listener(self):
- # core.log("started advertisements listener ...")
+ # logging.info("started advertisements listener ...")
expr = "type mgt subtype beacon and ether src %s" % wifi.SignatureAddress
sniff(iface=self._iface, filter=expr, prn=self._on_packet, store=0, stop_filter=lambda x: self._stopped.isSet())
@@ -173,7 +172,7 @@ class Advertiser(object):
for ident, peer in self._peers.items():
inactive_for = peer.inactive_for()
if inactive_for >= Advertiser.MAX_STALE_TIME:
- core.log("peer %s lost (inactive for %ds)" % (peer.full_name(), inactive_for))
+ logging.info("peer %s lost (inactive for %ds)" % (peer.full_name(), inactive_for))
self._lost_peer_cb(peer)
stale.append(ident)
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/peer.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/peer.py
index 6f9f1f9..0d3b061 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/peer.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/peer.py
@@ -1,8 +1,8 @@
import time
+import logging
import pwnagotchi.mesh.wifi as wifi
import pwnagotchi.ui.faces as faces
-import core
class Peer(object):
@@ -18,10 +18,10 @@ class Peer(object):
def update(self, sid, channel, rssi, adv):
if self.name() != adv['name']:
- core.log("peer %s changed name: %s -> %s" % (self.full_name(), self.name(), adv['name']))
+ logging.info("peer %s changed name: %s -> %s" % (self.full_name(), self.name(), adv['name']))
if self.session_id != sid:
- core.log("peer %s changed session id: %s -> %s" % (self.full_name(), self.session_id, sid))
+ logging.info("peer %s changed session id: %s -> %s" % (self.full_name(), self.session_id, sid))
self.presence[channel - 1] += 1
self.adv = adv
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/utils.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/utils.py
index 92e4939..be7bb0f 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/utils.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/mesh/utils.py
@@ -1,6 +1,6 @@
import _thread
+import logging
-import core
import pwnagotchi
import pwnagotchi.version as version
import pwnagotchi.plugins as plugins
@@ -35,7 +35,7 @@ class AsyncAdvertiser(object):
self._advertiser.start()
self._view.on_state_change('face', self._advertiser.on_face_change)
else:
- core.log("advertising is disabled")
+ logging.warning("advertising is disabled")
def _on_new_unit(self, peer):
self._view.on_new_peer(peer)
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/example.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/example.py
index 4a63275..e527f0f 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/example.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/example.py
@@ -5,15 +5,16 @@ __license__ = 'GPL3'
__description__ = 'An example plugin for pwnagotchi that implements all the available callbacks.'
__enabled__ = False # IMPORTANT: set this to True to enable your plugin.
+import logging
+
from pwnagotchi.ui.components import LabeledValue
from pwnagotchi.ui.view import BLACK
import pwnagotchi.ui.fonts as fonts
-import core
# called when the plugin is loaded
def on_loaded():
- core.log("WARNING: plugin %s should be disabled!" % __name__)
+ logging.warning("WARNING: plugin %s should be disabled!" % __name__)
# called to setup the ui elements
@@ -39,7 +40,7 @@ def on_display_setup(display):
# called when everything is ready and the main loop is about to start
def on_ready(agent):
- core.log("unit is ready")
+ logging.info("unit is ready")
# you can run custom bettercap commands if you want
# agent.run('ble.recon on')
# or set a custom state
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/gps.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/gps.py
index c3c53a9..7c57b24 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/gps.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/gps.py
@@ -5,7 +5,7 @@ __license__ = 'GPL3'
__description__ = 'Save GPS coordinates whenever an handshake is captured.'
__enabled__ = True # set to false if you just don't use GPS
-import core
+import logging
import json
import os
@@ -15,14 +15,14 @@ running = False
def on_loaded():
- core.log("GPS plugin loaded for %s" % device)
+ logging.info("GPS plugin loaded for %s" % device)
def on_ready(agent):
global running
if os.path.exists(device):
- core.log("enabling GPS bettercap's module for %s" % device)
+ logging.info("enabling GPS bettercap's module for %s" % device)
try:
agent.run('gps off')
except:
@@ -33,7 +33,7 @@ def on_ready(agent):
agent.run('gps on')
running = True
else:
- core.log("no GPS detected")
+ logging.warning("no GPS detected")
def on_handshake(agent, filename, access_point, client_station):
@@ -42,6 +42,6 @@ def on_handshake(agent, filename, access_point, client_station):
gps = info['gps']
gps_filename = filename.replace('.pcap', '.gps.json')
- core.log("saving GPS to %s (%s)" % (gps_filename, gps))
+ logging.info("saving GPS to %s (%s)" % (gps_filename, gps))
with open(gps_filename, 'w+t') as fp:
json.dump(gps, fp)
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py
index 657aefb..c8b301a 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py
@@ -2,7 +2,7 @@ import _thread
from threading import Lock
import shutil
-import core
+import logging
import os
import pwnagotchi, pwnagotchi.plugins as plugins
@@ -78,13 +78,12 @@ class Display(View):
self._render_cb = None
self._display = None
self._httpd = None
- self.canvas = None
if self._enabled:
self._init_display()
else:
self.on_render(self._on_view_rendered)
- core.log("display module is disabled")
+ logging.warning("display module is disabled")
if self._video_enabled:
_thread.start_new_thread(self._http_serve, ())
@@ -92,10 +91,10 @@ class Display(View):
def _http_serve(self):
if self._video_address is not None:
self._httpd = HTTPServer((self._video_address, self._video_port), VideoHandler)
- core.log("ui available at http://%s:%d/" % (self._video_address, self._video_port))
+ logging.info("ui available at http://%s:%d/" % (self._video_address, self._video_port))
self._httpd.serve_forever()
else:
- core.log("could not get ip of usb0, video server not starting")
+ logging.info("could not get ip of usb0, video server not starting")
def _is_inky(self):
return self._display_type in ('inkyphat', 'inky')
@@ -111,14 +110,14 @@ class Display(View):
def _init_display(self):
if self._is_inky():
- core.log("initializing inky display")
+ logging.info("initializing inky display")
from inky import InkyPHAT
self._display = InkyPHAT(self._display_color)
self._display.set_border(InkyPHAT.BLACK)
self._render_cb = self._inky_render
elif self._is_papirus():
- core.log("initializing papirus display")
+ logging.info("initializing papirus display")
from pwnagotchi.ui.papirus.epd import EPD
os.environ['EPD_SIZE'] = '2.0'
self._display = EPD()
@@ -126,7 +125,7 @@ class Display(View):
self._render_cb = self._papirus_render
elif self._is_waveshare1():
- core.log("initializing waveshare v1 display")
+ logging.info("initializing waveshare v1 display")
from pwnagotchi.ui.waveshare.v1.epd2in13 import EPD
self._display = EPD()
self._display.init(self._display.lut_full_update)
@@ -135,7 +134,7 @@ class Display(View):
self._render_cb = self._waveshare_render
elif self._is_waveshare2():
- core.log("initializing waveshare v2 display")
+ logging.info("initializing waveshare v2 display")
from pwnagotchi.ui.waveshare.v2.waveshare import EPD
self._display = EPD()
self._display.init(self._display.FULL_UPDATE)
@@ -144,63 +143,61 @@ class Display(View):
self._render_cb = self._waveshare_render
else:
- core.log("unknown display type %s" % self._display_type)
+ logging.critical("unknown display type %s" % self._display_type)
plugins.on('display_setup', self._display)
self.on_render(self._on_view_rendered)
- def image(self):
- img = None
- if self.canvas is not None:
- img = self.canvas if self._rotation == 0 else self.canvas.rotate(-self._rotation)
- return img
-
def _inky_render(self):
if self._display_color != 'mono':
display_colors = 3
else:
display_colors = 2
- imgbuf = self.canvas.convert('RGB').convert('P', palette=1, colors=display_colors)
-
+ img_buffer = self._canvas.convert('RGB').convert('P', palette=1, colors=display_colors)
if self._display_color == 'red':
- imgbuf.putpalette([
+ img_buffer.putpalette([
255, 255, 255, # index 0 is white
0, 0, 0, # index 1 is black
255, 0, 0 # index 2 is red
])
elif self._display_color == 'yellow':
- imgbuf.putpalette([
+ img_buffer.putpalette([
255, 255, 255, # index 0 is white
0, 0, 0, # index 1 is black
255, 255, 0 # index 2 is yellow
])
else:
- imgbuf.putpalette([
+ img_buffer.putpalette([
255, 255, 255, # index 0 is white
0, 0, 0 # index 1 is black
])
- self._display.set_image(imgbuf)
+ self._display.set_image(img_buffer)
self._display.show()
def _papirus_render(self):
- self._display.display(self.canvas)
+ self._display.display(self._canvas)
self._display.partial_update()
def _waveshare_render(self):
- buf = self._display.getbuffer(self.canvas)
+ buf = self._display.getbuffer(self._canvas)
if self._is_waveshare1():
self._display.display(buf)
elif self._is_waveshare2():
self._display.displayPartial(buf)
+ def image(self):
+ img = None
+ if self._canvas is not None:
+ img = self._canvas if self._rotation == 0 else self._canvas.rotate(-self._rotation)
+ return img
+
def _on_view_rendered(self, img):
- # core.log("display::_on_view_rendered")
VideoHandler.render(img)
if self._enabled:
- self.canvas = (img if self._rotation == 0 else img.rotate(self._rotation))
+ self._canvas = (img if self._rotation == 0 else img.rotate(self._rotation))
if self._render_cb is not None:
self._render_cb()
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/view.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/view.py
index 0c5eb8a..f86b88f 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/view.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/view.py
@@ -1,6 +1,7 @@
import _thread
from threading import Lock
import time
+import logging
from PIL import Image, ImageDraw
import core
@@ -114,7 +115,7 @@ class View(object):
_thread.start_new_thread(self._refresh_handler, ())
self._ignore_changes = ()
else:
- core.log("ui.fps is 0, the display will only update for major changes")
+ logging.warning("ui.fps is 0, the display will only update for major changes")
self._ignore_changes = ('uptime', 'name')
def add_element(self, key, elem):
@@ -135,7 +136,7 @@ class View(object):
def _refresh_handler(self):
delay = 1.0 / self._config['ui']['fps']
- # core.log("view refresh handler started with period of %.2fs" % delay)
+ # logging.info("view refresh handler started with period of %.2fs" % delay)
while True:
name = self._state.get('name')
@@ -313,10 +314,10 @@ class View(object):
self.set('status', self._voice.custom(text))
self.update()
- def update(self):
+ def update(self, force=False):
with self._lock:
changes = self._state.changes(ignore=self._ignore_changes)
- if len(changes):
+ if force or len(changes):
self._canvas = Image.new('1', (self._width, self._height), WHITE)
drawer = ImageDraw.Draw(self._canvas)
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/utils.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/utils.py
index 358b2fe..8761a59 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/utils.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/utils.py
@@ -1,5 +1,7 @@
import yaml
import os
+import logging
+
# https://stackoverflow.com/questions/823196/yaml-merge-in-python
def merge_config(user, default):
@@ -21,4 +23,20 @@ def load_config(args):
user_config = yaml.safe_load(fp)
config = merge_config(user_config, config)
- return config
\ No newline at end of file
+ return config
+
+
+def setup_logging(args, config):
+ formatter = logging.Formatter("[%(asctime)s] [%(levelname)s] %(message)s")
+ root = logging.getLogger()
+
+ root.setLevel(logging.DEBUG if args.debug else logging.INFO)
+
+ if config['main']['log']:
+ file_handler = logging.FileHandler(config['main']['log'])
+ file_handler.setFormatter(formatter)
+ root.addHandler(file_handler)
+
+ console_handler = logging.StreamHandler()
+ console_handler.setFormatter(formatter)
+ root.addHandler(console_handler)
From 879cf206db7c78eddd0111a09d0ac4ddf708ebcf Mon Sep 17 00:00:00 2001
From: Simone Margaritelli <evilsocket@gmail.com>
Date: Thu, 3 Oct 2019 17:10:46 +0200
Subject: [PATCH 17/32] releasing v1.0.0plz2
---
sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/version.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/version.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/version.py
index afa9429..17f3421 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/version.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/version.py
@@ -1 +1 @@
-version = '1.0.0plz'
+version = '1.0.0plz2'
From 881313532e0ca9ecbd56da7dbbc1d73cdc08f24e Mon Sep 17 00:00:00 2001
From: evilsocket <evilsocket@users.noreply.github.com>
Date: Thu, 3 Oct 2019 17:20:07 +0200
Subject: [PATCH 18/32] Update issue templates
---
.github/ISSUE_TEMPLATE/bug_report.md | 32 +++++++++++++++++++++++
.github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++++++
2 files changed, 52 insertions(+)
create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..3f21189
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. ...
+2. ...
+3. ...
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment (please complete the following information):**
+ - Pwnagotchi version
+ - OS version
+ - Type of hardware
+ - Any additional hardware used
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..11fc491
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
From dd9b722ca256c1241dca1aae96c01c860c514b73 Mon Sep 17 00:00:00 2001
From: evilsocket <evilsocket@users.noreply.github.com>
Date: Thu, 3 Oct 2019 17:20:58 +0200
Subject: [PATCH 19/32] Update issue templates
---
.github/ISSUE_TEMPLATE/other.md | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 .github/ISSUE_TEMPLATE/other.md
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
new file mode 100644
index 0000000..b0dd323
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -0,0 +1,10 @@
+---
+name: Other
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
From 77b6009349efdb47cdccb6b93004a32bdf03ae4e Mon Sep 17 00:00:00 2001
From: xenDE <daniel@mameso.com>
Date: Thu, 3 Oct 2019 18:11:42 +0200
Subject: [PATCH 20/32] plugin for add memory infos and cpu temperature to
screen
think this should be in default, but disabled
---
.../pwnagotchi/plugins/default/memtemp.py | 55 +++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100644 sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py
new file mode 100644
index 0000000..5ebc38c
--- /dev/null
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py
@@ -0,0 +1,55 @@
+# tempmem shows memory infos and cpu temperature
+#
+# totalmem usedmem freemem cputemp
+#
+__author__ = 'https://github.com/xenDE'
+__version__ = '1.0.0'
+__name__ = 'memtemp'
+__license__ = 'GPL3'
+__description__ = 'A plugin that will add a memory and temperature indicator'
+__enabled__ = False
+
+import struct
+
+from pwnagotchi.ui.components import LabeledValue
+from pwnagotchi.ui.view import BLACK
+import pwnagotchi.ui.fonts as fonts
+
+
+class MEMTEMP:
+ def __init__(self):
+ # only import when the module is loaded and enabled
+ import os
+
+ def get_temp(self):
+ try:
+ temp = os.popen('/opt/vc/bin/vcgencmd measure_temp').readlines()[0].split('=')[1].replace("\n", '').replace("'","")
+ return 'cpu:' + temp
+ except:
+ return 'cpu:0.0C'
+ # cpu:37.4C
+
+ def get_mem_info(self):
+ try:
+ total, used, free = map(int, os.popen('free -t -m').readlines()[-1].split()[1:])
+ return "tm:"+str(total)+" um:"+str(used)+" fm:"+str(free)
+ except:
+ return "tm:0 um:0 fm:0"
+ # tm:532 um:82 fm:353
+
+
+memtemp = None
+
+
+def on_loaded():
+ global memtemp
+ memtemp = MEMTEMP()
+
+
+def on_ui_setup(ui):
+ ui.add_element('memtemp', LabeledValue(color=BLACK, label='SYS', value='tm:0 um:0 fm:0 0.0C', position=(0, ui.height()-28),
+ label_font=fonts.Bold, text_font=fonts.Medium))
+
+
+def on_ui_update(ui):
+ ui.set('memtemp', "%s %s" % (memtemp.get_mem_info(), memtemp.get_temp()))
From cac5b6adfeb62187b87875aced361c250902aa92 Mon Sep 17 00:00:00 2001
From: Cassiano Aquino <cassianoaquino@me.com>
Date: Thu, 3 Oct 2019 17:44:07 +0100
Subject: [PATCH 21/32] fix broken memusage script
---
builder/pwnagotchi.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index 279dcf5..515ee70 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -172,7 +172,7 @@
dest: /usr/bin/memusage
mode: 0755
content: |
- #!/usr/bin/env
+ #!/usr/bin/env bash
free -m | awk '/Mem/ { printf( "%d %", $3 / $2 * 100 + 0.5 ) }'
- name: create monstart script
From fcd3ae650a244750448b203ea0468751eb530673 Mon Sep 17 00:00:00 2001
From: xenDE <daniel@mameso.com>
Date: Thu, 3 Oct 2019 18:46:46 +0200
Subject: [PATCH 22/32] =?UTF-8?q?eine=20configurierbare=20wartezeit=20hinz?=
=?UTF-8?q?ugef=C3=BCgt,=20bevor=20die=20werte=20aktualisiert=20werden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
to protect the display lifetime
---
.../scripts/pwnagotchi/plugins/default/memtemp.py | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py
index 5ebc38c..85a4552 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py
@@ -7,7 +7,7 @@ __version__ = '1.0.0'
__name__ = 'memtemp'
__license__ = 'GPL3'
__description__ = 'A plugin that will add a memory and temperature indicator'
-__enabled__ = False
+__enabled__ = True
import struct
@@ -15,8 +15,16 @@ from pwnagotchi.ui.components import LabeledValue
from pwnagotchi.ui.view import BLACK
import pwnagotchi.ui.fonts as fonts
+import time
+
class MEMTEMP:
+
+ # set the minimum seconds before refresh the values
+ refresh_wait = 30
+
+ refresh_ts_last = time.time() - refresh_wait
+
def __init__(self):
# only import when the module is loaded and enabled
import os
@@ -52,4 +60,7 @@ def on_ui_setup(ui):
def on_ui_update(ui):
- ui.set('memtemp', "%s %s" % (memtemp.get_mem_info(), memtemp.get_temp()))
+ if time.time() > memtemp.refresh_ts_last + memtemp.refresh_wait:
+ ui.set('memtemp', "%s %s" % (memtemp.get_mem_info(), memtemp.get_temp()))
+ memtemp.refresh_ts_last = time.time()
+
From 9b5a12bd0cf5225900eb154001675c30ca1ca44e Mon Sep 17 00:00:00 2001
From: xenDE <daniel@mameso.com>
Date: Thu, 3 Oct 2019 18:52:38 +0200
Subject: [PATCH 23/32] default: disable the plugin
---
.../pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py
index 85a4552..43c64c6 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py
@@ -7,7 +7,7 @@ __version__ = '1.0.0'
__name__ = 'memtemp'
__license__ = 'GPL3'
__description__ = 'A plugin that will add a memory and temperature indicator'
-__enabled__ = True
+__enabled__ = False
import struct
From fb1d3e919919da3e3b8702a8c0fb3047d6088007 Mon Sep 17 00:00:00 2001
From: xenDE <daniel@mameso.com>
Date: Thu, 3 Oct 2019 19:59:35 +0200
Subject: [PATCH 24/32] show only real mem useage without swap
removed swap size from showed memory
---
.../scripts/pwnagotchi/plugins/default/memtemp.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py
index 43c64c6..33249a4 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py
@@ -7,7 +7,7 @@ __version__ = '1.0.0'
__name__ = 'memtemp'
__license__ = 'GPL3'
__description__ = 'A plugin that will add a memory and temperature indicator'
-__enabled__ = False
+__enabled__ = True
import struct
@@ -39,7 +39,10 @@ class MEMTEMP:
def get_mem_info(self):
try:
- total, used, free = map(int, os.popen('free -t -m').readlines()[-1].split()[1:])
+ # includes RAM + Swap Memory:
+# total, used, free = map(int, os.popen('free -t -m').readlines()[-1].split()[1:])
+ # without Swap, only real memory:
+ total, used, free = map(int, os.popen('free -t -m').readlines()[-3].split()[1:4])
return "tm:"+str(total)+" um:"+str(used)+" fm:"+str(free)
except:
return "tm:0 um:0 fm:0"
From ca6b71db19176bccfc0ed182c2896aab73620666 Mon Sep 17 00:00:00 2001
From: xenDE <daniel@mameso.com>
Date: Thu, 3 Oct 2019 20:00:46 +0200
Subject: [PATCH 25/32] disable plaugin as default
"__enabled__ = False" as default
---
.../pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py
index 33249a4..2b1fc3d 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/memtemp.py
@@ -7,7 +7,7 @@ __version__ = '1.0.0'
__name__ = 'memtemp'
__license__ = 'GPL3'
__description__ = 'A plugin that will add a memory and temperature indicator'
-__enabled__ = True
+__enabled__ = False
import struct
From 26fe8ca059254679a67123eff92ba4c033fcd1c0 Mon Sep 17 00:00:00 2001
From: Simone Margaritelli <evilsocket@gmail.com>
Date: Thu, 3 Oct 2019 20:18:50 +0200
Subject: [PATCH 26/32] new on_internet_available event
---
docs/about.md | 19 +++++++++
docs/configure.md | 0
docs/connect.md | 0
docs/index.md | 5 +++
docs/install.md | 0
docs/plugins.md | 0
sdcard/rootfs/root/pwnagotchi/scripts/main.py | 39 ++++++++++---------
.../pwnagotchi/plugins/default/example.py | 5 +++
8 files changed, 50 insertions(+), 18 deletions(-)
create mode 100644 docs/about.md
create mode 100644 docs/configure.md
create mode 100644 docs/connect.md
create mode 100644 docs/index.md
create mode 100644 docs/install.md
create mode 100644 docs/plugins.md
diff --git a/docs/about.md b/docs/about.md
new file mode 100644
index 0000000..f1cb536
--- /dev/null
+++ b/docs/about.md
@@ -0,0 +1,19 @@
+## About the Project
+
+[Pwnagotchi](https://twitter.com/pwnagotchi) is an "AI" that learns from the WiFi environment and instruments
+[bettercap](https://www.bettercap.org/) in order to maximize the WPA key material that's being captured either passively
+ or by performing deauthentication and association attakcs. This material is collected as pcap files containing any form
+ of handshake supported by [hashcat](https://hashcat.net/hashcat/), including [PMKIDs](https://www.evilsocket.net/2019/02/13/Pwning-WiFi-networks-with-bettercap-and-the-PMKID-client-less-attack/),
+full and half WPA handshakes.
+
+
+
+Instead of playing [Super Mario or Atari games](https://becominghuman.ai/getting-mario-back-into-the-gym-setting-up-super-mario-bros-in-openais-gym-8e39a96c1e41?gi=c4b66c3d5ced), pwnagotchi will tune over time [its own parameters](https://github.com/evilsocket/pwnagotchi/blob/master/sdcard/rootfs/root/pwnagotchi/config.yml#L54), effectively learning to get better at pwning WiFi things. **Keep in mind:** unlike the usual RL simulations, pwnagotchi learns over time (where a single epoch can last from a few seconds to minutes, depending on how many access points and client stations are visible), do not expect it to perform amazingly well at the beginning, as it'll be exploring several combinations of parameters ... but listen to it when it's bored, bring it with you and have it observe new networks and capture new handshakes and you'll see :)
+
+Multiple units can talk to each other, advertising their own presence using a parasite protocol I've built on top of the existing dot11 standard, by broadcasting custom information elements. Over time, two or more units learn to cooperate if they detect each other's presence, by dividing the available channels among them.
+
+
+
+Depending on the status of the unit, several states and states transitions are configurable and represented on the display as different moods, expressions and sentences.
+
+If instead you just want to use your own parameters and save battery and CPU cycles, you can disable the AI in `config.yml` and enjoy an automated deauther, WPA handshake sniffer and portable bettercap + webui dedicated hardware.
diff --git a/docs/configure.md b/docs/configure.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/connect.md b/docs/connect.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 0000000..4af5b89
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,5 @@
+# Documentation
+
+- [About the Project](https://github.com/evilsocket/pwnagotchi/blob/master/docs/about.md)
+- [How to Install](https://github.com/evilsocket/pwnagotchi/blob/master/docs/install.md)
+- [Configuration](https://github.com/evilsocket/pwnagotchi/blob/master/docs/configure.md)
diff --git a/docs/install.md b/docs/install.md
new file mode 100644
index 0000000..e69de29
diff --git a/docs/plugins.md b/docs/plugins.md
new file mode 100644
index 0000000..e69de29
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/main.py b/sdcard/rootfs/root/pwnagotchi/scripts/main.py
index 7caa81e..b4730d0 100755
--- a/sdcard/rootfs/root/pwnagotchi/scripts/main.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/main.py
@@ -101,30 +101,33 @@ if args.do_manual:
display.on_manual_mode(log)
time.sleep(1)
- if config['twitter']['enabled'] and log.is_new() and Agent.is_connected() and log.handshakes > 0:
- import tweepy
+ if Agent.is_connected():
+ plugins.on('internet_available', config, log)
- logging.info("detected a new session and internet connectivity!")
+ if config['twitter']['enabled'] and log.is_new() and log.handshakes > 0:
+ import tweepy
- picture = '/dev/shm/pwnagotchi.png'
+ logging.info("detected a new session and internet connectivity!")
- display.update(force=True)
- display.image().save(picture, 'png')
- display.set('status', 'Tweeting...')
- display.update(force=True)
+ picture = '/dev/shm/pwnagotchi.png'
- try:
- auth = tweepy.OAuthHandler(config['twitter']['consumer_key'], config['twitter']['consumer_secret'])
- auth.set_access_token(config['twitter']['access_token_key'], config['twitter']['access_token_secret'])
- api = tweepy.API(auth)
+ display.update(force=True)
+ display.image().save(picture, 'png')
+ display.set('status', 'Tweeting...')
+ display.update(force=True)
- tweet = Voice(lang=config['main']['lang']).on_log_tweet(log)
- api.update_with_media(filename=picture, status=tweet)
- log.save_session_id()
+ try:
+ auth = tweepy.OAuthHandler(config['twitter']['consumer_key'], config['twitter']['consumer_secret'])
+ auth.set_access_token(config['twitter']['access_token_key'], config['twitter']['access_token_secret'])
+ api = tweepy.API(auth)
- logging.info("tweeted: %s" % tweet)
- except Exception as e:
- logging.exception("error while tweeting")
+ tweet = Voice(lang=config['main']['lang']).on_log_tweet(log)
+ api.update_with_media(filename=picture, status=tweet)
+ log.save_session_id()
+
+ logging.info("tweeted: %s" % tweet)
+ except Exception as e:
+ logging.exception("error while tweeting")
quit()
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/example.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/example.py
index e527f0f..9c1c8c4 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/example.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/example.py
@@ -17,6 +17,11 @@ def on_loaded():
logging.warning("WARNING: plugin %s should be disabled!" % __name__)
+# called in manual mode when there's internet connectivity
+def on_internet_available(config, log):
+ pass
+
+
# called to setup the ui elements
def on_ui_setup(ui):
# add custom UI elements
From 76bccec57235054292319e1002e55f187d70a265 Mon Sep 17 00:00:00 2001
From: dadav <33197631+dadav@users.noreply.github.com>
Date: Thu, 3 Oct 2019 21:09:34 +0200
Subject: [PATCH 27/32] Outsource twitter-code to plugin
---
sdcard/rootfs/root/pwnagotchi/scripts/main.py | 25 ---------
.../pwnagotchi/plugins/default/twitter.py | 53 +++++++++++++++++++
2 files changed, 53 insertions(+), 25 deletions(-)
create mode 100644 sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/twitter.py
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/main.py b/sdcard/rootfs/root/pwnagotchi/scripts/main.py
index b4730d0..c401c8e 100755
--- a/sdcard/rootfs/root/pwnagotchi/scripts/main.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/main.py
@@ -104,31 +104,6 @@ if args.do_manual:
if Agent.is_connected():
plugins.on('internet_available', config, log)
- if config['twitter']['enabled'] and log.is_new() and log.handshakes > 0:
- import tweepy
-
- logging.info("detected a new session and internet connectivity!")
-
- picture = '/dev/shm/pwnagotchi.png'
-
- display.update(force=True)
- display.image().save(picture, 'png')
- display.set('status', 'Tweeting...')
- display.update(force=True)
-
- try:
- auth = tweepy.OAuthHandler(config['twitter']['consumer_key'], config['twitter']['consumer_secret'])
- auth.set_access_token(config['twitter']['access_token_key'], config['twitter']['access_token_secret'])
- api = tweepy.API(auth)
-
- tweet = Voice(lang=config['main']['lang']).on_log_tweet(log)
- api.update_with_media(filename=picture, status=tweet)
- log.save_session_id()
-
- logging.info("tweeted: %s" % tweet)
- except Exception as e:
- logging.exception("error while tweeting")
-
quit()
agent.start_ai()
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/twitter.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/twitter.py
new file mode 100644
index 0000000..6eb61a8
--- /dev/null
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/twitter.py
@@ -0,0 +1,53 @@
+__author__ = '33197631+dadav@users.noreply.github.com'
+__version__ = '1.0.0'
+__name__ = 'twitter'
+__license__ = 'GPL3'
+__description__ = 'This plugin creates tweets about the recent activity of pwnagotchi'
+__enabled__ = True
+
+import logging
+from pwnagotchi.voice import Voice
+
+UI = None
+
+
+def on_loaded():
+ logging.info("Twitter plugin loaded.")
+
+
+# called in manual mode when there's internet connectivity
+def on_internet_available(config, log):
+ if config['twitter']['enabled'] and log.is_new() and log.handshakes > 0 and UI:
+ try:
+ import tweepy
+ except ImportError:
+ logging.error("Couldn't import tweepy")
+ return
+
+ logging.info("detected a new session and internet connectivity!")
+
+ picture = '/dev/shm/pwnagotchi.png'
+
+ UI.update(force=True)
+ UI.image().save(picture, 'png')
+ UI.set('status', 'Tweeting...')
+ UI.update(force=True)
+
+ try:
+ auth = tweepy.OAuthHandler(config['twitter']['consumer_key'], config['twitter']['consumer_secret'])
+ auth.set_access_token(config['twitter']['access_token_key'], config['twitter']['access_token_secret'])
+ api = tweepy.API(auth)
+
+ tweet = Voice(lang=config['main']['lang']).on_log_tweet(log)
+ api.update_with_media(filename=picture, status=tweet)
+ log.save_session_id()
+
+ logging.info("tweeted: %s" % tweet)
+ except Exception as e:
+ logging.exception("error while tweeting")
+
+
+def on_ui_setup(ui):
+ # need that object
+ global UI
+ UI = ui
From 62350a37ea91704df83910c3c623303b81e696bf Mon Sep 17 00:00:00 2001
From: dadav <33197631+dadav@users.noreply.github.com>
Date: Thu, 3 Oct 2019 21:18:32 +0200
Subject: [PATCH 28/32] Set manual ui view
---
.../pwnagotchi/scripts/pwnagotchi/plugins/default/twitter.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/twitter.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/twitter.py
index 6eb61a8..7aa4364 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/twitter.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/twitter.py
@@ -28,6 +28,7 @@ def on_internet_available(config, log):
picture = '/dev/shm/pwnagotchi.png'
+ UI.on_manual_mode(log)
UI.update(force=True)
UI.image().save(picture, 'png')
UI.set('status', 'Tweeting...')
From 2bba3eafc4ceee190a3f4d46c49057253d0ece84 Mon Sep 17 00:00:00 2001
From: Simone Margaritelli <evilsocket@gmail.com>
Date: Thu, 3 Oct 2019 21:47:34 +0200
Subject: [PATCH 29/32] working on #101
---
README.md | 230 ++---------------------
docs/about.md | 4 +
docs/configure.md | 51 +++++
docs/connect.md | 0
docs/dev.md | 52 +++++
docs/faq.md | 13 ++
docs/index.md | 14 ++
docs/install.md | 48 +++++
docs/plugins.md | 57 ++++++
docs/usage.md | 53 ++++++
sdcard/rootfs/root/pwnagotchi/config.yml | 2 +-
11 files changed, 304 insertions(+), 220 deletions(-)
delete mode 100644 docs/connect.md
create mode 100644 docs/dev.md
create mode 100644 docs/faq.md
create mode 100644 docs/usage.md
diff --git a/README.md b/README.md
index 14e415c..9a91890 100644
--- a/README.md
+++ b/README.md
@@ -18,233 +18,25 @@ Instead of playing [Super Mario or Atari games](https://becominghuman.ai/getting
Multiple units can talk to each other, advertising their own presence using a parasite protocol I've built on top of the existing dot11 standard, by broadcasting custom information elements. Over time, two or more units learn to cooperate if they detect each other's presence, by dividing the available channels among them.
-
-
-Depending on the status of the unit, several states and states transitions are configurable and represented on the display as different moods, expressions and sentences.
-
-If instead you just want to use your own parameters and save battery and CPU cycles, you can disable the AI in `config.yml` and enjoy an automated deauther, WPA handshake sniffer and portable bettercap + webui dedicated hardware.
-
-**NOTE:** The software **requires at least bettercap v2.25**.
-
-
-
## Why
For hackers to learn reinforcement learning, WiFi networking and have an excuse to take a walk more often. And **it's cute as f---**.
## Documentation
-**THIS IS STILL ALPHA STAGE SOFTWARE, IF YOU DECIDE TO TRY TO USE IT, YOU ARE ON YOUR OWN, NO SUPPORT WILL BE PROVIDED, NEITHER FOR INSTALLATION OR FOR BUGS**
+- [About the Project](https://github.com/evilsocket/pwnagotchi/blob/master/docs/about.md)
+- [How to Install](https://github.com/evilsocket/pwnagotchi/blob/master/docs/install.md)
+- [Configuration](https://github.com/evilsocket/pwnagotchi/blob/master/docs/configure.md)
+- [Usage](https://github.com/evilsocket/pwnagotchi/blob/master/docs/usage.md)
+- [Plugins](https://github.com/evilsocket/pwnagotchi/blob/master/docs/plugins.md)
+- [Developement](https://github.com/evilsocket/pwnagotchi/blob/master/docs/dev.md)
+- [FAQ](https://github.com/evilsocket/pwnagotchi/blob/master/docs/faq.md)
-However, there's [a Slack channel](https://join.slack.com/t/pwnagotchi/shared_invite/enQtNzc4NzY3MDE2OTAzLTg5NmNmNDJiMDM3ZWFkMWUwN2Y5NDk0Y2JlZWZjODlhMmRhNDZiOGMwYjJhM2UzNzA3YjA5NjJmZGY5NGI5NmI).
+## Links
-### Hardware
-
-- Raspberry Pi Zero W
-- A decent power bank (with 1500 mAh you get ~2 hours with AI on)
-
-#### Display (optional)
-
-The display is optional if you connect to `usb0` (by using the data port on the unit) and point your browser to the web ui (see config.yml).
-
-The supported models are:
-
-- [Waveshare eInk Display (both V1 and V2)](https://www.waveshare.com/2.13inch-e-paper-hat.htm)
-- [Pimoroni Inky pHAT](https://shop.pimoroni.com/products/inky-phat)
-- [PaPiRus eInk Screen](https://uk.pi-supply.com/products/papirus-zero-epaper-screen-phat-pi-zero)
-
-The only kind of displays supported are the ones listed above, but we are always happy to receive pull requests supporting new displays.
-
-You need to configure the display type in `config.yml` where you can find `ui.display.type`. If your display does not work after changing this setting, you might need to complete remove power from the Raspberry and make a clean boot.
-
-One thing to note, not all displays are created equaly, TFT displays for example work similar to an HDMI display, and they are not supported, currently all the displays supported are I2C displays.
-
-### Color and Black & White displays
-
-Some of the supported displays support Black & White and Coloured versions, one common question is regarding refresh speed of said displays.
-
-Color displays have a much slower refresh rate, in some cases it can take up to 15 seconds, if slow refresh rates is something that you want to avoid we advise you to use Black & White displays
-
-### FPS
-
-You can configure the refresh interval of the display on config.yml, we advise to use a slow refresh to not shorten the lifetime of your display.
-
-Another option is to change fps to 0, which will only refresh when changes are made to the screen.
-
-### Software
-
-- Raspbian + [nexmon patches](https://re4son-kernel.com/re4son-pi-kernel/) for monitor mode, or any Linux with a monitor mode enabled interface (if you tune config.yml).
-
-**Do not try with Kali on the Raspberry Pi 0 W, it is compiled without hardware floating point support and TensorFlow is simply not available for it, use Raspbian.**
-
-#### Automatically create an image
-
-You can use the `scripts/create_sibling.sh` script to create an - ready to flash - rasbian image with pwnagotchi.
-
-```shell
-usage: ./scripts/create_sibling.sh [OPTIONS]
-
- Options:
- -n <name> # Name of the pwnagotchi (default: pwnagotchi)
- -i <file> # Provide the path of an already downloaded raspbian image
- -o <file> # Name of the img-file (default: pwnagotchi.img)
- -s <size> # Size which should be added to second partition (in Gigabyte) (default: 4)
- -v <version> # Version of raspbian (Supported: latest; default: latest)
- -p # Only run provisioning (assumes the image is already mounted)
- -d # Only run dependencies checks
- -h # Show this help
-```
-
-#### Host Connection Share
-
-If you connect to the unit via `usb0` (thus using the data port), you might want to use the `scripts/linux_connection_share.sh` script to bring the interface up on your end and share internet connectivity from another interface, so you can update the unit and generally download things from the internet on it.
-
-#### Update your pwnagotchi
-
-You can use the `scripts/update_pwnagotchi.sh` script to update to the most recent version of pwnagotchi.
-
-```shell
-usage: ./update_pwnagitchi.sh [OPTIONS]
-
- Options:
- -v # Version to update to, can be a branch or commit. (default: master)
- -u # Url to clone from. (default: https://github.com/evilsocket/pwnagotchi)
- -m # Mode to restart to. (Supported: auto manual; default: auto)
- -b # Backup the current pwnagotchi config.
- -r # Restore the current pwnagotchi config. -b will be enabled.
- -h # Shows this help. Shows this help.
-
-```
-
-#### Backup your pwnagotchi
-
-You can use the `scripts/backup.sh` script to backup the important files of your unit.
-
-```shell
-usage: ./scripts/backup.sh HOSTNAME backup.zip
-```
-
-### UI
-
-The UI is available either via display if installed, or via http://pwnagotchi.local:8080/ if you connect to the unit via `usb0` and set a static address on the network interface (change `pwnagotchi` with the hostname of your unit).
-
-
-
-* **CH**: Current channel the unit is operating on or `*` when hopping on all channels.
-* **APS**: Number of access points on the current channel and total visible access points.
-* **UP**: Time since the unit has been activated.
-* **PWND**: Number of handshakes captured in this session and number of unique networks we own at least one handshake of, from the beginning.
-* **AUTO**: This indicates that the algorithm is running with AI disabled (or still loading), it disappears once the AI dependencies have been bootrapped and the neural network loaded.
-
-#### Languages
-
-Pwnagotchi is able to speak multiple languages!! Currently supported are:
-
-* **english** (default)
-* german
-* dutch
-* greek
-* macedonian
-* italian
-* french
-
-If you want to add a language use the `language.sh` script. If you want to add for example the language **italian** you would type:
-
-```shell
-./scripts/language.sh add it
-# Now make your changes to the file
-# sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/it/LC_MESSAGES/voice.po
-./scripts/language.sh compile it
-# DONE
-```
-
-If you changed the `voice.py`- File, the translations need an update. Do it like this:
-
-```shell
-./scripts/language.sh update it
-# Now make your changes to the file (changed lines are marked with "fuzzy")
-# sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/it/LC_MESSAGES/voice.po
-./scripts/language.sh compile it
-# DONE
-```
-
-Now you can use the `preview.py`-script to preview the changes:
-
-```shell
-./scripts/preview.py --lang it --display ws2 --port 8080 &
-./scripts/preview.py --lang it --display inky --port 8081 &
-# Now open http://localhost:8080 and http://localhost:8081
-```
-
-### Plugins
-
-Pwnagotchi has a simple plugins system that you can use to customize your unit and its behaviour. You can place your plugins anywhere
-as python files and then edit the `config.yml` file (`main.plugins` value) to point to their containing folder. Check the [plugins folder](https://github.com/evilsocket/pwnagotchi/tree/master/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/) for a list of default
-plugins and all the callbacks that you can define for your own customizations.
-
-Here's as an example the GPS plugin:
-
-```python
-__author__ = 'evilsocket@gmail.com'
-__version__ = '1.0.0'
-__name__ = 'gps'
-__license__ = 'GPL3'
-__description__ = 'Save GPS coordinates whenever an handshake is captured.'
-__enabled__ = True # set to false if you just don't use GPS
-
-import core
-import json
-import os
-
-device = '/dev/ttyUSB0'
-speed = 19200
-running = False
-
-
-def on_loaded():
- logging.info("GPS plugin loaded for %s" % device)
-
-
-def on_ready(agent):
- global running
-
- if os.path.exists(device):
- logging.info("enabling GPS bettercap's module for %s" % device)
- try:
- agent.run('gps off')
- except:
- pass
-
- agent.run('set gps.device %s' % device)
- agent.run('set gps.speed %d' % speed)
- agent.run('gps on')
- running = True
- else:
- logging.info("no GPS detected")
-
-
-def on_handshake(agent, filename, access_point, client_station):
- if running:
- info = agent.session()
- gps = info['gps']
- gps_filename = filename.replace('.pcap', '.gps.json')
-
- logging.info("saving GPS to %s (%s)" % (gps_filename, gps))
- with open(gps_filename, 'w+t') as fp:
- json.dump(gps, fp)
-```
-
-### Random Info
-
-- `hostname` sets the unit name.
-- At first boot, each unit generates a unique RSA keypair that can be used to authenticate advertising packets.
-- **On a rpi0w, it'll take approximately 30 minutes to load the AI**.
-- `/var/log/pwnagotchi.log` is your friend.
-- if connected to a laptop via usb data port, with internet connectivity shared, magic things will happen.
-- checkout the `ui.video` section of the `config.yml` - if you don't want to use a display, you can connect to it with the browser and a cable.
-- If you get `[FAILED] Failed to start Remount Root and Kernel File Systems.` while booting pwnagotchi, make sure
-the `PARTUUID`s for `rootfs` and `boot` partitions are the same in `/etc/fstab`. Use `sudo blkid` to find those values when you are using `create_sibling.sh`.
-- You can create a `/root/custom.yml` configuration file to override the defaults.
+- [Project Slack](https://join.slack.com/t/pwnagotchi/shared_invite/enQtNzc4NzY3MDE2OTAzLTg5NmNmNDJiMDM3ZWFkMWUwN2Y5NDk0Y2JlZWZjODlhMmRhNDZiOGMwYjJhM2UzNzA3YjA5NjJmZGY5NGI5NmI)
+- [Project Twitter](https://twitter.com/pwnagotchi)
+- [Project Website](https://pwnagotchi.ai/)
## License
diff --git a/docs/about.md b/docs/about.md
index f1cb536..8f141ad 100644
--- a/docs/about.md
+++ b/docs/about.md
@@ -17,3 +17,7 @@ Multiple units can talk to each other, advertising their own presence using a pa
Depending on the status of the unit, several states and states transitions are configurable and represented on the display as different moods, expressions and sentences.
If instead you just want to use your own parameters and save battery and CPU cycles, you can disable the AI in `config.yml` and enjoy an automated deauther, WPA handshake sniffer and portable bettercap + webui dedicated hardware.
+
+## License
+
+`pwnagotchi` is made with ♥ by [@evilsocket](https://twitter.com/evilsocket) and the [amazing dev team](https://github.com/evilsocket/pwnagotchi/graphs/contributors). It's released under the GPL3 license.
\ No newline at end of file
diff --git a/docs/configure.md b/docs/configure.md
index e69de29..98cd01c 100644
--- a/docs/configure.md
+++ b/docs/configure.md
@@ -0,0 +1,51 @@
+### Connecting to your Pwnagotchi
+
+Once you wrote the image file on the SD card, there're a few steps you'll have to follow in order to configure your unit properly, first, start with connecting the USB cable to the
+data port of the Raspberry Pi and the RPi to your computer. After a few seconds the board will boot and you will see a new Ethernet interface on your host computer.
+
+You'll need to configure it with a static IP address:
+
+- IP: `10.0.0.2`
+- Netmask: `255.255.255.0`
+- Gateway: `10.0.0.1`
+- DNS (if required): `8.8.8.8` (or whatever)
+
+If everything's been configured properly, you will now be able to `ping` both `10.0.0.2` or `pwnagotchi.local` (if you haven't customized the hostname yet).
+
+You can now connect to your unit using SSH:
+
+```bash
+ssh pi@10.0.0.2
+```
+
+The default password is `raspberry`, you should change it as soon as you log in for the first time by issuing the `passwd`command and selecting a new and more complex passphrase.
+
+Moreover, it is recommended that you copy your SSH public key among the unit's authorized ones, so you can directly log in without entering a password:
+
+```bash
+ssh-copy-id -i ~/.ssh/id_rsa.pub pi@10.0.0.2
+```
+
+### Configuration
+
+You can now set a new name for your unit by [changing the hostname](https://geek-university.com/raspberry-pi/change-raspberry-pis-hostname/). Create the `/root/custom.yml` file (either via SSH or by direclty editing the SD card contents from a computer) that will override
+the [default configuration](https://github.com/evilsocket/pwnagotchi/blob/master/sdcard/rootfs/root/pwnagotchi/config.yml) with your custom values.
+
+For instance, you can change `main.lang` to one of the supported languages:
+
+* **english** (default)
+* german
+* dutch
+* greek
+* macedonian
+* italian
+* french
+
+The set the type of display you want to use via `ui.display.type` (if your display does not work after changing this setting, you might need to complete remove power from the Raspberry and make a clean boot).
+
+You can configure the refresh interval of the display via `ui.fps`, we advise to use a slow refresh to not shorten the lifetime of your display. The default value is 0, which will only refresh when changes are made to the screen.
+
+### Host Connection Share
+
+If you connect to the unit via `usb0` (thus using the data port), you might want to use the `scripts/linux_connection_share.sh` or
+ `scripts/macos_connection_share.sh` script to bring the interface up on your end and share internet connectivity from another interface, so you can update the unit and generally download things from the internet on it.
\ No newline at end of file
diff --git a/docs/connect.md b/docs/connect.md
deleted file mode 100644
index e69de29..0000000
diff --git a/docs/dev.md b/docs/dev.md
new file mode 100644
index 0000000..5a4df64
--- /dev/null
+++ b/docs/dev.md
@@ -0,0 +1,52 @@
+## Software
+
+- Raspbian + [nexmon patches](https://re4son-kernel.com/re4son-pi-kernel/) for monitor mode, or any Linux with a monitor mode enabled interface (if you tune config.yml).
+
+**Do not try with Kali on the Raspberry Pi 0 W, it is compiled without hardware floating point support and TensorFlow is simply not available for it, use Raspbian.**
+
+## Creating an Image
+
+You can use the `scripts/create_sibling.sh` script to create an - ready to flash - rasbian image with pwnagotchi.
+
+```shell
+usage: ./scripts/create_sibling.sh [OPTIONS]
+
+ Options:
+ -n <name> # Name of the pwnagotchi (default: pwnagotchi)
+ -i <file> # Provide the path of an already downloaded raspbian image
+ -o <file> # Name of the img-file (default: pwnagotchi.img)
+ -s <size> # Size which should be added to second partition (in Gigabyte) (default: 4)
+ -v <version> # Version of raspbian (Supported: latest; default: latest)
+ -p # Only run provisioning (assumes the image is already mounted)
+ -d # Only run dependencies checks
+ -h # Show this help
+```
+## Adding a Language
+
+If you want to add a language use the `language.sh` script. If you want to add for example the language **italian** you would type:
+
+```shell
+./scripts/language.sh add it
+# Now make your changes to the file
+# sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/it/LC_MESSAGES/voice.po
+./scripts/language.sh compile it
+# DONE
+```
+
+If you changed the `voice.py`- File, the translations need an update. Do it like this:
+
+```shell
+./scripts/language.sh update it
+# Now make your changes to the file (changed lines are marked with "fuzzy")
+# sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/locale/it/LC_MESSAGES/voice.po
+./scripts/language.sh compile it
+# DONE
+```
+
+Now you can use the `preview.py`-script to preview the changes:
+
+```shell
+./scripts/preview.py --lang it --display ws2 --port 8080 &
+./scripts/preview.py --lang it --display inky --port 8081 &
+# Now open http://localhost:8080 and http://localhost:8081
+```
diff --git a/docs/faq.md b/docs/faq.md
new file mode 100644
index 0000000..ed4a1f3
--- /dev/null
+++ b/docs/faq.md
@@ -0,0 +1,13 @@
+# FAQ
+
+## Why eINK?
+
+Because!
+
+## Why the AI takes 30 minutes to load?
+
+Because Python sucks and TF is huge.
+
+## Why ...?
+
+Because!
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
index 4af5b89..3c23b8c 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -3,3 +3,17 @@
- [About the Project](https://github.com/evilsocket/pwnagotchi/blob/master/docs/about.md)
- [How to Install](https://github.com/evilsocket/pwnagotchi/blob/master/docs/install.md)
- [Configuration](https://github.com/evilsocket/pwnagotchi/blob/master/docs/configure.md)
+- [Usage](https://github.com/evilsocket/pwnagotchi/blob/master/docs/usage.md)
+- [Plugins](https://github.com/evilsocket/pwnagotchi/blob/master/docs/plugins.md)
+- [Developement](https://github.com/evilsocket/pwnagotchi/blob/master/docs/dev.md)
+- [FAQ](https://github.com/evilsocket/pwnagotchi/blob/master/docs/faq.md)
+
+## Links
+
+- [Project Slack](https://join.slack.com/t/pwnagotchi/shared_invite/enQtNzc4NzY3MDE2OTAzLTg5NmNmNDJiMDM3ZWFkMWUwN2Y5NDk0Y2JlZWZjODlhMmRhNDZiOGMwYjJhM2UzNzA3YjA5NjJmZGY5NGI5NmI)
+- [Project Twitter](https://twitter.com/pwnagotchi)
+- [Project Website](https://pwnagotchi.ai/)
+
+## License
+
+`pwnagotchi` is made with ♥ by [@evilsocket](https://twitter.com/evilsocket) and the [amazing dev team](https://github.com/evilsocket/pwnagotchi/graphs/contributors). It's released under the GPL3 license.
\ No newline at end of file
diff --git a/docs/install.md b/docs/install.md
index e69de29..4081e95 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -0,0 +1,48 @@
+# Installation
+
+The project has been developed to run on a Raspberry Pi 0 W configured as an [USB Ethernet gadget](https://learn.adafruit.com/turning-your-raspberry-pi-zero-into-a-usb-gadget/ethernet-gadget) device in order to connect to it via USB.
+However, given the proper configuration tweaks, any GNU/Linux computer with a WiFi interface that supports monitor mode could be used.
+
+## Required Hardware
+
+- [Raspberry Pi Zero W](https://www.raspberrypi.org/products/raspberry-pi-zero-w/).
+- A micro SD card, 8GB recomended, **preferably of good quality and speed**.
+- A decent power bank (with 1500 mAh you get ~2 hours with AI on).
+- One of the supported displays (optional).
+
+### Display
+
+The display is an optional component as the UI is also rendered via a web interface available via the USB cable. If you connect to `usb0` (by using the data port on the unit) and point your browser to the web ui (see config.yml), your unit can work in "headless mode".
+
+If instead you want to fully enjoy walking around and literally looking at your unit's face, the supported display models are:
+
+- [Waveshare eInk Display (both V1 and V2)](https://www.waveshare.com/2.13inch-e-paper-hat.htm)
+- [Pimoroni Inky pHAT](https://shop.pimoroni.com/products/inky-phat)
+- [PaPiRus eInk Screen](https://uk.pi-supply.com/products/papirus-zero-epaper-screen-phat-pi-zero)
+
+Needless to say, we are always happy to receive pull requests adding support for new models.
+
+One thing to note, not all displays are created equaly, TFT displays for example work similar to an HDMI display, and they are not supported, currently all the displays supported are I2C displays.
+
+#### Color and Black & White displays
+
+Some of the supported displays support Black & White and Coloured versions, one common question is regarding refresh speed of said displays.
+
+Color displays have a much slower refresh rate, in some cases it can take up to 15 seconds, if slow refresh rates is something that you want to avoid we advise you to use Black & White displays
+
+## Flashing an Image
+
+The easiest way to create a new Pwnagotchi is downloading the latest stable image from [our release page](https://github.com/evilsocket/pwnagotchi/releases) and write it to your SD card. You will need to use an image writing tool to install the image you have downloaded on your SD card.
+
+[balenaEtcher](https://www.balena.io/etcher/) is a graphical SD card writing tool that works on Mac OS, Linux and Windows,
+and is the easiest option for most users. balenaEtcher also supports writing images directly from the zip file,
+without any unzipping required. To write your image with balenaEtcher:
+
+- Download the latest [Pwnagotchi .img file](https://github.com/evilsocket/pwnagotchi/releases).
+- Download [balenaEtcher](https://www.balena.io/etcher/) and install it.
+- Connect an SD card reader with the SD card inside.
+- Open balenaEtcher and select from your hard drive the Raspberry Pi .img or .zip file you wish to write to the SD card.
+- Select the SD card you wish to write your image to.
+- Review your selections and click 'Flash!' to begin writing data to the SD card.
+
+Your SD card is now ready for the first boot!
\ No newline at end of file
diff --git a/docs/plugins.md b/docs/plugins.md
index e69de29..512c872 100644
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -0,0 +1,57 @@
+# Plugins
+
+Pwnagotchi has a simple plugins system that you can use to customize your unit and its behaviour. You can place your plugins anywhere
+as python files and then edit the `config.yml` file (`main.plugins` value) to point to their containing folder. Check the [plugins folder](https://github.com/evilsocket/pwnagotchi/tree/master/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/) for a list of default
+plugins and all the callbacks that you can define for your own customizations.
+
+Here's as an example the GPS plugin:
+
+```python
+__author__ = 'evilsocket@gmail.com'
+__version__ = '1.0.0'
+__name__ = 'gps'
+__license__ = 'GPL3'
+__description__ = 'Save GPS coordinates whenever an handshake is captured.'
+__enabled__ = True # set to false if you just don't use GPS
+
+import core
+import json
+import os
+
+device = '/dev/ttyUSB0'
+speed = 19200
+running = False
+
+
+def on_loaded():
+ logging.info("GPS plugin loaded for %s" % device)
+
+
+def on_ready(agent):
+ global running
+
+ if os.path.exists(device):
+ logging.info("enabling GPS bettercap's module for %s" % device)
+ try:
+ agent.run('gps off')
+ except:
+ pass
+
+ agent.run('set gps.device %s' % device)
+ agent.run('set gps.speed %d' % speed)
+ agent.run('gps on')
+ running = True
+ else:
+ logging.info("no GPS detected")
+
+
+def on_handshake(agent, filename, access_point, client_station):
+ if running:
+ info = agent.session()
+ gps = info['gps']
+ gps_filename = filename.replace('.pcap', '.gps.json')
+
+ logging.info("saving GPS to %s (%s)" % (gps_filename, gps))
+ with open(gps_filename, 'w+t') as fp:
+ json.dump(gps, fp)
+```
diff --git a/docs/usage.md b/docs/usage.md
new file mode 100644
index 0000000..7d6c5d8
--- /dev/null
+++ b/docs/usage.md
@@ -0,0 +1,53 @@
+### UI
+
+The UI is available either via display if installed, or via http://pwnagotchi.local:8080/ if you connect to the unit via `usb0` and set a static address on the network interface (change `pwnagotchi` with the hostname of your unit).
+
+
+
+* **CH**: Current channel the unit is operating on or `*` when hopping on all channels.
+* **APS**: Number of access points on the current channel and total visible access points.
+* **UP**: Time since the unit has been activated.
+* **PWND**: Number of handshakes captured in this session and number of unique networks we own at least one handshake of, from the beginning.
+* **AUTO**: This indicates that the algorithm is running with AI disabled (or still loading), it disappears once the AI dependencies have been bootrapped and the neural network loaded.
+
+### BetterCAP's Web UI
+
+Moreover, given that the unit is running bettercap with API and Web UI, you'll be able to use the unit as a WiFi penetration testing portable station
+by accessing `http://pwnagotchi.local/`.
+
+
+
+### Update your Pwnagotchi
+
+You can use the `scripts/update_pwnagotchi.sh` script to update to the most recent version of pwnagotchi.
+
+```shell
+usage: ./update_pwnagitchi.sh [OPTIONS]
+
+ Options:
+ -v # Version to update to, can be a branch or commit. (default: master)
+ -u # Url to clone from. (default: https://github.com/evilsocket/pwnagotchi)
+ -m # Mode to restart to. (Supported: auto manual; default: auto)
+ -b # Backup the current pwnagotchi config.
+ -r # Restore the current pwnagotchi config. -b will be enabled.
+ -h # Shows this help. Shows this help.
+
+```
+
+### Backup your Pwnagotchi
+
+You can use the `scripts/backup.sh` script to backup the important files of your unit.
+
+```shell
+usage: ./scripts/backup.sh HOSTNAME backup.zip
+```
+
+### Random Info
+
+- **On a rpi0w, it'll take approximately 30 minutes to load the AI**.
+- `/var/log/pwnagotchi.log` is your friend.
+- if connected to a laptop via usb data port, with internet connectivity shared, magic things will happen.
+- checkout the `ui.video` section of the `config.yml` - if you don't want to use a display, you can connect to it with the browser and a cable.
+- If you get `[FAILED] Failed to start Remount Root and Kernel File Systems.` while booting pwnagotchi, make sure
+the `PARTUUID`s for `rootfs` and `boot` partitions are the same in `/etc/fstab`. Use `sudo blkid` to find those values when you are using `create_sibling.sh`.
+
diff --git a/sdcard/rootfs/root/pwnagotchi/config.yml b/sdcard/rootfs/root/pwnagotchi/config.yml
index b71ddde..28f2770 100644
--- a/sdcard/rootfs/root/pwnagotchi/config.yml
+++ b/sdcard/rootfs/root/pwnagotchi/config.yml
@@ -23,7 +23,7 @@ main:
ai:
# if false, only the default 'personality' will be used
- enabled: false
+ enabled: true
path: /root/brain.nn
# 1.0 - laziness = probability of start training
laziness: 0.1
From 6f0ec08c47150dca5986ba24292abcd4eafce685 Mon Sep 17 00:00:00 2001
From: Simone Margaritelli <evilsocket@gmail.com>
Date: Thu, 3 Oct 2019 22:31:27 +0200
Subject: [PATCH 30/32] documented the reward function (closes #50)
---
docs/usage.md | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 98 insertions(+), 1 deletion(-)
diff --git a/docs/usage.md b/docs/usage.md
index 7d6c5d8..e9777bc 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -1,4 +1,101 @@
-### UI
+### Usage
+
+At its core Pwnagotchi is a very simple creature: we could summarize its main algorithm as:
+
+```python
+# main loop
+while True:
+ # ask bettercap for all visible access points and their clients
+ aps = get_all_visible_access_points()
+ # loop each AP
+ for ap in aps:
+ # send an association frame in order to grab the PMKID
+ send_assoc(ap)
+ # loop each client station of the AP
+ for client in ap.clients:
+ # deauthenticate the client to get its half or full handshake
+ deauthenticate(client)
+
+ wait_for_loot()
+```
+
+Despite its simplicity, this logic is controlled by several parameters that regulate the wait times, the timeouts, on which channels to hop and so on.
+
+From `config.yml`:
+
+```yaml
+personality:
+ # advertise our presence
+ advertise: true
+ # perform a deauthentication attack to client stations in order to get full or half handshakes
+ deauth: true
+ # send association frames to APs in order to get the PMKID
+ associate: true
+ # list of channels to recon on, or empty for all channels
+ channels: []
+ # minimum WiFi signal strength in dBm
+ min_rssi: -200
+ # number of seconds for wifi.ap.ttl
+ ap_ttl: 120
+ # number of seconds for wifi.sta.ttl
+ sta_ttl: 300
+ # time in seconds to wait during channel recon
+ recon_time: 30
+ # number of inactive epochs after which recon_time gets multiplied by recon_inactive_multiplier
+ max_inactive_scale: 2
+ # if more than max_inactive_scale epochs are inactive, recon_time *= recon_inactive_multiplier
+ recon_inactive_multiplier: 2
+ # time in seconds to wait during channel hopping if activity has been performed
+ hop_recon_time: 10
+ # time in seconds to wait during channel hopping if no activity has been performed
+ min_recon_time: 5
+ # maximum amount of deauths/associations per BSSID per session
+ max_interactions: 3
+ # maximum amount of misses before considering the data stale and triggering a new recon
+ max_misses_for_recon: 5
+ # number of active epochs that triggers the excited state
+ excited_num_epochs: 10
+ # number of inactive epochs that triggers the bored state
+ bored_num_epochs: 15
+ # number of inactive epochs that triggers the sad state
+ sad_num_epochs: 25
+```
+
+There is no optimal set of parameters for every situation: when the unit is moving (during a walk for instance) smaller timeouts and RSSI thresholds might be preferred
+in order to quickly remove routers that are not in range anymore, while when stationary in high density areas (like an office) other parameters might be better.
+The role of the AI is to observe what's going on at the WiFi level, and adjust those parameters in order to maximize the cumulative reward of that loop / epoch.
+
+#### Reward Function
+
+After each iteration of the main loop (an `epoch`), the reward, a score that represents how well the parameters performed, is computed as
+(an excerpt from `pwnagotchi/ai/reward.py`):
+
+```python
+# state contains the information of the last epoch
+# epoch_n is the number of the last epoch
+tot_epochs = epoch_n + 1e-20 # 1e-20 is added to avoid a division by 0
+tot_interactions = max(state['num_deauths'] + state['num_associations'], state['num_handshakes']) + 1e-20
+tot_channels = wifi.NumChannels
+
+# ideally, for each interaction we would have an handshake
+h = state['num_handshakes'] / tot_interactions
+# small positive rewards the more active epochs we have
+a = .2 * (state['active_for_epochs'] / tot_epochs)
+# make sure we keep hopping on the widest channel spectrum
+c = .1 * (state['num_hops'] / tot_channels)
+# small negative reward if we don't see aps for a while
+b = -.3 * (state['blind_for_epochs'] / tot_epochs)
+# small negative reward if we interact with things that are not in range anymore
+m = -.3 * (state['missed_interactions'] / tot_interactions)
+# small negative reward for inactive epochs
+i = -.2 * (state['inactive_for_epochs'] / tot_epochs)
+
+reward = h + a + c + b + i + m
+```
+
+By maximizing this reward value, the AI learns over time to find the set of parameters that better perform with the current environmental conditions.
+
+### User Interface
The UI is available either via display if installed, or via http://pwnagotchi.local:8080/ if you connect to the unit via `usb0` and set a static address on the network interface (change `pwnagotchi` with the hostname of your unit).
From 780664b1c0222c54d0592163deb52de758a168cc Mon Sep 17 00:00:00 2001
From: Simone Margaritelli <evilsocket@gmail.com>
Date: Thu, 3 Oct 2019 22:37:55 +0200
Subject: [PATCH 31/32] fix
---
docs/usage.md | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/docs/usage.md b/docs/usage.md
index e9777bc..e23dc68 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -1,4 +1,16 @@
-### Usage
+### User Interface
+
+The UI is available either via display if installed, or via http://pwnagotchi.local:8080/ if you connect to the unit via `usb0` and set a static address on the network interface (change `pwnagotchi` with the hostname of your unit).
+
+
+
+* **CH**: Current channel the unit is operating on or `*` when hopping on all channels.
+* **APS**: Number of access points on the current channel and total visible access points.
+* **UP**: Time since the unit has been activated.
+* **PWND**: Number of handshakes captured in this session and number of unique networks we own at least one handshake of, from the beginning.
+* **AUTO**: This indicates that the algorithm is running with AI disabled (or still loading), it disappears once the AI dependencies have been bootrapped and the neural network loaded.
+
+### Training the AI
At its core Pwnagotchi is a very simple creature: we could summarize its main algorithm as:
@@ -95,17 +107,6 @@ reward = h + a + c + b + i + m
By maximizing this reward value, the AI learns over time to find the set of parameters that better perform with the current environmental conditions.
-### User Interface
-
-The UI is available either via display if installed, or via http://pwnagotchi.local:8080/ if you connect to the unit via `usb0` and set a static address on the network interface (change `pwnagotchi` with the hostname of your unit).
-
-
-
-* **CH**: Current channel the unit is operating on or `*` when hopping on all channels.
-* **APS**: Number of access points on the current channel and total visible access points.
-* **UP**: Time since the unit has been activated.
-* **PWND**: Number of handshakes captured in this session and number of unique networks we own at least one handshake of, from the beginning.
-* **AUTO**: This indicates that the algorithm is running with AI disabled (or still loading), it disappears once the AI dependencies have been bootrapped and the neural network loaded.
### BetterCAP's Web UI
From 56b1d21bb04d62a165b55a21371cc7217e89c3d0 Mon Sep 17 00:00:00 2001
From: Simone Margaritelli <evilsocket@gmail.com>
Date: Thu, 3 Oct 2019 22:59:57 +0200
Subject: [PATCH 32/32] refactored main.py
---
sdcard/rootfs/root/pwnagotchi/scripts/main.py | 142 +++++++-----------
.../pwnagotchi/plugins/default/example.py | 2 +-
.../scripts/pwnagotchi/plugins/default/gps.py | 4 +-
.../pwnagotchi/plugins/default/twitter.py | 24 +--
.../scripts/pwnagotchi/ui/display.py | 27 +++-
5 files changed, 87 insertions(+), 112 deletions(-)
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/main.py b/sdcard/rootfs/root/pwnagotchi/scripts/main.py
index c401c8e..cba98d5 100755
--- a/sdcard/rootfs/root/pwnagotchi/scripts/main.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/main.py
@@ -12,7 +12,6 @@ import pwnagotchi.version as version
import pwnagotchi.plugins as plugins
from pwnagotchi.log import SessionParser
-from pwnagotchi.voice import Voice
from pwnagotchi.agent import Agent
from pwnagotchi.ui.display import Display
@@ -34,41 +33,6 @@ args = parser.parse_args()
config = utils.load_config(args)
utils.setup_logging(args, config)
-if args.do_clear:
- print("clearing the display ...")
- cleardisplay = config['ui']['display']['type']
- if cleardisplay in ('inkyphat', 'inky'):
- print("inky display")
- from inky import InkyPHAT
-
- epd = InkyPHAT(config['ui']['display']['color'])
- epd.set_border(InkyPHAT.BLACK)
- self._render_cb = self._inky_render
- elif cleardisplay in ('papirus', 'papi'):
- print("papirus display")
- from pwnagotchi.ui.papirus.epd import EPD
-
- os.environ['EPD_SIZE'] = '2.0'
- epd = EPD()
- epd.clear()
- elif cleardisplay in ('waveshare_1', 'ws_1', 'waveshare1', 'ws1'):
- print("waveshare v1 display")
- from pwnagotchi.ui.waveshare.v1.epd2in13 import EPD
-
- epd = EPD()
- epd.init(epd.lut_full_update)
- epd.Clear(0xFF)
- elif cleardisplay in ('waveshare_2', 'ws_2', 'waveshare2', 'ws2'):
- print("waveshare v2 display")
- from pwnagotchi.ui.waveshare.v2.waveshare import EPD
-
- epd = EPD()
- epd.init(epd.FULL_UPDATE)
- epd.Clear(0xff)
- else:
- print("unknown display type %s" % cleardisplay)
- quit()
-
plugins.load_from_path(plugins.default_path)
if 'plugins' in config['main'] and config['main']['plugins'] is not None:
plugins.load_from_path(config['main']['plugins'])
@@ -79,74 +43,78 @@ display = Display(config=config, state={'name': '%s>' % pwnagotchi.name()})
agent = Agent(view=display, config=config)
logging.info("%s@%s (v%s)" % (pwnagotchi.name(), agent._identity, version.version))
-# for key, value in config['personality'].items():
-# logging.info(" %s: %s" % (key, value))
for _, plugin in plugins.loaded.items():
- logging.info("plugin '%s' v%s loaded from %s" % (plugin.__name__, plugin.__version__, plugin.__file__))
+ logging.debug("plugin '%s' v%s loaded from %s" % (plugin.__name__, plugin.__version__, plugin.__file__))
-if args.do_manual:
+if args.do_clear:
+ logging.info("clearing the display ...")
+ display.clear()
+
+elif args.do_manual:
logging.info("entering manual mode ...")
log = SessionParser(config['main']['log'])
- logging.info("the last session lasted %s (%d completed epochs, trained for %d), average reward:%s (min:%s max:%s)" % (
- log.duration_human,
- log.epochs,
- log.train_epochs,
- log.avg_reward,
- log.min_reward,
- log.max_reward))
+ logging.info(
+ "the last session lasted %s (%d completed epochs, trained for %d), average reward:%s (min:%s max:%s)" % (
+ log.duration_human,
+ log.epochs,
+ log.train_epochs,
+ log.avg_reward,
+ log.min_reward,
+ log.max_reward))
while True:
display.on_manual_mode(log)
time.sleep(1)
if Agent.is_connected():
- plugins.on('internet_available', config, log)
+ plugins.on('internet_available', display, config, log)
- quit()
+else:
+ logging.info("entering auto mode ...")
-agent.start_ai()
-agent.setup_events()
-agent.set_starting()
-agent.start_monitor_mode()
-agent.start_event_polling()
+ agent.start_ai()
+ agent.setup_events()
+ agent.set_starting()
+ agent.start_monitor_mode()
+ agent.start_event_polling()
-# print initial stats
-agent.next_epoch()
+ # print initial stats
+ agent.next_epoch()
-agent.set_ready()
+ agent.set_ready()
-while True:
- try:
- # recon on all channels
- agent.recon()
- # get nearby access points grouped by channel
- channels = agent.get_access_points_by_channel()
- # check for free channels to use
- agent.check_channels(channels)
- # for each channel
- for ch, aps in channels:
- agent.set_channel(ch)
+ while True:
+ try:
+ # recon on all channels
+ agent.recon()
+ # get nearby access points grouped by channel
+ channels = agent.get_access_points_by_channel()
+ # check for free channels to use
+ agent.check_channels(channels)
+ # for each channel
+ for ch, aps in channels:
+ agent.set_channel(ch)
- if not agent.is_stale() and agent.any_activity():
- logging.info("%d access points on channel %d" % (len(aps), ch))
+ if not agent.is_stale() and agent.any_activity():
+ logging.info("%d access points on channel %d" % (len(aps), ch))
- # for each ap on this channel
- for ap in aps:
- # send an association frame in order to get for a PMKID
- agent.associate(ap)
- # deauth all client stations in order to get a full handshake
- for sta in ap['clients']:
- agent.deauth(ap, sta)
+ # for each ap on this channel
+ for ap in aps:
+ # send an association frame in order to get for a PMKID
+ agent.associate(ap)
+ # deauth all client stations in order to get a full handshake
+ for sta in ap['clients']:
+ agent.deauth(ap, sta)
- # An interesting effect of this:
- #
- # From Pwnagotchi's perspective, the more new access points
- # and / or client stations nearby, the longer one epoch of
- # its relative time will take ... basically, in Pwnagotchi's universe,
- # WiFi electromagnetic fields affect time like gravitational fields
- # affect ours ... neat ^_^
- agent.next_epoch()
- except Exception as e:
- logging.exception("main loop exception")
+ # An interesting effect of this:
+ #
+ # From Pwnagotchi's perspective, the more new access points
+ # and / or client stations nearby, the longer one epoch of
+ # its relative time will take ... basically, in Pwnagotchi's universe,
+ # WiFi electromagnetic fields affect time like gravitational fields
+ # affect ours ... neat ^_^
+ agent.next_epoch()
+ except Exception as e:
+ logging.exception("main loop exception")
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/example.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/example.py
index 9c1c8c4..4166e4a 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/example.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/example.py
@@ -18,7 +18,7 @@ def on_loaded():
# called in manual mode when there's internet connectivity
-def on_internet_available(config, log):
+def on_internet_available(ui, config, log):
pass
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/gps.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/gps.py
index 7c57b24..cd292ea 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/gps.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/gps.py
@@ -15,14 +15,14 @@ running = False
def on_loaded():
- logging.info("GPS plugin loaded for %s" % device)
+ logging.info("gps plugin loaded for %s" % device)
def on_ready(agent):
global running
if os.path.exists(device):
- logging.info("enabling GPS bettercap's module for %s" % device)
+ logging.info("enabling gps bettercap's module for %s" % device)
try:
agent.run('gps off')
except:
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/twitter.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/twitter.py
index 7aa4364..0c7d8d9 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/twitter.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/plugins/default/twitter.py
@@ -8,16 +8,14 @@ __enabled__ = True
import logging
from pwnagotchi.voice import Voice
-UI = None
-
def on_loaded():
- logging.info("Twitter plugin loaded.")
+ logging.info("twitter plugin loaded.")
# called in manual mode when there's internet connectivity
-def on_internet_available(config, log):
- if config['twitter']['enabled'] and log.is_new() and log.handshakes > 0 and UI:
+def on_internet_available(ui, config, log):
+ if config['twitter']['enabled'] and log.is_new() and log.handshakes > 0:
try:
import tweepy
except ImportError:
@@ -28,11 +26,11 @@ def on_internet_available(config, log):
picture = '/dev/shm/pwnagotchi.png'
- UI.on_manual_mode(log)
- UI.update(force=True)
- UI.image().save(picture, 'png')
- UI.set('status', 'Tweeting...')
- UI.update(force=True)
+ ui.on_manual_mode(log)
+ ui.update(force=True)
+ ui.image().save(picture, 'png')
+ ui.set('status', 'Tweeting...')
+ ui.update(force=True)
try:
auth = tweepy.OAuthHandler(config['twitter']['consumer_key'], config['twitter']['consumer_secret'])
@@ -46,9 +44,3 @@ def on_internet_available(config, log):
logging.info("tweeted: %s" % tweet)
except Exception as e:
logging.exception("error while tweeting")
-
-
-def on_ui_setup(ui):
- # need that object
- global UI
- UI = ui
diff --git a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py
index c8b301a..ed6b188 100644
--- a/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py
+++ b/sdcard/rootfs/root/pwnagotchi/scripts/pwnagotchi/ui/display.py
@@ -102,12 +102,15 @@ class Display(View):
def _is_papirus(self):
return self._display_type in ('papirus', 'papi')
- def _is_waveshare1(self):
+ def _is_waveshare_v1(self):
return self._display_type in ('waveshare_1', 'ws_1', 'waveshare1', 'ws1')
- def _is_waveshare2(self):
+ def _is_waveshare_v2(self):
return self._display_type in ('waveshare_2', 'ws_2', 'waveshare2', 'ws2')
+ def _is_waveshare(self):
+ return self._is_waveshare_v1() or self._is_waveshare_v2()
+
def _init_display(self):
if self._is_inky():
logging.info("initializing inky display")
@@ -124,7 +127,7 @@ class Display(View):
self._display.clear()
self._render_cb = self._papirus_render
- elif self._is_waveshare1():
+ elif self._is_waveshare_v1():
logging.info("initializing waveshare v1 display")
from pwnagotchi.ui.waveshare.v1.epd2in13 import EPD
self._display = EPD()
@@ -133,7 +136,7 @@ class Display(View):
self._display.init(self._display.lut_partial_update)
self._render_cb = self._waveshare_render
- elif self._is_waveshare2():
+ elif self._is_waveshare_v2():
logging.info("initializing waveshare v2 display")
from pwnagotchi.ui.waveshare.v2.waveshare import EPD
self._display = EPD()
@@ -149,6 +152,18 @@ class Display(View):
self.on_render(self._on_view_rendered)
+ def clear(self):
+ if self._display is None:
+ logging.error("no display object created")
+ elif self._is_inky():
+ self._display.Clear()
+ elif self._is_papirus():
+ self._display.clear()
+ elif self._is_waveshare():
+ self._display.Clear(WHITE)
+ else:
+ logging.critical("unknown display type %s" % self._display_type)
+
def _inky_render(self):
if self._display_color != 'mono':
display_colors = 3
@@ -183,9 +198,9 @@ class Display(View):
def _waveshare_render(self):
buf = self._display.getbuffer(self._canvas)
- if self._is_waveshare1():
+ if self._is_waveshare_v1():
self._display.display(buf)
- elif self._is_waveshare2():
+ elif self._is_waveshare_v2():
self._display.displayPartial(buf)
def image(self):