--- a/src/configuration.inc	Sun Jun 30 23:22:32 2019 +0200
+++ b/src/configuration.inc	Thu Sep 19 12:01:29 2019 +0200
@@ -1,7 +1,7 @@
 #ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ; ============================================================================
 ; 
-;    File configuration.inc                   combined next generation V3.03.4
+;    File configuration.inc                   combined next generation V3.04.3
 ; 
 ;    OSTC hwOS Configuration
 ; 
@@ -24,8 +24,8 @@
 #endif
 
 #define softwareversion_x		0x03
-#define softwareversion_y		0x03
-#define softwareversion_beta	0x01
+#define softwareversion_y		0x05
+#define softwareversion_beta	0x00
 
 
 #ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -43,12 +43,12 @@
 #endif
 
 #define firmware_creation_year	0x13
-#define firmware_creation_month	0x04
-#define firmware_creation_day	0x0d
+#define firmware_creation_month	0x08
+#define firmware_creation_day	0x0a
 
-#define firmware_expire_year	0x13
-#define firmware_expire_month	0x08
-#define firmware_expire_day		0x1e
+#define firmware_expire_year	0x14
+#define firmware_expire_month	0x0a
+#define firmware_expire_day		0x1f
 
 
 #ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -56,14 +56,12 @@
 ; global Version Selection
 ; ------------------------
 ;
-; _hwos_tech_2_TR		compile hwOS in Tech  version for OSTC 2, Plus and TR (with RX functions)
-; _hwos_tech_3_cR		compile hwOS in Tech  version for OSTC 3       and cR (with external sensors)
-; _hwos_tech			compile hwOS in Tech  version for all models          (does not fit yet)
-; _hwos_sport			compile hwos in Sport version
-;
+; _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)
 #endif
 
-#define _hwos_tech_2_TR
+#define _hwos_tech_3_cR
 
 
 #ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -74,12 +72,12 @@
 ; _language_1			first or single language,
 ;						set to 'en', 'de', 'fr', or 'it', defaults to 'en'
 ;
-; _language_2			second language, coding as above or 'none'		mem: approx. 3854 byte in Sport version
+; _language_2			second language, coding as above or 'none'		mem: approx. 4.0 kbyte in Sport, 4.228 kbyte in Tech
 ; 
 #endif
 
-#define _language_1		de
-#define _language_2		none
+#define _language_1		en
+#define _language_2		de
 
 
 #ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -87,18 +85,21 @@
 ; Features Selection
 ; ------------------
 ;
-; _screendump			screen dump function				mem:    334 byte, default: Sport:     included, Tech:     included
-; _compass				compass function					mem: 12.488 byte, default: Sport:     included, Tech:     included
-; _rx_functions			RX functions (OSTC TR)				mem:  7.942 byte, default: Sport:     included, Tech:     included
-; _huge_font			huge font							mem:  3.651 byte, default: Sport:     included, Tech: NOT included
-; _helium				Helium (Trimix) gases and diluents	mem:  2.172 byte, default: Sport: NOT included, Tech:     included
-; _ccr_pscr				loop modes CCR and pSCR				mem:  4.308 byte, default: Sport: NOT included, Tech:     included
-; _external_sensor		external sensor for CCR & pSCR	1)	mem:  3.640 byte, default: Sport: NOT included, Tech:     included
-; _cave_mode			cave mode way-out calculation		mem:        byte, default: Sport: NOT included, Tech:     included	## FEATURE IS UNDER CONSTRUCTION YET ##
-; _min_depth_option		resettable min. and max. depth		mem:        byte, default: Sport: NOT included, Tech: NOT included
-; _ostc_logo			use of a bitmap-based OSTC logo		mem:  1.748 byte, default: Sport: NOT included, Tech: NOT included
+; _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 to be excluded in case _ccr_pscr is excluded, too.
+; 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.
@@ -111,50 +112,36 @@
 
 #define _screendump
 #define _compass
-#define _huge_font
 #define _rx_functions
+#define _rx_update
 #define _helium
 #define _ccr_pscr
+#define _gauge_mode
+#define _high_ppO2_max
 
 
 #define NOT_INCLUDED_external_sensor
 #define NOT_INCLUDED_cave_mode
 #define NOT_INCLUDED_min_depth_option
-#define NOT_INCLUDED_ostc_logo
 
 #endif
 
 
 #ifdef _hwos_tech_3_cR
 
-#define _screendump
+#define NOT_INCLUDED_screendump
 #define _compass
-#define _huge_font
 #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 NOT_INCLUDED_min_depth_option
-#define NOT_INCLUDED_ostc_logo
-
-#endif
-
-
-#ifdef _hwos_tech
-
-#define _screendump
-#define _compass
-#define _huge_font
-#define _rx_functions
-#define _helium
-#define _ccr_pscr
-#define _external_sensor
-
-#define NOT_INCLUDED_cave_mode
-#define NOT_INCLUDED_min_depth_option
-#define NOT_INCLUDED_ostc_logo
 
 #endif
 
@@ -163,15 +150,16 @@
 
 #define _screendump
 #define _compass
-#define _huge_font
 #define _rx_functions
+#define _rx_update
 #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 NOT_INCLUDED_cave_mode
 #define NOT_INCLUDED_min_depth_option
-#define NOT_INCLUDED_ostc_logo
 
 #endif
 
@@ -192,3 +180,63 @@
 #define NOT_INCLUDED_DEBUG
 #define NOT_INCLUDED_debug_output
 #define NOT_INCLUDED_profiling
+
+
+
+
+
+#ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+;
+; Software Configuration
+;
+#endif
+
+#ifdef _screendump
+#define SW_CONF_1    0x01
+#else
+#define SW_CONF_1    0x00
+#endif
+
+#ifdef _compass
+#define SW_CONF_2    0x02
+#else
+#define SW_CONF_2    0x00
+#endif
+
+#ifdef _rx_functions
+#define SW_CONF_3    0x04
+#else
+#define SW_CONF_3    0x00
+#endif
+
+#ifdef _rx_update
+#define SW_CONF_4    0x08
+#else
+#define SW_CONF_4    0x00
+#endif
+
+#ifdef _helium
+#define SW_CONF_5    0x10
+#else
+#define SW_CONF_5    0x00
+#endif
+
+#ifdef _ccr_pscr
+#define SW_CONF_6    0x20
+#else
+#define SW_CONF_6    0x00
+#endif
+
+#ifdef _external_sensor
+#define SW_CONF_7    0x40
+#else
+#define SW_CONF_7    0x00
+#endif
+
+#ifdef _cave_mode
+#define SW_CONF_8    0x80
+#else
+#define SW_CONF_8    0x00
+#endif
+
+#define SW_CONF  SW_CONF_1 + SW_CONF_2 + SW_CONF_3 + SW_CONF_4 + SW_CONF_5 + SW_CONF_6 + SW_CONF_7 + SW_CONF_8