Mercurial > public > mk2

changeset 59:2ff1b30b1bdf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
1.70 stable release
author heinrichsweikamp
date Thu, 05 Aug 2010 09:44:43 +0200
parents 23dba7f60f88
children 3691ea95a34d
files code_part1/OSTC_code_asm_part1/MAIN.HEX code_part1/OSTC_code_asm_part1/MAIN.err code_part1/OSTC_code_asm_part1/MAIN_with_part2and3.HEX code_part1/OSTC_code_asm_part1/simulator.asm
diffstat 4 files changed, 6 insertions(+), 55 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/MAIN.HEX	Wed Aug 04 21:36:50 2010 +0200
+++ b/code_part1/OSTC_code_asm_part1/MAIN.HEX	Thu Aug 05 09:44:43 2010 +0200
@@ -2359,7 +2359,7 @@
 :1093B000B96F7CEF11F0020EE827C70EE861E86F85
 :1093C000020EB96FC8D7030EE927630EE961E96F92
 :1093D000030EB96FC0D7248D2B87E9C14BF14C6BBD
-:1093E000640E4D6F4E6B1CEC0AF0E80E4727030E1F
+:1093E000640E4D6F4E6B1CEC0AF08C5147278D516B
 :1093F000482347C1C5F148C1C6F1C5C18CF1C6C1FA
 :109400008DF1209120931F9F23972399A2EC4AF07E
 :109410001F83500EEDEC18F005EF3CF059EC0DF009
--- a/code_part1/OSTC_code_asm_part1/MAIN.err	Wed Aug 04 21:36:50 2010 +0200
+++ b/code_part1/OSTC_code_asm_part1/MAIN.err	Thu Aug 05 09:44:43 2010 +0200
@@ -1,5 +1,5 @@
 Warning[203] C:\MK2\CODE_PART1\OSTC_CODE_ASM_PART1\DIVEMODE_MENU.ASM 411 : Found opcode in column 1. (bra)
-Message[301] C:\MK2\CODE_PART1\OSTC_CODE_ASM_PART1\MAIN.ASM 135 : MESSAGE: (OSTC - diving computer code,  Copyright (C) 2009 HeinrichsWeikamp GbR)
+Message[301] C:\MK2\CODE_PART1\OSTC_CODE_ASM_PART1\MAIN.ASM 135 : MESSAGE: (OSTC - diving computer code,  Copyright (C) 2010 HeinrichsWeikamp GbR)
 Message[301] C:\MK2\CODE_PART1\OSTC_CODE_ASM_PART1\MAIN.ASM 136 : MESSAGE: (This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the)
 Message[301] C:\MK2\CODE_PART1\OSTC_CODE_ASM_PART1\MAIN.ASM 137 : MESSAGE: (Free Software Foundation, either version 3 of the License, or (at your option) any later version.)
 Message[301] C:\MK2\CODE_PART1\OSTC_CODE_ASM_PART1\MAIN.ASM 138 : MESSAGE: (This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY)
--- a/code_part1/OSTC_code_asm_part1/MAIN_with_part2and3.HEX	Wed Aug 04 21:36:50 2010 +0200
+++ b/code_part1/OSTC_code_asm_part1/MAIN_with_part2and3.HEX	Thu Aug 05 09:44:43 2010 +0200
@@ -2365,7 +2365,7 @@
 :1093B000B96F7CEF11F0020EE827C70EE861E86F85
 :1093C000020EB96FC8D7030EE927630EE961E96F92
 :1093D000030EB96FC0D7248D2B87E9C14BF14C6BBD
-:1093E000640E4D6F4E6B1CEC0AF0E80E4727030E1F
+:1093E000640E4D6F4E6B1CEC0AF08C5147278D516B
 :1093F000482347C1C5F148C1C6F1C5C18CF1C6C1FA
 :109400008DF1209120931F9F23972399A2EC4AF07E
 :109410001F83500EEDEC18F005EF3CF059EC0DF009
--- a/code_part1/OSTC_code_asm_part1/simulator.asm	Wed Aug 04 21:36:50 2010 +0200
+++ b/code_part1/OSTC_code_asm_part1/simulator.asm	Thu Aug 05 09:44:43 2010 +0200
@@ -125,10 +125,10 @@
 	clrf	xB+1
 	call	mult16x16	;xA*xB=xC			; Depth in m*100
 
-	movlw	LOW		d'1000'
+	movf	amb_pressure+0,W
 	addwf	xC+0,F
-	movlw	HIGH	d'1000'
-	addwfc	xC+1,F							; Add 1000mBar
+	movf	amb_pressure+1,W
+	addwfc	xC+1,F							; Add ambient pressure
 	
 	movff	xC+0,sim_pressure+0
 	movff	xC+1,sim_pressure+1
@@ -224,21 +224,6 @@
 	WIN_INVERT	.0
 
 simulator_calc_deco_loop1:
-
-;	movlw	.011
-;	call	PLED_SetColumn
-;	movlw	.009
-;	call	PLED_SetRow
-;	lfsr	FSR2,letter
-;	movff	char_O_array_decodepth+0,lo		; Get Depth
-;	bsf		leftbind
-;	output_8
-;	bcf		leftbind
-;	movlw	' '
-;	movwf	POSTINC2
-;call	word_processor	
-
-
 	call	divemode_check_decogases			; Checks for decogases and sets the gases
 	call	divemode_prepare_flags_for_deco
 
@@ -258,40 +243,6 @@
 simulator_calc_deco_loop2:
 	call	PLED_simulator_data
 
-; Debugger
-;	call	enable_rs232	
-;	movff	char_I_deco_He_ratio5,TXREG
-;	call	rs232_wait_tx				; wait for UART
-;	movff	char_I_deco_N2_ratio5,TXREG
-;	call	rs232_wait_tx				; wait for UART
-;	movff	char_I_deco_He_ratio4,TXREG
-;	call	rs232_wait_tx				; wait for UART
-;	movff	char_I_deco_N2_ratio4,TXREG
-;	call	rs232_wait_tx				; wait for UART
-;	movff	char_I_deco_He_ratio3,TXREG
-;	call	rs232_wait_tx				; wait for UART
-;	movff	char_I_deco_N2_ratio3,TXREG
-;	call	rs232_wait_tx				; wait for UART
-;	movff	char_I_deco_He_ratio2,TXREG
-;	call	rs232_wait_tx				; wait for UART
-;	movff	char_I_deco_N2_ratio2,TXREG
-;	call	rs232_wait_tx				; wait for UART
-;	movff	char_I_deco_He_ratio,TXREG
-;	call	rs232_wait_tx				; wait for UART
-;	movff	char_I_deco_N2_ratio,TXREG
-;	call	rs232_wait_tx				; wait for UART
-;	movff	char_I_deco_gas_change5,TXREG
-;	call	rs232_wait_tx				; wait for UART
-;	movff	char_I_deco_gas_change4,TXREG
-;	call	rs232_wait_tx				; wait for UART
-;	movff	char_I_deco_gas_change3,TXREG
-;	call	rs232_wait_tx				; wait for UART
-;	movff	char_I_deco_gas_change2,TXREG
-;	call	rs232_wait_tx				; wait for UART
-;	movff	char_I_deco_gas_change,TXREG
-;	call	rs232_wait_tx				; wait for UART
-;
-
 	btg		LED_red
 
 	call	divemode_check_decogases			; Checks for decogases and sets the gases