--- a/code_part1/OSTC_code_c_part2/p2_deco.c	Wed Jun 19 11:21:09 2013 +0200
+++ b/code_part1/OSTC_code_c_part2/p2_deco.c	Mon Aug 12 15:08:05 2013 +0200
@@ -371,8 +371,7 @@
 static short read_custom_function(PARAMETER unsigned char cf)
 {
 #ifdef CROSS_COMPILE
-    return (cf & 32) ? eeprom.bank1_CF[cf-32].value.lo
-                     : eeprom.bank0_CF[cf   ].value.lo;
+    return READ_CF_MACRO(cf);
 #else
     extern unsigned char hi, lo;
     extern void getcustom15();
@@ -1064,7 +1063,7 @@
     case 3: //---- At surface: start a new dive ------------------------------
         clear_deco_table();
         copy_deco_table();
-        int_O_ascenttime = 0;       // Reset DTR.
+        int_O_ascenttime = 0;       // Reset TTS.
         int_O_extra_ascenttime = 0;
         char_O_nullzeit = 0;        // Reset bottom time.
         char_O_deco_status = 0;     // Calc bottom-time/nullzeit next iteration.
@@ -2244,7 +2243,7 @@
     sim_gas_last_depth = 0;             // Surface gas marker.
     gas_switch_set();                   // Sets initial calc_N2/He_ratio
 
-    //---- CCR mode : do the full TTS at once --------------------------------
+    //---- CCR mode : do the full CNS at once --------------------------------
     if( char_I_const_ppO2 != 0 )
     {
         overlay unsigned short t;       // Needs 16bits here !