Mercurial > public > hwos_code

changeset 109:1aeb01c0e4ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author heinrichsweikamp
date Thu, 05 Jun 2014 11:53:21 +0200
parents dc44aa645549 (diff) 24e8bac09013 (current diff)
children d39493c786a2
files
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/changelog.txt	Wed Jun 04 19:19:18 2014 +0200
+++ b/src/changelog.txt	Thu Jun 05 11:53:21 2014 +0200
@@ -1,6 +1,7 @@
 New in 1.31:
 CHANGE: Minor language updates
 NEW: Show a Safety Stop if enabled (Menu "Deco Parameters")
+BUGFIX: dive profile recording issue in OC mode
 
 New in 1.30:
 NEW: Show event "Bailout" in internal logbook
--- a/src/ghostwriter.asm	Wed Jun 04 19:19:18 2014 +0200
+++ b/src/ghostwriter.asm	Thu Jun 05 11:53:21 2014 +0200
@@ -876,6 +876,8 @@
 	movlw	infolength_ppo2_sensors
     rcall	ghostwrite_byte_profile 	; WREG -> Profile in ext. flash
 	movlw	div_ppo2_sensors            ; Divisor ppO2
+    btfss   FLAG_ccr_mode               ; =1: CCR mode (Fixed ppO2 or Sensor) active
+    movlw   .0                          ; No ppO2 data in OC mode
     rcall	ghostwrite_byte_profile 	; WREG -> Profile in ext. flash
 
     movlw   .4                          ; Type