Mercurial > public > hwos_code
diff src/isr.asm @ 490:8dfb93e80338
NEW: Deep Sleep mode for OSTC Plus and OSTC 2 (2017) (Entered automatically)
NEW: Logbook detail page in larger font (And nicer layout)
CHANGE: Sleep mode current slightly reduced for all hwOS devices
NEW: Logbook now records battery information
NEW: Markers in internal logbook drawn as small "m" next to the profile
| author | heinrichsweikamp |
|---|---|
| date | Wed, 29 Mar 2017 21:35:12 +0200 |
| parents | bab31db6e006 |
| children | b7eb98dbd800 |
line wrap: on
line diff
--- a/src/isr.asm Mon Mar 27 16:06:09 2017 +0200 +++ b/src/isr.asm Wed Mar 29 21:35:12 2017 +0200 @@ -316,18 +316,13 @@ ;============================================================================= -isr_tmr7: ; each 62,5ms - bcf PIR5,TMR7IF ; clear flag +isr_tmr7: ; each 62,5ms + bcf PIR5,TMR7IF ; clear flag banksel 0xF16 ; Addresses, F16h through F5Fh, are also used by SFRs, but are not part of the Access RAM. movlw .248 movwf TMR7H ; -> Rollover after 2048 cycles -> 62,5ms - banksel isr_backup - movf max_CCPR1L,W ; Dimm value - cpfseq CCPR1L ; = current PWM value? - rcall isr_dimm_tft ; No, adjust until max_CCPR1L=CCPR1L ! - - banksel common + banksel common call get_analog_switches ; Get analog readings btfss INTCON3,INT1IE bra isr_tmr7_a @@ -340,6 +335,16 @@ btfsc analog_sw1_pressed rcall isr_switch_right isr_tmr7_b: + banksel common + btfss no_sensor_int ; No sensor interrupt (because it's addressed during sleep) + bra isr_tmr7_c ; No, continue + banksel isr_backup ; Back to Bank0 ISR data + return +isr_tmr7_c: + banksel isr_backup + movf max_CCPR1L,W ; Dimm value + cpfseq CCPR1L ; = current PWM value? + rcall isr_dimm_tft ; No, adjust until max_CCPR1L=CCPR1L ! banksel isr_backup decfsz ir_S8_timeout,F ; IR Data still valid?