--- a/src/configuration.inc	Fri Feb 21 10:51:36 2020 +0100
+++ b/src/configuration.inc	Fri Feb 28 15:45:07 2020 +0100
@@ -1,7 +1,7 @@
 #ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ; ============================================================================
 ; 
-;    File configuration.inc                   combined next generation V3.06.2
+;    File configuration.inc                   combined next generation V3.08.8
 ; 
 ;    OSTC hwOS Configuration
 ; 
@@ -15,17 +15,17 @@
 ; Firmware Version
 ; ----------------
 ;
-; softwareversion_x			firmware version, major               (1 -   9)
-; softwareversion_y			firmware version, minor               (0 -  99)
-; softwareversion_beta		0= Release, 1= Beta 1, 2= Beta 2, ... (0 - 255)
+; fw_version_major				firmware version, major               (1 -  9)
+; fw_version_minor				firmware version, minor               (0 - 99)
+; fw_version_beta				0= Release, 1= Beta 1, 2= Beta 2, ... (0 - 99)
 ;
 ; NOTE: all values need to be defined in hex!
 ;
 #endif
 
-#define softwareversion_x		0x03
-#define softwareversion_y		0x08
-#define softwareversion_beta	0x00
+#define fw_version_major		0x03
+#define fw_version_minor		0x09
+#define fw_version_beta			0x01
 
 
 #ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -42,13 +42,13 @@
 ;
 #endif
 
-#define firmware_creation_year	0x13
-#define firmware_creation_month	0x08
-#define firmware_creation_day	0x0a
+#define firmware_creation_year	0x14
+#define firmware_creation_month	0x02
+#define firmware_creation_day	0x1C
 
-#define firmware_expire_year	0x14
-#define firmware_expire_month	0x0a
-#define firmware_expire_day		0x1f
+#define firmware_expire_year	0x15
+#define firmware_expire_month	0x01
+#define firmware_expire_day		0x01
 
 
 #ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -56,9 +56,10 @@
 ; global Version Selection
 ; ------------------------
 ;
-; _hwos_tech_2_TR		compile Tech  version for OSTC 2, Plus and TR (1 language  only    ) memory: 122.054 used,   884 free
-; _hwos_tech_3_cR		compile Tech  version for OSTC 3       and cR (2 languages possible) memory: 118.148 used, 4.790 free (with 1 language only)
-; _hwos_sport			compile Sport version for all models          (2 languages possible) memory: 115.764 used, 7.174 free (with 1 language only)
+; _hwos_tech_2_TR   compile Tech  version for OSTC 2, Plus and TR (1 language  en   ) memory: 121.832 used, 1.048 free
+; _hwos_tech_3_cR   compile Tech  version for OSTC 3       and cR (2 languages en+de) memory: 122.074 used,   874 free
+; _hwos_sport       compile Sport version for all models          (2 languages en+de) memory: 119.192 used, 3.756 free
+;                                                                                             122.880 max. available
 #endif
 
 #define _hwos_tech_3_cR
@@ -76,30 +77,28 @@
 ; 
 #endif
 
-#define _language_1		en
-#define _language_2		de
+#define _language_1		de
+#define _language_2		none
 
 
 #ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ;
 ; Features Selection
 ; ------------------
+;																memory requirements not up-to-date!
+; _compass				compass function								mem: 10.488 byte
+; _helium				helium (trimix) gases and diluents				mem:  2.182 byte
+; _ccr_pscr				CCR & pSCR modes, basic functionality			mem:  4.110 byte
+; _external_sensor		CCR & pSCR modes, external sensor support		mem:  3.452 byte
+; _gauge_mode			gauge mode										mem:     30 byte  when _not_ included
+; _high_ppO2_max		raised ppO2 max limit (2.0 bar)					mem:      0 byte
+; _rx_functions			RX function        (OSTC TR)					mem:  4.886 byte
+; _rx_update			RX firmware update (OSTC TR)					mem:  2.472 byte
+; _cave_mode			cave mode return calculation					mem:    720 byte
+; _gas_contingency		auto-switch to alternative tanks on depleption	mem:    452 byte
+; _min_depth_option		resettable min. and max. depth					mem:    394 byte  ## special user group only ##
+; _screendump			screen dump function							mem:    338 byte  ## special user group only ##
 ;
-; _screendump			screen dump function				mem:    338 byte
-; _compass				compass function					mem: 10.488 byte
-; _rx_functions			RX functions (OSTC TR)				mem:  4.886 byte
-; _rx_update			updates RX firmware				1)	mem:  2.472 byte
-; _helium				Helium (Trimix) gases and diluents	mem:  2.182 byte
-; _ccr_pscr				loop modes CCR and pSCR				mem:  4.110 byte
-; _external_sensor		external sensor for CCR & pSCR	2)	mem:  3.452 byte
-; _gauge_mode			gauge mode							mem:     30 byte  when _not_ included
-; _high_ppO2_max		raised ppO2 max limit (2.0 bar)		mem:      0 byte
-; _cave_mode			cave mode way-out calculation		mem:        byte  ## under construction yet  ##
-; _min_depth_option		resettable min. and max. depth		mem:    394 byte  ## special user group only ##
-; _gas_contingency		continue deco on other gases		mem:    452 byte  ## special user group only ##
-;
-; 1) needs _rx_functions to be included, too / can not be included without _rx_functions
-; 2) needs _ccr_pscr     to be included, too / can not be included without _ccr_pscr
 ;
 ; NOTES: - Exclude options by prepending NOT_INCLUDED to the label.
 ;        - Not all options will fit concurrently if two languages are slected.
@@ -110,56 +109,56 @@
 
 #ifdef _hwos_tech_2_TR
 
-#define _screendump
 #define _compass
-#define _rx_functions
-#define _rx_update
 #define _helium
 #define _ccr_pscr
+#define _rx_functions
+#define _rx_update
 #define _gauge_mode
 #define _high_ppO2_max
-
-
 #define NOT_INCLUDED_external_sensor
 #define NOT_INCLUDED_cave_mode
+#define NOT_INCLUDED_gas_contingency
 #define NOT_INCLUDED_min_depth_option
+#define NOT_INCLUDED_screendump
 
 #endif
 
 
 #ifdef _hwos_tech_3_cR
 
-#define NOT_INCLUDED_screendump
 #define _compass
 #define _helium
 #define _ccr_pscr
-#define _external_sensor
 #define _gauge_mode
 #define _high_ppO2_max
-#define _gas_contingency
-
 #define NOT_INCLUDED_rx_functions
 #define NOT_INCLUDED_rx_update
-#define NOT_INCLUDED_cave_mode
+#define _external_sensor
+#define _cave_mode
+#define _gas_contingency
+#define NOT_INCLUDED_gas_contingency
 #define NOT_INCLUDED_min_depth_option
+#define NOT_INCLUDED_screendump
 
 #endif
 
 
 #ifdef _hwos_sport
 
-#define _screendump
 #define _compass
-#define _rx_functions
-#define _rx_update
+#define _gas_contingency
 #define NOT_INCLUDED_helium
 #define NOT_INCLUDED_ccr_pscr
-#define NOT_INCLUDED_external_sensor
-
 #define NOT_INCLUDED_gauge_mode
 #define NOT_INCLUDED_high_ppO2_max
+#define _rx_functions
+#define _rx_update
+#define NOT_INCLUDED_external_sensor
 #define NOT_INCLUDED_cave_mode
+#define NOT_INCLUDED_gas_contingency
 #define NOT_INCLUDED_min_depth_option
+#define NOT_INCLUDED_screendump
 
 #endif
 
@@ -170,19 +169,41 @@
 ; -----------
 ;
 ; _DEBUG			put firmware in a global debug mode		default: not included
-; _debug_output		debug outputs (for performance)			default: not included
 ; _profiling		deco engine performance measurements	default: not included
+; _debug_output		performance outputs (for _profiling)	default: not included
 ;
-; NOTE: - Exclude options by prepending NOT_INCLUDED to the label.
+; NOTE: - Exclude options by prepending NOT_INCLUDED to the label
 ;
 #endif
 
 #define NOT_INCLUDED_DEBUG
+#define NOT_INCLUDED_profiling
 #define NOT_INCLUDED_debug_output
-#define NOT_INCLUDED_profiling
 
 
+#ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+;
+; Auto-Includes (serve functional dependencies)
+;
+#endif
 
+#ifdef  _cave_mode
+#ifndef _gas_contingency
+#define _gas_contingency
+#endif
+#endif
+
+#ifdef  _rx_update
+#ifndef _rx_functions
+#define _rx_functions
+#endif
+#endif
+
+#ifdef  _external_sensor
+#ifndef _ccr_pscr
+#define _ccr_pscr
+#endif
+#endif
 
 
 #ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx