batmon.sh bugfix + housekeeping

skeleton/BASE/README.txt

@@ -40,11 +40,11 @@ Following Instructions 101
 ----------------------------------------
 Install
 
-MinUI is meant to be installed over a working stock TF1. The official Anbernic image requires a 64GB SD card: 
+MinUI is meant to be installed over a working stock TF1. The official Anbernic image requires a 64GB or larger SD card: 
 
   https://drive.google.com/drive/folders/1HfGCxkratM_zYiYfGWCrHZ1AynO3hIwU 
   
-Or you can download a reduced image that can be flashed to a 4GB SD card:
+Or you can download a reduced image that can be flashed to a 4GB or larger SD card:
 
   https://github.com/shauninman/union-minui/releases/tag/stock-tf1-20230309
 
@@ -66,7 +66,9 @@ Shortcuts
 
 Reduce/increase brightness:
 
-MENU + VOLUME UP or VOLUME DOWN
+  MENU + VOLUME UP or VOLUME DOWN
+
+The remaining emulation shortcuts are all user defined.
 
 ----------------------------------------
 Roms

skeleton/SYSTEM/rg35xx/paks/MinUI.pak/batmon.sh

@@ -2,21 +2,23 @@
 
 touch /mnt/sdcard/batmon.txt
 while :; do
+	O=`cat /sys/class/power_supply/battery/charger_online`
 	C=`cat /sys/class/power_supply/battery/capacity`
 	V=`cat /sys/class/power_supply/battery/voltage_now`
-	M=$(($V/1000))
-	M=$(($M-3300))
-	M=$(($M/8))
 	
-	if [ $M -gt 80 ]; 	then M=100;
+	# should match POW_updateBatteryStatus() in api.c
-	if [ $M -gt 60 ]; 	then M=80;
+	M=$(($V/10000))
+	M=$(($M-310))
+	
+	if   [ $M -gt 80 ]; then M=100;
+	elif [ $M -gt 60 ]; then M=80;
 	elif [ $M -gt 40 ]; then M=60;
 	elif [ $M -gt 20 ]; then M=40;
 	elif [ $M -gt 10 ]; then M=20;
 	else 					 M=10; fi
 	
 	N=`date`
-	echo "$C ($M) $V $N" >> /mnt/sdcard/batmon.txt
+	echo "$C ($O:$M) $V $N" >> /mnt/sdcard/batmon.txt
 	sync
 	sleep 5
 done

src/common/api.c

@@ -1391,7 +1391,7 @@ static void POW_quitOverlay(void) {
 static void POW_updateBatteryStatus(void) {
 	pow.is_charging = getInt("/sys/class/power_supply/battery/charger_online");
 	
-	// TODO: newer batteries have a different range, ???-420
+	// TODO: newer batteries have a different range, ???-???
 	int i = getInt("/sys/class/power_supply/battery/voltage_now") / 10000; // 310-410
 	i -= 310; 	// ~0-100
 

todo.txt

@@ -5,29 +5,26 @@
 Please see the README.txt in the zip file for installation and update instructions.
 
 **Base**
-- added support for newer hardware revisions which:
+- removed incomplete hdmi support (won't support codepath I won't use, ergonomics are all wrong)
-- broke already incomplete hdmi support
-- broke in-game low battery icon
-- increased how long boot feels (power LED doesn't come on as early as previous versions of MinUI which used a custom uImage)
 
 **Extras**
 - 
 
 -------------------------------
 
-return to alpha
+api
-
+	battery ramp is wrong for bigger battery
-regressions:
+	rewrite scaling logic
-	hdmi is an unknown
+	rewrite overlay
-	lost in-game low battery overlay
+	move scanlines/grid to overlay?
+	
+more regressions
+	slow power led
+	prevents power on with more than enough power
 
 BUG:
 	minui.elf treats bare tag rom folders as empty
 	
-rewrite
-	selectScaler
-restore overlay
-
 minarch
 	some cores can only fast forward with prevent tearing off
 		can this be set as an override preference?
@@ -53,45 +50,6 @@ minarch
 		the requirements for resolution independence...
 		and because I'll need a self-contained implementation to be able to address the unique quirks of each platform I want to support
 
-add most recent uImage/kernel changes
-	wait till things settle
-	keep an eye on gpu work
-		not interested in tripling boot time for gpu access
-		I would never pick up the device again if it took that long to boot
-
-hdmi
-	I might this off as a novelty
-		it's a distraction
-		my time is better spent unionizing this for the Mini
-	minarch menu
-		need to figure out how to create a 4:3 thumb from a distorted framebuffer
-		should be able to reconstruct it with screen->w|h and renderer.(src|dst)_(w|h)
-			just need to downsample to a cropped region of the source
-			or keep the libretro buffer data and use that to create the snapshot and resized backing
-				
-	audio
-		the following works if we boot with hdmi attached but hangs/crashes when we disconnect hdmi
-			I imagine the crash is because SDL is trying to write to a device that is no longer present
-			the hang is the result of the audio callback stopping maybe?
-			no, it's hanging in SDL_CloseAudio()
-				could this have something to do with env vars?
-				eggs had a similar crash with another (something like NO BLANK ON QUIT) flag
-		
-			if (GetHDMI()) SDL_putenv("AUDIODEV=plughw:0,1");
-			else SDL_putenv("AUDIODEV=default");
-		
-	usb contollers
-	prevent sleep (auto or manual) when on hdmi
-		should show a message saying sleep is disabled on hdmi or
-		turn off mirroring while asleep
-		I still think sleep on HDMI is a bad idea unless connected to power...
-
-
-create a clean image to flash and install over
-	advanced users seem to be confused about how simple it is tow install :sweat_smile:
-	this might be difficult with the gpio revs on newer devices
-
-
 minui
 	- 
 
@@ -100,14 +58,13 @@ misc
 	port say, show, blank, and confirm
 	make my own simple file browser? :sweat_smile:
 
-checkout eggs tools
+commander
-	I wonder if I could patch in Commander-11, BPreplayBold is too bold at that size
+	create a commander-11-mono for text views?
 
 cores
 	vb
 		launching directly into native scaling has normal performance
 		but launching into aspect and switching to native tanks the framerate
-		conversely aspect runs terrible on hdmi (~45fps) but native runs fine
 	pcsx-rearmed
 		reset hangs the PlayStation emulator core
 		Tekken 3 freezes PlayStation emulator core while fast-forwarding after a while