# HG changeset patch # User heinrichsweikamp # Date 1324066408 -3600 # Node ID e2acb601504cc941a52da90bb22b42e72a6a90c5 # Parent 67ab3c028bc2f413ad7aef42f65e363781ef6698 some cleanup diff -r 67ab3c028bc2 -r e2acb601504c code_part1/OSTC_code_asm_part1/definitions.asm --- a/code_part1/OSTC_code_asm_part1/definitions.asm Tue Dec 13 21:00:40 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/definitions.asm Fri Dec 16 21:13:28 2011 +0100 @@ -334,7 +334,7 @@ active_gas res 1 ; Holds number of active gas last_diluent res 1 ; backup of diluent percentage in const ppO2 mode -last_ppO2_value res 1 ; last calculated ppO2 value +;last_ppO2_value res 1 ; last calculated ppO2 value debug_char res 6 ; For debugmode @@ -368,7 +368,7 @@ movlw low(tag) movff WREG,temp10+0 movlw high(tag) - movff WREG,temp10+0 + movff WREG,temp10+1 call PLED_resetdebugger @end: Endif diff -r 67ab3c028bc2 -r e2acb601504c code_part1/OSTC_code_asm_part1/eeprom_rs232.asm --- a/code_part1/OSTC_code_asm_part1/eeprom_rs232.asm Tue Dec 13 21:00:40 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/eeprom_rs232.asm Fri Dec 16 21:13:28 2011 +0100 @@ -166,16 +166,16 @@ nop nop nop - btfsc PIR1,RCIF ; data arrived? - return - nop nop nop nop btfsc PIR1,RCIF ; data arrived? return - + nop + nop + nop + nop nop nop nop @@ -186,6 +186,20 @@ nop nop nop + nop + nop + nop + nop + btfsc PIR1,RCIF ; data arrived? + return + nop + nop + nop + nop + nop + nop + nop + nop btfsc PIR1,RCIF ; data arrived? return diff -r 67ab3c028bc2 -r e2acb601504c code_part1/OSTC_code_asm_part1/pled_outputs.asm --- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm Tue Dec 13 21:00:40 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm Fri Dec 16 21:13:28 2011 +0100 @@ -1694,7 +1694,7 @@ PLED_depth: - ostc_debug 'r' ; Sends debug-information to screen if debugmode active +; ostc_debug 'r' ; Sends debug-information to screen if debugmode active SAFE_2BYTE_COPY rel_pressure, lo call adjust_depth_with_salinity ; computes salinity setting into lo:hi [mbar]