Mercurial > public > mk2

changeset 57:152fbe7f121d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small update simulator
author heinrichsweikamp
date Tue, 03 Aug 2010 21:42:43 +0200
parents a63d63a8612e
children
files code_part1/OSTC_code_asm_part1/MAIN_with_part2and3.HEX code_part1/OSTC_code_asm_part1/simulator.asm
diffstat 2 files changed, 30 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/MAIN_with_part2and3.HEX	Tue Aug 03 14:46:52 2010 +0200
+++ b/code_part1/OSTC_code_asm_part1/MAIN_with_part2and3.HEX	Tue Aug 03 21:42:43 2010 +0200
@@ -1546,7 +1546,7 @@
 :10608000DE6E200EDE6E5AEC2CF0C9CF31F15AECE8
 :106090002CF0C9CF32F11E8F376B372B366B365150
 :1060A00055EC0BF0270EDE6E4EEC0CF012002C932C
-:1060B0009D9A8186DFEC4AF06B0EAD6E22EC0CF0FF
+:1060B0009D9A8186A1EC4AF06B0EAD6E22EC0CF03D
 :1060C00081969D8A78EF3AF027959D9A818620ECFB
 :1060D00080F0010130EC80F0010118EC80F001014A
 :1060E000010ECB6FCC6B680EAD6E22EC0CF01F85F1
@@ -2090,7 +2090,7 @@
 :108280001C0EBAEC0EF0316703D0326701D012D069
 :10829000010E3127000E3223700E820FA96E31C1FC
 :1082A000A8FFFDEC0BF0700E830FA96E32C1A8FF82
-:1082B000FDEC0BF08196249D2CB1EAEC4AF060ECC9
+:1082B000FDEC0BF08196249D2CB1ACEC4AF060EC07
 :1082C00080F00101196B1A6B03EF3AF01FA712003F
 :1082D00029BB0ED024BD19D01F93B62B020EA6ECDD
 :1082E0000EF0020FD8B0FF0EE806B6651F8312002D
@@ -2367,7 +2367,7 @@
 :1093D000B96FC0D7248D2B87E9C14BF14C6B640E5C
 :1093E0004D6F4E6B1CEC0AF0E80E4727030E482326
 :1093F00047C1C5F148C1C6F1C5C18CF1C6C18DF1E7
-:10940000209120931F9F23972399DFEC4AF01F831D
+:10940000209120931F9F23972399A1EC4AF01F835B
 :10941000500EEDEC18F004EF3CF059EC0DF0BDEC03
 :109420002AF017EC44F0010EE8CF7FF0BC0E90EC70
 :1094300009F0000EE8CF7FF0239723991FA109D0F0
@@ -2375,31 +2375,31 @@
 :109450001F9123B709D023B907D01FB97AEF11F0B4
 :109460001FB390EF48F0EAD7050EB96F6AD723EC27
 :1094700042F0248D2B87E9C14BF14C6B640E4D6F8C
-:109480004E6B1CEC0AF0E80E4727030E482347C139
-:10949000C5F148C1C6F1C5C18CF1C6C18DF1DFEC83
+:109480004E6B1CEC0AF08C5147278D51482347C185
+:10949000C5F148C1C6F1C5C18CF1C6C18DF1A1ECC1
 :1094A0004AF0010EE8CF7FF00C0E90EC09F0000EB0
 :1094B000E8CF7FF013EC3DF0B1EC3DF000EC80F034
 :1094C000010123C5CDF1CD67F5D7010EE8CF4CF2F0
-:1094D000FF0EE8CF23F5CFEC1AF00BEC0CF00FC524
-:1094E000ADFF22EC0CF00EC5ADFF22EC0CF00DC56B
-:1094F000ADFF22EC0CF00CC5ADFF22EC0CF00BC55F
-:10950000ADFF22EC0CF00AC5ADFF22EC0CF009C552
-:10951000ADFF22EC0CF008C5ADFF22EC0CF01DC530
-:10952000ADFF22EC0CF01CC5ADFF22EC0CF06AC5BF
-:10953000ADFF22EC0CF069C5ADFF22EC0CF068C564
-:10954000ADFF22EC0CF067C5ADFF22EC0CF01BC5A3
-:10955000ADFF22EC0CF0817813EC3DF0B1EC3DF066
-:1095600000EC80F00101430EEDEC18F0E82FB3D7CA
-:10957000000EE8CF4CF2FF0EE8CF23F514D081881F
-:10958000EAEC4AF0249D2B97FA0E06EC0BF0FA0E4B
-:1095900006EC0BF0FA0E06EC0BF08198010EE86F6A
-:1095A000050EB96FCED613EC3DF0B1EC3DF000ECFA
-:1095B00080F0010123C5CDF1CD67F5D7E0D72C812F
-:1095C000530EEDEC18F062EC80F00101540EEDEC5E
-:1095D00018F012002C91530EEDEC18F064EC80F0B2
-:1095E0000101540EEDEC18F0470EEDEC18F030ECE4
-:1095F00080F00101CBEC3FF0480EEDEC18F028ECC8
-:1096000080F001011200FFFFFFFFFFFFFFFFFFFFE0
+:1094D000FF0EE8CF23F5CFEC1AF0817813EC3DF0C6
+:1094E000B1EC3DF000EC80F00101430EEDEC18F022
+:1094F000E82FF1D7000EE8CF4CF2FF0EE8CF23F5AE
+:1095000014D08188ACEC4AF0249D2B97FA0E06EC1F
+:109510000BF0FA0E06EC0BF0FA0E06EC0BF081984D
+:10952000010EE86F050EB96F0CD713EC3DF0B1ECEE
+:109530003DF000EC80F0010123C5CDF1CD67F5D7FA
+:10954000E0D72C81530EEDEC18F062EC80F00101B5
+:10955000540EEDEC18F012002C91530EEDEC18F0B7
+:1095600064EC80F00101540EEDEC18F0470EEDECC8
+:1095700018F030EC80F00101CBEC3FF0480EEDEC40
+:1095800018F028EC80F001011200FFFFFFFFFFFF41
+:10959000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDB
+:1095A000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFCB
+:1095B000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBB
+:1095C000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAB
+:1095D000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF9B
+:1095E000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF8B
+:1095F000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7B
+:10960000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6A
 :10961000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5A
 :10962000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4A
 :10963000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3A
--- a/code_part1/OSTC_code_asm_part1/simulator.asm	Tue Aug 03 14:46:52 2010 +0200
+++ b/code_part1/OSTC_code_asm_part1/simulator.asm	Tue Aug 03 21:42:43 2010 +0200
@@ -198,7 +198,6 @@
 	bsf		simulatormode_active			; normal simulator mode
 	bsf		standalone_simulator			; Standalone Simulator active
 
-
 	movff	logbook_temp2,xA+0
 	clrf	xA+1
 	movlw	d'100'
@@ -206,10 +205,12 @@
 	clrf	xB+1
 	call	mult16x16	;xA*xB=xC			; Depth in m*100
 
-	movlw	LOW		d'1000'
+;	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
+;	movlw	HIGH	d'1000'
+	addwfc	xC+1,F							; Add ambient pressure
 	
 	movff	xC+0,sim_pressure+0
 	movff	xC+1,sim_pressure+1