chrissewell/pwnagotchi
1
0
Fork 0
mirror of https://github.com/jayofelony/pwnagotchi.git synced 2025-07-01 18:37:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove pisugar2 and 3 from custom repo's.

Browse Source 
Upgrade pisugarx some more.

Signed-off-by: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
This commit is contained in:
Jeroen Oudshoorn
2024-12-18 00:21:58 +01:00
parent a70772b312
commit 724e674134
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pwnagotchi/defaults.toml
View File

@ -9,8 +9,6 @@ main.whitelist = [
main.confd = "/etc/pwnagotchi/conf.d/" main.confd = "/etc/pwnagotchi/conf.d/"
main.custom_plugin_repos = [ main.custom_plugin_repos = [
"https://github.com/jayofelony/pwnagotchi-torch-plugins/archive/master.zip", "https://github.com/jayofelony/pwnagotchi-torch-plugins/archive/master.zip",
"https://github.com/tisboyo/pwnagotchi-pisugar2-plugin/archive/master.zip",
"https://github.com/nullm0ose/pwnagotchi-plugin-pisugar3/archive/master.zip",
"https://github.com/Sniffleupagus/pwnagotchi_plugins/archive/master.zip", "https://github.com/Sniffleupagus/pwnagotchi_plugins/archive/master.zip",
"https://github.com/NeonLightning/pwny/archive/master.zip", "https://github.com/NeonLightning/pwny/archive/master.zip",
"https://github.com/marbasec/UPSLite_Plugin_1_3/archive/master.zip" "https://github.com/marbasec/UPSLite_Plugin_1_3/archive/master.zip"
@ -60,6 +58,8 @@ main.plugins.onlinehashcrack.dashboard = ""
main.plugins.onlinehashcrack.single_files = false main.plugins.onlinehashcrack.single_files = false
main.plugins.pisugarx.enabled = false main.plugins.pisugarx.enabled = false
main.plugins.pisugarx.rotation = false
main.plugins.pisugarx.default_display = "percentage"
main.plugins.session-stats.enabled = true main.plugins.session-stats.enabled = true
main.plugins.session-stats.save_directory = "/var/tmp/pwnagotchi/sessions/" main.plugins.session-stats.save_directory = "/var/tmp/pwnagotchi/sessions/"

24
pwnagotchi/plugins/default/pisugarx.py
View File

@ -29,8 +29,11 @@ class PiSugar(plugins.Plugin):
self._agent = None self._agent = None
self.is_new_model = False self.is_new_model = False
self.options = dict() self.options = dict()
conn, event_conn = connect_tcp() try:
self.ps = PiSugarServer(conn, event_conn) conn, event_conn = connect_tcp()
self.ps = PiSugarServer(conn, event_conn)
except Exception as e:
logging.error("[PiSugarX] error: %s" % repr(e))
self.ready = False self.ready = False
self.lasttemp = 69 self.lasttemp = 69
self.drot = 0 # display rotation self.drot = 0 # display rotation
@ -96,14 +99,15 @@ class PiSugar(plugins.Plugin):
padding-bottom: 10px; padding-bottom: 10px;
} }
table { table {
width: 100%; width: 40%;
border-collapse: collapse; border-collapse: collapse;
margin: 20px 0; margin: 20px 0;
} }
table th, table td { table th, table td {
border: 1px solid #ccc; border: 1px solid #ccc;
padding: 10px; padding: 5px;
text-align: left; text-align: left;
font-size: 12px;
} }
table thead { table thead {
background-color: #f9f9f9; background-color: #f9f9f9;
@ -129,26 +133,18 @@ class PiSugar(plugins.Plugin):
ret += f''' ret += f'''
<tr><td>Server version</td><td>{self.ps.get_version()}</td></tr> <tr><td>Server version</td><td>{self.ps.get_version()}</td></tr>
<tr><td>PiSugar Model</td><td>{self.ps.get_model()}</td></tr> <tr><td>PiSugar Model</td><td>{self.ps.get_model()}</td></tr>
<tr><td>Firmware Version</td><td>{self.ps.get_fireware_version() if self.ps.get_model() == 'Pisugar 3' else 'Not supported'}</td></tr>
<tr><td>Battery Level</td><td>{self.ps.get_battery_level()}%</td></tr> <tr><td>Battery Level</td><td>{self.ps.get_battery_level()}%</td></tr>
<tr><td>Battery Voltage</td><td>{self.ps.get_battery_voltage()}V</td></tr> <tr><td>Battery Voltage</td><td>{self.ps.get_battery_voltage()}V</td></tr>
<tr><td>Battery Current</td><td>{self.ps.get_battery_current()}A</td></tr> <tr><td>Battery Current</td><td>{self.ps.get_battery_current()}A</td></tr>
<tr><td>Battery LED Amount</td><td>{self.ps.get_battery_led_amount() if self.ps.get_model() == 'Pisugar 2' else 'Not supported'}</td></tr> <tr><td>Battery LED Amount</td><td>{self.ps.get_battery_led_amount() if self.ps.get_model() == 'Pisugar 2' else 'Not supported'}</td></tr>
<tr><td>Battery Power Plugged In</td><td>{'Yes' if self.ps.get_battery_power_plugged() and self.is_new_model else 'No'}</td></tr>
<tr><td>Battery Allow Charging</td><td>{'Yes' if self.ps.get_battery_allow_charging() and self.is_new_model else 'No'}</td></tr> <tr><td>Battery Allow Charging</td><td>{'Yes' if self.ps.get_battery_allow_charging() and self.is_new_model else 'No'}</td></tr>
<tr><td>Battery Charging Range</td><td>{self.ps.get_battery_charging_range() if self.is_new_model or self.ps.get_model() == 'Pisugar 3' else 'Not supported'}%</td></tr> <tr><td>Battery Charging Range</td><td>{self.ps.get_battery_charging_range() if self.is_new_model or self.ps.get_model() == 'Pisugar 3' else 'Not supported'}</td></tr>
<tr><td>Battery Charging</td><td>{'Yes' if self.ps.get_battery_charging() else 'No'}</td></tr>
<tr><td>Battery Input Protect Enabled</td><td>{'Yes' if self.ps.get_battery_input_protect_enabled() else 'No'}</td></tr>
<tr><td>Battery Output Enabled</td><td>{'Yes' if self.ps.get_battery_output_enabled() else 'No'}</td></tr>
<tr><td>Duration of Keep Charging When Full</td><td>{self.ps.get_battery_full_charge_duration} seconds</td></tr> <tr><td>Duration of Keep Charging When Full</td><td>{self.ps.get_battery_full_charge_duration} seconds</td></tr>
<tr><td>Battery Safe Shutdown Level</td><td>{self.ps.get_battery_safe_shutdown_level() if self.ps.get_battery_safe_shutdown_level() is not None else 'Not set'}%</td></tr> <tr><td>Battery Safe Shutdown Level</td><td>{self.ps.get_battery_safe_shutdown_level() if self.ps.get_battery_safe_shutdown_level() is not None else 'Not set'}%</td></tr>
<tr><td>Battery Safe Shutdown Delay</td><td>{self.ps.get_battery_safe_shutdown_delay()} seconds</td></tr> <tr><td>Battery Safe Shutdown Delay</td><td>{self.ps.get_battery_safe_shutdown_delay()} seconds</td></tr>
<tr><td>Battery Auto Power On</td><td>{'Yes' if self.ps.get_battery_auto_power_on() else 'No'}</td></tr> <tr><td>Battery Auto Power On</td><td>{'Yes' if self.ps.get_battery_auto_power_on() else 'No'}</td></tr>
<tr><td>Battery Soft Power Off Enabled</td><td>{'Yes' if self.ps.get_battery_soft_poweroff and self.ps.get_model() == 'Pisugar 3' else 'No'}</td></tr> <tr><td>Battery Soft Power Off Enabled</td><td>{'Yes' if self.ps.get_battery_soft_poweroff() and self.ps.get_model() == 'Pisugar 3' else 'No'}</td></tr>
<tr><td>System Time</td><td>{self.ps.get_system_time()}</td></tr> <tr><td>System Time</td><td>{self.ps.get_system_time()}</td></tr>
<tr><td>RTC Time</td><td>{self.ps.get_rtc_time()}</td></tr>
<tr><td>RTC Alarm Time</td><td>{self.ps.get_rtc_alarm_time()}</td></tr>
<tr><td>RTC Alarm Enabled</td><td>{'Yes' if self.ps.get_rtc_alarm_enabled() else 'No'}</td></tr>
<tr><td>RTC Adjust PPM</td><td>{self.ps.get_rtc_adjust_ppm() if self.ps.get_model() == 'Pisugar 3' else 'Not supported'}</td></tr> <tr><td>RTC Adjust PPM</td><td>{self.ps.get_rtc_adjust_ppm() if self.ps.get_model() == 'Pisugar 3' else 'Not supported'}</td></tr>
<tr><td>RTC Alarm Repeat</td><td>{self.ps.get_rtc_alarm_repeat()}</td></tr> <tr><td>RTC Alarm Repeat</td><td>{self.ps.get_rtc_alarm_repeat()}</td></tr>
<tr><td>Single Tap Enabled</td><td>{'Yes' if self.ps.get_tap_enable(tap='single') else 'No'}</td></tr> <tr><td>Single Tap Enabled</td><td>{'Yes' if self.ps.get_tap_enable(tap='single') else 'No'}</td></tr>