diff code_part1/OSTC_code_asm_part1/MAIN.ASM @ 344:797e2ac42d24 ScreenDump

MERGE with 1.91 main trunk.
author JeanDo
date Sat, 21 May 2011 14:48:07 +0200
parents 447390289f47 2144f19fa1eb
children b5b030c1ae7e
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/MAIN.ASM	Tue May 17 01:05:04 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/MAIN.ASM	Sat May 21 14:48:07 2011 +0200
@@ -82,6 +82,7 @@
 osct_asm	code
 #include    strings.inc
 
+#include	isr.asm				; Interrupt service routine (RTC&Sensor)
 #include	displaytext.asm		; sends texts to wordprocessor
 #include	math.asm			; mathematical functions
 #include 	wait.asm			; waitroutines
@@ -103,7 +104,6 @@
 #include	menu_ppO2.asm		; Constant ppO2 setup menu
 #include 	menu_battery.asm	; Submenu "Battery Info"
 #include	menu_gassetup.asm	; Menu "Gas Setup"
-#include	isr.asm				; Interrupt service routine (RTC&Sensor)
 #include	surfmode.asm		; Mainroutines for Surfacemode
 #include	divemode.asm		; Mainroutines for Divemode
 #include	divemode_menu.asm	; Underwater menu