# HG changeset patch
# User heinrichsweikamp
# Date 1401962001 -7200
# Node ID 1aeb01c0e4fff7a11ca41722c44ff2740560fc31
# Parent  dc44aa6455490c946a49b999d1ca400ce11e1a9d# Parent  24e8bac09013cad6de5d2d91e8a367b53e5f65ef
Merge

diff -r 24e8bac09013 -r 1aeb01c0e4ff src/changelog.txt
--- 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
diff -r 24e8bac09013 -r 1aeb01c0e4ff src/ghostwriter.asm
--- 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