# HG changeset patch
# User heinrichsweikamp
# Date 1385890392 -3600
# Node ID e16e636def61ffc07f20442b46b7f69ab3d98aa6
# Parent ae830d5e63efae6a50326e21bd2de0be31463f36
2.74 release
diff -r ae830d5e63ef -r e16e636def61 code_part1/OSTC_code_asm_part1/MAIN.ASM
--- a/code_part1/OSTC_code_asm_part1/MAIN.ASM Sat Nov 30 20:41:43 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/MAIN.ASM Sun Dec 01 10:33:12 2013 +0100
@@ -47,21 +47,21 @@
movf PORTB,W ; move portb into latch register
- btfsc PIR1,TMR1IF ; Timer1 INT (external 32.768kHz Clock)
- call timer1int
-
btfsc INTCON,TMR0IF ; Timer0 INT (Debounce Timer)
call timer0int
- btfsc PIR1,RCIF ; UART
- call uartint
-
btfsc INTCON,INT0IF ; Switch left
call switch_left_int
btfsc INTCON3,INT1IF ; switch right
call switch_right_int
+ btfsc PIR1,TMR1IF ; Timer1 INT (external 32.768kHz Clock)
+ call timer1int
+
+ btfsc PIR1,RCIF ; UART
+ call uartint
+
movff prod_temp+1,PRODH
movff prod_temp+0,PRODL
retfie FAST
diff -r ae830d5e63ef -r e16e636def61 code_part1/OSTC_code_asm_part1/changelog.txt
--- a/code_part1/OSTC_code_asm_part1/changelog.txt Sat Nov 30 20:41:43 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt Sun Dec 01 10:33:12 2013 +0100
@@ -5,6 +5,7 @@
TODO: show gas change stops different from decostops
BUGFIX: FTTS>9min in OSTC 2C hardware
NEW: Show the bailout list in surfacemode (CC Modes)
+CHANGE: Faster button response
New in 2.73:
BETA Version - Do NOT use for diving
diff -r ae830d5e63ef -r e16e636def61 code_part1/OSTC_code_asm_part1/definitions.asm
--- a/code_part1/OSTC_code_asm_part1/definitions.asm Sat Nov 30 20:41:43 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm Sun Dec 01 10:33:12 2013 +0100
@@ -57,8 +57,9 @@
; #DEFINE SSPADD_VALUE d'16' ; 400kHz I2C clock @ 32MHz Fcy
#DEFINE SSPADD_VALUE d'32' ; 200kHz I2C clock @ 32MHz Fcy
#DEFINE SSPSTAT_VALUE b'00000000' ; with slew rate control
-; #DEFINE T0CON_VALUE b'00010000' ; Timer0 1:2 -> 32ms
- #DEFINE T0CON_VALUE b'00010011' ; Timer0 1:16 -> 256ms
+; #DEFINE T0CON_VALUE b'00010000' ; Timer0 1:2 -> 32ms
+; #DEFINE T0CON_VALUE b'00010011' ; Timer0 1:16 -> 256ms
+ #DEFINE T0CON_VALUE b'00010010' ; Timer0 1:8 -> 128ms
#DEFINE SPEED_32MHz
#DEFINE FT_SMALL .0
@@ -364,6 +365,11 @@
marker_depth res 2 ; rel. pressure [mbar] of last set marker
marker_time res 3 ; divetime mins:2 and sec of last marker
+sim_btm_time res 1 ; Simulated bottom time
+sim_btm_depth res 1 ; Simulated max depth
+sim_CNS res 1 ; Backup CNS value during decoplanning.
+
+
ASSERT_BANK1 MACRO tag
Ifdef __DEBUG
diff -r ae830d5e63ef -r e16e636def61 code_part1/OSTC_code_asm_part1/simulator.asm
--- a/code_part1/OSTC_code_asm_part1/simulator.asm Sat Nov 30 20:41:43 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/simulator.asm Sun Dec 01 10:33:12 2013 +0100
@@ -26,11 +26,11 @@
;=============================================================================
; Temp data, local to this module, moved to ACCES0 area.
;
- CBLOCK tmp ; Into safe (from C library) area.
- sim_btm_time ; Simulated bottom time
- sim_btm_depth ; Simulated max depth
- sim_CNS ; Backup CNS value during decoplanning.
- ENDC
+; CBLOCK tmp ; Into safe (from C library) area.
+; sim_btm_time ; Simulated bottom time
+; sim_btm_depth ; Simulated max depth
+; sim_CNS ; Backup CNS value during decoplanning.
+; ENDC
;=============================================================================