Mercurial > public > hwos_code

diff src/tft_outputs.asm @ 477:44b8a826b314

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
NEW: Show battery type in surface mode next to battery voltage
author heinrichsweikamp
date Mon, 16 Jan 2017 11:59:55 +0100
parents 237afdfb4918
children ad8acade5567
line wrap: on
line diff
--- a/src/tft_outputs.asm	Mon Jan 16 11:05:02 2017 +0100
+++ b/src/tft_outputs.asm	Mon Jan 16 11:59:55 2017 +0100
@@ -2410,16 +2410,20 @@
     bcf     win_invert
 	call	TFT_standard_color
 	WIN_TINY batt_voltage_column,batt_voltage_row
+        movff   battery_type,lo		; =0:1.5V, =1:3,6V Saft, =2:LiIon 3,7V/0.8Ah, =3:LiIon 3,7V/3.1Ah, =4: LiIon 3,7V/2.3Ah
+	PUTC	"T"
+	bsf	leftbind
+        output_8
+        PUTC    ":"
 	movff	batt_voltage+0,lo
 	movff	batt_voltage+1,hi
-	bsf		leftbind
 	output_16dp	.2
 	bcf		leftbind
 	PUTC	'V'
-	movff	buffer+5,buffer+3
+	movff	buffer+8,buffer+6
 	movlw	0x00
-	movff	WREG,buffer+4			; Only "x.yV"
-    STRCAT_PRINT	""
+	movff	WREG,buffer+7			; Only "x.yV"
+	STRCAT_PRINT	""
 	return
 
 ;update_battery_debug: