Mercurial > public > mk2
changeset 378:51baf8777b73 64kByte Logbook
testing, removing unused stuff
| author | heinrichsweikamp |
|---|---|
| date | Mon, 13 Jun 2011 11:29:37 +0200 |
| parents | be71e563ac09 |
| children | cf1023a53d0c |
| files | code_part1/OSTC_code_asm_part1/MAIN.ASM code_part1/OSTC_code_asm_part1/isr.asm code_part1/OSTC_code_asm_part1/start.asm |
| diffstat | 3 files changed, 5 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/MAIN.ASM Mon Jun 13 07:45:59 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/MAIN.ASM Mon Jun 13 11:29:37 2011 +0200 @@ -68,10 +68,6 @@ btfsc INTCON3,INT1IF ; switch right call switch_right_int -; Test for race condition - btfsc PIR1,TMR1IF ;Timer1 INT (external 32.768kHz Clock) - call timer1int - movff prod_temp+1,PRODH movff prod_temp+0,PRODL movff wreg_temp,WREG ;restore working register
--- a/code_part1/OSTC_code_asm_part1/isr.asm Mon Jun 13 07:45:59 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/isr.asm Mon Jun 13 11:29:37 2011 +0200 @@ -185,6 +185,10 @@ cpfslt TMR1H ; Did we miss a 1/16 second? incf timer1int_counter1,F ; Yes, add extra 1/16 second + movlw 0x10 ; Timer1 int after 62.5ms (=16/second) + cpfslt TMR1H ; Did we miss another 1/16 second? + incf timer1int_counter1,F ; Yes, add another extra 1/16 second + movlw 0x08 ; Timer1 int after 62.5ms (=16/second) subwf TMR1H,F @@ -395,7 +399,7 @@ return clrf hours incf day,F -; Test for race condition +; test for race condition ; movff time_correction_value,secs ; Correct too slow clock check_date:
--- a/code_part1/OSTC_code_asm_part1/start.asm Mon Jun 13 07:45:59 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/start.asm Mon Jun 13 11:29:37 2011 +0200 @@ -26,15 +26,7 @@ movlb b'00000001' ; ram bank 1 selected movff STKPTR,temp10 clrf temp10+1 - call init - - read_int_eeprom d'92' ; Read number of CF used in this firmware - movlw 0xFF ; First start value - cpfseq EEDATA ; Compare - bra start2 ; Normal power-on/hard reset boot - bra first_start ; Reset and jump to surfmode -start2: btfsc divemode ; Reset from Divemode? call PLED_resetdebugger ; Yes! Something went wrong, show reset informations start3: