Mercurial > public > hwos_code

diff src/logbook.asm @ 66:00636132cca6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
BUGFIX: Maintain last selected customview in surface mode
author heinrichsweikamp
date Sat, 11 Jan 2014 18:03:04 +0100
parents ec4d8503ec45
children c34516c99ca8
line wrap: on
line diff
--- a/src/logbook.asm	Fri Jan 10 10:18:16 2014 +0100
+++ b/src/logbook.asm	Sat Jan 11 18:03:04 2014 +0100
@@ -28,7 +28,7 @@
 #include	"divemode.inc"
 #include	"ghostwriter.inc"
 
-   	extern   do_main_menu,comm_mode
+   	extern   do_main_menu2,comm_mode
 
     CBLOCK tmp+0x40		        ; Keep space for menu processor.
         count_temperature       ; Current sample count for temperature divisor
@@ -285,7 +285,7 @@
 
 logbook3b:
 	btfss		logbook_page_not_empty	; Was there at least one dive?
-	goto		do_main_menu			; Not a single header was found, leave logbook.
+	goto		do_main_menu2			; Not a single header was found, leave logbook.
 	bra			logbook_display_loop2
 
 logbook_reset:
@@ -347,7 +347,7 @@
 
     rcall       log_screendump_and_onesecond    ; Check if we need to make a screenshot and check for new second
 	btfsc		sleepmode					; Timeout?
-	goto		do_main_menu				; Yes
+	goto		do_main_menu2				; Yes
 
 	bra         logbook_loop                ; Wait for something to do
 
@@ -355,7 +355,7 @@
 	movlw		logbook_row_number+.2		; exit?
 	cpfseq		menupos
 	bra			display_profile_or_exit2	; No, check for "Next Page"
-	goto		do_main_menu
+	goto		do_main_menu2
 
 display_profile_or_exit2:
 	movlw		logbook_row_number+.1		; Next page?