Mercurial > public > hwos_code

changeset 492:336bfbbeb2b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2.15 rc
author heinrichsweikamp
date Thu, 30 Mar 2017 11:28:40 +0200
parents 66b9b8c082a9
children dd84cdd6c2d2
files src/changelog.txt src/hwos.inc src/logbook.asm
diffstat 3 files changed, 12 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/changelog.txt	Thu Mar 30 10:41:43 2017 +0200
+++ b/src/changelog.txt	Thu Mar 30 11:28:40 2017 +0200
@@ -1,11 +1,11 @@
 [2.15]
+- Stable Version -
 NEW: Deep Sleep mode for OSTC Plus and OSTC 2 (2017) (Entered automatically)
 NEW: Logbook detail page in larger font (And nicer layout)
 CHANGE: Sleep mode current slightly reduced for all hwOS devices
 NEW: Logbook now records battery information
 NEW: Markers in internal logbook drawn as small "m" next to the profile
 
-
 [2.14]
 - BETA Version -
 NEW: PSCR mode (Passive semi-closed rebreather)
--- a/src/hwos.inc	Thu Mar 30 10:41:43 2017 +0200
+++ b/src/hwos.inc	Thu Mar 30 11:28:40 2017 +0200
@@ -23,7 +23,7 @@
 ; Firmware definition
 #DEFINE	softwareversion_x		d'2'		; Software version  XX.YY
 #DEFINE	softwareversion_y		d'15'		; Software version  XX.YY
-#DEFINE softwareversion_beta 	1 			; (and 0 for release)
+#DEFINE softwareversion_beta 	0 			; (and 0 for release)
 ; Firmware version will appear in "Change Firmware" style
 #DEFINE firmware_expire_year    .18
 #DEFINE firmware_expire_month   .3
--- a/src/logbook.asm	Thu Mar 30 10:41:43 2017 +0200
+++ b/src/logbook.asm	Thu Mar 30 11:28:40 2017 +0200
@@ -918,23 +918,25 @@
     ; tiny "m"
     incf        apnoe_mins,W	; increase row (Y)
     movwf       win_top
-    movlw       .4
-    movwf       win_height
-    movlw       .2
-    movwf       win_width+0
-    clrf	win_width+1
+    ; limit win_top to 220
+    movlw	.220
+    cpfslt	win_top
+    movwf	win_top
     decf        logbook_pixel_x_pos,W	; decrease column (X)
     movwf       win_leftx2
+    ; limit win_leftx2 to 151
+    movlw	.151
+    cpfslt	win_leftx2
+    movwf	win_leftx2
 
     movlw       color_orange
     call        TFT_set_color
-    WIN_FONT   FT_TINY
+    WIN_FONT	FT_TINY
     lfsr	FSR2,buffer
     STRCPY_PRINT    "m"
-;    bcf         log_marker_found            ; Clear flag
+    bcf         log_marker_found            ; Clear flag
 
 profile_display_skip_marker:
-    bcf         log_marker_found            ; Clear flag    ; mH
     ;---- Draw CNS curve, if any ---------------------------------------------
     movf        divisor_cns,W
     bz          profile_display_skip_cns