Mercurial > public > hwos_code

changeset 359:2be48ccfa9de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make AUTO SP available on OSTC2 hardware
author heinrichsweikamp
date Mon, 03 Aug 2015 17:27:05 +0200
parents 366f8b31f222
children 5f142cff43f6
files src/menu_tree.asm src/start.asm
diffstat 2 files changed, 15 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/menu_tree.asm	Mon Aug 03 12:18:18 2015 +0200
+++ b/src/menu_tree.asm	Mon Aug 03 17:27:05 2015 +0200
@@ -96,7 +96,8 @@
     MENU_END
 
 do_ccr_menu_ostc2:
-    MENU_BEGIN  tCCRSetup, .3           ; ostc2 menu
+    MENU_BEGIN  tCCRSetup, .4           ; ostc2 menu
+        MENU_OPTION     tCCRMode,    oCCRMode,    0
         MENU_CALL       tDiluentSetup,          do_diluent_setup
         MENU_CALL       tFixedSetpoints,        do_fixed_setpoints
         MENU_CALL       tExit,                  do_continue_main_menu
--- a/src/start.asm	Mon Aug 03 12:18:18 2015 +0200
+++ b/src/start.asm	Mon Aug 03 17:27:05 2015 +0200
@@ -351,6 +351,19 @@
     decfsz  lo,F
     bra     restart_set_modes_and_flags3
     ; CC Mode
+    btfsc   analog_o2_input                 ; cR?
+    bra     restart_set_modes_and_flags2b   ; Yes, skip mode check
+    btfsc   optical_input                   ; 3
+    bra     restart_set_modes_and_flags2b   ; Yes, skip mode check
+    ; Make sure Sensor is not selected
+    ; opt_ccr_mode must be <> 1 (=0: Fixed SP, =1: Sensor, =2: Auto SP)
+    banksel opt_ccr_mode
+    movlw   .1
+    cpfseq  opt_ccr_mode                    ; = Sensor?
+    bra     restart_set_modes_and_flags2b   ; No
+    clrf    opt_ccr_mode                    ; Yes, reset to Fixed SP
+restart_set_modes_and_flags2b:
+    banksel common
 	bsf     FLAG_ccr_mode               ; =1: CCR mode (Fixed SP, Auto SP or Sensor) active
     call    enable_ir_s8                ; Enable IR/S8-Port
     return