From ccc6223c1b02583b199c17ee8451b6102728f52c Mon Sep 17 00:00:00 2001 From: Anjandev Momi Date: Thu, 15 Jul 2021 18:29:35 -0400 Subject: [PATCH] Revert "add a configurable daemon that warns on low battery" This reverts commit c7e0e3b65690c5dca9ad6dc8f1c6f48f466c5972. Signed-off-by: Anjandev Momi --- Makefile | 11 +--- configs/appcfg/xinit_template | 19 ------- configs/default_hooks/battery | 6 --- configs/default_hooks/battery_crit | 6 --- programs/sxmo_batterymonitor.c | 87 ------------------------------ 5 files changed, 1 insertion(+), 128 deletions(-) delete mode 100644 configs/default_hooks/battery delete mode 100644 configs/default_hooks/battery_crit delete mode 100644 programs/sxmo_batterymonitor.c diff --git a/Makefile b/Makefile index b55ddad..583b598 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,6 @@ PREFIX:=/usr PROGRAMS = \ programs/sxmo_setpineled \ programs/sxmo_megiaudioroute \ - programs/sxmo_batterymonitor \ programs/sxmo_vibratepine all: $(PROGRAMS) @@ -24,11 +23,8 @@ programs/sxmo_megiaudioroute: programs/sxmo_megiaudioroute.c programs/sxmo_vibratepine: programs/sxmo_vibratepine.c gcc -o programs/sxmo_vibratepine programs/sxmo_vibratepine.c -programs/sxmo_batterymonitor: programs/sxmo_batterymonitor.c - gcc -o programs/sxmo_batterymonitor programs/sxmo_batterymonitor.c - clean: - rm -f programs/sxmo_setpineled programs/sxmo_megiaudioroute programs/sxmo_vibratepine programs/sxmo_batterymonitor + rm -f programs/sxmo_setpineled programs/sxmo_megiaudioroute programs/sxmo_vibratepine install: $(PROGRAMS) cd configs && find . -type f -exec install -D -m 0644 "{}" "$(DESTDIR)$(PREFIX)/share/sxmo/{}" \; && cd .. @@ -45,8 +41,6 @@ install: $(PROGRAMS) install -D -m 0644 -t $(DESTDIR)$(PREFIX)/share/applications/ configs/xdg/mimeapps.list - install -D -m 0644 -t $(DESTDIR)/etc/sudoers.d/ configs/sudo/poweroff - install -D -m 0644 -T configs/xorg/monitor.conf $(DESTDIR)$(PREFIX)/share/X11/xorg.conf.d/90-monitor.conf mkdir -p $(DESTDIR)/etc/NetworkManager/dispatcher.d @@ -56,12 +50,9 @@ install: $(PROGRAMS) # Bin install -D -t $(DESTDIR)$(PREFIX)/bin scripts/*/* - install -D -m 0755 programs/sxmo_batterymonitor $(DESTDIR)$(PREFIX)/bin/ - install -D -m 0755 programs/sxmo_setpineled $(DESTDIR)$(PREFIX)/bin/ install -D programs/sxmo_megiaudioroute $(DESTDIR)$(PREFIX)/bin/ - install -D programs/sxmo_vibratepine $(DESTDIR)$(PREFIX)/bin/ echo "NOTICE: Do not forget to add sxmo-setpermissions to your init system, e.g. for openrc: rc-update add sxmo-setpermissions default && rc-service sxmo-setpermissions start" >&2 diff --git a/configs/appcfg/xinit_template b/configs/appcfg/xinit_template index e16593c..62598da 100644 --- a/configs/appcfg/xinit_template +++ b/configs/appcfg/xinit_template @@ -65,22 +65,3 @@ export SXMO_LOCK_SCREEN_OFF=1 # Or, enable vibration feedback on keypress #export KEYBOARD_ARGS="-o | clickclack -V" - -## Configuration parameters for sxmo_batterymonitor ## - -# The following values are the defaults - -# enable (1) or disable (0) the warning -#export BM_WARN=1 - -# enable (1) or disable (0) repeating warnings and hook executions -#export BM_LOOP=0 - -# set a threshold for the warning -#export BM_WARN_THRESHOLD=15 - -# set a threshold for the action (executes battery hook) -#export BM_WARN_CRIT_THRESHOLD=5 - -#let the daemon check every 5 minutes (300s) -sxmo_batterymonitor -i 300 diff --git a/configs/default_hooks/battery b/configs/default_hooks/battery deleted file mode 100644 index 90807fb..0000000 --- a/configs/default_hooks/battery +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env sh - -# This script is executed when sxmo_batterymonitor detects a battery capacity below the set threshold -# You can use it to shutdown, play a notification sound, send a message, etc - -mpv --no-video /usr/share/sxmo/notify.ogg >/dev/null && notify-send \"battery low\" && sxmo_vibratepine 1500 & diff --git a/configs/default_hooks/battery_crit b/configs/default_hooks/battery_crit deleted file mode 100644 index c4766d1..0000000 --- a/configs/default_hooks/battery_crit +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env sh - -# This script is executed when sxmo_batterymonitor detects a battery capacity below the set threshold -# You can use it to shutdown, play a notification sound, send a message, etc - -sudo busybox poweroff diff --git a/programs/sxmo_batterymonitor.c b/programs/sxmo_batterymonitor.c deleted file mode 100644 index 982d9ed..0000000 --- a/programs/sxmo_batterymonitor.c +++ /dev/null @@ -1,87 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include - -static void help(){ - printf("Usage: sxmo_batterymonitor [POSIX style options]\nPOSIX options:\n-h\t\tprint help\n-i\tinterval\t set an interval in seconds"); - exit(EXIT_SUCCESS); -} - -void term(){ - syslog (LOG_NOTICE, "sxmo_batterymonitor daemon terminated."); - closelog(); -} - -int main(int argc, char* argv[], char* envp[]){ - int interval=10; - if (argc < 3){ - help(); - } - if ( strcmp(argv[1], "-i") == 0 ){ - interval = atoi(argv[2]); - } - else{ - help(); - } - if (system("pidof -o $PPID sxmo_batterymonitor > /dev/null") == 0){ - printf("Another daemon is already running -- exiting"); - exit(EXIT_FAILURE); - } - if( daemon(0,0) != 0){ - exit(EXIT_FAILURE); - } - openlog ("sxmo_batterymonitor", LOG_PID, LOG_DAEMON); - syslog (LOG_NOTICE, "sxmo_batterymonitor daemon started."); - setenv("BATTERY_DEVICE","/sys/class/power_supply/axp20x-battery",0); - setenv("DISPLAY",":0",0); - setenv("BM_LOOP","0",0); - setenv("BM_WARN","1",0); - setenv("BM_WARN_THRESHOLD","15",0); - setenv("BM_WARN_CRIT_THRESHOLD","5",0); - char* device = getenv("BATTERY_DEVICE"); - char* cap = "/capacity",data=0; - char* path= strcat(device,cap); - int c=0,wrn=0,bm_disable_warn=0,bm_warn_threshold=15,bm_warn_crit_threshold=5,loop=0; - loop = atoi(getenv("BM_LOOP")); - bm_disable_warn = atoi(getenv("BM_WARN")); - bm_warn_threshold = atoi(getenv("BM_WARN_THRESHOLD")); - bm_warn_crit_threshold = atoi(getenv("BM_WARN_CRIT_THRESHOLD")); - while (1){ - FILE *ptr = fopen(path,"r"); - fgets(&data,5,ptr); - c = atoi(&data); - switch( loop ){ - case 1: - if( (bm_disable_warn == 1) && (c < bm_warn_threshold) ){ - system("$XDG_CONFIG_HOME/sxmo/hooks/battery &"); - } - if( c < bm_warn_crit_threshold ){ - system("$XDG_CONFIG_HOME/sxmo/hooks/battery_crit &"); - } - default: - if( (bm_disable_warn == 1) && (c < bm_warn_threshold) && (wrn == 0)){ - wrn = 1; - system("$XDG_CONFIG_HOME/sxmo/hooks/battery &"); - } - if( (c < bm_warn_crit_threshold) && (wrn != 2) ){ - wrn=2; - system("$XDG_CONFIG_HOME/sxmo/hooks/battery_crit &"); - } - if( c >= bm_warn_crit_threshold ){ - wrn = 1; - } - if( c >= bm_warn_threshold ){ - wrn = 0; - } - } - fclose(ptr); - sleep(interval); - } - term(); - exit(EXIT_FAILURE); -}