--- a/BootLoader/Src/base_bootlader.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/BootLoader/Src/base_bootlader.c	Sat Nov 15 19:29:44 2025 +0100
@@ -262,8 +262,8 @@
 	.signature = "mh",
 
 	.release_year   = 25,
-	.release_month  = 1,
-	.release_day    = 13,
+	.release_month  = 11,
+	.release_day    = 15,
 	.release_sub    = 0,
 
 	/* max 48 with trailing 0 */
@@ -280,7 +280,7 @@
 {
 
 	// first 52 bytes
-	.primarySerial = 0xFFFF,
+	.primarySerial = 0x06a4,
 	.primaryLicence	= 0x00,
 	.revision8bit = 0x02,
 	.production_year = 0x19,
@@ -688,7 +688,7 @@
 	tComm_init();
 
 	tInfo_button_text("exit","","sleep");
-	tInfo_newpage("bootloader 251102");
+	tInfo_newpage("bootloader 251115");
 	tInfo_write("start bluetooth");
 	tInfo_write(textVersion);
 #if 0

--- a/BootLoader/Src/display_mini.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/BootLoader/Src/display_mini.c	Sat Nov 15 19:29:44 2025 +0100
@@ -175,7 +175,7 @@
 	aTxBuffer[1] = OLED_VFP_SET_13h;
 	send((uint8_t*)aTxBuffer, 2);
 	aTxBuffer[0] = 0x72;
-	aTxBuffer[1] = 0x08;
+	aTxBuffer[1] = 0x0C;
 	send((uint8_t*)aTxBuffer, 2);
 
 	aTxBuffer[0] = 0x70;

--- a/BootLoader/Src/externLogbookFlash_mini.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/BootLoader/Src/externLogbookFlash_mini.c	Sat Nov 15 19:29:44 2025 +0100
@@ -80,17 +80,6 @@
 
 #define HEADER2OFFSET 0x400
 
-typedef enum{
-	EF_HEADER,
-	EF_SAMPLE,
-	EF_DEVICEDATA,
-	EF_VPMDATA,
-	EF_SETTINGS,
-	EF_FIRMWARE,
-	EF_FIRMWARE2,
-}which_ring_enum;
-
-
 typedef struct{
 uint8_t IsBusy:1;
 uint8_t IsWriteEnabled:1;
@@ -320,7 +309,11 @@
 		}
 		else if(pSample2)
 		{
-			actualAddress += length1;
+			/* actualAddress += length1; do dummy read to get EEPROM to the correct address */
+			for(uint32_t i = 0; i<length1; i++)
+			{
+				ext_flash_read_block(&pSample2[0], EF_FIRMWARE2);
+			}
 			for(uint32_t i = 0; i<length2; i++)
 			{
 				ext_flash_read_block(&pSample2[i], EF_FIRMWARE2);

--- a/BootLoader/Src/gfx_engine_mini.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/BootLoader/Src/gfx_engine_mini.c	Sat Nov 15 19:29:44 2025 +0100
@@ -850,7 +850,7 @@
 
 
 /* this is NOT fast nor optimized */
-static void GFX_draw_pixel(GFX_DrawCfgScreen *hgfx, int16_t x, int16_t y, uint8_t color)
+void GFX_draw_pixel(GFX_DrawCfgScreen *hgfx, int16_t x, int16_t y, uint8_t color)
 {
 	uint16_t* pDestination;
 
@@ -2544,7 +2544,7 @@
 
 #define		Vsync_d1	2
 #define		VFP_d1		4	// make sure this value * VSYNC is also set in display.c for OLED_VFP_SET
-#define		VBP_d1		4	// make sure this value * VSYNC is also set in display.c for OLED_VBP_SET
+#define		VBP_d1		6	// make sure this value * VSYNC is also set in display.c for OLED_VBP_SET
 
   /* Horizontal synchronization width = Hsync - 1 */
   LtdcHandle.Init.HorizontalSync = Hsync_d1 - 1;

--- a/BootLoader/Src/ostc_mini.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/BootLoader/Src/ostc_mini.c	Sat Nov 15 19:29:44 2025 +0100
@@ -350,7 +350,7 @@
     UartHandle.Init.StopBits   = UART_STOPBITS_1;
     UartHandle.Init.Parity     = UART_PARITY_NONE;
     UartHandle.Init.Mode       = UART_MODE_TX_RX;
-    HAL_UART_Init(&UartHandle);
+    /* HAL_UART_Init(&UartHandle); moved final init step into BT config function to avoid problems while module power is off */
 
 #ifdef USART_PIEZO
     UartPiezoTxHandle.Instance        = USART_PIEZO;

--- a/BootLoader/Src/tComm_mini.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/BootLoader/Src/tComm_mini.c	Sat Nov 15 19:29:44 2025 +0100
@@ -750,16 +750,16 @@
     // get model + features
     case 0x60:
         aTxBuffer[count++] = 0x00; // hardware descriptor HIGH byte
-        aTxBuffer[count++] = 0x3B; // hardware descriptor LOW byte // 0x3B is OSTC4 //  0x1A is OTSC3
+        aTxBuffer[count++] = 0x3B; // hardware descriptor LOW byte // 0x3B is OSTC 4/5 //  0x1A is OTSC3
         aTxBuffer[count++] = 0x00; // feature descriptor HIGH byte
         aTxBuffer[count++] = 0x00; // feature descriptor LOW byte
-        aTxBuffer[count++] = 0x43; // model id
+        aTxBuffer[count++] = 0x44; // model id OSTC5
         aTxBuffer[count++] = prompt4D4C(receiveStartByteUart);
         break;
 
     // get model
     case 0x6A:
-        aTxBuffer[count++] = 0x3B; // 0x3B is OSTC4 //  0x1A is OTSC3
+        aTxBuffer[count++] = 0x3B; // 0x3B is OSTC 4/5 //  0x1A is OTSC3
         aTxBuffer[count++] = prompt4D4C(receiveStartByteUart);
         break;
 
@@ -1076,6 +1076,7 @@
     const uint8_t id_Region1_firmware = 0xFF;
     const uint8_t id_RTE = 0xFE;
     uint8_t textpointer = 0;
+    uint32_t index = 0;
 
     //Get length
     if(HAL_UART_Receive(&UartHandle, sBuffer, 4,5000)!= HAL_OK) // 58000
@@ -1233,7 +1234,7 @@
             return 0xFF;
     }
     else
-    //if(region == 2)
+    if(id == id_FONT)
     {
         uint8_t ptr = 0;
         ptr += gfx_number_to_string(7,0,&display_text[ptr],lengthTotal);
@@ -1248,7 +1249,7 @@
     }
 
 
-    // only non RTE !!
+    /* only non RTE !! (at this point RTE path already performed a return some lines above */
     uint8_t* pBufferCompare = (uint8_t*)getFrame(20);
     ByteCompareStatus = 0;
 
@@ -1262,14 +1263,14 @@
 
         if(lengthCompare != length1)
             ByteCompareStatus = 10000;
-        for(int i = 0; i < length1; i++)
+        for(index = 0; index < length1; index++)
         {
-            if(pBuffer1[0] != pBufferCompare[0])
+            if(pBuffer1[index] != pBufferCompare[index])
                 ByteCompareStatus++;
         }
     }
     else
-    //if(region == 2)
+    if(id == id_FONT)
     {
         /* upper region firmware can be larger (1MB) */
         if(ext_flash_read_firmware2(0, pBufferCompare,4, 0,0) != 0xFFFFFFFF)
@@ -1281,16 +1282,16 @@
             ByteCompareStatus = 10000;
         if(offsetTotal != offsetCompare)
             ByteCompareStatus += 20000;
-        for(int i = 0; i < length1; i++)
+        for(index = 0; index < length1; index++)
         {
-            if(pBuffer1[0] != pBufferCompare[0])
+            if(pBuffer1[index] != pBufferCompare[index])
                 ByteCompareStatus++;
         }
 
         lengthCompare = ext_flash_read_firmware2(0, 0,768000, pBufferCompare,768000);
-        for(int i = 0; i < length2; i++)
+        for(index = 0; index < length2; index++)
         {
-            if(pBuffer2[0] != pBufferCompare[0])
+            if(pBuffer2[index] != pBufferCompare[index])
                 ByteCompareStatus++;
         }
     }
@@ -1553,7 +1554,14 @@
 			{
 				if(indexRef != 0)
 				{
-					indexRef = 0;
+					if((answerOkay[0] == aRxBuffer[indexBuf]))
+					{
+						indexRef = 1;
+					}
+					else
+					{
+						indexRef = 0;
+					}
 				}
 			}
 			indexBuf++;
@@ -1747,12 +1755,13 @@
 
 void tComm_StartBlueModConfig()
 {
+	HAL_UART_Init(&UartHandle);
+
 #ifdef OSTC4_HW
 	uint8_t answer = HAL_OK;
 	uint8_t RxBuffer[UART_CMD_BUF_SIZE];
 	uint8_t index = 0;
 
-
 	BmTmpConfig = BM_CONFIG_ECHO;
 	do	/* flush RX buffer */
 	{
@@ -1838,16 +1847,19 @@
 										BmTmpConfig++;
 									break;
 			case BM_INIT_POWERON:		MX_Bluetooth_PowerOn();
+										HAL_UART_Init(&UartHandle);
 										BmTmpConfig++;
 									break;
-			case BM_INIT_TRIGGER_ON:	HAL_Delay(2000);
-										HAL_GPIO_WritePin(BLE_UBLOX_DSR_GPIO_PORT,BLE_UBLOX_DSR_PIN,GPIO_PIN_RESET);
+			case BM_INIT_COMMAND_ON:	HAL_Delay(2600);
+										HAL_GPIO_WritePin(BLE_UBLOX_DSR_GPIO_PORT,BLE_UBLOX_DSR_PIN,GPIO_PIN_SET);
 										BmTmpConfig++;
 									break;
+#if 0
 			case BM_INIT_TRIGGER_OFF:	HAL_GPIO_WritePin(BLE_UBLOX_DSR_GPIO_PORT,BLE_UBLOX_DSR_PIN,GPIO_PIN_SET);
 										HAL_Delay(2000);
 										BmTmpConfig++;
 									break;
+#endif
 			case BM_INIT_ECHO:
 			case BM_INIT_ECHO2:			sprintf(TxBuffer,"ATE0\r");
 				break;
@@ -1878,6 +1890,7 @@
 									break;
 			case BM_INIT_DONE:			tInfo_write("Done");
 										BmTmpConfig = BM_CONFIG_DONE;
+										HAL_GPIO_WritePin(BLE_UBLOX_DSR_GPIO_PORT,BLE_UBLOX_DSR_PIN,GPIO_PIN_RESET);
 									break;
 			default:
 				break;

--- a/Common/CPU1-F429.ld	Sun Nov 02 19:30:58 2025 +0100
+++ b/Common/CPU1-F429.ld	Sat Nov 15 19:29:44 2025 +0100
@@ -208,7 +208,7 @@
     /* Define Known Address for Each Font */
     /* Flash Sector 23 is protected (bootloader font + image) => use end of sector 22 */
 
-.lower_fonts 	0x080A0000  : {
+.lower_fonts 	0x080AA000  : {
 	 *(.lower_fonts.image_data_*)
 	 
 	 *(.lower_fonts.*) 

--- a/Common/Inc/configuration.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Common/Inc/configuration.h	Sat Nov 15 19:29:44 2025 +0100
@@ -72,8 +72,14 @@
 /* Enable to have CO2 sensor functionality available */
 #define ENABLE_CO2_SUPPORT
 
-/* Enable to have GPS sensor functionality available */
-/* #define ENABLE_GNSS_SUPPORT */
+/* Enable to have external GPS sensor functionality available */
+/*#define ENABLE_GNSS_EXTERN*/
+
+/* Enable to have internal (OSTC5) GPS sensor functionality available */
+/*#define ENABLE_GNSS_INTERN*/
+
+/* Enable to provide UTC time to GNSS module at startup. ! CAUTION ! Incorrect time will reduce performance of module */
+/* #define ENABLE_GNSS_TIME_INIT */
 
 /* Enable to have Sentinel rebreather interface available */
 /* #define ENABLE_SENTINEL_MODE */
@@ -90,11 +96,20 @@
 /* Enable to have a faster transfer speed between bluetooth module and CPU */
 #define ENABLE_FAST_COMM
 
-/* Enable to have position sensor support active */
-/* #define ENABLE_GPIO_V2 */
+/* Enable to have support of Polar HC10 heartbeat sensor active */
+/* #define ENABLE_PULSE_SENSOR_BT */
 
 /* Enable RTE sleep mode debugging */
 /* #define ENABLE_SLEEP_DEBUG */
 
+/* Enable to receive data from the radio connection usart */
+/* #define ENABLE_USART_RADIO */
+
+/* Enable to show messages which are den during runtime in a popup window */
+/* #define ENABLE_LOGGER_WINDOW */
+
+/* Enable to have the possibility to switch between four individual sets of settings */
+/* #define ENABLE_SETTING_PROFILES */
+
 
 #endif

--- a/Common/Inc/data_central.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Common/Inc/data_central.h	Sat Nov 15 19:29:44 2025 +0100
@@ -44,7 +44,8 @@
 #define EXT_INTERFACE_SENSOR_CNT	(8u)		/* 1 MUX + 7 sensors may be connected to the external interface (1 MUX + 3 ADC + 4 UART) */
 #define EXT_INTERFACE_MUX_OFFSET	(3u)		/* the sensor struct starts with 3 ADC sensors */
 
-#define EXT_INTERFACE_BUZZER_ON_TIME_MS (2000u)		/* max time the buzzer should be active without break */
+#define EXT_INTERFACE_BUZZER_ON_TIME_MS (2000u)		/* max time the buzzer should be active without break (continuous Operation) */
+#define EXT_INTERFACE_BUZZER_PING_TIME_MS (1000u)	/* max time the buzzer should be active for single ping */
 #define EXT_INTERFACE_BUZZER_STABLE_TIME_MS (500u)	/* min time a state (ON / OFF) should be stable before it may be changed */
 
 
@@ -343,6 +344,8 @@
     uint16_t info_compassHeadingUpdate;
     int16_t gnssPositionUpdate;
     SGnssCoord info_gnssPosition;
+    int16_t scrubberState;
+    uint16_t info_scrubberState;
 } SEvents;
 
 
@@ -591,10 +594,13 @@
 
 uint8_t drawingColor_from_ascentspeed(float speed);
 
+void formatStringOfTime(char* pString, uint8_t strLen, RTC_TimeTypeDef Stime, uint8_t showAlive, uint8_t showSeconds);
 void convertStringOfDate_DDMMYY(char* pString, uint8_t strLen, uint8_t day, uint8_t month, uint8_t year);
 void getStringOfFormat_DDMMYY(char* pString, uint8_t strLen);
 void convertUTCToLocal(uint8_t utcHours, uint8_t utcMinutes, uint8_t* pLocalHours, uint8_t* pLocalMinutes);
 
 uint8_t calculateSlowExit(uint16_t* pCountDownSec, float* pExitDepthMeter, uint8_t* pColor);
 
+bool isScrubberTimerEnabled(const SSettings *settings);
+bool isScrubberTimerRunning(const SDiveState *diveState, const SSettings *settings);
 #endif // DATA_CENTRAL_H

--- a/Common/Inc/data_exchange.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Common/Inc/data_exchange.h	Sat Nov 15 19:29:44 2025 +0100
@@ -339,7 +339,7 @@
 
 	uint8_t revisionHardware;
 	uint8_t revisionCRCx0x7A;
-	uint8_t spare1_3;
+	uint8_t displayVersion;
 	uint8_t spare1_4;
 
 	uint8_t setAccidentFlag;

--- a/Common/Inc/settings.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Common/Inc/settings.h	Sat Nov 15 19:29:44 2025 +0100
@@ -32,8 +32,7 @@
 
 // From Common/Inc:
 #include "FirmwareData.h"
-
-//#include "data_central.h"
+#include "firmwareEraseProgram.h"
 
 #include "global_constants.h"
 // From Common/Drivers/
@@ -76,10 +75,16 @@
 #define PRESSURE_OFFSET_LIMIT_MBAR	50
 
 #define MAX_COMPASS_COMP 		(2u)
+
+#define MAX_COMPASS_DECLINATION_DEG 99
+
 #define MAX_VIEWPORT_MODE 		(0x7F)
 
-#define MAX_SCRUBBER_TIME 		(999u)
+#define MAX_SCRUBBER_TIME		(999u)
 #define MIN_SCRUBBER_TIME       -99
+#define SCRUBBER_WARNING_TIME   30
+#define SCRUBBER_ERROR_TIME     0
+
 #define MIN_PPO2_SP_CBAR		(40u)
 
 #define PSCR_MAX_O2_DROP		(15u)
@@ -90,6 +95,8 @@
 
 #define FUTURE_SPARE_SIZE		(0u)		/* Applied for reuse of old, not used, scooter block (was 32 bytes)*/
 
+#define NUMBER_OF_PROFILES		(4u)
+
 typedef enum
 {
 	O2_SENSOR_SOURCE_OPTIC = 0,
@@ -105,7 +112,7 @@
 
 typedef enum
 {
-	SCRUB_TIMER_OFF = 0,
+	INVALID_SCRUB_TIMER_OFF = 0,
 	SCRUB_TIMER_MINUTES,
 	SCRUB_TIMER_PERCENT,
 	SCRUB_TIMER_END
@@ -255,7 +262,7 @@
 	uint8_t co2_sensor_active;									/* redefined in 0xFFFF0021 */
 	uint8_t ext_uart_protocol;									/* redefined in 0xFFFF0022 */
 
-	uint8_t scubberActiveId;									/* redefined in 0xFFFF0023 */
+	uint8_t scrubberActiveId;									/* redefined in 0xFFFF0023 */
 	SScrubberData scrubberData[2];
 	uint8_t ext_sensor_map_Obsolete[5];
 	uint8_t buttonLockActive;									/* redefined in 0xFFFF0025 */
@@ -324,35 +331,11 @@
 	/* new in 0xFFFF002c */
 	StimeZone timeZone;
 	uint8_t warningBuzzer;
+	/* new in 0xFFFF002d */
+	uint8_t profileName[NUMBER_OF_PROFILES][9];
+	uint8_t activeProfile;
 } SSettings;
 
-typedef struct
-{
-	// 8 bytes
-	uint16_t primarySerial;
-	uint8_t primaryLicence;
-	uint8_t revision8bit;
-	uint8_t production_year;
-	uint8_t production_month;
-	uint8_t production_day;
-	uint8_t production_bluetooth_name_set;
-
-	// 44 bytes
-	char production_info[44];
-
-	// 8 bytes
-	uint16_t secondarySerial;
-	uint8_t secondaryLicence;
-	uint8_t secondaryReason8bit;
-	uint8_t secondary_year;
-	uint8_t secondary_month;
-	uint8_t secondary_day;
-	uint8_t secondary_bluetooth_name_set;
-
-	// 4 bytes
-	char secondary_info[4];
-} SHardwareData;
-
 uint8_t writeData(uint8_t *);
 uint8_t readData(uint8_t what,uint8_t *);
 uint8_t readDataLimits__8and16BitValues_4and7BytesOutput(uint8_t what, uint8_t * data);
@@ -364,9 +347,11 @@
 uint8_t getDecoType(void);
 uint8_t getFutureTTS(void);
 
+uint16_t settingsGetSize();
 SSettings* settingsGetPointer(void);
+SSettings* profileGetPointer(uint8_t number);
 const SSettings* settingsGetPointerStandard(void);
-void set_settings_to_Standard(void);
+void set_settings_to_Standard(uint8_t whichSettings);
 void mod_settings_for_first_start_with_empty_ext_flash(void);
 const SFirmwareData* firmwareDataGetPointer(void);
 const SHardwareData* hardwareDataGetPointer(void);
@@ -382,8 +367,9 @@
 void setActualRTEversion(uint8_t high, uint8_t low);
 void getActualRTEandFONTversion(uint8_t *RTEhigh, uint8_t *RTElow, uint8_t *FONThigh, uint8_t *FONTlow);
 
-void set_new_settings_missing_in_ext_flash(void);
-uint8_t check_and_correct_settings(void);
+void setFlipDisplay(uint8_t flipDisplay);
+void set_new_settings_missing_in_ext_flash(uint8_t whichSettings);
+uint8_t check_and_correct_settings(uint8_t whichSettings);
 uint8_t newFirmwareVersionCheckViaSettings(void);
 void set_settings_button_to_factory_with_individual_buttonBalance(void);
 uint8_t getLicence(void);
@@ -405,4 +391,7 @@
 uint8_t isSettingsWarning();
 
 bool checkAndFixSetpointSettings(void);
+
+bool isScrubberWarning(const SScrubberData *scrubberData);
+bool isScrubberError(const SScrubberData *scrubberData);
 #endif // SETTINGS_H

Binary file Current build/OSTC4update_230925.bin has changed

Binary file Current build/OSTC4update_251115.bin has changed

--- a/Current build/readme.txt	Sun Nov 02 19:30:58 2025 +0100
+++ b/Current build/readme.txt	Sat Nov 15 19:29:44 2025 +0100
@@ -1,3 +1,3 @@
-Heinrichs Weikamp OSTC4 update files.
+Heinrichs Weikamp OSTC4 / OSTC 5 update files.
 
 The builds are for testing purposes only. Be careful, they might not work and are definitely not recommended for real dives. 
\ No newline at end of file

--- a/Discovery/Inc/base.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/base.h	Sat Nov 15 19:29:44 2025 +0100
@@ -111,6 +111,7 @@
 void set_globalState_Menu_Line(uint8_t line);
 uint8_t get_globalState_Menu_Line(void);
 void get_idSpecificStateList(uint32_t id, SStateList *output);
+uint8_t get_lineOfID(uint32_t id);
 void delayMicros(uint32_t micros);
 void get_RTC_DateTime(RTC_DateTypeDef * sdatestructureget, RTC_TimeTypeDef * stimestructureget);
 void set_RTC_DateTime(RTC_DateTypeDef * sdatestructure, RTC_TimeTypeDef * stimestructure);

--- a/Discovery/Inc/check_warning.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/check_warning.h	Sat Nov 15 19:29:44 2025 +0100
@@ -30,6 +30,12 @@
 #include <stdint.h>
 #include "data_central.h"
 
+
+#define REQUEST_BUZZER_OFF			(0u)
+#define REQUEST_BUZZER_ONCE			(1u)
+#define REQUEST_BUZZER_CONTINUOUS	(2u)
+
+
 /* Exported function prototypes ----------------------------------------------*/
 void check_warning(void);
 void check_warning2(SDiveState *pDiveState);
@@ -46,5 +52,7 @@
 uint8_t getSetpointLowId(void);
 uint8_t getSetpointDecoId(void);
 void requestBuzzerActivation(uint8_t active);
+uint8_t getBuzzerActivationRequest();
 uint8_t getBuzzerActivationState();
+void deactivateBuzzer();
 #endif // CHECK_WARNING_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Discovery/Inc/cv_heartbeat.h	Sat Nov 15 19:29:44 2025 +0100
@@ -0,0 +1,143 @@
+///////////////////////////////////////////////////////////////////////////////
+/// -*- coding: UTF-8 -*-
+///
+/// \file   Discovery/Inc/cv_heartbeat.h
+/// \brief  Function definitions for connecting to a Polar HC10 heartbeat sensor
+/// \date   3 July 2025
+
+///////////////////////////////////////////////////////////////////////////////
+/// \par Copyright (c) 2014-2015 Heinrichs Weikamp gmbh
+///
+///     This program is free software: you can redistribute it and/or modify
+///     it under the terms of the GNU General Public License as published by
+///     the Free Software Foundation, either version 3 of the License, or
+///     (at your option) any later version.
+///
+///     This program is distributed in the hope that it will be useful,
+///     but WITHOUT ANY WARRANTY; without even the implied warranty of
+///     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+///     GNU General Public License for more details.
+///
+///     You should have received a copy of the GNU General Public License
+///     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//////////////////////////////////////////////////////////////////////////////
+
+#ifndef INC_CV_HEARTBEAT_H_
+#define INC_CV_HEARTBEAT_H_
+
+#include <stdint.h>
+
+
+#define BLUEMOD_ADDR_SIZE		(20u)		/* length of address respond */
+#define BLUEMOD_RSSI_SIZE		(5u)
+#define BLUEMOD_NAME_SIZE		(40u)
+
+void openEdit_Heartbeat(void);
+
+typedef enum
+{
+	NO_INDICATOR = 0,
+	DEVICE_INDICATOR,
+	CONNECTION_INDICATOR,
+	SERVICE_INDICATOR,
+	CHARACTERISTIC_INDICATOR,
+	DESCRIPTOR_INDICATOR,
+	PULSE_INDICATOR,
+	OK_INDICATOR,			/* module control */
+	ERROR_INDICATOR			/* module control */
+} indicatior_t;
+
+typedef enum
+{
+	BT_READ_NOTHING = 0,
+	BT_READ_DEVICE_ADDR,
+	BT_READ_DEVICE_RSSI,
+	BT_READ_DEVICE_NAME,
+	BT_READ_CON_DETAILS,
+	BT_READ_SERV_HANDLE,
+	BT_READ_SERV_START,
+	BT_READ_SERV_END,
+	BT_READ_SERV_UUID,
+	BT_READ_CHAR_CONHANDLE,
+	BT_READ_CHAR_ATTRIBUTE,
+	BT_READ_CHAR_PROPERTY,
+	BT_READ_CHAR_VALUEHANDLE,
+	BT_READ_CHAR_UUID,
+	BT_READ_DESC_CONHANDLE,
+	BT_READ_DESC_CHARHANDLE,
+	BT_READ_DESC_DESCHANDLE,
+	BT_READ_DESC_UUID,
+	BT_READ_PULSE_CONHANDLE,
+	BT_READ_PULSE_VALUEHANDLE,
+	BT_READ_PULSE_DATA,
+} readDataType_t;
+
+typedef enum
+ {
+	SENSOR_HB_OFFLINE = 0,		/* Default Status no data available  */
+	SENSOR_HB_ENABLE_BLE,
+	SENSOR_HB_CHECK_CONFIG,
+	SENSOR_HB_DISCOVER,
+	SENSOR_HB_CONNECT,
+	SENSOR_HB_DISCONNECT,
+	SENSOR_HB_SERVICES,
+	SENSOR_HB_CHARACTERISTIC,
+	SENSOR_HB_DESCRIPTOR,
+	SENSOR_HB_SUBSCRIBE,
+	SENSOR_HB_RESTART,
+	SENSOR_HB_DETECTION_INDICATOR,		/* searching for indicators to identify data items */
+	SENSOR_HB_DETECTION_RSSI,
+	SENSOR_HB_DETECTION_NAME,
+	SENSOR_HB_DETECTION_MAN,
+	SENSOR_HB_DETECTION_UUID,
+	SENSOR_HB_FOUND,		/* A device providing the requested service was found */
+	SENSOR_HB_CONNECTED,	/* Connection to heartbeat sensor established */
+ 	SENSOR_HB_OFFLINEMODE,	/* Oflline measurement started */
+ } sensorHeartbeat_State_t;
+
+typedef struct
+{
+	uint8_t address[BLUEMOD_ADDR_SIZE];
+	uint8_t rssi[BLUEMOD_RSSI_SIZE];
+	uint8_t name[BLUEMOD_NAME_SIZE];
+} btDdeviceData_t;
+
+
+typedef struct
+{
+	uint8_t handle;
+	uint8_t start[6];
+	uint8_t end[6];
+	uint8_t uuid[50];
+} btDeviceService_t;
+
+typedef struct
+{
+	uint8_t conHandle;
+	uint8_t attrHandle[10];
+	uint8_t properties[10];
+	uint8_t valueHandle[10];
+	uint8_t uuid[50];
+} btDeviceCharacteristic_t;
+
+typedef struct
+{
+	uint8_t conHandle;
+	uint8_t charHandle[10];
+	uint8_t descHandle[10];
+	uint8_t uuid[50];
+} btDeviceDescriptor_t;
+
+typedef struct {
+    uint16_t heart_rate;
+    uint16_t energy_expended;
+    uint16_t rr_intervals[10];
+    uint8_t rr_count;
+} HRMeasurement_t;
+
+sensorHeartbeat_State_t cv_heartbeat_getState();
+void refresh_Heartbeat(void);
+void cv_heartbeat_Control(void);
+uint8_t cv_heartbeat_HandleData();
+
+#endif /* INC_CV_HEARTBEAT_H_ */

--- a/Discovery/Inc/demo.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/demo.h	Sat Nov 15 19:29:44 2025 +0100
@@ -35,4 +35,6 @@
 void demoConfigureSettings(void);
 void demoSendCommand(uint8_t action);
 
+void demo_HandleData(void);
+
 #endif // DEMO_H

--- a/Discovery/Inc/externLogbookFlash.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/externLogbookFlash.h	Sat Nov 15 19:29:44 2025 +0100
@@ -41,7 +41,17 @@
  */
 #define DDSTART				0x00000000
 #define DDSTOP				0x00000FFF
-#define unused1START	0x00001000
+
+#define PROFILE0_START	0x00001000		/* store profiles within one 4k sector because they are always read / written as one block */
+#define PROFILE0_STOP	0x000013FF		/* no ring functionality is implemented because changes are not expected very often */
+#define PROFILE1_START	0x00001400
+#define PROFILE1_STOP	0x000017FF
+#define PROFILE2_START	0x00001800
+#define PROFILE2_STOP	0x00001BFF
+#define PROFILE3_START	0x00001C00
+#define PROFILE3_STOP	0x00001FFF
+
+#define unused1START	0x00002000
 #define unused1STOP		0x00007FFF
 
 /* 32 KB */
@@ -84,6 +94,22 @@
 #define SECTOR_INUSE		(4)
 #define SECTOR_EMPTY		(5)
 
+
+typedef enum{
+	EF_HEADER,
+	EF_SAMPLE,
+	EF_DEVICEDATA,
+	EF_VPMDATA,
+	EF_SETTINGS,
+	EF_FIRMWARE,
+	EF_FIRMWARE2,
+	EF_PROFILE0,
+	EF_PROFILE1,
+	EF_PROFILE2,
+	EF_PROFILE3,
+}which_ring_enum;
+
+
 /* Exported types ------------------------------------------------------------*/
 typedef struct{
 uint8_t byteLow;
@@ -108,8 +134,8 @@
 } convert16_Type;
 
 /* Exported functions --------------------------------------------------------*/
-void ext_flash_write_settings(uint8_t resetRing);
-uint8_t ext_flash_read_settings(void);
+void ext_flash_write_settings(uint8_t whichSettings, uint8_t resetRing);
+uint8_t ext_flash_read_settings(uint8_t whichSettings);
 
 void ext_flash_write_devicedata(uint8_t resetRing);
 uint16_t ext_flash_read_devicedata(uint8_t *buffer, uint16_t max_length);

--- a/Discovery/Inc/firmwareEraseProgram.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/firmwareEraseProgram.h	Sat Nov 15 19:29:44 2025 +0100
@@ -41,11 +41,42 @@
 #define HARDWAREDATA_ADDRESS	(0x08000000 + 0x0000A040)
 /* Exported functions --------------------------------------------------------*/
 
+ typedef struct
+ {
+ 	// 8 bytes
+ 	uint16_t primarySerial;
+ 	uint8_t primaryLicence;
+ 	uint8_t revision8bit;
+ 	uint8_t production_year;
+ 	uint8_t production_month;
+ 	uint8_t production_day;
+ 	uint8_t production_bluetooth_name_set;
 
+ 	// 44 bytes
+ 	char production_info[44];
+
+ 	// 8 bytes
+ 	uint16_t secondarySerial;
+ 	uint8_t secondaryLicence;
+ 	uint8_t secondaryReason8bit;
+ 	uint8_t secondary_year;
+ 	uint8_t secondary_month;
+ 	uint8_t secondary_day;
+ 	uint8_t secondary_bluetooth_name_set;
+
+ 	// 4 bytes
+ 	char secondary_info[4];
+ } SHardwareData;
+
+
+uint32_t CalcFletcher32(uint32_t startAddr, uint32_t endAddr);
 
 uint8_t firmware_eraseFlashMemory(void);
 uint8_t firmware_programFlashMemory(uint8_t *pBuffer1, uint32_t length1);//, uint8_t *pBuffer2, uint32_t length2)
 
+uint8_t bootloader_eraseFlashMemory(void);
+uint8_t bootloader_programFlashMemory(uint8_t *pBuffer1, uint32_t length1, SHardwareData* pHwInfo);
+
 uint8_t firmware2_variable_upperpart_eraseFlashMemory(uint32_t length, uint32_t offset);
 uint8_t firmware2_variable_upperpart_programFlashMemory(uint32_t length, uint32_t offset, uint8_t *pBuffer1, uint32_t pBuffer1Size, uint8_t *pBuffer2);
 

--- a/Discovery/Inc/gfx_colors.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/gfx_colors.h	Sat Nov 15 19:29:44 2025 +0100
@@ -87,8 +87,8 @@
 	CLUT_MenuPageHardware,
 	CLUT_MenuPageSystem,
 	CLUT_MenuPageCustomView,
+	CLUT_MenuPageCvOption,
 	CLUT_MenuPageDivePlanner,
-	CLUT_MenuPage10,
 	CLUT_ButtonSymbols,
 	CLUT_InfoSurface,
 	CLUT_InfoDive,

--- a/Discovery/Inc/gfx_engine.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/gfx_engine.h	Sat Nov 15 19:29:44 2025 +0100
@@ -140,6 +140,7 @@
 void GFX_clear_window_immediately(GFX_DrawCfgWindow* hgfx);
 
 //void GFX_draw_circle_with_MEMORY(uint8_t use_memory, GFX_DrawCfgScreen *hgfx, point_t center, uint8_t radius, int8_t color);
+void GFX_draw_pixel(GFX_DrawCfgScreen *hgfx, int16_t x, int16_t y, uint8_t color);
 void GFX_draw_circle(GFX_DrawCfgScreen *hgfx, point_t center, uint8_t radius, int8_t color);
 void GFX_draw_colorline(GFX_DrawCfgScreen *hgfx, point_t start, point_t stop, uint8_t color);
 void GFX_draw_thick_line(uint8_t thickness, GFX_DrawCfgScreen *hgfx, point_t start, point_t stop, uint8_t color);

--- a/Discovery/Inc/logbook.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/logbook.h	Sat Nov 15 19:29:44 2025 +0100
@@ -212,7 +212,7 @@
 uint8_t logbook_getHeader(uint8_t StepBackwards,SLogbookHeader* pLogbookHeader);
 uint16_t logbook_readSampleData(uint8_t StepBackwards, uint16_t length,uint16_t* depth, uint8_t*  gasid, int16_t* temperature, uint16_t* ppo2,
 							    uint16_t* setpoint, uint16_t* sensor1, uint16_t* sensor2, uint16_t* sensor3, uint16_t* cns, uint8_t* bailout,
-								uint16_t* decostopDepth, uint16_t* tank, SGnssCoord* pPosition, uint8_t* event);
+								uint16_t* decostopDepth, uint16_t* tank, uint16_t* compassHeading, SGnssCoord* pPosition, uint16_t* scrubberState, uint8_t* event);
 void logbook_test(void);
 void logbook_InitAndWrite(SDiveState* pStateReal);
 void logbook_recover_brokenlog(uint8_t headerId);
@@ -221,4 +221,6 @@
 uint16_t logbook_fillDummySampleBuffer(SLogbookHeader* pHeader);
 void logbook_readDummySamples(uint8_t* pTarget, uint16_t length);
 
+void logScrubberState(const SScrubberData *scrubberData);
+
 #endif /* LOGBOOK_H */

--- a/Discovery/Inc/ostc.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/ostc.h	Sat Nov 15 19:29:44 2025 +0100
@@ -60,6 +60,10 @@
 #define DISPLAY_VERSION_LCD						(0u)
 #define DISPLAY_VERSION_NEW						(1u)
 
+#define CHUNK_SIZE				(160u)		/* the DMA will handle chunk size transfers */
+#define CHUNKS_PER_BUFFER		(3u)
+
+
 /* Exported variables --------------------------------------------------------*/
 
 extern SPI_HandleTypeDef hspiDisplay;
@@ -82,6 +86,7 @@
 void MX_SPI_Init(void);
 void MX_GPIO_Init(void);
 void MX_UART_Init(void);
+void MX_UART_BT_Init_DMA();
 uint8_t MX_UART_ButtonAdjust(uint8_t *array);
 
 void MX_SmallCPU_Reset_To_Boot(void);
@@ -104,5 +109,15 @@
 void SetDisplayVersion(uint8_t version);
 uint8_t isNewDisplay(void);
 
+uint8_t UART_getChar();
+
+#ifdef ENABLE_PULSE_SENSOR_BT
+void UART_StartDMARx();
+#endif
+#ifdef ENABLE_USART_RADIO
+void MX_UART_RADIO_Init_DMA();
+void UART_StartDMARxRadio();
+#endif
+
 
 #endif // OSTC_H

--- a/Discovery/Inc/ostc_hw2.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/ostc_hw2.h	Sat Nov 15 19:29:44 2025 +0100
@@ -167,6 +167,22 @@
 #define USART_IR_HUD_IRQn                           USART2_IRQn
 // to it directly#define USART_IR_HUD_IRQHandler    USART2_IRQHandler
 
+#define USART_RADIO                                 USART3
+#define USART_RADIO_CLK_ENABLE()                   __USART3_CLK_ENABLE();
+#define USART_RADIO_FORCE_RESET()                  __USART3_FORCE_RESET()
+#define USART_RADIO_RELEASE_RESET()                __USART3_RELEASE_RESET()
+//#define USART_IR_HUD_TX_AF                          GPIO_AF7_USART3
+//#define USART_IR_HUD_TX_PIN                         GPIO_PIN_5
+//#define USART_IR_HUD_TX_GPIO_PORT                   GPIOD
+//#define USART_IR_HUD_TX_GPIO_CLK_ENABLE()           __GPIOD_CLK_ENABLE()
+
+#define USART_RADIO_RX_AF                          GPIO_AF7_USART3
+#define USART_RADIO_RX_PIN                         GPIO_PIN_11
+#define USART_RADIO_RX_GPIO_PORT                   GPIOB
+#define USART_RADIO_RX_GPIO_CLK_ENABLE()           __GPIOB_CLK_ENABLE()
+#define USART_RADIO_IRQn                           USART3_IRQn
+
+
 #define TIMx                                        TIM4
 #define TIMx_CLK_ENABLE                             __TIM4_CLK_ENABLE
 #define TIMx_IRQn                                   TIM4_IRQn

--- a/Discovery/Inc/simulation.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/simulation.h	Sat Nov 15 19:29:44 2025 +0100
@@ -63,7 +63,11 @@
 SDecoinfo* simulation_decoplaner_Bachelorarbeit_VPM(uint16_t depth_meter, uint16_t intervall_time_minutes, uint16_t dive_time_minutes, SgasChangeList *pGasChangeList);
 void simulation_gas_consumption(uint16_t *outputConsumptionList, uint16_t depth_meter, uint16_t dive_time_minutes, SDecoinfo *decoInfoInput, uint8_t gasConsumTravelInput, uint8_t gasConsumDecoInput, const SgasChangeList *pGasChangeList);
 void simulation_helper_change_points(SSimDataSummary *outputSummary, uint16_t depth_meter, uint16_t dive_time_minutes, SDecoinfo *decoInfoInput, const SgasChangeList *pGasChangeList);
-
+void simulation_evaluate_profil(uint16_t *outputConsumptionList,
+								SSimDataSummary *outputSummary,
+								uint16_t depth_meter, uint16_t dive_time_minutes,uint8_t gasConsumTravelInput, uint8_t gasConsumDecoInput,
+								SDecoinfo *decoInfoInput,
+								const SgasChangeList *pGasChangeList);
 
 void Sim_Descend (void);
 void Sim_Ascend (void);

--- a/Discovery/Inc/t3.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/t3.h	Sat Nov 15 19:29:44 2025 +0100
@@ -44,6 +44,6 @@
 uint8_t t3_customview_disabled(uint8_t view);
 void t3_handleAutofocus(void);
 
-int printScrubberText(char *text, size_t size, const SScrubberData *scrubberData, SSettings *settings);
+unsigned printScrubberText(char *text, size_t size, const SScrubberData scrubberData[], const SSettings *settings, bool useTwoLines);
 
 #endif /* T3_H */

--- a/Discovery/Inc/tComm.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/tComm.h	Sat Nov 15 19:29:44 2025 +0100
@@ -43,10 +43,13 @@
 		BM_CONFIG_SILENCE,
 		BM_CONFIG_DONE,
 		BM_CONFIG_RETRY,
+		BM_CONFIG5_ESCAPE1 = 50,
+		BM_CONFIG5_ESCAPE2,
+		BM_CONFIG5_BAUD,
+		BM_CONFIG5_DATAMODE,
 		BM_INIT_POWEROFF = 100,
 		BM_INIT_POWERON,
-		BM_INIT_TRIGGER_ON,
-		BM_INIT_TRIGGER_OFF,
+		BM_INIT_COMMAND_ON,
 		BM_INIT_ECHO,
 		BM_INIT_FACTORY,
 		BM_INIT_ECHO2,

--- a/Discovery/Inc/tHome.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/tHome.h	Sat Nov 15 19:29:44 2025 +0100
@@ -81,7 +81,10 @@
 		CVIEW_CcrSummary,
         CVIEW_Timer,
 		CVIEW_Position,
-		CVIEW_END			/* The ID is used in shift operation => 31 is the max number of supported views */
+#ifdef ENABLE_LOGGER_WINDOW
+		CVIEW_Logger = 25,			/* keep development views at the end of the list to avoid id problems in official releases */
+#endif
+		CVIEW_END	= 32			/* The ID is used in shift operation => 31 is the max number of supported views */
 };
 
 enum CUSTOMVIEWS_BF

--- a/Discovery/Inc/tInfo.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/tInfo.h	Sat Nov 15 19:29:44 2025 +0100
@@ -60,10 +60,15 @@
 void tInfo_write_buttonTextline(GFX_DrawCfgScreen *screenPtr, uint8_t left2ByteCode, char middle2ByteCode, char right2ByteCode);
 void tInfo_write_buttonTextline_simple(uint8_t left2ByteCode, char middle2ByteCode, char right2ByteCode);
 
+void tInfo_drawPixel(int16_t x, int16_t y, uint8_t color);
+void tInfo_draw_colorline(point_t start, point_t stop, uint8_t color);
+void t_Info_draw_circle(point_t center, uint8_t radius, int8_t color);
+
 void tInfo_setEvent(uint32_t inputEventID, uint32_t inputFunctionCall);
 
 void tInfo_set_on_off(uint32_t editID, uint8_t int1);
 void exitInfo(void);
 void exitInfoToBack(void);
+void exitInfoSilent(void);
 
 #endif /* TINFO_H */

--- a/Discovery/Inc/tInfoCompass.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/tInfoCompass.h	Sat Nov 15 19:29:44 2025 +0100
@@ -28,6 +28,15 @@
 #ifndef TINFO_COMPASS_H
 #define TINFO_COMPASS_H
 
+#include "gfx.h"
+
+typedef struct
+{
+	point_t coord;
+	point_t eclipse;
+	uint8_t check[360];
+} axisIndicator_t;
+
 /* Exported functions --------------------------------------------------------*/
 void openInfo_Compass(void);
 void refreshInfo_Compass(GFX_DrawCfgScreen s);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Discovery/Inc/tInfoLogger.h	Sat Nov 15 19:29:44 2025 +0100
@@ -0,0 +1,47 @@
+///////////////////////////////////////////////////////////////////////////////
+/// -*- coding: UTF-8 -*-
+///
+/// \file   Discovery/Inc/tInfoSensor.h
+/// \brief  Infopage content for visualisation of UART protocol flow
+/// \author heinrichs weikamp gmbh
+/// \date   17-07-2025
+///
+/// $Id$
+///////////////////////////////////////////////////////////////////////////////
+/// \par Copyright (c) 2014-2025 Heinrichs Weikamp gmbh
+///
+///     This program is free software: you can redistribute it and/or modify
+///     it under the terms of the GNU General Public License as published by
+///     the Free Software Foundation, either version 3 of the License, or
+///     (at your option) any later version.
+///
+///     This program is distributed in the hope that it will be useful,
+///     but WITHOUT ANY WARRANTY; without even the implied warranty of
+///     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+///     GNU General Public License for more details.
+///
+///     You should have received a copy of the GNU General Public License
+///     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//////////////////////////////////////////////////////////////////////////////
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef TINFO_LOGGER_H
+#define TINFO_LOGGER_H
+
+#define LINE_HEADER_BYTES (3u)
+#define MAX_CHAR_PER_LINE (60u)
+#define MAX_LOGGER_LINES  (13u)
+
+#define LOG_TX_LINE	(0u)
+#define LOG_RX_LINE (1u)
+
+#include "gfx_engine.h"
+
+/* Exported functions --------------------------------------------------------*/
+void openInfo_Logger();
+void refreshInfo_Logger(GFX_DrawCfgScreen s);
+void sendActionToInfoLogger(uint8_t sendAction);
+void InfoLogger_writeLine(uint8_t* pLine,uint8_t lineLength,uint8_t direction);
+uint8_t InfoLogger_isUpdated();
+
+#endif /* TINFO_LOGGER_H */

--- a/Discovery/Inc/tMenu.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/tMenu.h	Sat Nov 15 19:29:44 2025 +0100
@@ -68,6 +68,7 @@
 void nextline(char * text, uint8_t *textPointer);
 
 void tM_init(void);
+void tM_build_pages(void);
 void openMenu(uint8_t freshWithFlipPages);
 void openMenu_first_page_with_OC_gas_update(void);
 void updateMenu(void);
@@ -94,4 +95,5 @@
 void clearDisabledMenuLines(void);
 
 char *makeGrey(bool isGrey);
+char printCheckbox(bool isChecked);
 #endif /* TMENU_H */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Discovery/Inc/tMenuCvOption.h	Sat Nov 15 19:29:44 2025 +0100
@@ -0,0 +1,47 @@
+///////////////////////////////////////////////////////////////////////////////
+/// -*- coding: UTF-8 -*-
+///
+/// \file   Discovery/Inc/tMenuCvOption.h
+/// \brief  Header file of Menu Lines for System settings
+/// \author heinrichs weikamp gmbh
+/// \date   24-April-2025
+///
+/// $Id$
+///////////////////////////////////////////////////////////////////////////////
+/// \par Copyright (c) 2014-2025 Heinrichs Weikamp gmbh
+///
+///     This program is free software: you can redistribute it and/or modify
+///     it under the terms of the GNU General Public License as published by
+///     the Free Software Foundation, either version 3 of the License, or
+///     (at your option) any later version.
+///
+///     This program is distributed in the hope that it will be useful,
+///     but WITHOUT ANY WARRANTY; without even the implied warranty of
+///     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+///     GNU General Public License for more details.
+///
+///     You should have received a copy of the GNU General Public License
+///     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//////////////////////////////////////////////////////////////////////////////
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef TMENU_CVOPTION_H
+#define TMENU_CVOPTION_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32f4xx_hal.h"
+#include "gfx_engine.h"
+
+/** @addtogroup Template
+	* @{
+	*/
+
+/* Exported variables --------------------------------------------------------*/
+
+
+/* Exported functions --------------------------------------------------------*/
+
+uint32_t tMCvOption_refresh(uint8_t line, char *text, uint16_t *tab, char *subtext);
+void tMCvOption_checkLineStatus(void);
+
+#endif /* TMENU_CVOPTION_H */

--- a/Discovery/Inc/tMenuEdit.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/tMenuEdit.h	Sat Nov 15 19:29:44 2025 +0100
@@ -68,7 +68,10 @@
 void tMenuEdit_select(uint32_t editID);
 
 void evaluateNewString	(uint32_t editID, uint32_t *pNewValue1, uint32_t *pNewValue2, uint32_t *pNewValue3, uint32_t *pNewValue4);
+void evaluateNewStringText(uint32_t editID, uint8_t *pNewString);
+
 void tMenuEdit_newInput	(uint32_t editID, uint32_t int1, uint32_t int2, uint32_t int3, uint32_t int4);
+void tMenuEdit_newInputText(uint32_t editID, uint8_t* ptext);
 void tMenuEdit_newButtonText(uint32_t editID, char *text);
 void tMenuEdit_set_on_off(uint32_t editID, uint32_t int1);
 
@@ -91,6 +94,7 @@
 void write_field_toggle(uint32_t editID, uint16_t XleftGimpStyle, uint16_t XrightGimpStyle, uint16_t YtopGimpStyle, const tFont *Font, const char *text, uint8_t int1,  uint8_t int2);
 void write_field_on_off(uint32_t editID, uint16_t XleftGimpStyle, uint16_t XrightGimpStyle, uint16_t YtopGimpStyle, const tFont *Font, const char *text, uint8_t int1);
 void write_field_fpoint(uint32_t editID, uint16_t XleftGimpStyle, uint16_t XrightGimpStyle, uint16_t YtopGimpStyle, const tFont *Font, const char *text, float input);
+void write_field_text(uint32_t editID, uint16_t XleftGimpStyle, uint16_t XrightGimpStyle, uint16_t YtopGimpStyle, const tFont *Font, const char *text, uint8_t* pInput);
 
 void stop_cursor_fields(void);
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Discovery/Inc/tMenuEditCvOption.h	Sat Nov 15 19:29:44 2025 +0100
@@ -0,0 +1,43 @@
+///////////////////////////////////////////////////////////////////////////////
+/// -*- coding: UTF-8 -*-
+///
+/// \file   Discovery/Inc/tMenuEditCvOption.h
+/// \brief  Header file for editing Hardware Settings
+/// \author heinrichs weikamp gmbh
+/// \date   24-Apr-2025
+///
+/// $Id$
+///////////////////////////////////////////////////////////////////////////////
+/// \par Copyright (c) 2014-2025 Heinrichs Weikamp gmbh
+///
+///     This program is free software: you can redistribute it and/or modify
+///     it under the terms of the GNU General Public License as published by
+///     the Free Software Foundation, either version 3 of the License, or
+///     (at your option) any later version.
+///
+///     This program is distributed in the hope that it will be useful,
+///     but WITHOUT ANY WARRANTY; without even the implied warranty of
+///     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+///     GNU General Public License for more details.
+///
+///     You should have received a copy of the GNU General Public License
+///     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//////////////////////////////////////////////////////////////////////////////
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef TMENU_EDIT_CVOPTION_H
+#define TMENU_EDIT_CVOPTION_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "stm32f4xx_hal.h"
+#include "gfx_engine.h"
+#include "global_constants.h"
+#include "settings.h"
+#include "data_central.h"
+
+void openEdit_CvOption(uint8_t line);
+void refresh_CompassEdit(void);
+uint32_t tMCvOption_refresh(uint8_t line, char *text, uint16_t *tab, char *subtext);
+void tMCvOption_checkLineStatus(void);
+
+#endif /* TMENU_EDIT_CVOPTION_H */

--- a/Discovery/Inc/tMenuSystem.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/tMenuSystem.h	Sat Nov 15 19:29:44 2025 +0100
@@ -36,6 +36,16 @@
 	* @{
 	*/
 
+#define CUSTOM_BLOCK_INFO_ADDR	(0x0811FFF0)
+
+typedef struct
+{
+    uint32_t Reserved;		/* for future use */
+    uint32_t Type;			/* type => block purpose */
+    uint32_t fletcher;		/* fletcher check sum */
+    uint32_t length;		/* length of block starting from 0x08100000 */
+} customBlockInfo_t;
+
 void set_CustomsviewsSubpage(uint8_t page);
 
 /* Exported variables --------------------------------------------------------*/
@@ -44,6 +54,5 @@
 /* Exported functions --------------------------------------------------------*/
 
 uint32_t tMSystem_refresh(uint8_t line, char *text, uint16_t *tab, char *subtext);
-void tMSystem_checkLineStatus(void);
 
 #endif /* TMENU_SYSTEM_H */

--- a/Discovery/Inc/tStructure.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/tStructure.h	Sat Nov 15 19:29:44 2025 +0100
@@ -66,6 +66,7 @@
 #define InfoPageCompass 6
 #define InfoPageSensor  8
 #define InfoPagePreDive 9
+#define InfoPageLogger  10
 
 #define StI 			_MB(0,1,0,0,0)
 #define StILOGLIST		_MB(0,2,0,0,0)
@@ -76,6 +77,7 @@
 #define StIDEBUG		_MB(0,7,0,0,0)
 #define StISENINFO		_MB(0,8,0,0,0)
 #define StIPREDIVE		_MB(0,9,0,0,0)
+#define StILOGGER		_MB(0,10,0,0,0)
 
 #define StI_GoToLogbook			_MB(0,1,1,0,0)
 #define StI_GoToPlanner			_MB(0,1,2,0,0)
@@ -214,17 +216,14 @@
 #define StMXTRA_CCRmode					_MB(2,4,1,1,0)
 #define StMXTRA_O2_Fallback				_MB(2,4,2,1,0)
 #define StMXTRA_ScrubTimer				_MB(2,4,3,1,0)
-#define StMXTRA_ScrubTimer_Max			_MB(2,4,3,2,0)
-#define StMXTRA_ScrubTimer_Reset		_MB(2,4,3,3,0)
-#define StMXTRA_ScrubTimer_OP_Mode		_MB(2,4,3,5,0)
+#define StMXTRA_ScrubTimer_Active		_MB(2,4,3,2,0)
+#define StMXTRA_ScrubTimer_Max			_MB(2,4,3,3,0)
+#define StMXTRA_ScrubTimer_Reset		_MB(2,4,3,4,0)
+#define StMXTRA_ScrubTimer_OP_Mode		_MB(2,4,3,6,0)
 #define StMXTRA_PSCR_O2_Drop			_MB(2,4,4,1,0)
 #define StMXTRA_PSCR_LUNG_RATIO			_MB(2,4,4,2,0)
 #define StMXTRA_Predive_Check			_MB(2,4,5,1,0)
 
-
-
-
-
 /* PAGE 5 */
 #define StMDECO		_MB(2,5,0,0,0)
 
@@ -273,136 +272,185 @@
 
 #define StMHARD1_Bluetooth			_MB(2,7,1,1,0)
 
-#define StMHARD2_Compass				_MB(2,7,2,0,0)
-#define StMHARD2_Compass_SetCourse		_MB(2,7,2,2,0)
-#define StMHARD2_Compass_ResetCourse	_MB(2,7,2,3,0)
-#define StMHARD2_Compass_Calibrate		_MB(2,7,2,4,0)
-#define StMHARD2_Compass_Inertia		_MB(2,7,2,5,0)
-#define StMHARD2_Compass_Declination	_MB(2,7,2,6,0)
-
 //#define StMHARD2_Exit						_MB(2,7,2,2,0)
 
-#define StMHARD3_Sensors			_MB(2,7,3,0,0)
-#define StMHARD3_O2_Sensor1			_MB(2,7,3,1,0)
-#define StMHARD3_O2_Sensor2			_MB(2,7,3,2,0)
-#define StMHARD3_O2_Sensor3			_MB(2,7,3,3,0)
-#define StMHARD3_O2_Calibrate		_MB(2,7,3,4,0)
-#define StMHARD3_Sensor_Info		_MB(2,7,3,5,0)
-#define StMHARD3_Sensor_Detect		_MB(2,7,3,6,0)
+#define StMHARD3_Sensors			_MB(2,7,2,0,0)
+#define StMHARD3_O2_Sensor1			_MB(2,7,2,1,0)
+#define StMHARD3_O2_Sensor2			_MB(2,7,2,2,0)
+#define StMHARD3_O2_Sensor3			_MB(2,7,2,3,0)
+#define StMHARD3_O2_Calibrate		_MB(2,7,2,4,0)
+#define StMHARD3_Sensor_Info		_MB(2,7,2,5,0)
+#define StMHARD3_Sensor_Detect		_MB(2,7,2,6,0)
 
 
-#define StMHARD4_BrightnessEco	_MB(2,7,4,1,0)
-#define StMHARD4_BrightnessStd	_MB(2,7,4,2,0)
-#define StMHARD4_BrightnessHigh	_MB(2,7,4,3,0)
-#define StMHARD4_BrightnessMax	_MB(2,7,4,4,0)
+#define StMHARD4_BrightnessEco	_MB(2,7,3,1,0)
+#define StMHARD4_BrightnessStd	_MB(2,7,3,2,0)
+#define StMHARD4_BrightnessHigh	_MB(2,7,3,3,0)
+#define StMHARD4_BrightnessMax	_MB(2,7,3,4,0)
 
-#define StMHARD5_Button1		_MB(2,7,5,1,0)
-#define StMHARD5_ButtonBalance1	_MB(2,7,5,2,0)
-#define StMHARD5_ButtonBalance2	_MB(2,7,5,3,0)
-#define StMHARD5_ButtonBalance3	_MB(2,7,5,4,0)
-#define StMHARD5_ButtonLock		_MB(2,7,5,5,0)
+#define StMHARD5_Button1		_MB(2,7,4,1,0)
+#define StMHARD5_ButtonBalance1	_MB(2,7,4,2,0)
+#define StMHARD5_ButtonBalance2	_MB(2,7,4,3,0)
+#define StMHARD5_ButtonBalance3	_MB(2,7,4,4,0)
+#define StMHARD5_ButtonLock		_MB(2,7,4,5,0)
+
+#define StMHARD6_WarningBuz		_MB(2,7,5,1,0)
 
 //#define StMHARD6_UpdateCPU2_No	_MB(2,7,6,1,0)
 //#define StMHARD6_UpdateCPU2_Yes	_MB(2,7,6,2,0)
 //#define StMHARD6_UpdateCPU2_Now	_MB(2,7,6,3,0)
 
 /* PAGE 8 */
-#define StMSYS		_MB(2,8,0,0,0)
+#define StMOption						_MB(2,8,0,0,0)
+#define StMOption_Compass				_MB(2,8,1,0,0)
+#define StMOption_Compass_SetCourse		_MB(2,8,1,1,0)
+#define StMOption_Compass_ResetCourse	_MB(2,8,1,2,0)
+#define StMOption_Compass_Calibrate		_MB(2,8,1,3,0)
+#define StMOption_Compass_Inertia		_MB(2,8,1,4,0)
+#define StMOption_Compass_Declination	_MB(2,8,1,5,0)
 
-/* PAGE 8 EDIT FIELD CONTENT */
-#define StMSYS1_DateTime _MB(2,8,1,0,0)
-#define StMSYS1_Date	_MB(2,8,1,1,0)
-#define StMSYS1_Time	_MB(2,8,1,2,0)
-#define StMSYS1_FORMAT	_MB(2,8,1,3,0)
-#define StMSYS1_DDMMYY	_MB(2,8,1,3,1)
-#define StMSYS1_MMDDYY	_MB(2,8,1,3,2)
-#define StMSYS1_YYMMDD	_MB(2,8,1,3,3)
-#define StMSYS1_12HR    _MB(2,8,1,4,0)
-#define StMSYS1_GNSSDT  _MB(2,8,1,5,0)
-#define StMSYS1_ZONE	_MB(2,8,1,6,0)
+#define StMOption_Timer					_MB(2,8,2,0,0)
+#define StMOption_Timer_Value			_MB(2,8,2,1,0)
+
+#define StMOption_Heartbeat 			_MB(2,8,3,0,0)
+
+/* PAGE 9 */
+#define StMSYS		_MB(2,9,0,0,0)
 
-#define StMSYS_Timer	_MB(2,8,2,1,0)
+/* PAGE 9 EDIT FIELD CONTENT */
+#define StMSYS1_DateTime _MB(2,9,1,0,0)
+#define StMSYS1_Date	_MB(2,9,1,1,0)
+#define StMSYS1_Time	_MB(2,9,1,2,0)
+#define StMSYS1_FORMAT	_MB(2,9,1,3,0)
+#define StMSYS1_DDMMYY	_MB(2,9,1,3,1)
+#define StMSYS1_MMDDYY	_MB(2,9,1,3,2)
+#define StMSYS1_YYMMDD	_MB(2,9,1,3,3)
+#define StMSYS1_12HR    _MB(2,9,1,4,0)
+#define StMSYS1_GNSSDT  _MB(2,9,1,5,0)
+#define StMSYS1_ZONE	_MB(2,9,1,6,0)
 
-#define StMSYS2_English	_MB(2,8,3,1,0)
-#define StMSYS2_German	_MB(2,8,3,2,0)
-#define StMSYS2_French	_MB(2,8,3,3,0)
-#define StMSYS2_Italian	_MB(2,8,3,4,0)
-#define StMSYS2_Espanol	_MB(2,8,3,5,0)
+#ifdef ENABLE_SETTING_PROFILES
+#define StMSYS_Profile		_MB(2,9,2,0,0)
+#define StMSYS_ProfileA 	_MB(2,9,2,1,0)
+#define StMSYS_ProfileB 	_MB(2,9,2,2,0)
+#define StMSYS_ProfileC 	_MB(2,9,2,3,0)
+#define StMSYS_ProfileD 	_MB(2,9,2,4,0)
 
-#define StMSYS3_Units		_MB(2,8,4,1,0)
-#define StMSYS3_Colors	_MB(2,8,4,2,0)
-#define StMSYS3_Debug		_MB(2,8,4,3,0)
+#define StMSYS2_English	_MB(2,9,3,1,0)
+#define StMSYS2_German	_MB(2,9,3,2,0)
+#define StMSYS2_French	_MB(2,9,3,3,0)
+#define StMSYS2_Italian	_MB(2,9,3,4,0)
+#define StMSYS2_Espanol	_MB(2,9,3,5,0)
 
-#define StMSYS4_Info		_MB(2,8,5,1,0)
+#define StMSYS3_Units	_MB(2,9,4,1,0)
+#define StMSYS3_Colors	_MB(2,9,4,2,0)
+#ifdef HAVE_DEBUG_VIEW
+#define StMSYS3_Debug	_MB(2,9,4,3,0)
+#endif
+
+#define StMSYS4_Info	_MB(2,9,5,1,0)
 
-#define StMSYS5_Exit			_MB(2,8,6,1,0)
-#define StMSYS5_LogbookOffset	_MB(2,8,6,7,0)
-#define StMSYS5_ResetAll		_MB(2,8,6,2,0)
-#define StMSYS5_ResetDeco		_MB(2,8,6,3,0)
-#define StMSYS5_Reboot			_MB(2,8,6,4,0)
-#define StMSYS5_Maintenance		_MB(2,8,6,5,0)
-#define StMSYS5_ResetLogbook	_MB(2,8,6,6,0)
-#define StMSYS5_SetBattCharge	_MB(2,8,6,7,0)
-#define StMSYS5_RebootRTE		_MB(2,8,6,8,0)
-#define StMSYS5_RebootMainCPU	_MB(2,8,6,9,0)
-#define StMSYS5_ScreenTest		_MB(2,8,6,10,0)
-#define StMSYS5_SetFactoryBC	_MB(2,8,6,11,0)
-#define StMSYS5_ResetBluetooth	_MB(2,8,6,12,0)
-#define StMSYS5_SetSampleIndx   _MB(2,8,6,13,0)
-#define StMSYS5_AdjustSurfPres  _MB(2,8,6,14,0)
+#define StMSYS5_Exit			_MB(2,9,6,1,0)
+#define StMSYS5_LogbookOffset	_MB(2,9,6,7,0)
+#define StMSYS5_ResetAll		_MB(2,9,6,2,0)
+#define StMSYS5_ResetDeco		_MB(2,9,6,3,0)
+#define StMSYS5_Reboot			_MB(2,9,6,4,0)
+#define StMSYS5_Maintenance		_MB(2,9,6,5,0)
+#define StMSYS5_ResetLogbook	_MB(2,9,6,6,0)
+#define StMSYS5_SetBattCharge	_MB(2,9,6,7,0)
+#define StMSYS5_RebootRTE		_MB(2,9,6,8,0)
+#define StMSYS5_RebootMainCPU	_MB(2,9,6,9,0)
+#define StMSYS5_ScreenTest		_MB(2,9,6,10,0)
+#define StMSYS5_SetFactoryBC	_MB(2,9,6,11,0)
+#define StMSYS5_ResetBluetooth	_MB(2,9,6,12,0)
+#define StMSYS5_SetSampleIndx   _MB(2,9,6,13,0)
+#define StMSYS5_AdjustSurfPres  _MB(2,9,6,14,0)
+#define StMSYS5_FlashBoot		_MB(2,9,6,15,0)
+
+#else
+
+#define StMSYS2_English	_MB(2,9,2,1,0)
+#define StMSYS2_German	_MB(2,9,2,2,0)
+#define StMSYS2_French	_MB(2,9,2,3,0)
+#define StMSYS2_Italian	_MB(2,9,2,4,0)
+#define StMSYS2_Espanol	_MB(2,9,2,5,0)
+
+#define StMSYS3_Units	_MB(2,9,3,1,0)
+#define StMSYS3_Colors	_MB(2,9,3,2,0)
+#ifdef HAVE_DEBUG_VIEW
+#define StMSYS3_Debug	_MB(2,9,3,3,0)
+#endif
 
-#define StMSYS_Custom0			_MB(2,8,1,0,0)
-#define StMSYS_Custom1			_MB(2,8,2,0,0)
-#define StMSYS_Custom2			_MB(2,8,3,0,0)
-#define StMSYS_Custom3			_MB(2,8,4,0,0)
-#define StMSYS_Custom4			_MB(2,8,5,0,0)
-#define StMSYS_Custom5			_MB(2,8,6,0,0)
+#define StMSYS4_Info	_MB(2,9,4,1,0)
 
- /* PAGE 9 */
+#define StMSYS5_Exit			_MB(2,9,5,1,0)
+#define StMSYS5_LogbookOffset	_MB(2,9,5,7,0)
+#define StMSYS5_ResetAll		_MB(2,9,5,2,0)
+#define StMSYS5_ResetDeco		_MB(2,9,5,3,0)
+#define StMSYS5_Reboot			_MB(2,9,5,4,0)
+#define StMSYS5_Maintenance		_MB(2,9,5,5,0)
+#define StMSYS5_ResetLogbook	_MB(2,9,5,6,0)
+#define StMSYS5_SetBattCharge	_MB(2,9,5,7,0)
+#define StMSYS5_RebootRTE		_MB(2,9,5,8,0)
+#define StMSYS5_RebootMainCPU	_MB(2,9,5,9,0)
+#define StMSYS5_ScreenTest		_MB(2,9,5,10,0)
+#define StMSYS5_SetFactoryBC	_MB(2,9,5,11,0)
+#define StMSYS5_ResetBluetooth	_MB(2,9,5,12,0)
+#define StMSYS5_SetSampleIndx   _MB(2,9,5,13,0)
+#define StMSYS5_AdjustSurfPres  _MB(2,9,5,14,0)
+#define StMSYS5_FlashBoot		_MB(2,9,5,15,0)
+#endif
 
- # define StMCustom 	_MB(2,9,0,0,0)
+/* Temporary line markers for dive mode custom view configuration */
+/* These use line numbers 21-26 which don't conflict with actual menu items */
+#define StMSYS_Custom0			_MB(2,9,21,0,0)
+#define StMSYS_Custom1			_MB(2,9,22,0,0)
+#define StMSYS_Custom2			_MB(2,9,23,0,0)
+#define StMSYS_Custom3			_MB(2,9,24,0,0)
+#define StMSYS_Custom4			_MB(2,9,25,0,0)
+#define StMSYS_Custom5			_MB(2,9,26,0,0)
 
- /* PAGE 9 EDIT FIELD CONTENT */
+/* PAGE 10 */
+#define StMCustom 	_MB(2,10,0,0,0)
+
+ /* PAGE 10 EDIT FIELD CONTENT */
 //
 
-#define StMCustom1_CViewTimeout		_MB(2,9,1,1,0)
-#define StMCustom1_CViewStandard	_MB(2,9,1,2,0)
-#define StMCustom1_CViewStandardBF	_MB(2,9,1,3,0)
-#define StMCustom1_CViewAutoFocusBF	_MB(2,9,1,4,0)
-#define StMCustom1_CornerTimeout	_MB(2,9,1,5,0)
-#define StMCustom1_CornerStandard	_MB(2,9,1,6,0)
+#define StMCustom1_CViewTimeout		_MB(2,10,1,1,0)
+#define StMCustom1_CViewStandard	_MB(2,10,1,2,0)
+#define StMCustom1_CViewStandardBF	_MB(2,10,1,3,0)
+#define StMCustom1_CViewAutoFocusBF	_MB(2,10,1,4,0)
+#define StMCustom1_CornerTimeout	_MB(2,10,1,5,0)
+#define StMCustom1_CornerStandard	_MB(2,10,1,6,0)
 
-#define StMCustom2_BFSelection		_MB(2,9,2,1,0)
+#define StMCustom2_BFSelection		_MB(2,10,2,1,0)
 
-#define StMCustom3_CViewSelection1	_MB(2,9,3,1,0)
-#define StMCustom3_CViewSelection2	_MB(2,9,3,2,0)
-#define StMCustom3_CViewSelection3	_MB(2,9,3,3,0)
-#define StMCustom3_CViewSelection4	_MB(2,9,3,4,0)
-#define StMCustom3_CViewSelection5	_MB(2,9,3,5,0)
-#define StMCustom3_CViewSelection6	_MB(2,9,3,6,0)
+#define StMCustom3_CViewSelection1	_MB(2,10,3,1,0)
+#define StMCustom3_CViewSelection2	_MB(2,10,3,2,0)
+#define StMCustom3_CViewSelection3	_MB(2,10,3,3,0)
+#define StMCustom3_CViewSelection4	_MB(2,10,3,4,0)
+#define StMCustom3_CViewSelection5	_MB(2,10,3,5,0)
+#define StMCustom3_CViewSelection6	_MB(2,10,3,6,0)
 
-#define StMCustom4_CViewSelection1	_MB(2,9,4,1,0)
+#define StMCustom4_CViewSelection1	_MB(2,10,4,1,0)
 
 #ifdef ENABLE_MOTION_CONTROL
-#define StMCustom5_CViewPortCalib	_MB(2,9,5,1,0)
-#define StMCustom5_CViewPortSpotSize _MB(2,9,5,2,0)
-#define StMCustom5_CViewPortLayout	_MB(2,9,5,3,0)
-#define StMCustom5_CViewPortAmbient	_MB(2,9,5,4,0)
-#define StMCustom5_CViewPortControl	_MB(2,9,5,5,0)
-#endif
-#ifdef ENABLE_GPIO_V2
-#define StMCustom5_CViewWarningBuz	_MB(2,9,5,1,0)
+#define StMCustom5_CViewPortCalib	_MB(2,10,5,1,0)
+#define StMCustom5_CViewPortSpotSize _MB(2,10,5,2,0)
+#define StMCustom5_CViewPortLayout	_MB(2,10,5,3,0)
+#define StMCustom5_CViewPortAmbient	_MB(2,10,5,4,0)
+#define StMCustom5_CViewPortControl	_MB(2,10,5,5,0)
 #endif
 
-/* PAGE 10 */
-#define StMPLAN		_MB(2,10,0,0,0)
+/* PAGE 11 */
+#define StMPLAN		_MB(2,11,0,0,0)
 
-/* PAGE 10 EDIT FIELD CONTENT */
-#define StMPLAN2_Interval			_MB(2,10,2,1,0)
-#define StMPLAN3_DiveTime			_MB(2,10,3,1,0)
-#define StMPLAN4_MaxDepth			_MB(2,10,4,1,0)
-#define StMPLAN5_ExitResult			_MB(2,10,5,1,0)
-#define StMPLAN4_Settings			_MB(2,10,6,1,0)
+/* PAGE 11 EDIT FIELD CONTENT */
+#define StMPLAN2_Interval			_MB(2,11,2,1,0)
+#define StMPLAN3_DiveTime			_MB(2,11,3,1,0)
+#define StMPLAN4_MaxDepth			_MB(2,11,4,1,0)
+#define StMPLAN5_ExitResult			_MB(2,11,5,1,0)
+#define StMPLAN4_Settings			_MB(2,11,6,1,0)
 
 
 

--- a/Discovery/Inc/text_multilanguage.h	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Inc/text_multilanguage.h	Sat Nov 15 19:29:44 2025 +0100
@@ -395,6 +395,8 @@
 		TXT2BYTE_TIMEZONE,
 
 		TXT2BYTE_BUZZER,
+		TXT2BYTE_Pulse,
+		TXT2BYTE_Logger,
 
 		TXT2BYTE_END,
 };

--- a/Discovery/Src/base.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Src/base.c	Sat Nov 15 19:29:44 2025 +0100
@@ -237,12 +237,17 @@
 #include "t7.h"
 #include "t3.h"
 #include "tMenuEditSetpoint.h"
+#include "cv_heartbeat.h"
+#include "tInfoLogger.h"
 
 #ifdef DEMOMODE
 #include "demo.h"
 static void TIM_DEMO_init(void);
 #endif
 
+#ifdef ENABLE_USART_RADIO
+#include "demo.h"
+#endif
 
 //#include "lodepng.h"
 //#include <stdlib.h> // for malloc and free
@@ -377,33 +382,26 @@
 
     MX_GPIO_Init();
     //  MX_SmallCPU_NO_Reset_Helper();	 //161116 hw
-    MX_Bluetooth_PowerOff();	/* disable module, needed in case of e.g. a reset event to make sure module is configured from scratch */
     MX_SPI_Init();
     MX_UART_Init();
     SDRAM_Config();
     HAL_Delay( 100 );
 
     stateRealGetPointerWrite()->lastKnownBatteryPercentage = 0; // damit das nicht in settings kopiert wird.
-    set_settings_to_Standard();
+    set_settings_to_Standard(EF_SETTINGS);									/* initialize setting structure with default value => will be overwritten by flash read operation */
     mod_settings_for_first_start_with_empty_ext_flash();
-    ext_flash_read_settings();
+    ext_flash_read_settings(EF_SETTINGS);
     if( newFirmwareVersionCheckViaSettings() ) // test for old firmware version in loaded settings
     {
         wasFirmwareUpdateCheckBattery = 1;
         set_settings_button_to_factory_with_individual_buttonBalance(); // will adapt individual values
     }
-    //settingsGetPointer()->bluetoothActive = 0; 	/* MX_Bluetooth_PowerOff();  unnecessary as part of MX_GPIO_Init() */
-    //settingsGetPointer()->compassBearing = 0;
-    set_new_settings_missing_in_ext_flash(); // includes update of firmware version  161121
+
+    set_new_settings_missing_in_ext_flash(EF_SETTINGS); // includes update of firmware version  161121
 
     GFX_init( &pLayerInvisible );
     TIM_BACKLIGHT_init();
 
-    // new 170508: bluetooth on at start
-    settingsGetPointer()->bluetoothActive = 1;
-    MX_Bluetooth_PowerOn();
-    tComm_StartBlueModConfig();
-
     /*
     if( (hardwareDataGetPointer()->primarySerial == 20+18)
      || (hardwareDataGetPointer()->primarySerial == 20+25)
@@ -413,7 +411,7 @@
         tComm_Set_Bluetooth_Name(1);
     }
     */
-    errorsInSettings = check_and_correct_settings();
+    errorsInSettings = check_and_correct_settings(EF_SETTINGS);
     createDiveSettings();
 
 #ifdef QUICK_SLEEP
@@ -438,6 +436,12 @@
     display_power_on__2_of_2__post_RGB();
     GFX_use_colorscheme( settingsGetPointer()->tX_colorscheme );
 
+
+    // new 170508: bluetooth on at start
+    settingsGetPointer()->bluetoothActive = 1;
+    MX_Bluetooth_PowerOn();
+    tComm_StartBlueModConfig();
+
     tHome_init();
     tI_init();
     tM_init();
@@ -472,7 +476,7 @@
     if( settingsGetPointer()->debugModeOnStart )
     {
         settingsGetPointer()->debugModeOnStart = 0;
-        ext_flash_write_settings(0);
+        ext_flash_write_settings(EF_SETTINGS,0);
         setDebugMode();
         openInfo( StIDEBUG );
     }
@@ -502,11 +506,13 @@
             resetToFirmwareUpdate();
 
         tCCR_control();
+
         if( tComm_control() )// will stop while loop if tComm Mode started until exit from UART
         {
             createDiveSettings();
             updateMenu();
-            ext_flash_write_settings(0);
+            ext_flash_write_settings(EF_SETTINGS,0);
+            time_without_button_pressed_deciseconds = 0;	/* reset timeout to avoid shutdown after long time in Comm state */
         }
 
         /* check if tasks depending on global state are pending */
@@ -527,12 +533,22 @@
         {
         	TriggerButtonAction();
         }
+#ifdef ENABLE_PULSE_SENSOR_BT
+        cv_heartbeat_HandleData();
+#endif
+
+#ifdef ENABLE_USART_RADIO
+        demo_HandleData();
+#endif
         if(DoHousekeeping)
         {
            	DoHousekeeping = housekeepingFrame();
         }
         if(DoDisplayRefresh)							/* set every 100ms by timer interrupt */
         {
+#ifdef ENABLE_PULSE_SENSOR_BT
+        	cv_heartbeat_Control();
+#endif
 	        DoDisplayRefresh = 0;
 
 	        updateSetpointStateUsed();
@@ -728,6 +744,15 @@
 {
 	SStateList status;
 	get_globalStateList(&status);
+
+#ifdef ENABLE_LOGGER_WINDOW
+	if((status.base != 0) && (get_globalState() != StILOGGER) && (InfoLogger_isUpdated()))
+	{
+		openInfo_Logger();
+		get_globalStateList(&status);
+	}
+#endif
+
 	switch(status.base)
 	{
 	case BaseHome:
@@ -920,6 +945,8 @@
 								break;
 							case InfoPagePreDive: 	sendActionToInfoPreDive(action);
 								break;
+							case InfoPageLogger: 	exitInfo();
+								break;
 							default:				sendActionToInfo(action);
 								break;
 						}
@@ -1024,7 +1051,7 @@
 	GFX_logoAutoOff();
 	display_power_off();
     ext_flash_write_devicedata(true);	/* write data at default position */
-    ext_flash_write_settings(true);		/* write data at default position */
+    ext_flash_write_settings(EF_SETTINGS,true);		/* write data at default position */
     set_globalState(StStop);
 }
 
@@ -1056,6 +1083,16 @@
     output->mode  = (uint8_t)((id     ) & 0xFF);
 }
 
+uint8_t get_lineOfID(uint32_t id)
+{
+	uint8_t ret = (uint8_t)((id >> 16) & 0xFF);
+	if(ret > 6)
+	{
+		ret = 0;
+	}
+	return ret;
+}
+
 SButtonLock get_ButtonLock(void)
 {
 	return ButtonLockState;

--- a/Discovery/Src/check_warning.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Src/check_warning.c	Sat Nov 15 19:29:44 2025 +0100
@@ -79,7 +79,7 @@
 #endif
 static uint8_t buzzerOn = 0;			/* current state of the buzzer */
 
-static void setBuzzer(int8_t warningActive);
+static void handleBuzzer(int8_t warningActive);
 /* Exported functions --------------------------------------------------------*/
 
 void requestBuzzerActivation(uint8_t active)
@@ -87,22 +87,39 @@
 	buzzerRequestActive = active;
 }
 
+uint8_t getBuzzerActivationRequest()
+{
+	return buzzerRequestActive;
+}
+
 uint8_t getBuzzerActivationState()
 {
 	return buzzerOn;
 }
 
-static void setBuzzer(int8_t warningActive)
+static void handleBuzzer(int8_t warningActive)
 {
 	static uint32_t guiTimeoutCnt = 0;		/* max delay till buzzer will be activated independend from gui request */
 	static uint32_t stateTick = 0;			/* activation tick of current state */
 	static uint8_t lastWarningState = 0;	/* the parameter value of the last call*/
+	static uint8_t lastBuzzerRequest = 0;
+	static uint8_t guiTrigger = 0;
 
 	uint32_t tick =  HAL_GetTick();
 
-	if(warningActive)
+	if(stateUsed->mode == MODE_SURFACE)
 	{
-		if(!lastWarningState)				/* init structures */
+		warningActive = 0;					/* no warning buzzer in surface mode => overwrite value */
+	}
+
+	/* There are two sources for buzzer activation: the warning detection and activation by gui => both need to be merged */
+	if((buzzerRequestActive != REQUEST_BUZZER_OFF) &&  (lastBuzzerRequest == REQUEST_BUZZER_OFF))
+	{
+		guiTrigger = 1;
+	}
+	if((warningActive) || (buzzerRequestActive != REQUEST_BUZZER_OFF))
+	{
+		if((lastWarningState == 0) && (lastBuzzerRequest == REQUEST_BUZZER_OFF))			/* init structures */
 		{
 			guiTimeoutCnt = tick;
 			stateTick = tick;
@@ -111,22 +128,38 @@
 		{
 			if(time_elapsed_ms(stateTick, tick) > EXT_INTERFACE_BUZZER_STABLE_TIME_MS)	/* buzzer has to be on for a certain time */
 			{
-				if((!buzzerRequestActive) || (time_elapsed_ms(stateTick, tick) > EXT_INTERFACE_BUZZER_ON_TIME_MS))
+				if((buzzerRequestActive == REQUEST_BUZZER_OFF)
+						|| ((buzzerRequestActive == REQUEST_BUZZER_ONCE) && (time_elapsed_ms(stateTick, tick) > EXT_INTERFACE_BUZZER_PING_TIME_MS))
+						||  (time_elapsed_ms(stateTick, tick) > EXT_INTERFACE_BUZZER_ON_TIME_MS))
 				{
 					buzzerOn = 0;
 					stateTick = tick;
 					guiTimeoutCnt = tick;
+					buzzerRequestActive = REQUEST_BUZZER_OFF;
 				}
 			}
 		}
 		else
 		{
-			if(time_elapsed_ms(stateTick, tick) > EXT_INTERFACE_BUZZER_STABLE_TIME_MS)	/* buzzer has to be off for a certain time */
+			if((time_elapsed_ms(stateTick, tick) > EXT_INTERFACE_BUZZER_STABLE_TIME_MS) || ( guiTrigger))	/* buzzer has to be off for a certain time */
 			{
-				if((buzzerRequestActive) || (time_elapsed_ms(guiTimeoutCnt, tick) > EXT_INTERFACE_BUZZER_ON_TIME_MS + GUI_BUZZER_TIMEOUT_MS))
+				if((warningActive) || (buzzerRequestActive != REQUEST_BUZZER_OFF))
 				{
-					buzzerOn = 1;
-					stateTick = tick;
+					if(((stateUsed->mode != MODE_SURFACE) && (time_elapsed_ms(guiTimeoutCnt, tick)) > (EXT_INTERFACE_BUZZER_ON_TIME_MS + GUI_BUZZER_TIMEOUT_MS))
+						|| ( guiTrigger))
+					{
+						buzzerOn = 1;
+						stateTick = tick;
+						guiTrigger = 0;
+						if(buzzerRequestActive == REQUEST_BUZZER_ONCE)
+						{
+							buzzerRequestActive = REQUEST_BUZZER_OFF;
+						}
+					}
+					if((time_elapsed_ms(guiTimeoutCnt, tick)) > (EXT_INTERFACE_BUZZER_ON_TIME_MS + EXT_INTERFACE_BUZZER_STABLE_TIME_MS))  /* timeout request */
+					{
+						buzzerRequestActive = REQUEST_BUZZER_OFF;
+					}
 				}
 			}
 		}
@@ -135,9 +168,16 @@
 	{
 		buzzerOn = 0;
 	}
+	lastBuzzerRequest = buzzerRequestActive;
 	lastWarningState = warningActive;
 }
 
+void deactivateBuzzer()
+{
+	buzzerRequestActive = REQUEST_BUZZER_OFF;
+	buzzerOn = 0;
+}
+
 void check_warning(void)
 {
   check_warning2(stateUsedWrite);
@@ -160,7 +200,7 @@
 
 	if(settingsGetPointer()->warningBuzzer)
 	{
-		setBuzzer(pDiveState->warnings.numWarnings);
+		handleBuzzer(pDiveState->warnings.numWarnings);
 	}
 
 /* Warnings checked after this line will not cause activation of the buzzer */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Discovery/Src/cv_heartbeat.c	Sat Nov 15 19:29:44 2025 +0100
@@ -0,0 +1,668 @@
+///////////////////////////////////////////////////////////////////////////////
+/// -*- coding: UTF-8 -*-
+///
+/// \file   Discovery/Src/cv_heartbeat.c
+/// \brief  providing functionality to connect OSTC to a Polar HC10 heartbeat sensor
+/// \author heinrichs weikamp gmbh
+/// \date   03-July-2025
+///
+/// $Id$
+///////////////////////////////////////////////////////////////////////////////
+/// \par Copyright (c) 2014-2025 Heinrichs Weikamp gmbh
+///
+///     This program is free software: you can redistribute it and/or modify
+///     it under the terms of the GNU General Public License as published by
+///     the Free Software Foundation, either version 3 of the License, or
+///     (at your option) any later version.
+///
+///     This program is distributed in the hope that it will be useful,
+///     but WITHOUT ANY WARRANTY; without even the implied warranty of
+///     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+///     GNU General Public License for more details.
+///
+///     You should have received a copy of the GNU General Public License
+///     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//////////////////////////////////////////////////////////////////////////////
+
+#include "configuration.h"
+
+#ifdef ENABLE_PULSE_SENSOR_BT
+#include "cv_heartbeat.h"
+#include "tMenuEdit.h"
+
+#include "gfx_fonts.h"
+#include "tHome.h"
+#include "ostc.h"
+#include "tComm.h"
+#include "tInfoLogger.h"
+#include "stdlib.h"
+
+static sensorHeartbeat_State_t heartbeatState = SENSOR_HB_OFFLINE;
+
+static uint8_t OnAction_Heartbeat(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
+static uint32_t startDetection_ms;
+
+#define MAX_BT_DEVICE 10		/* max number of device which may be handled */
+static btDdeviceData_t btDeviceList[MAX_BT_DEVICE];
+static btDeviceService_t curDeviceService[10];
+static btDeviceCharacteristic_t curDevCharacteristic[10];
+static btDeviceDescriptor_t curDevDescriptor;
+
+
+static uint8_t curCharacteristicIndex = 0;
+static uint8_t curServiceIndex = 0;
+static uint8_t curBtIndex = 0;
+static uint8_t connHandle = ' ';
+static uint8_t evaluateDevIndex = 0xFF;
+static uint8_t evaluateSrvIndex = 0xFF;
+static uint8_t evaluateCharIndex = 0xFF;
+
+static void parsePulseMeasurement(uint8_t* pData, uint8_t length)
+{
+	uint8_t rawData[10];
+
+	char* enptr;
+	uint8_t flags = 0;
+	uint16_t rr = 0;
+	uint8_t index = 0;
+	uint8_t* pRaw = (uint8_t*)&rawData;
+	char tmpStr[3];
+
+	tmpStr[2] = 0;
+
+	HRMeasurement_t pulseData;
+
+	for(index = 0; index < length; index +=2)
+	{
+		memcpy(tmpStr,&pData[index],2);
+		rawData[index / 2] = strtol(tmpStr, &enptr,16);
+	}
+	flags = pRaw[0];
+	index = 1;
+    /* 0: Heart Rate Format bit (0 = UINT8, 1 = UINT16) */
+	if (flags & 0x01)
+	{
+	   	pulseData.heart_rate = pRaw[index] | (pRaw[index + 1] << 8);
+	    index += 2;
+	} else
+	{
+	  	pulseData.heart_rate = pRaw[index];
+	    index += 1;
+	}
+
+	/* 3: Energy Expended Status	*/
+	if (flags & 0x08)
+	{
+	   	pulseData.energy_expended = pRaw[index] | (pRaw[index + 1] << 8);
+	    index += 2;
+	} else
+	{
+	  	pulseData.energy_expended = 0;
+	}
+    /* 4: RR-Interval bit			*/
+	pulseData.rr_count = 0;
+	if (flags & 0x10)
+	{
+	    while (index + 1 < 4 && pulseData.rr_count < 10)
+	    {
+	        rr = pRaw[index] | (pRaw[index + 1] << 8);
+	        pulseData.rr_intervals[pulseData.rr_count++] = rr;
+	        index += 2;
+	    }
+	}
+//			snprintf(text,40,"Pulse: %d",pulseData.heart_rate);
+//			InfoLogger_writeLine((uint8_t*)text,strlen(text),0);
+}
+
+static indicatior_t checkIndicators(uint8_t* pdata)
+{
+	indicatior_t ret = NO_INDICATOR;
+
+	if(strcmp((char*)pdata,"+UBTD:") == 0)
+	{
+		ret = DEVICE_INDICATOR;
+	}
+	else if(strcmp((char*)pdata,"+UUBTACLC:") == 0)
+	{
+		ret = CONNECTION_INDICATOR;
+	}
+	else if(strcmp((char*)pdata,"+UBTGDP:") == 0)
+	{
+		ret = SERVICE_INDICATOR;
+	}
+	else if(strcmp((char*)pdata,"+UBTGDCS:") == 0)
+	{
+		ret = CHARACTERISTIC_INDICATOR;
+	}
+	else if(strcmp((char*)pdata,"+UBTGDCD:") == 0)
+	{
+		ret = DESCRIPTOR_INDICATOR;
+	}
+	else if(strcmp((char*)pdata,"+UUBTGN:") == 0)
+	{
+		ret = PULSE_INDICATOR;
+	}
+	return ret;
+}
+
+static void handleOK()
+{
+	uint8_t index = 0;
+
+	switch(heartbeatState)
+	{
+		case SENSOR_HB_ENABLE_BLE:	heartbeatState = SENSOR_HB_CHECK_CONFIG;
+							break;
+		case SENSOR_HB_CHECK_CONFIG: heartbeatState = SENSOR_HB_DISCOVER;
+							break;
+		case SENSOR_HB_RESTART: 	heartbeatState = SENSOR_HB_OFFLINE;
+							break;
+		case SENSOR_HB_DISCOVER: 	if(curBtIndex > 0)
+									{
+										heartbeatState = SENSOR_HB_CONNECT;
+										evaluateDevIndex = 0;
+									}
+									else
+									{
+										heartbeatState = SENSOR_HB_OFFLINE;
+									}
+
+							break;
+		case SENSOR_HB_SERVICES: 	evaluateSrvIndex = 0xFF;
+									if(curServiceIndex != 0)
+									{
+										for(index = 0; index <= curServiceIndex; index++)
+										{
+											if(strcmp((char*)curDeviceService[index].uuid,"180D") == 0)
+											{
+												heartbeatState = SENSOR_HB_CHARACTERISTIC;
+												evaluateSrvIndex = index;
+												curCharacteristicIndex = 0;
+												break;
+											}
+										}
+									}
+									if(evaluateSrvIndex == 0xFF)		/* device does not provide heartbeat data => disconnect */
+									{
+										heartbeatState = SENSOR_HB_DISCONNECT;
+									}
+							break;
+		case SENSOR_HB_CHARACTERISTIC:	evaluateCharIndex = 0xFF;
+										if(curCharacteristicIndex != 0)
+										{
+											for(index = 0; index < curCharacteristicIndex; index++)
+											{
+												if(strcmp((char*)curDevCharacteristic[index].uuid,"2A37") == 0)
+												{
+													heartbeatState = SENSOR_HB_DESCRIPTOR;
+													evaluateCharIndex = index;
+													break;
+												}
+											}
+										}
+										if(evaluateCharIndex == 0xFF)		/* device does not provide heartbeat data => disconnect */
+										{
+											heartbeatState = SENSOR_HB_DISCONNECT;
+										}
+							break;
+		case SENSOR_HB_DESCRIPTOR:		if(strcmp((char*)curDevDescriptor.uuid,"2902") == 0)
+										{
+											heartbeatState = SENSOR_HB_SUBSCRIBE;
+										}
+										else
+										{
+											heartbeatState = SENSOR_HB_DISCONNECT;
+										}
+							break;
+
+		case SENSOR_HB_SUBSCRIBE:		heartbeatState = SENSOR_HB_CONNECTED;
+							break;
+		case SENSOR_HB_DISCONNECT:		evaluateDevIndex++;
+										connHandle= ' ';
+										if(evaluateDevIndex < curBtIndex)	/* more devices to be evaluated? */
+										{
+											heartbeatState = SENSOR_HB_CONNECT;
+										}
+										else
+										{
+											heartbeatState = SENSOR_HB_OFFLINE;
+										}
+							break;
+		case SENSOR_HB_CONNECT:			/* handled in data rx section */
+		default:
+							break;
+	}
+}
+
+static void handleERROR()
+{
+	switch(heartbeatState)
+	{
+		case SENSOR_HB_DISCONNECT:			evaluateDevIndex++;
+											connHandle= ' ';
+											if(evaluateDevIndex < curBtIndex)	/* more devices to be evaluated? */
+											{
+												heartbeatState = SENSOR_HB_CONNECT;
+											}
+											else
+											{
+												heartbeatState = SENSOR_HB_OFFLINE;
+											}
+						break;
+		default:
+						break;
+	}
+}
+
+uint8_t cv_heartbeat_HandleData()
+{
+	static uint8_t firstDevice = 1;
+	static uint8_t curLine[MAX_CHAR_PER_LINE];			/* holds complete line and is used for logging */
+	static uint8_t curLineIndex = 0;
+	static uint8_t parameter[40];		/* content of the parameter in read state */
+	static uint8_t writeIndex = 0;
+	static uint8_t complete = 0;
+
+	static readDataType_t readType = BT_READ_NOTHING;
+
+	uint8_t data = 0;
+	data = UART_getChar();
+
+	while((data != 0) && (complete == 0))
+	{
+		if(curLineIndex == MAX_CHAR_PER_LINE - 1)		/* avoid overflow */
+		{
+			InfoLogger_writeLine(curLine,curLineIndex,0);
+			memset(curLine,0,sizeof(curLine));
+			curLineIndex = 0;
+		}
+		if((data == '\r') || (data == '\n'))
+		{
+			if(curLineIndex > 0)
+			{
+				InfoLogger_writeLine(curLine,curLineIndex,0);
+				if(strcmp((char*)curLine,"OK") == 0)
+				{
+					handleOK();
+				}
+				else
+				{
+					if(strcmp((char*)curLine,"ERROR") == 0)
+					{
+						handleERROR();
+					}
+				}
+			}
+			switch(readType)
+			{
+				case BT_READ_DEVICE_NAME: 	if(writeIndex < BLUEMOD_NAME_SIZE)
+											{
+												memcpy (btDeviceList[curBtIndex].name, parameter, writeIndex);
+											}
+								break;
+				case BT_READ_SERV_UUID: 	if((writeIndex < 50) && (curServiceIndex < 10))
+											{
+												memcpy(curDeviceService[curServiceIndex].uuid, parameter, writeIndex);
+											}
+											curServiceIndex++;
+								break;
+				case BT_READ_CHAR_UUID: 	if(writeIndex < 50)
+											{
+												memcpy(curDevCharacteristic[curCharacteristicIndex].uuid, parameter, writeIndex);
+												curCharacteristicIndex++;
+											}
+								break;
+				case BT_READ_DESC_UUID: 	if(writeIndex < 50)
+											{
+												memcpy(curDevDescriptor.uuid, parameter, writeIndex);
+											}
+								break;
+				case BT_READ_PULSE_DATA: 	if(writeIndex < 50)
+											{
+												parsePulseMeasurement(parameter, writeIndex);
+											}
+								break;
+				default:
+					break;
+			}
+			curLineIndex = 0;
+			writeIndex = 0;
+			memset(curLine,0,sizeof(curLine));
+			readType = BT_READ_NOTHING;
+		}
+		else
+		{
+			if(curLineIndex < MAX_CHAR_PER_LINE) curLine[curLineIndex++] = data;
+
+			if(data == ':')
+			{
+				switch(checkIndicators(curLine))
+				{
+					case DEVICE_INDICATOR: 		readType = BT_READ_DEVICE_ADDR;
+						break;
+					case CONNECTION_INDICATOR:  readType = BT_READ_CON_DETAILS;
+						break;
+					case SERVICE_INDICATOR: 	readType = BT_READ_SERV_HANDLE;
+						break;
+					case CHARACTERISTIC_INDICATOR: readType = BT_READ_CHAR_CONHANDLE;
+						break;
+					case DESCRIPTOR_INDICATOR: 	readType = BT_READ_DESC_CONHANDLE;
+						break;
+					case PULSE_INDICATOR:		readType = BT_READ_PULSE_CONHANDLE;
+						break;
+					default:
+						break;
+				}
+				writeIndex = 0;
+				memset(parameter,0,sizeof(parameter));
+			}
+			else
+			{
+				if(data == ',')					/* parameter end */
+				{
+					switch(readType)
+					{
+						case BT_READ_DEVICE_ADDR:  if(writeIndex < BLUEMOD_ADDR_SIZE-1)
+													{
+														if(firstDevice)
+														{
+															firstDevice = 0;
+														}
+														else
+														{
+															curBtIndex++;
+														}
+														parameter[writeIndex-1] = 0;	/*remove 'p' from address */
+														strcpy((char*)btDeviceList[curBtIndex].address, (char*)parameter);
+													}
+													readType = BT_READ_DEVICE_RSSI;
+								break;
+						case BT_READ_DEVICE_RSSI:	if(writeIndex < BLUEMOD_RSSI_SIZE-1)
+													{
+														strcpy((char*)btDeviceList[curBtIndex].rssi, (char*)parameter);
+													}
+													readType = BT_READ_DEVICE_NAME;
+								break;
+						case BT_READ_DEVICE_NAME: 	if(writeIndex < BLUEMOD_NAME_SIZE-1)
+													{
+														memcpy(btDeviceList[curBtIndex].name, parameter, writeIndex);
+													}
+													readType = BT_READ_NOTHING;
+										break;
+						case BT_READ_CON_DETAILS:	connHandle = parameter[0];
+													heartbeatState = SENSOR_HB_SERVICES;
+													readType = BT_READ_NOTHING;
+													curServiceIndex = 0;
+										break;
+						case BT_READ_SERV_HANDLE:	curDeviceService[curServiceIndex].handle = parameter[0];
+													readType = BT_READ_SERV_START;
+										break;
+						case BT_READ_SERV_START: 	if(writeIndex < 6)
+													{
+														memcpy(curDeviceService[curServiceIndex].start, parameter, writeIndex);
+													}
+													readType = BT_READ_SERV_END;
+										break;
+						case BT_READ_SERV_END: 		if(writeIndex < 6)
+													{
+														memcpy(curDeviceService[curServiceIndex].end, parameter, writeIndex);
+													}
+													readType = BT_READ_SERV_UUID;
+										break;
+						case BT_READ_CHAR_CONHANDLE: curDevCharacteristic[curCharacteristicIndex].conHandle = parameter[0];
+													 readType = BT_READ_CHAR_ATTRIBUTE;
+										break;
+						case BT_READ_CHAR_ATTRIBUTE: if(writeIndex < 10)
+													{
+														memcpy(curDevCharacteristic[curCharacteristicIndex].attrHandle, parameter, writeIndex);
+													}
+													readType = BT_READ_CHAR_PROPERTY;
+										break;
+						case BT_READ_CHAR_PROPERTY: if(writeIndex < 10)
+													{
+														memcpy(curDevCharacteristic[curCharacteristicIndex].properties, parameter, writeIndex);
+													}
+													readType = BT_READ_CHAR_VALUEHANDLE;
+										break;
+						case BT_READ_CHAR_VALUEHANDLE: if(writeIndex < 10)
+													{
+														memcpy(curDevCharacteristic[curCharacteristicIndex].valueHandle, parameter, writeIndex);
+													}
+													readType = BT_READ_CHAR_UUID;
+										break;
+						case BT_READ_DESC_CONHANDLE: curDevDescriptor.conHandle = parameter[0];
+													 readType = BT_READ_DESC_CHARHANDLE;
+										break;
+						case BT_READ_DESC_CHARHANDLE: if(writeIndex < 10)
+													{
+														memcpy(curDevDescriptor.charHandle, parameter, writeIndex);
+													}
+													readType = BT_READ_DESC_DESCHANDLE;
+										break;
+						case BT_READ_DESC_DESCHANDLE: if(writeIndex < 10)
+													{
+														memcpy(curDevDescriptor.descHandle, parameter, writeIndex);
+													}
+													readType = BT_READ_DESC_UUID;
+										break;
+						case BT_READ_PULSE_CONHANDLE: curDevDescriptor.conHandle = parameter[0];
+													  readType = BT_READ_PULSE_VALUEHANDLE;
+										break;
+						case BT_READ_PULSE_VALUEHANDLE: if(writeIndex < 10)
+														{
+											//				if(strcmp((char*)curDevCharacteristic[evaluateCharIndex].valueHandle,(char*) parameter) == 0)
+															{
+																readType = BT_READ_PULSE_DATA;
+															}
+#if 0
+															else
+															{
+																readType = BT_READ_NOTHING;
+															}
+#endif
+														}
+										break;
+						default:					readType = BT_READ_NOTHING;
+							break;
+					}
+					writeIndex = 0;
+					memset(parameter,0 , sizeof(parameter));
+				}
+				else
+				{
+					if(readType != BT_READ_NOTHING)
+					{
+						parameter[writeIndex++] = data;
+					}
+				}
+			}
+		}
+		data = UART_getChar();
+	}
+	return complete;
+}
+
+sensorHeartbeat_State_t cv_heartbeat_getState()
+{
+	return heartbeatState;
+}
+
+void openEdit_Heartbeat(void)
+{
+    char text[32];
+    snprintf(text, 32, "\001%c%c", TXT_2BYTE, TXT2BYTE_Pulse);
+    write_topline(text);
+
+    set_globalState(StMOption_Heartbeat);
+    resetMenuEdit(CLUT_MenuPageCvOption);
+
+    snprintf(text, 32, "%c%c", TXT_2BYTE, TXT2BYTE_SensorDetect);
+    write_field_button(StMOption_Heartbeat, 30, 299, ME_Y_LINE1, &FontT48, text);
+
+    write_buttonTextline(TXT2BYTE_ButtonMinus, TXT2BYTE_ButtonEnter, TXT2BYTE_ButtonPlus);
+
+    setEvent(StMOption_Heartbeat, (uint32_t)OnAction_Heartbeat);
+}
+
+static uint8_t OnAction_Heartbeat(uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
+{
+	switch(heartbeatState)
+	{
+		case SENSOR_HB_OFFLINE:
+				HAL_UART_AbortReceive_IT(&UartHandle);
+				MX_UART_BT_Init_DMA();
+				UART_StartDMARx();
+				heartbeatState = SENSOR_HB_ENABLE_BLE;
+				startDetection_ms = HAL_GetTick();
+				curBtIndex = 0;
+				memset(btDeviceList, 0, sizeof(btDeviceList));
+			break;
+
+		default:
+			break;
+	}
+    return UNSPECIFIC_RETURN;
+}
+
+void cv_heartbeat_Control(void)
+{
+	static uint8_t action = 0;
+	static uint8_t retry = 0;
+	static uint8_t lastState = 0;
+	char cmd[50];
+
+	cmd[0] = 0;
+
+	if(action == 3)
+	{
+		action = 0;
+		switch(heartbeatState)
+		{
+			case SENSOR_HB_ENABLE_BLE:	HAL_Delay(1000);
+										snprintf(cmd, sizeof(cmd), "+++" ); //"AT+UBTD=2,1,5000\r\n"
+										InfoLogger_writeLine((uint8_t*)cmd,3,1);
+										HAL_UART_Transmit(&UartHandle, (uint8_t*)cmd, 3, 5000);
+										HAL_Delay(1000);
+										cmd[0] = 0;
+				break;
+			case SENSOR_HB_CHECK_CONFIG:  snprintf(cmd, sizeof(cmd), "AT+UBTCFG=2\r\n" );	// AT+UBTLE?
+
+#if 0
+				if(settingsGetPointer()->dive_mode == DIVEMODE_OC)
+				{
+					snprintf(cmd, sizeof(cmd), "AT+UBTLE=2\r\n" ); //+UBTLE=1 //"AT+UBTD=2,1,5000\r\n"
+				}
+				else
+				{
+					snprintf(cmd, sizeof(cmd), "AT+UBTLE=3\r\n" ); //+UBTLE=1 //"AT+UBTD=2,1,5000\r\n"
+				}
+#endif
+				break;
+			case SENSOR_HB_DISCOVER:	if(lastState != SENSOR_HB_DISCOVER)
+										{
+											snprintf(cmd, sizeof(cmd), "AT+UBTD=2,1\r\n" ); //+UBTLE=1 //"AT+UBTD=2,1,5000\r\n"
+											curBtIndex = 0;
+										}
+
+										//snprintf(cmd, sizeof(cmd), "AT&W\r\n" ); //  AT+UBTD=2,1\r\n "AT+UBTD=2,1,5000\r\n"
+				break;
+#if 0
+			case SENSOR_HB_RESTART:	snprintf(cmd, sizeof(cmd), "AT+UBTD=2,1\r\n" ); //+UBTLE=1 //"AT+UBTD=2,1,5000\r\n"
+
+									//	snprintf(cmd, sizeof(cmd), "AT+CPWROFF\r\n" ); //  AT+UBTD=2,1\r\n "AT+UBTD=2,1,5000\r\n"
+				break;
+#endif
+			case SENSOR_HB_CONNECT:		if(evaluateDevIndex < curBtIndex)
+										{
+											snprintf(cmd, sizeof(cmd), "AT+UBTACLC=%s\r\n",btDeviceList[evaluateDevIndex].address);
+										}
+				break;
+			case SENSOR_HB_DISCONNECT:		snprintf(cmd, sizeof(cmd), "AT+UBTACLD=%c\r\n",connHandle);
+				break;
+			case SENSOR_HB_SERVICES:	if((connHandle >= '0') && (connHandle <= '9') && (lastState != SENSOR_HB_SERVICES))
+										{
+											snprintf(cmd, sizeof(cmd), "AT+UBTGDP=%c\r\n",connHandle);
+											memset(curDeviceService, 0, sizeof(curDeviceService));
+										}
+				break;
+			case SENSOR_HB_CHARACTERISTIC:	snprintf(cmd, sizeof(cmd), "AT+UBTGDCS=%c,%s,%s\r\n",connHandle,curDeviceService[evaluateSrvIndex].start
+																								,curDeviceService[evaluateSrvIndex].end);
+											memset(curDevCharacteristic, 0, sizeof(curDevCharacteristic));
+				break;
+			case SENSOR_HB_DESCRIPTOR: 		snprintf(cmd, sizeof(cmd), "AT+UBTGDCD=%c,%s,%s\r\n",connHandle,curDevCharacteristic[evaluateCharIndex].valueHandle
+																											,curDeviceService[evaluateSrvIndex].end);
+				break;
+			case SENSOR_HB_SUBSCRIBE: 		snprintf(cmd, sizeof(cmd), "AT+UBTGWC=%c,%s,1\r\n",connHandle,curDevDescriptor.descHandle);
+				break;
+			default:
+				break;
+		}
+		if(cmd[0] != 0)
+		{
+			{
+				InfoLogger_writeLine((uint8_t*)cmd,strlen(cmd),1);
+				HAL_UART_Transmit(&UartHandle, (uint8_t*)cmd, strlen(cmd), 5000);
+				retry++;
+				if(retry == 3)
+				{
+					heartbeatState = SENSOR_HB_OFFLINE;
+				}
+			}
+		}
+		if(lastState != heartbeatState)
+		{
+			lastState = heartbeatState;
+			retry = 0;
+		}
+	}
+	else
+	{
+		action++;
+	}
+}
+void refresh_Heartbeat(void)
+{
+	char text[32];
+	uint8_t index = 0;
+
+	snprintf(text, 32, "\001%c%c", TXT_2BYTE, TXT2BYTE_Pulse);
+	write_topline(text);
+
+	switch(heartbeatState)
+	{
+		case SENSOR_HB_OFFLINE:
+		default:							snprintf(text, 32, "%c%c", TXT_2BYTE, TXT2BYTE_SensorDetect);
+											write_label_var(30, 299, ME_Y_LINE1, &FontT48, text);
+
+	    									if(curBtIndex > 0)
+	    									{
+	    										while((index < curBtIndex) && (index < 3))
+	    										{
+													snprintf(text, 40, "%s", btDeviceList[index].address);
+													write_label_var(  30, 300,  ME_Y_LINE3 + (index * ME_Y_LINE_STEP), &FontT48, text);
+													index++;
+	    										}
+	    									}
+			break;
+		case SENSOR_HB_ENABLE_BLE:			snprintf(text, 32, "Activate BLE");
+											write_label_var(  30, 300, ME_Y_LINE1, &FontT48, text);
+			break;
+		case SENSOR_HB_DISCOVER:
+	    									snprintf(text, 32, "Searching");
+	    									write_label_var(  30, 300, ME_Y_LINE1, &FontT48, text);
+
+	    									if(curBtIndex > 0)
+	    									{
+	    										while((index < curBtIndex) && (index < 4))
+	    										{
+													snprintf(text, 40, "%s", btDeviceList[index].address);
+													write_label_var(  30, 300,  ME_Y_LINE2 + (index * ME_Y_LINE_STEP), &FontT48, text);
+													index++;
+	    										}
+	    									}
+			break;
+	}
+
+    write_buttonTextline(TXT2BYTE_ButtonMinus, TXT2BYTE_ButtonEnter, TXT2BYTE_ButtonPlus);
+}
+#endif

--- a/Discovery/Src/data_central.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Src/data_central.c	Sat Nov 15 19:29:44 2025 +0100
@@ -717,10 +717,12 @@
 
 uint32_t	CRC_CalcBlockCRC_moreThan768000(uint32_t *buffer1, uint32_t *buffer2, uint32_t words)
 {
- cm_t        crc_model;
- uint32_t      word_to_do;
- uint8_t       byte_to_do;
- int         i;
+	 cm_t        crc_model;
+	 uint32_t      word_to_do;
+	 uint8_t       byte_to_do;
+	 int         i;
+
+	 uint32_t wordCnt = 0;
  
      // Values for the STM32F generator.
  
@@ -733,10 +735,10 @@
  
      cm_ini(&crc_model);
  
-     while (words--)
+     do
      {
          // The STM32F10x hardware does 32-bit words at a time!!!
-				if(words > (768000/4))
+				if(wordCnt >= (768000/4))
 					word_to_do = *buffer2++;
 				else
 					word_to_do = *buffer1++;
@@ -765,7 +767,8 @@
  
              cm_nxt(&crc_model, byte_to_do);
          }
-     }
+         wordCnt++;
+     } while (wordCnt != words);
  
      // Return the final result.
  
@@ -843,30 +846,33 @@
 {
 	float newTarget = newHeading;
 
-	if(settingsGetPointer()->compassInertia == 0)
+	if((newHeading > 0.0) && (newHeading < 360))
 	{
-		compass_compensated = newHeading;
-	}
-	else
-	{
-		if((compass_compensated > 270.0) && (newHeading < 90.0))		/* transition passing 0 clockwise */
+		if(settingsGetPointer()->compassInertia == 0)
 		{
-			newTarget = newHeading + 360.0;
+			compass_compensated = newHeading;
 		}
+		else
+		{
+			if((compass_compensated > 270.0) && (newHeading < 90.0))		/* transition passing 0 clockwise */
+			{
+				newTarget = newHeading + 360.0;
+			}
 
-		if((compass_compensated < 90.0) && (newHeading > 270.0))		/* transition passing 0 counter clockwise */
-		{
-			newTarget = newHeading - 360.0;
-		}
+			if((compass_compensated < 90.0) && (newHeading > 270.0))		/* transition passing 0 counter clockwise */
+			{
+				newTarget = newHeading - 360.0;
+			}
 
-		compass_compensated = compass_compensated + ((newTarget - compass_compensated) / (COMPASS_FRACTION * (settingsGetPointer()->compassInertia)));
-		if(compass_compensated < 0.0)
-		{
-			compass_compensated += 360.0;
-		}
-		if(compass_compensated >= 360.0)
-		{
-			compass_compensated -= 360.0;
+			compass_compensated = compass_compensated + ((newTarget - compass_compensated) / (COMPASS_FRACTION * (settingsGetPointer()->compassInertia)));
+			if(compass_compensated < 0.0)
+			{
+				compass_compensated += 360.0;
+			}
+			if(compass_compensated >= 360.0)
+			{
+				compass_compensated -= 360.0;
+			}
 		}
 	}
 }
@@ -972,6 +978,62 @@
     return color;
 }
 
+void formatStringOfTime(char* pString, uint8_t strLen, RTC_TimeTypeDef Stime, uint8_t showAlive, uint8_t showSeconds)
+{
+    char timeSuffix[] = {0,0,0};
+    uint8_t hours;
+
+	if(strLen > 10)
+	{
+
+        hours = Stime.Hours;
+        if (settingsGetPointer()->amPMTime)
+        {
+        	timeSuffix[1] = 'M';
+    		if (Stime.Hours > 11)
+    		{
+    			timeSuffix[0] = 'P';
+    		}
+    		else
+    		{
+    			timeSuffix[0] = 'A';
+    		}
+
+    		if (Stime.Hours % 12 == 0)
+    		{
+    			hours = 12;
+    		}
+    		else
+    		{
+    			hours = (Stime.Hours % 12);
+    		}
+        }
+
+       	if(showSeconds)
+       	{
+       		if((Stime.Seconds % 2) || (!showAlive))
+       		{
+       			snprintf(pString, strLen,"%02d:%02d:%02d\016\016%s\017",hours, Stime.Minutes, Stime.Seconds,timeSuffix);
+       		}
+       		else
+       		{
+       			snprintf(pString, strLen,"%02d\031:\030%02d\031:\030%02d\016\016%s\017",hours, Stime.Minutes, Stime.Seconds,timeSuffix);
+       		}
+       	}
+       	else
+       	{
+       		if((Stime.Seconds % 2) || (!showAlive))
+       		{
+       			snprintf(pString, strLen,"%02d:%02d\016\016%s\017",hours, Stime.Minutes,timeSuffix);
+       		}
+        	else
+        	{
+        		snprintf(pString, strLen,"%02d\031:\030%02d\016\016%s\017",hours, Stime.Minutes,timeSuffix);
+        	}
+        }
+	}
+}
+
 /* returns the date in the order defined by the settings DDMMYY => X */
 void convertStringOfDate_DDMMYY(char* pString, uint8_t strLen, uint8_t day, uint8_t month, uint8_t year)
 {

--- a/Discovery/Src/data_exchange_main.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Src/data_exchange_main.c	Sat Nov 15 19:29:44 2025 +0100
@@ -412,7 +412,7 @@
 				break;
 			case SENSOR_CO2:	SensorActive[SENSOR_CO2] = 1;
 				break;
-#if defined ENABLE_GPIO_V2 || defined ENABLE_GNSS_SUPPORT
+#if defined ENABLE_GNSS_INTERNAL || defined ENABLE_GNSS_EXTERN
 			case SENSOR_GNSS:	SensorActive[SENSOR_GNSS] = 1;
 				break;
 #endif
@@ -442,12 +442,10 @@
 	}
 #endif
 
-#ifdef ENABLE_GPIO_V2
-	if(getBuzzerActivationState())
+	if((isNewDisplay()) && getBuzzerActivationState())
 	{
 		externalInterface_Cmd |= EXT_INTERFACE_BUZZER_ON;
 	}
-#endif
 
 	dataOut.data.externalInterface_Cmd = externalInterface_Cmd;
 	externalInterface_Cmd = 0;
@@ -468,7 +466,11 @@
 		dataOut.revisionHardware = 0xFF;
 		dataOut.revisionCRCx0x7A = 0xFF;
 	}
-	
+	if(isNewDisplay())
+	{
+		dataOut.displayVersion = 1;
+	}
+
 	if(DataEX_check_header_and_footer_ok() && !told_reset_logik_alles_ok)
 	{
 		MX_tell_reset_logik_alles_ok();
@@ -847,8 +849,7 @@
 	SDiveState *pStateReal = stateRealGetPointerWrite();
 	uint8_t idx;
 	float meter = 0;
-	SSettings *pSettings;
-	
+
 #ifdef ENABLE_EXTERNAL_PRESSURE
     float CO2Corr = 0.0;
 #endif
@@ -912,6 +913,7 @@
 		}
 	}
 
+	SSettings *pSettings = settingsGetPointer();
 	if((requestNecessary.uw != 0) && (dataIn.confirmRequest.uw != 0))
 	{
 		if(((dataIn.confirmRequest.uw) & CRBUTTON) != 0)
@@ -949,14 +951,12 @@
 
 		if(requestNecessary.ub.button == 1)	/* send button values to RTE */
 		{
-			setButtonResponsiveness(settingsGetPointer()->ButtonResponsiveness);
+			setButtonResponsiveness(pSettings->ButtonResponsiveness);
 		}
 	}
 
 	/*	uint8_t IAmStolenPleaseKillMe;
 	 */
-	pSettings = settingsGetPointer();
-
 	if(pSettings->IAmStolenPleaseKillMe > 3)
 	{
 		pSettings->salinity = 0;
@@ -1044,7 +1044,7 @@
             disableTimer();
 
 				// new 170508
-			settingsGetPointer()->bluetoothActive = 0;
+			pSettings->bluetoothActive = 0;
 			MX_Bluetooth_PowerOff();
 			//Init dive Mode
 			decoLock = DECO_CALC_init_as_is_start_of_dive;
@@ -1374,3 +1374,12 @@
 	return;
 }
 
+bool isScrubberTimerEnabled(const SSettings *settings)
+{
+	return settings->scrubberActiveId != 0x00 && isLoopMode(settings->dive_mode);
+}
+
+bool isScrubberTimerRunning(const SDiveState *diveState, const SSettings *settings)
+{
+	return isScrubberTimerEnabled(settings) && diveState->mode == MODE_DIVE && isLoopMode(diveState->diveSettings.diveMode);
+}

--- a/Discovery/Src/demo.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Src/demo.c	Sat Nov 15 19:29:44 2025 +0100
@@ -28,6 +28,8 @@
 #include "data_exchange_main.h" // for time_elapsed_ms()
 #include "settings.h"
 #include "ostc.h"
+#include "tInfoLogger.h"
+#include <string.h>
 
 #ifndef DEMOMODE
 
@@ -425,5 +427,62 @@
 
 #endif // DEMO
 
+#ifdef ENABLE_USART_RADIO				/* debug function to check receiption of radio data */
+void demo_HandleData(void)
+{
+	static uint8_t comStarted = 0;
+	static uint8_t text[50];
+	static uint8_t index = 0;
+	static uint32_t startTick = 0;
+	static uint8_t firstData = 1;
+	uint8_t data = 0;
+
+	switch(comStarted)
+	{
+		case 0: 	startTick = HAL_GetTick();
+					comStarted++;
+				break;
+		case 1:		if(time_elapsed_ms(startTick, HAL_GetTick()) > 5000)
+					{
+						MX_UART_RADIO_Init_DMA();
+						UART_StartDMARxRadio();
+						comStarted++;
+						sprintf((char*)text,"RadioStarted");
+						InfoLogger_writeLine(text,strlen((char*)text),1);
+					}
+			break;
+		case 2:				data = UART_getChar();
+							if(data != 0)
+							{
+								if(firstData)
+								{
+									firstData = 0;
+									sprintf((char*)text,"FirstData");
+									InfoLogger_writeLine(text,strlen((char*)text),1);
+								}
+								if((index == 50) || (data =='r')  || (data =='n'))
+								{
+									if(index > 0)
+									{
+										InfoLogger_writeLine(text,index,0);
+										index = 0;
+									}
+								}
+								else
+								{
+									text[index++] = data;
+								}
+							}
+			break;
+		default:
+			break;
+	}
+
+
+	{
+	}
+}
+#endif
+
 
 /************************ (C) COPYRIGHT heinrichs weikamp *****END OF FILE****/

--- a/Discovery/Src/display.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Src/display.c	Sat Nov 15 19:29:44 2025 +0100
@@ -407,7 +407,7 @@
 	aTxBuffer[1] = OLED_VFP_SET_13h;
 	send((uint8_t*)aTxBuffer, 2);
 	aTxBuffer[0] = 0x72;
-	aTxBuffer[1] = 0x08;
+	aTxBuffer[1] = 0x0C;
 	send((uint8_t*)aTxBuffer, 2);
 
 	aTxBuffer[0] = 0x70;

--- a/Discovery/Src/externLogbookFlash.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Src/externLogbookFlash.c	Sat Nov 15 19:29:44 2025 +0100
@@ -84,17 +84,6 @@
 
 #define HEADER2OFFSET 0x400
 
-typedef enum{
-	EF_HEADER,
-	EF_SAMPLE,
-	EF_DEVICEDATA,
-	EF_VPMDATA,
-	EF_SETTINGS,
-	EF_FIRMWARE,
-	EF_FIRMWARE2,
-}which_ring_enum;
-
-
 typedef struct{
 uint8_t IsBusy:1;
 uint8_t IsWriteEnabled:1;
@@ -130,6 +119,7 @@
 static uint32_t	actualPointerDevicedata = DDSTART;
 static uint32_t	actualPointerVPM = 0;
 static uint32_t	actualPointerSettings = SETTINGSSTART;
+static uint32_t	actualPointerProfile = PROFILE0_START;
 static uint32_t	actualPointerFirmware = 0;
 static uint32_t	actualPointerFirmware2 = 0;
 
@@ -344,7 +334,11 @@
 		}
 		else if(pSample2)
 		{
-			actualAddress += length1;
+			/* actualAddress += length1; do dummy read to get EEPROM to the correct address */
+			for(uint32_t i = 0; i<length1; i++)
+			{
+				ext_flash_read_block(&pSample2[0], EF_FIRMWARE2);
+			}
 			for(uint32_t i = 0; i<length2; i++)
 			{
 				ext_flash_read_block(&pSample2[i], EF_FIRMWARE2);
@@ -527,28 +521,44 @@
 	return;
 }
 #else
-void ext_flash_write_settings(uint8_t resetRing)
+void ext_flash_write_settings(uint8_t whichSettings, uint8_t resetRing)
 {
-	uint8_t *pData;
+	SSettings *pSettings;
 	const uint16_t length = sizeof(SSettings);
 	uint8_t length_lo, length_hi;
 	uint8_t dataLength[2] = { 0 };
 
+	pSettings = settingsGetPointer();
+
 	ext_flash_disable_protection();
 
-	if(stateRealGetPointer()->lastKnownBatteryPercentage)
+	switch (whichSettings)
 	{
-		settingsGetPointer()->lastKnownBatteryPercentage = stateRealGetPointer()->lastKnownBatteryPercentage;
-	}
-	settingsGetPointer()->backup_localtime_rtc_tr = stateRealGetPointer()->lifeData.timeBinaryFormat;
-	settingsGetPointer()->backup_localtime_rtc_dr = stateRealGetPointer()->lifeData.dateBinaryFormat;
-
-	pData = (uint8_t *)settingsGetPointer();
-
-	/* Reset the Ring to the start address if requested (e.g. because we write the default block during shutdown) */
-	if((resetRing) || ((actualPointerSettings + length) >= SETTINGSSTOP))
-	{
-		actualPointerSettings = SETTINGSSTART;
+		default:
+		case EF_SETTINGS:		if(stateRealGetPointer()->lastKnownBatteryPercentage)
+								{
+									pSettings->lastKnownBatteryPercentage = stateRealGetPointer()->lastKnownBatteryPercentage;
+								}
+								pSettings->backup_localtime_rtc_tr = stateRealGetPointer()->lifeData.timeBinaryFormat;
+								pSettings->backup_localtime_rtc_dr = stateRealGetPointer()->lifeData.dateBinaryFormat;
+								/* Reset the Ring to the start address if requested (e.g. because we write the default block during shutdown) */
+								if((resetRing) || ((actualPointerSettings + length) >= SETTINGSSTOP))
+								{
+									actualPointerSettings = SETTINGSSTART;
+								}
+			break;
+		case EF_PROFILE0:		actualPointerProfile = PROFILE0_START;
+								pSettings = profileGetPointer(0);
+			break;
+		case EF_PROFILE1:		actualPointerProfile = PROFILE1_START;
+								pSettings = profileGetPointer(1);
+			break;
+		case EF_PROFILE2:		actualPointerProfile = PROFILE2_START;
+								pSettings = profileGetPointer(2);
+			break;
+		case EF_PROFILE3:		actualPointerProfile = PROFILE3_START;
+								pSettings = profileGetPointer(3);
+			break;
 	}
 
 	length_lo = (uint8_t)(length & 0xFF);
@@ -556,8 +566,8 @@
 	dataLength[0] = length_lo;
 	dataLength[1] = length_hi;
 
-	ef_write_block(dataLength,2, EF_SETTINGS, 0);
-	ef_write_block(pData,length, EF_SETTINGS, 0);
+	ef_write_block(dataLength,2, whichSettings, 0);
+	ef_write_block((uint8_t*)pSettings,length, whichSettings, 0);
 //	ext_flash_enable_protection();
 }
 #endif
@@ -570,7 +580,7 @@
  * new settings should be fine as they are added
  * and loaded before calling this function
  */
-uint8_t ext_flash_read_settings(void)
+uint8_t ext_flash_read_settings(uint8_t whichSettings)
 {
 	uint8_t returnValue = HAL_BUSY;
 	uint8_t exit = 0;
@@ -579,69 +589,90 @@
 	uint8_t length_lo, length_hi;
 	uint16_t lengthOnEEPROM;
 	uint32_t header;
-	SSettings *pSettings = settingsGetPointer();
-
-	actualAddress = SETTINGSSTART;
+	SSettings* pSettings = settingsGetPointer();
 
-	ext_flash_read_block_start();
-	ext_flash_read_block(&length_lo, EF_SETTINGS);
-	ext_flash_read_block(&length_hi, EF_SETTINGS);
-	
-	while ((length_lo != 0xFF) && (length_hi != 0xFF) && (exit == 0))		/* get the latest stored setting block */
+	switch(whichSettings)
+	{
+		case EF_SETTINGS:	pSettings = settingsGetPointer();
+							actualAddress = SETTINGSSTART;
+			break;
+		case EF_PROFILE0:	pSettings = profileGetPointer(0);
+							actualAddress = PROFILE0_START;
+			break;
+		case EF_PROFILE1:	pSettings = profileGetPointer(1);
+							actualAddress = PROFILE1_START;
+					break;
+		case EF_PROFILE2:	pSettings = profileGetPointer(2);
+							actualAddress = PROFILE2_START;
+					break;
+		case EF_PROFILE3:	pSettings = profileGetPointer(3);
+							actualAddress = PROFILE3_START;
+					break;
+		default: returnValue = HAL_ERROR;
+	}
+
+	if(returnValue != HAL_ERROR)
 	{
-		lengthOnEEPROM = length_hi * 256;
-		lengthOnEEPROM += length_lo;
-		if(lengthOnEEPROM <= lengthStandardNow) 			/* EEPROM Header size equal or smaller => settings constant or upgraded */
+		ext_flash_read_block_start();
+		ext_flash_read_block(&length_lo, whichSettings);
+		ext_flash_read_block(&length_hi, whichSettings);
+
+		while ((length_lo != 0xFF) && (length_hi != 0xFF) && (exit == 0))		/* get the latest stored setting block */
 		{
-			ext_flash_read_block_multi(&header, 4, EF_SETTINGS);
-			if((header <= pSettings->header) && (header >= pSettings->updateSettingsAllowedFromHeader))	/* check to allow update of header */
+			lengthOnEEPROM = length_hi * 256;
+			lengthOnEEPROM += length_lo;
+			if(lengthOnEEPROM <= lengthStandardNow) 			/* EEPROM Header size equal or smaller => settings constant or upgraded */
 			{
-				returnValue = HAL_OK;
-				pSettings->header = header;
-				pData = (uint8_t *)pSettings + 4; /* header */
-				for(uint16_t i = 0; i < (lengthOnEEPROM-4); i++)
-					ext_flash_read_block(&pData[i], EF_SETTINGS);
-				if(header != pSettings->header)				/* setting layout changed => no additional setting sets expected */
+				ext_flash_read_block_multi(&header, 4, whichSettings);
+				if((header <= pSettings->header) && (header >= pSettings->updateSettingsAllowedFromHeader))	/* check to allow update of header */
 				{
+					returnValue = HAL_OK;
+					pSettings->header = header;
+					pData = (uint8_t *)pSettings + 4; /* header */
+					for(uint16_t i = 0; i < (lengthOnEEPROM-4); i++)
+						ext_flash_read_block(&pData[i], whichSettings);
+					if(header != pSettings->header)				/* setting layout changed => no additional setting sets expected */
+					{
+						exit = 1;
+					}
+				}
+				else
+				{
+					returnValue = HAL_ERROR;
 					exit = 1;
 				}
 			}
-			else
+			else											/* size of settings decreased => possible downgrade of firmware */
 			{
-				returnValue = HAL_ERROR;
+				ext_flash_read_block_multi(&header, 4, whichSettings);
+
+				if(header > 0xFFFF0014)						/* verify that new (old) header should be compatible (only less bytes, no change in layout) */
+				{
+					returnValue = HAL_OK;
+					pSettings->header = header;
+					pData = (uint8_t *)pSettings + 4; /* header */
+					for(uint16_t i = 0; i < (lengthStandardNow-4); i++) 		/* only read the data fitting into the structure */
+						ext_flash_read_block(&pData[i], whichSettings);
+				}
+				else
+				{
+					returnValue = HAL_ERROR;
+				}
 				exit = 1;
 			}
+			ext_flash_read_block(&length_lo, whichSettings);
+			ext_flash_read_block(&length_hi, whichSettings);
 		}
-		else											/* size of settings decreased => possible downgrade of firmware */
-		{
-			ext_flash_read_block_multi(&header, 4, EF_SETTINGS);
+		ext_flash_decf_address_ring(whichSettings);				/* set pointer back to empty address */
+		ext_flash_decf_address_ring(whichSettings);
+		ext_flash_read_block_stop();
 
-			if(header > 0xFFFF0014)						/* verify that new (old) header should be compatible (only less bytes, no change in layout) */
-			{
-				returnValue = HAL_OK;
-				pSettings->header = header;
-				pData = (uint8_t *)pSettings + 4; /* header */
-				for(uint16_t i = 0; i < (lengthStandardNow-4); i++) 		/* only read the data fitting into the structure */
-					ext_flash_read_block(&pData[i], EF_SETTINGS);
-			}
-			else
-			{
-				returnValue = HAL_ERROR;
-			}
-			exit = 1;
+		if(actualAddress > actualPointerSettings)				/* the write pointer has not yet been set up probably */
+		{
+			actualPointerSettings = actualAddress;
 		}
-		ext_flash_read_block(&length_lo, EF_SETTINGS);
-		ext_flash_read_block(&length_hi, EF_SETTINGS);
+		ext_flash_read_block_stop();
 	}
-	ext_flash_decf_address_ring(EF_SETTINGS);				/* set pointer back to empty address */
-	ext_flash_decf_address_ring(EF_SETTINGS);
-	ext_flash_read_block_stop();
-
-	if(actualAddress > actualPointerSettings)				/* the write pointer has not yet been set up probably */
-	{
-		actualPointerSettings = actualAddress;
-	}
-	ext_flash_read_block_stop();
 	return returnValue;
 }
 
@@ -1851,6 +1882,13 @@
 			ringStart = FWSTART2;
 			ringStop = FWSTOP2;
 			break;
+		case EF_PROFILE0:
+		case EF_PROFILE1:
+		case EF_PROFILE2:
+		case EF_PROFILE3:	actualAddress = actualPointerProfile;
+							ringStart = PROFILE0_START;
+							ringStop = PROFILE3_STOP;
+			break;
 		default:
 			ringStart = FLASHSTART;
 			ringStop = FLASHSTOP;
@@ -1932,6 +1970,11 @@
 		case EF_FIRMWARE2:
 			actualPointerFirmware2 = actualAddress;
 			break;
+		case EF_PROFILE0:
+		case EF_PROFILE1:
+		case EF_PROFILE2:
+		case EF_PROFILE3:	actualPointerProfile = actualAddress;
+			break;
 		default:
 			break;
 	}
@@ -1996,6 +2039,13 @@
 			ringStart = SETTINGSSTART;
 			ringStop = SETTINGSSTOP;
 			break;
+		case EF_PROFILE0:
+		case EF_PROFILE1:
+		case EF_PROFILE2:
+		case EF_PROFILE3:	ringStart = PROFILE0_START;
+							ringStop = PROFILE3_STOP;
+			break;
+
 		default:
 			ringStart = FLASHSTART;
 			ringStop = FLASHSTOP;
@@ -2145,6 +2195,12 @@
 			ringStart = FWSTART2;
 			ringStop = FWSTOP2;
 			break;
+		case EF_PROFILE0:
+		case EF_PROFILE1:
+		case EF_PROFILE2:
+		case EF_PROFILE3:	ringStart = PROFILE0_START;
+							ringStop = PROFILE3_STOP;
+			break;
 		default:
 			ringStart = FLASHSTART;
 			ringStop = FLASHSTOP;
@@ -2190,6 +2246,13 @@
 			ringStart = FWSTART2;
 			ringStop = FWSTOP2;
 			break;
+		case EF_PROFILE0:
+		case EF_PROFILE1:
+		case EF_PROFILE2:
+		case EF_PROFILE3:	ringStart = PROFILE0_START;
+							ringStop = PROFILE3_STOP;
+			break;
+
 		default:
 			ringStart = FLASHSTART;
 			ringStop = FLASHSTOP;

--- a/Discovery/Src/gfx_colors.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Src/gfx_colors.c	Sat Nov 15 19:29:44 2025 +0100
@@ -89,8 +89,8 @@
 	0x00AC00ff,//0x00E5AE18, // CLUT_MenuPageHardware
 	0x00ff00ff,//0x00E5AEFF, // CLUT_MenuPageSystem 
 	0x00FF55FF,//0x00FFFF00, // CLUT_MenuPageCustomView
+	0x00FFAAFF, // CLUT_MenuPageCVOption
 	0x00C4EACC, // CLUT_MenuPageDivePlanner
-	0x00000000, // CLUT_MenuPage10 - UNUSED
 	0x00FFFFFF, // CLUT_ButtonSymbols
 	0x000092D0, // CLUT_InfoSurface
 	0x000092D0, // CLUT_InfoDive - UNUSED

--- a/Discovery/Src/gfx_engine.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Src/gfx_engine.c	Sat Nov 15 19:29:44 2025 +0100
@@ -1075,7 +1075,7 @@
 
 
 /* this is NOT fast nor optimized */
-static void GFX_draw_pixel(GFX_DrawCfgScreen *hgfx, int16_t x, int16_t y, uint8_t color)
+void GFX_draw_pixel(GFX_DrawCfgScreen *hgfx, int16_t x, int16_t y, uint8_t color)
 {
 	uint16_t* pDestination;
 
@@ -3483,7 +3483,7 @@
 
 #define		Vsync_d1	2
 #define		VFP_d1		4	// make sure this value * VSYNC is also set in display.c for OLED_VFP_SET
-#define		VBP_d1		4	// make sure this value * VSYNC is also set in display.c for OLED_VBP_SET
+#define		VBP_d1		6	// make sure this value * VSYNC is also set in display.c for OLED_VBP_SET
 
   /* Horizontal synchronization width = Hsync - 1 */
   LtdcHandle.Init.HorizontalSync = Hsync_d1 - 1;
@@ -3828,7 +3828,7 @@
 		hgfx.WindowX1 = 779;
 		if(Font == &FontT24)
 		{
-			hgfx.WindowX0 = hgfx.WindowX1 - (Font->spacesize*3);
+			hgfx.WindowX0 = hgfx.WindowX1 - (Font->spacesize*7);
 		}
 		else
 		{

--- a/Discovery/Src/logbook.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Src/logbook.c	Sat Nov 15 19:29:44 2025 +0100
@@ -67,6 +67,9 @@
 #define DEFAULT_SAMPLES	(100)	/* Number of sample data bytes in case of an broken header information */
 #define DUMMY_SAMPLES	(1000)	/* Maximum number of samples profided by a dummy dive profile */
 
+#define SCRUBBER_ERROR_FLAG 0x4000
+#define SCRUBBER_WARNING_FLAG 0x2000
+
 typedef struct /* don't forget to adjust void clear_divisor(void) */
 {
 	uint8_t temperature;
@@ -467,6 +470,10 @@
             eventByte1.ub.bit7 = 1;
             eventByte2.ub.bit2 = 1;
     }
+    if (state->events.scrubberState) {
+        eventByte1.ub.bit7 = 1;
+        eventByte2.ub.bit3 = 1;
+    }
 
     //Add EventByte 1
     if(eventByte1.uw > 0)
@@ -510,8 +517,9 @@
     }
     if (state->events.compassHeadingUpdate) {
         // New heading and type of heading
-        sample[length++] = state->events.info_compassHeadingUpdate & 0xFF;
-        sample[length++] = (state->events.info_compassHeadingUpdate & 0xFF00) >> 8;
+        pdata = (uint8_t*)&state->events.info_compassHeadingUpdate;
+        sample[length++] = *pdata++;
+        sample[length++] = *pdata++;
     }
     if (state->events.gnssPositionUpdate) {
     	pdata = (uint8_t*)&state->events.info_gnssPosition.fLon;
@@ -525,6 +533,11 @@
         sample[length++] = *pdata++;
         sample[length++] = *pdata++;
     }
+    if (state->events.scrubberState) {
+        pdata = (uint8_t*)&state->events.info_scrubberState;
+        sample[length++] = *pdata++;
+        sample[length++] = *pdata++;
+    }
 
     if(divisor.temperature == 0)
     {
@@ -706,7 +719,7 @@
   */
 static uint16_t readSample(int32_t* depth, int16_t * gasid, int16_t* setpoint_cbar, int32_t* temperature, int32_t* sensor1, int32_t* sensor2,
 						   int32_t* sensor3, int32_t* cns, SManualGas* manualGas, int16_t* bailout, int16_t* decostopDepth, uint16_t* tank,
-						   SGnssCoord* pPosition, uint8_t* event)
+						   uint16_t* compassHeading, SGnssCoord* pPosition, uint16_t* scrubberState, uint8_t* event)
 {
 	int length = 0;
 	_Bool bEvent = 0;
@@ -740,6 +753,12 @@
   if(tank)
 	  *tank = 0;
 
+  if (compassHeading)
+    *compassHeading = UINT16_MAX;
+
+  if (scrubberState)
+    *scrubberState = UINT16_MAX;
+
   if(manualGas)
   {
     manualGas->percentageO2 =-1;
@@ -836,6 +855,14 @@
 				if(gasid)
 						*gasid = 0;
 			}
+
+            // Compass heading
+            if (eventByte2.ub.bit1) {
+                ext_flash_read_next_sample_part((uint8_t*)compassHeading, 2);
+                bytesRead += 2;
+                length -= 2;
+            }
+
 			/* gnss position start dive */
 			if(eventByte2.ub.bit2)
 			{
@@ -864,6 +891,13 @@
 					memcpy(&pPosition->fLat, &tempU32, 4);
 				}
 			}
+
+            // Scrubber state
+            if (eventByte2.ub.bit3) {
+                ext_flash_read_next_sample_part((uint8_t*)scrubberState, 2);
+                bytesRead += 2;
+                length -= 2;
+            }
 	}
 
 	if(divisor.temperature == 0)
@@ -1006,7 +1040,7 @@
   */
 uint16_t logbook_readSampleData(uint8_t StepBackwards, uint16_t length,uint16_t* depth, uint8_t*  gasid, int16_t* temperature, uint16_t* ppo2,
 							    uint16_t* setpoint, uint16_t* sensor1, uint16_t* sensor2, uint16_t* sensor3, uint16_t* cns, uint8_t* bailout,
-								uint16_t* decostopDepth, uint16_t* tank, SGnssCoord* pPosition, uint8_t* event)
+								uint16_t* decostopDepth, uint16_t* tank, uint16_t* compassHeading, SGnssCoord* pPosition, uint16_t* scrubberState, uint8_t* event)
 {
      //Test read
     //SLogbookHeader header;
@@ -1043,6 +1077,10 @@
 	uint16_t tankVal = 0;
 	uint32_t small_profileLength = 0;
 	uint8_t eventdata;
+    uint16_t compassHeadingVal;
+    uint16_t compassHeadingLast = UINT16_MAX;
+    uint16_t scrubberStateVal;
+    uint16_t scrubberStateLast = UINT16_MAX;
 	SGnssCoord posCoord;
 	posCoord.fLat = 0.0;
 	posCoord.fLon = 0.0;
@@ -1126,7 +1164,7 @@
 				ext_flash_set_entry_point();
 				divisorBackup = divisor;
 				retVal = readSample(&depthVal,&gasidVal, &setPointVal, &temperatureVal, &sensor1Val, &sensor2Val, &sensor3Val, &cnsVal, &manualGasVal,
-									&bailoutVal, &decostepDepthVal, &tankVal, &posCoord, &eventdata);
+									&bailoutVal, &decostepDepthVal, &tankVal, &compassHeadingVal, &posCoord, &scrubberStateVal, &eventdata);
 
 				if(retVal == 0)
 				{
@@ -1134,7 +1172,7 @@
 						ext_flash_reopen_read_sample_at_entry_point();
 						divisor = divisorBackup;
 						retVal = readSample(&depthVal,&gasidVal,&setPointVal, &temperatureVal, &sensor1Val, &sensor2Val, &sensor3Val, &cnsVal,
-											&manualGasVal, &bailoutVal, &decostepDepthVal, &tankVal, &posCoord, &eventdata);
+											&manualGasVal, &bailoutVal, &decostepDepthVal, &tankVal, &compassHeadingVal, &posCoord, &scrubberStateVal, &eventdata);
 
 						if(retVal == 0)
 								break;
@@ -1201,6 +1239,16 @@
 				else
 						decostepDepthLast = decostepDepthVal;
 
+				if (compassHeadingVal == UINT16_MAX)
+						compassHeadingVal = compassHeadingLast;
+				else
+						compassHeadingLast = compassHeadingVal;
+
+				if (scrubberStateVal == UINT16_MAX)
+						scrubberStateVal = scrubberStateLast;
+				else
+						scrubberStateLast = scrubberStateVal;
+
 				counter++;
 				// Heed compression
 				// Write here to arrays
@@ -1264,6 +1312,13 @@
 						sensor2[iNum] = (sensor2Val / 0xFFFF) & 0xFF;
 					if(sensor3)
 						sensor3[iNum] = (sensor3Val / 0xFFFF) & 0xFF;
+
+                    if (compassHeading)
+                        compassHeading[iNum] = compassHeadingVal;
+
+                    if (scrubberState)
+                        scrubberState[iNum] = scrubberStateVal;
+
 					iNum++;
 					counter = 0;
 
@@ -1274,6 +1329,7 @@
 					}
 				}
 		}
+
 		if(pPosition)
 		{
 			memcpy(pPosition, &posCoord, sizeof(posCoord));
@@ -1321,8 +1377,23 @@
 		{
 			//InitdiveProfile
 			pSettings->totalDiveCounter++;
-			logbook_initNewdiveProfile(pStateReal,settingsGetPointer());
+			logbook_initNewdiveProfile(pStateReal, pSettings);
 			min_temperature_float_celsius = pStateReal->lifeData.temperature_celsius;
+            if (isScrubberTimerRunning(pStateReal, pSettings)) {
+                int16_t maxScrubberTime = INT16_MIN;
+                SScrubberData *longestScrubberData = NULL;
+                for (unsigned timerId = 0; timerId < 2; timerId++) {
+                    if (pSettings->scrubberActiveId & (1 << timerId)) {
+                        SScrubberData *scrubberData = &pStateReal->scrubberDataDive[timerId];
+                        if (scrubberData->TimerCur > maxScrubberTime) {
+                            maxScrubberTime = scrubberData->TimerCur;
+                            longestScrubberData = scrubberData;
+                        }
+                    }
+                }
+
+                logScrubberState(longestScrubberData);
+            }
 
 			//Write logbook sample
 			logbook_writeSample(pStateReal);
@@ -1355,13 +1426,13 @@
 				{
 					pSettings->logbookOffset++;
 				}
-				ext_flash_write_settings(0);
+				ext_flash_write_settings(EF_SETTINGS,0);
 				ext_flash_disable_protection_for_logbook();
 
 				ext_flash_CloseSector();	/* this is just a repair function which invalidates a not used sector in case a log maintenance was called before dive */
 				bDiveMode = 3;
 
-#if defined ENABLE_GNSS_SUPPORT || defined ENABLE_GPIO_V2
+#if defined ENABLE_GNSS_INTERN || defined ENABLE_GNSS_EXTERN
 			pStateReal->events.gnssPositionUpdate = 1;
 
 			if(pStateReal->lifeData.gnssData.alive & GNSS_ALIVE_BACKUP_POS)
@@ -1873,7 +1944,9 @@
     int16_t decostepDepthVal = 0;
 	uint16_t tankVal = 0;
 	uint8_t eventdata;
+    uint16_t compassHeadingVal;
 	SGnssCoord posCoord;
+    uint16_t scrubberStateVal;
 
 		//uint16_t* ppo2, uint16_t* cns#
      uint32_t bytesRead = 0;
@@ -1894,21 +1967,21 @@
         ext_flash_set_entry_point();
         divisorBackup = divisor;
 		retVal = readSample(&depthVal,&gasidVal, &setPointVal, &temperatureVal, &sensor1Val, &sensor2Val, &sensor3Val, &cnsVal, &manualGasVal,
-							&bailoutVal, &decostepDepthVal,&tankVal, &posCoord, &eventdata);
+							&bailoutVal, &decostepDepthVal, &tankVal, &compassHeadingVal, &posCoord, &scrubberStateVal, &eventdata);
         if(retVal == 0)
         {
           //Error try to read again!!!
           ext_flash_reopen_read_sample_at_entry_point();
           divisor = divisorBackup;
 		  retVal = readSample(&depthVal,&gasidVal, &setPointVal, &temperatureVal, &sensor1Val, &sensor2Val, &sensor3Val, &cnsVal, &manualGasVal,
-								&bailoutVal, &decostepDepthVal, &tankVal, &posCoord, &eventdata);
+								&bailoutVal, &decostepDepthVal, &tankVal, &compassHeadingVal, &posCoord, &scrubberStateVal, &eventdata);
           if(retVal == 0)
           {
               //Error try to read again!!!
               ext_flash_reopen_read_sample_at_entry_point();
               divisor = divisorBackup;
 			  retVal = readSample(&depthVal,&gasidVal, &setPointVal, &temperatureVal, &sensor1Val, &sensor2Val, &sensor3Val, &cnsVal, &manualGasVal,
-				 				&bailoutVal, &decostepDepthVal,&tankVal, &posCoord, &eventdata);
+				 				&bailoutVal, &decostepDepthVal, &tankVal, &compassHeadingVal, &posCoord, &scrubberStateVal, &eventdata);
               if(retVal == 0)
               {
                 ext_flash_reopen_read_sample_at_entry_point();
@@ -2146,5 +2219,19 @@
 	dummyReadIdx += length;
 }
 
+void logScrubberState(const SScrubberData *scrubberData)
+{
+    uint16_t scrubberState = scrubberData->TimerCur & 0x0FFF; // truncate to 12 bit
+    if (isScrubberError(scrubberData)) {
+        scrubberState |= SCRUBBER_ERROR_FLAG;
+    }
+
+    if (isScrubberWarning(scrubberData)) {
+        scrubberState |= SCRUBBER_WARNING_FLAG;
+    }
+
+    stateUsedWrite->events.scrubberState = 1;
+    stateUsedWrite->events.info_scrubberState = scrubberState;
+}
 
 /************************ (C) COPYRIGHT heinrichs weikamp *****END OF FILE****/

--- a/Discovery/Src/logbook_miniLive.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Src/logbook_miniLive.c	Sat Nov 15 19:29:44 2025 +0100
@@ -367,7 +367,7 @@
     	ReplayDataOffset = StepBackwards;
 		logbook_getHeader(StepBackwards ,&logbookHeader);
 
-		dataLength = logbook_readSampleData(StepBackwards, DEPTH_DATA_LENGTH, ReplayDepthData,NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ReplayMarkerData);
+		dataLength = logbook_readSampleData(StepBackwards, DEPTH_DATA_LENGTH, ReplayDepthData,NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ReplayMarkerData);
 
 	/* check if a marker is provided. If not disable marker functionality for the replay block */
 		for(index = 0; index < dataLength; index++)

--- a/Discovery/Src/ostc.c	Sun Nov 02 19:30:58 2025 +0100
+++ b/Discovery/Src/ostc.c	Sat Nov 15 19:29:44 2025 +0100
@@ -27,8 +27,10 @@
 //////////////////////////////////////////////////////////////////////////////
 
 /* Includes ------------------------------------------------------------------*/
+#include "configuration.h"
 #include "ostc.h"
 #include "stm32f4xx_hal.h"
+#include "cv_heartbeat.h"
 
 #ifndef BOOTLOADER_STANDALONE
 #include "tCCR.h"
@@ -45,6 +47,10 @@
 #endif
 UART_HandleTypeDef UartIR_HUD_Handle;
 
+#ifdef ENABLE_USART_RADIO
+UART_HandleTypeDef UartRadio_Handle;
+#endif
+
 __IO ITStatus UartReady = RESET;
 __IO ITStatus UartReadyHUD = RESET;
 
@@ -54,6 +60,19 @@
 
 /* Private variables with external access via get_xxx() function -------------*/
 static uint8_t	hardwareDisplay = 0;		//< either OSTC4 LCD (=0) or new Screen (=1)
+
+#ifdef ENABLE_PULSE_SENSOR_BT
+static DMA_HandleTypeDef  hdma_uart_BT_rx;
+#endif
+
+#ifdef ENABLE_USART_RADIO
+static DMA_HandleTypeDef  hdma_uart_radio_rx;
+#endif
+
+static uint16_t rxBufRead = 0;
+static uint16_t rxBufWrite = 0;
+static uint8_t rxBufferUart[CHUNK_SIZE * CHUNKS_PER_BUFFER];		/* The complete buffer has a X * chunk size to allow variations in buffer read time */
+
 /* Private function prototypes -----------------------------------------------*/
 
 /* Exported functions --------------------------------------------------------*/
@@ -138,7 +157,10 @@
     SMALLCPU_CSB_GPIO_ENABLE();
     OSCILLOSCOPE_GPIO_ENABLE();
     OSCILLOSCOPE2_GPIO_ENABLE();
-    BLE_UBLOX_DSR_GPIO_ENABLE();
+    if(isNewDisplay())
+    {
+    	BLE_UBLOX_DSR_GPIO_ENABLE();
+    }
 
     GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
     GPIO_InitStruct.Pull = GPIO_PULLUP;
@@ -232,12 +254,15 @@
     HAL_GPIO_Init(BLE_NENABLE_GPIO_PORT, &GPIO_InitStruct);
     HAL_GPIO_WritePin(BLE_NENABLE_GPIO_PORT,BLE_NENABLE_PIN,GPIO_PIN_RESET);
 
-    GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-    GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-    GPIO_InitStruct.Speed = GPIO_SPEED_LOW;
-    GPIO_InitStruct.Pin = BLE_UBLOX_DSR_PIN;
-    HAL_GPIO_Init(BLE_UBLOX_DSR_GPIO_PORT, &GPIO_InitStruct);
-    HAL_GPIO_WritePin(BLE_UBLOX_DSR_GPIO_PORT,BLE_UBLOX_DSR_PIN,GPIO_PIN_RESET);
+    if(isNewDisplay())
+    {
+		GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+		GPIO_InitStruct.Pull = GPIO_PULLDOWN;
+		GPIO_InitStruct.Speed = GPIO_SPEED_LOW;
+		GPIO_InitStruct.Pin = BLE_UBLOX_DSR_PIN;
+		HAL_GPIO_Init(BLE_UBLOX_DSR_GPIO_PORT, &GPIO_InitStruct);
+		HAL_GPIO_WritePin(BLE_UBLOX_DSR_GPIO_PORT,BLE_UBLOX_DSR_PIN,GPIO_PIN_RESET);
+    }
 }
 
 
@@ -248,7 +273,11 @@
     GPIO_InitStruct.Pin = BLE_NENABLE_PIN;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     HAL_GPIO_Init(BLE_NENABLE_GPIO_PORT, &GPIO_InitStruct);
-    HAL_GPIO_WritePin(BLE_UBLOX_DSR_GPIO_PORT,BLE_UBLOX_DSR_PIN,GPIO_PIN_RESET);
+
+    if(isNewDisplay())
+    {
+    	HAL_GPIO_WritePin(BLE_UBLOX_DSR_GPIO_PORT,BLE_UBLOX_DSR_PIN,GPIO_PIN_RESET);
+    }
 }
 
 
@@ -353,7 +382,7 @@
     UartHandle.Init.StopBits   = UART_STOPBITS_1;
     UartHandle.Init.Parity     = UART_PARITY_NONE;
     UartHandle.Init.Mode       = UART_MODE_TX_RX;
-    HAL_UART_Init(&UartHandle);
+    /* HAL_UART_Init(&UartHandle); moved final init step into BT config function to avoid problems while module power is off */
 
 #ifdef USART_PIEZO
     UartPiezoTxHandle.Instance        = USART_PIEZO;
@@ -378,8 +407,122 @@
 
     HAL_UART_Init(&UartIR_HUD_Handle);
 #endif
+
+#ifdef ENABLE_USART_RADIO
+    UartRadio_Handle.Instance        = USART_RADIO;
+    UartRadio_Handle.Init.BaudRate   = 9600;
+    UartRadio_Handle.Init.WordLength = UART_WORDLENGTH_8B;
+    UartRadio_Handle.Init.StopBits   = UART_STOPBITS_1;
+    UartRadio_Handle.Init.Parity     = UART_PARITY_NONE;
+    UartRadio_Handle.Init.HwFlowCtl  = UART_HWCONTROL_NONE;
+    UartRadio_Handle.Init.Mode       = UART_MODE_RX;
+
+    HAL_UART_Init(&UartRadio_Handle);
+#endif
+
 }
 
+#ifdef ENABLE_PULSE_SENSOR_BT
+void MX_UART_BT_Init_DMA()
+{
+
+	__DMA2_CLK_ENABLE();
+	 __HAL_RCC_DMA2_CLK_ENABLE();
+
+	hdma_uart_BT_rx.Instance = DMA2_Stream2;
+	hdma_uart_BT_rx.Init.Channel = DMA_CHANNEL_4;
+	hdma_uart_BT_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
+	hdma_uart_BT_rx.Init.PeriphInc = DMA_PINC_DISABLE;
+	hdma_uart_BT_rx.Init.MemInc = DMA_MINC_ENABLE;
+	hdma_uart_BT_rx.Init.PeriphDataAlignment = DMA_MDATAALIGN_BYTE;
+	hdma_uart_BT_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+	hdma_uart_BT_rx.Init.Mode = DMA_NORMAL;
+	hdma_uart_BT_rx.Init.Priority = DMA_PRIORITY_LOW;
+	hdma_uart_BT_rx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
+	HAL_DMA_Init(&hdma_uart_BT_rx);
+
+	__HAL_LINKDMA(&UartHandle, hdmarx, hdma_uart_BT_rx);
+
+	HAL_NVIC_SetPriority(DMA2_Stream2_IRQn, 0, 0);
+	HAL_NVIC_EnableIRQ(DMA2_Stream2_IRQn);
+}
+#endif
+
+#ifdef ENABLE_USART_RADIO
+void MX_UART_RADIO_Init_DMA()
+{
+
+	__DMA2_CLK_ENABLE();
+	 __HAL_RCC_DMA2_CLK_ENABLE();
+
+	hdma_uart_radio_rx.Instance = DMA2_Stream1;
+	hdma_uart_radio_rx.Init.Channel = DMA_CHANNEL_4;
+	hdma_uart_radio_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
+	hdma_uart_radio_rx.Init.PeriphInc = DMA_PINC_DISABLE;
+	hdma_uart_radio_rx.Init.MemInc = DMA_MINC_ENABLE;
+	hdma_uart_radio_rx.Init.PeriphDataAlignment = DMA_MDATAALIGN_BYTE;
+	hdma_uart_radio_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+	hdma_uart_radio_rx.Init.Mode = DMA_NORMAL;
+	hdma_uart_radio_rx.Init.Priority = DMA_PRIORITY_LOW;
+	hdma_uart_radio_rx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
+	HAL_DMA_Init(&hdma_uart_radio_rx);
+
+	__HAL_LINKDMA(&UartRadio_Handle, hdmarx, hdma_uart_radio_rx);
+
+	HAL_NVIC_SetPriority(DMA2_Stream1_IRQn, 0, 0);
+	HAL_NVIC_EnableIRQ(DMA2_Stream1_IRQn);
+}
+#endif
+
+
+uint8_t UART_getChar()
+{
+	uint8_t retChar = 0;
+
+	if((rxBufRead != rxBufWrite) && (rxBufferUart[rxBufRead] != 0))
+	{
+		retChar = rxBufferUart[rxBufRead];
+		rxBufferUart[rxBufRead++] = 0;
+		if(rxBufRead == CHUNK_SIZE * CHUNKS_PER_BUFFER)
+		{
+			rxBufRead = 0;
+		}
+	}
+	return retChar;
+}
+#ifdef ENABLE_PULSE_SENSOR_BT
+void UART_StartDMARx()
+{
+	HAL_UART_Receive_DMA (&UartHandle, &rxBufferUart[rxBufWrite], CHUNK_SIZE);
+	rxBufWrite += CHUNK_SIZE;
+	if(rxBufWrite >= CHUNK_SIZE * CHUNKS_PER_BUFFER)
+	{
+		rxBufWrite = 0;
+	}
+}
+void DMA2_Stream2_IRQHandler(void)
+{
+  HAL_DMA_IRQHandler(&hdma_uart_BT_rx);
+}
+#endif
+
+#ifdef ENABLE_USART_RADIO
+void UART_StartDMARxRadio()
+{
+	HAL_UART_Receive_DMA (&UartRadio_Handle, &rxBufferUart[rxBufWrite], CHUNK_SIZE);
+	rxBufWrite += CHUNK_SIZE;
+	if(rxBufWrite >= CHUNK_SIZE * CHUNKS_PER_BUFFER)
+	{
+		rxBufWrite = 0;
+	}
+}
+
+void DMA2_Stream2_IRQHandler(void)
+{
+  HAL_DMA_IRQHandler(&hdma_uart_radio_rx);
+}
+#endif
+
 void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)
 {
     if(huart == &UartHandle)
@@ -390,7 +533,20 @@
 void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
 {
     if(huart == &UartHandle)
-        UartReady = SET;
+    {
+#ifdef ENABLE_PULSE_SENSOR_BT
+    	if(cv_heartbeat_getState() != SENSOR_HB_OFFLINE)
+    	{
+    		UART_StartDMARx();
+    	}
+    	else
+    	{
+    		UartReady = SET;
+    	}
+#else
+    	UartReady = SET;
+#endif
+    }
     else
     if(huart == &UartIR_HUD_Handle)
     {