# HG changeset patch # User heinrichsweikamp # Date 1269552034 -3600 # Node ID 239cb2cdc0c98cf35100896d06a3c91a57c7a7d9 # Parent 3b30cd73978209d8f77803b946e73dea6ec1ea60 1.53 beta - very small fix diff -r 3b30cd739782 -r 239cb2cdc0c9 code_part1/OSTC_code_asm_part1/MAIN.COD Binary file code_part1/OSTC_code_asm_part1/MAIN.COD has changed diff -r 3b30cd739782 -r 239cb2cdc0c9 code_part1/OSTC_code_asm_part1/MAIN.HEX --- a/code_part1/OSTC_code_asm_part1/MAIN.HEX Thu Mar 25 22:16:19 2010 +0100 +++ b/code_part1/OSTC_code_asm_part1/MAIN.HEX Thu Mar 25 22:20:34 2010 +0100 @@ -1008,7 +1008,7 @@ :10408000382B376B1EEC0DF02F0EDE6EA92ACFEC0D :104090000DF0A8CF32F1386B382B376B1EEC0DF0DA :1040A0001B0EA2EC0DF033C132F1A832322FFDD736 -:1040B000D8A004D0490E24EC10F005D0230E7CECDF +:1040B000D8B004D0490E24EC10F005D0230E7CECCF :1040C00010F024EC10F0210EA2EC0DF0A850336398 :1040D00001D009D0190E09275A0EE8CF7DF009C189 :1040E0007CF024EC0EF0230E7CEC10F024EC10F0AD diff -r 3b30cd739782 -r 239cb2cdc0c9 code_part1/OSTC_code_asm_part1/MAIN.err --- a/code_part1/OSTC_code_asm_part1/MAIN.err Thu Mar 25 22:16:19 2010 +0100 +++ b/code_part1/OSTC_code_asm_part1/MAIN.err Thu Mar 25 22:20:34 2010 +0100 @@ -1,5 +1,5 @@ -Warning[203] J:\MK2\MK2\CODE_PART1\OSTC_CODE_ASM_PART1\PLED_OUTPUTS.ASM 3230 : Found opcode in column 1. (return) -Warning[203] J:\MK2\MK2\CODE_PART1\OSTC_CODE_ASM_PART1\PLED_OUTPUTS.ASM 3233 : Found opcode in column 1. (return) +Warning[203] J:\MK2\MK2\CODE_PART1\OSTC_CODE_ASM_PART1\PLED_OUTPUTS.ASM 3093 : Found opcode in column 1. (return) +Warning[203] J:\MK2\MK2\CODE_PART1\OSTC_CODE_ASM_PART1\PLED_OUTPUTS.ASM 3096 : Found opcode in column 1. (return) Warning[203] J:\MK2\MK2\CODE_PART1\OSTC_CODE_ASM_PART1\ISR.ASM 357 : Found opcode in column 1. (movlw) Warning[203] J:\MK2\MK2\CODE_PART1\OSTC_CODE_ASM_PART1\ISR.ASM 358 : Found opcode in column 1. (movwf) Warning[203] J:\MK2\MK2\CODE_PART1\OSTC_CODE_ASM_PART1\DIVEMODE_MENU.ASM 411 : Found opcode in column 1. (bra) diff -r 3b30cd739782 -r 239cb2cdc0c9 code_part1/OSTC_code_asm_part1/MAIN_with_part2and3.HEX --- a/code_part1/OSTC_code_asm_part1/MAIN_with_part2and3.HEX Thu Mar 25 22:16:19 2010 +0100 +++ b/code_part1/OSTC_code_asm_part1/MAIN_with_part2and3.HEX Thu Mar 25 22:20:34 2010 +0100 @@ -1034,7 +1034,7 @@ :10408000382B376B1EEC0DF02F0EDE6EA92ACFEC0D :104090000DF0A8CF32F1386B382B376B1EEC0DF0DA :1040A0001B0EA2EC0DF033C132F1A832322FFDD736 -:1040B000D8A004D0490E24EC10F005D0230E7CECDF +:1040B000D8B004D0490E24EC10F005D0230E7CECCF :1040C00010F024EC10F0210EA2EC0DF0A850336398 :1040D00001D009D0190E09275A0EE8CF7DF009C189 :1040E0007CF024EC0EF0230E7CEC10F024EC10F0AD diff -r 3b30cd739782 -r 239cb2cdc0c9 code_part1/OSTC_code_asm_part1/pled_outputs.asm --- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm Thu Mar 25 22:16:19 2010 +0100 +++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm Thu Mar 25 22:20:34 2010 +0100 @@ -1053,7 +1053,7 @@ decfsz lo,F ; max. 5 times... bra PLED_pre_dive_screen2_loop1 - btfss STATUS,C ; test carry + btfsc STATUS,C ; test carry bra PLED_pre_dive_white movlw color_grey @@ -1134,143 +1134,6 @@ bcf leftbind return ; Return (CC Mode) - - - - - - - - - - - - - - -; -; -; WIN_LEFT .100 -; WIN_FONT FT_SMALL -; bsf leftbind -; -; movlw d'2' -; movwf wait_temp ; here: stores eeprom address for gas list -; movlw d'231' -; movwf waitms_temp ; here: stores row for gas list -; clrf hi ; here: Gas counter -; -;PLED_gas_list_loop: -; incf hi,F ; Increase Gas -; movlw d'4' -; addwf wait_temp,F ; Increase eeprom address for gas list -;; movlw d'25' -;; addwf waitms_temp,F ; Increase row -;; WIN_LEFT .100 -;; movff waitms_temp,win_top ; Set Row -; -; lfsr FSR2,letter -; movlw 'G' -; movwf POSTINC2 -; movff hi,lo ; copy gas number -; output_8 ; display gas number -; movlw ':' -; movwf POSTINC2 -; movff wait_temp, EEADR; Gas #hi: %O2 - Set address in internal EEPROM -; call read_eeprom ; get byte (stored in EEDATA) -; movff EEDATA,lo ; copy to lo -; output_8 ; outputs into Postinc2! -; movlw '/' -; movwf POSTINC2 -; incf EEADR,F ; Gas #hi: %He - Set address in internal EEPROM -; call read_eeprom ; get byte (stored in EEDATA) -; movff EEDATA,lo ; copy to lo -; output_8 ; outputs into Postinc2! -; -; -; read_int_eeprom d'27' ; read flag register -; movff hi,lo ; copy gas number -;PLED_gas_list_loop1: -; rrcf EEDATA ; roll flags into carry -; decfsz lo,F ; max. 5 times... -; bra PLED_gas_list_loop1 -; -; movlw .015 -; btfss STATUS,C ; test carry -; movlw .010 -; movwf grayvalue ; grey out inactive gases! -; -; call word_processor -; movlw .015 -; movwf grayvalue ; reset grey value for compatibility -; -; movlw d'5' ; list all five gases -; cpfseq hi ; All gases shown? -; bra PLED_gas_list_loop ; No -; -; return ; No, return (OC mode) -; -;PLED_splist_start: -; WIN_LEFT .100 -; WIN_FONT FT_SMALL -; bsf leftbind -; -; ; list three SP in Gaslist -; movlw d'35' ; 36 = current SP position in EEPROM -; movwf wait_temp ; here: stores eeprom address for gas list -; movlw d'231' -; movwf waitms_temp ; here: stores row for gas list -; clrf temp5 ; here: SP counter -; -;PLED_splist_loop: -; incf wait_temp,F ; EEPROM address -; incf temp5,F ; Increase SP -; -; movlw d'25' -; addwf waitms_temp,F ; Increase row -; movff waitms_temp,win_top ; Set Row -; WIN_LEFT .100 -; -; lfsr FSR2,letter -; movlw 'S' -; movwf POSTINC2 -; movlw 'P' -; movwf POSTINC2 -; movff temp5,lo ; copy gas number -; output_8 ; display gas number -; movlw ':' -; movwf POSTINC2 -; movff wait_temp, EEADR; SP #hi position -; call read_eeprom ; get byte (stored in EEDATA) -; movff EEDATA,lo ; copy to lo -; clrf hi -; output_16dp d'3' ; outputs into Postinc2! -; call word_processor -; -; movlw d'3' ; list all three SP -; cpfseq temp5 ; All gases shown? -; bra PLED_splist_loop ; No -; -; bcf leftbind -; return ; no, return -; -; -; -; - - - - - - - - - - - - - - PLED_active_gas_surfmode: ; Displays start gas/SP 1 ostc_debug 'q' ; Sends debug-information to screen if debugmode active