Mercurial > public > mk2

diff code_part1/OSTC_code_asm_part1/simulator.asm @ 576:ab2686087bce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
faster font display, code cleaning
author heinrichsweikamp
date Sun, 22 Apr 2012 14:38:10 +0200
parents cbdcbbc91877
children cda5b45b953f
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/simulator.asm	Sat Apr 21 15:08:09 2012 +0200
+++ b/code_part1/OSTC_code_asm_part1/simulator.asm	Sun Apr 22 14:38:10 2012 +0200
@@ -45,18 +45,12 @@
     movff   WREG,char_I_dive_interval
 
 menu_simulator1:
-	clrf	timeout_counter2
-	bsf		menubit
-	bsf		cursor
 	call	PLED_brightness_full			;max. brightness
 	call	PLED_ClearScreen
 	call	PLED_simulator_mask
 
 menu_simulator2:
-	bcf		switch_left
-	bcf		switch_right
-	bcf		menubit2
-	bcf		menubit3
+	call	menu_pre_loop_common		; Clear some menu flags, timeout and switches
 	call	PLED_simulator_data
 	call	PLED_menu_cursor
 
@@ -160,8 +154,7 @@
 	bcf		menubit2
 	bcf		menubit3
 	bcf		menubit
-	bcf		switch_left
-	bcf		switch_right
+	call	wait_switches		; Waits until switches are released, resets flag if button stays pressed!
 
 	call	simulator_save_tissue_data  ; Stores 32 floats "pre_tissue" into bank3
 
@@ -235,8 +228,7 @@
         WIN_INVERT	.0                  ; Init new Wordprocessor	
 	
 simulator_show_decoplan1:
-        bcf		switch_left
-        bcf		switch_right
+	call	wait_switches		; Waits until switches are released, resets flag if button stays pressed!
 simulator_show_decoplan2:
 	btfsc	uart_dump_screen        ; Asked to dump screen contains ?
 	call	dump_screen             ; Yes!