Mercurial > public > mk2
diff code_part1/OSTC_code_asm_part1/divemode.asm @ 167:cb055a7d75f3
+ Use overlay local vars.
+ Make all private functions static.
+ Merge calc_tissue 2sec and 1min
+ Merge sim_tissue 1min and 10min
+ Expose basic display utilities for c-code.
+ Prepare stand-alone utilities for p2_main.c testing platform.
+ New c utility: int read_custom_function(cf#)
| author | JeanDo |
|---|---|
| date | Mon, 24 Jan 2011 23:31:57 +0100 |
| parents | 144822282fa3 |
| children | e26f49674956 |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/divemode.asm Sat Jan 22 23:24:12 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/divemode.asm Mon Jan 24 23:31:57 2011 +0100 @@ -347,14 +347,14 @@ movff EEDATA, char_I_deco_N2_ratio2; = N2! read_int_eeprom d'113' ; Read He ratio - movff EEDATA,char_I_deco_He_ratio ; And copy into hold register + movff EEDATA,char_I_deco_He_ratio1; And copy into hold register read_int_eeprom d'112' ; Read O2 ratio - movff char_I_deco_He_ratio, wait_temp ; copy into bank1 register + movff char_I_deco_He_ratio1, wait_temp ; copy into bank1 register bsf STATUS,C ; movlw d'100' ; 100% subfwb wait_temp,W ; minus He subfwb EEDATA,F ; minus O2 - movff EEDATA, char_I_deco_N2_ratio; = N2! + movff EEDATA, char_I_deco_N2_ratio1; = N2! ; Now, set change depth. Inactive gases have depth=0! @@ -367,7 +367,7 @@ read_int_eeprom d'121' ; read gas_change_depth Gas4 movff EEDATA,char_I_deco_gas_change2 read_int_eeprom d'122' ; read gas_change_depth Gas5 - movff EEDATA,char_I_deco_gas_change + movff EEDATA,char_I_deco_gas_change1 ; Debugger @@ -412,7 +412,7 @@ movff lo,char_I_deco_gas_change4 movff lo,char_I_deco_gas_change3 movff lo,char_I_deco_gas_change2 - movff lo,char_I_deco_gas_change ; clear + movff lo,char_I_deco_gas_change1 ; clear return calc_deko_divemode2: