From 5b1702c62a06f9781a85103f7581237a7fa28c41 Mon Sep 17 00:00:00 2001 From: David Carley Date: Tue, 7 Dec 2021 19:15:13 -0800 Subject: [PATCH 1/4] Changed default speeds on PWM to 6000/24000, and clean up old cookies --- scripts/delete-cookies.py | 6 ++++++ scripts/install.sh | 16 ++++------------ src/resources/onefinity_defaults.json | 8 ++++---- 3 files changed, 14 insertions(+), 16 deletions(-) create mode 100644 scripts/delete-cookies.py diff --git a/scripts/delete-cookies.py b/scripts/delete-cookies.py new file mode 100644 index 0000000..af59fb9 --- /dev/null +++ b/scripts/delete-cookies.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 +import sqlite3 + +db = sqlite3.connect('/home/pi/.config/chromium/Default/Cookies') +cur = db.cursor() +cur.execute("DELETE FROM cookies WHERE creation_utc < 13240000000000000") diff --git a/scripts/install.sh b/scripts/install.sh index 50986ca..2b4739c 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -154,15 +154,11 @@ if [ ! -e /etc/cron.d/reboot ]; then cp ./scripts/cron_reboot_logrotate /etc/cron.reboot/logrotate fi -########################################## -# Begin one-time cleanup tasks for 1.0.7 -########################################## +# Delete some cookies that were left behind in older images +chmod +x ./scripts/delete-cookies.py +./scripts/delete-cookies.py -# Delete cached login data -rm -rf "/home/pi/.config/chromium/Login Data" -rm -rf "/home/pi/.config/chromium/Login Data.journal" - -# Get rid of some old files that were left behind +# Get rid of some old files that were left behind in older images rm -rf /home/pi/hostinfo.txt rm -rf /home/pi/ssidinfo.txt rm -rf /home/Downloads/bbctrl-20200415.json @@ -174,10 +170,6 @@ rm -rf /home/bbmc/favicon.ico # Force a logrotate to get everything into a good state logrotate -f /etc/logrotate.conf -########################################## -# End one-time cleanup tasks for 1.0.7 -########################################## - sync if $REBOOT; then diff --git a/src/resources/onefinity_defaults.json b/src/resources/onefinity_defaults.json index 07e2fe2..735cc1c 100644 --- a/src/resources/onefinity_defaults.json +++ b/src/resources/onefinity_defaults.json @@ -11,8 +11,8 @@ "tool-enable-mode": "disabled", "tool-direction-mode": "disabled", "tool-type": "PWM Spindle", - "min-spin": 0, - "max-spin": 255 + "min-spin": 6000, + "max-spin": 24000 }, "pwm-spindle": { "pwm-min-duty": 1, @@ -230,8 +230,8 @@ "tool-reversed": false, "tool-enable-mode": "disabled", "tool-direction-mode": "disabled", - "min-spin": 0, - "max-spin": 255 + "min-spin": 6000, + "max-spin": 24000 }, "pwm-spindle": { "pwm-min-duty": 1, From 1a2613677de2f175222996d4edf3553b21a99c06 Mon Sep 17 00:00:00 2001 From: "David A. Carley" Date: Wed, 8 Dec 2021 10:04:36 -0800 Subject: [PATCH 2/4] Update delete-cookies.py Neglected to commit the changes to the DB. --- scripts/delete-cookies.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/delete-cookies.py b/scripts/delete-cookies.py index af59fb9..60a25da 100644 --- a/scripts/delete-cookies.py +++ b/scripts/delete-cookies.py @@ -4,3 +4,4 @@ import sqlite3 db = sqlite3.connect('/home/pi/.config/chromium/Default/Cookies') cur = db.cursor() cur.execute("DELETE FROM cookies WHERE creation_utc < 13240000000000000") +db.commit() From eced4c7d6f2fdbd53540d5182ebafae101a325db Mon Sep 17 00:00:00 2001 From: "David A. Carley" Date: Wed, 8 Dec 2021 10:26:30 -0800 Subject: [PATCH 3/4] Update install.sh Force chromium to restart to see cookie changes --- scripts/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install.sh b/scripts/install.sh index 2b4739c..d0f6a71 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -157,6 +157,7 @@ fi # Delete some cookies that were left behind in older images chmod +x ./scripts/delete-cookies.py ./scripts/delete-cookies.py +pkill -HUP chromium # Force Chromium to restart, to see the cookie changes # Get rid of some old files that were left behind in older images rm -rf /home/pi/hostinfo.txt From cadae46ab323d3015893446e16f2d1c729e37ed3 Mon Sep 17 00:00:00 2001 From: "David A. Carley" Date: Wed, 8 Dec 2021 14:57:24 -0800 Subject: [PATCH 4/4] Update package.json Changed version number to 1.0.9. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2c6901b..3e0804c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bbctrl", - "version": "1.0.9b3", + "version": "1.0.9", "homepage": "https://onefinitycnc.com/", "repository": "https://github.com/OneFinityCNC/onefinity", "license": "GPL-3.0+",