ostc4: Discovery/Src/data_exchange

comparison Discovery/Src/data_exchange_main.c @ 662:1b995079c045 Betatest

PSCR Mode

author	heinrichs weikamp
date	Tue, 14 Dec 2021 15:36:10 +0100
parents	830de438e0b0
children	52d68cf9994c

comparison

equal deleted inserted replaced

-:87bee7cc77b3
+:1b995079c045
 #include "tCCR.h"
 #include "timer.h"
 #include "buehlmann.h"
 #include "externLogbookFlash.h"
-//#define TESTBENCH
+/* #define TESTBENCH */
 /* Exported variables --------------------------------------------------------*/
 static uint8_t	wasPowerOn = 0;
 static confirmbit8_Type requestNecessary = { .uw = 0 };
 static uint8_t wasUpdateNotPowerOn = 0;
 static uint8_t data_old__lost_connection_to_slave_counter_temp = 0;
 static uint8_t data_old__lost_connection_to_slave_counter_retry = 0;
 static uint32_t data_old__lost_connection_to_slave_counter_total = 0;
 static uint8_t DeviceDataUpdated = 0;
+static uint16_t externalInterface_Cmd = 0;
 /* Private types -------------------------------------------------------------*/
 #define UNKNOWN_TIME_HOURS		1
 #define UNKNOWN_TIME_MINUTES	0
 #define UNKNOWN_TIME_SECOND		0
 	static uint8_t setEndDiveWasSend = 0;
 	if(getDeviceDataWasSend)
 	{
 		dataOut.getDeviceDataNow = 0;
-		requestNecessary.ub.devicedata = 1;
 	}
 	getDeviceDataWasSend = 0;
 	if(dataOut.getDeviceDataNow)
 	{
 		getDeviceDataWasSend = 1;
+		requestNecessary.ub.devicedata = 1;
 	}
 	if(setEndDiveWasSend)
 	{
 		dataOut.setEndDive = 0;
 	}
 	if(setAccidentFlagWasSend)
 	{
 		dataOut.setAccidentFlag = 0;
-		requestNecessary.ub.accident = 1;
 	}
 	setAccidentFlagWasSend = 0;
 	if(dataOut.setAccidentFlag)
 	{
 		setAccidentFlagWasSend = 1;
+		requestNecessary.ub.accident = 1;
 	}
 	if(setDateWasSend)
 	{
 		dataOut.setDateNow = 0;
-		requestNecessary.ub.date = 1;
 	}
 	setDateWasSend = 0;
 	if(dataOut.setDateNow)
 	{
 		setDateWasSend = 1;
+		requestNecessary.ub.date = 1;
 	}
 	if(setTimeWasSend)
 	{
 		dataOut.setTimeNow = 0;
-		requestNecessary.ub.time = 1;
 	}
 	setTimeWasSend = 0;
 	if(dataOut.setTimeNow)
 	{
 		setTimeWasSend = 1;
+		requestNecessary.ub.time = 1;
 	}
 	if(calibrateCompassWasSend)
 	{
 		dataOut.calibrateCompassNow = 0;
-		requestNecessary.ub.compass = 1;
 	}
 	calibrateCompassWasSend = 0;
 	if(dataOut.calibrateCompassNow)
 	{
 		calibrateCompassWasSend = 1;
 	}
 	if(clearDecoWasSend)
 	{
 		dataOut.clearDecoNow = 0;
+		requestNecessary.ub.compass = 1;
+	}
+	if(dataOut.clearDecoNow)
+	{
+		clearDecoWasSend = 1;
 		requestNecessary.ub.clearDeco = 1;
 	}
-	if(dataOut.clearDecoNow)
-	{
-		clearDecoWasSend = 1;
-	}
 	if(setButtonSensitivityWasSend)
 	{
 		dataOut.setButtonSensitivityNow = 0;
-		requestNecessary.ub.button = 1;
 	}
 	setButtonSensitivityWasSend = 0;
 	if(dataOut.setButtonSensitivityNow)
 	{
 		setButtonSensitivityWasSend = 1;
+		requestNecessary.ub.button = 1;
 	}
 }
 uint8_t DataEX_call(void)
 	dataOut.data.divetimeToCreateLogbook = settings->divetimeToCreateLogbook;
 	dataOut.data.timeoutDiveReachedZeroDepth = settings->timeoutDiveReachedZeroDepth;
 	dataOut.data.offsetPressureSensor_mbar = settings->offsetPressure_mbar;
 	dataOut.data.offsetTemperatureSensor_centiDegree = settings->offsetTemperature_centigrad;
+	if(settings->co2_sensor_active)
+	{
+		externalInterface_Cmd |= EXT_INTERFACE_33V_ON;
+	}
+	dataOut.data.externalInterface_Cmd = externalInterface_Cmd;
+	externalInterface_Cmd = 0;
 	if((hardwareDataGetPointer()->primarySerial <= 32) || (((hardwareDataGetPointer()->primarySerial == 72) && (hardwareDataGetPointer()->secondarySerial == 15))))
 	{
 		dataOut.revisionHardware = 0x00;
 		dataOut.revisionCRCx0x7A = 0x7A;
 	return temp;
 }
 void DataEX_copy_to_LifeData(_Bool *modeChangeFlag)
 {
+	static uint16_t getDeviceDataAfterStartOfMainCPU = 20;
 	SDiveState *pStateReal = stateRealGetPointerWrite();
-	static uint16_t getDeviceDataAfterStartOfMainCPU = 20;
 	uint8_t idx;
+	float meter = 0;
+	SSettings *pSettings;
 	// wireless - �ltere daten aufr�umen
 #if 0
 	for(int i=0;i<(2*NUM_GASES+1);i++)
 	{
 			dataOut.getDeviceDataNow = 1;
 			getDeviceDataAfterStartOfMainCPU = 10*60*10; /* * 100ms = 60 second => update device data every 10 minutes */
 		}
 	}
-	/* new 151207 hw */
+	if((requestNecessary.uw != 0) && (dataIn.confirmRequest.uw != 0))
-	if(requestNecessary.uw != 0)
 	{
 		if(((dataIn.confirmRequest.uw) & CRBUTTON) != 0)
 		{
 			requestNecessary.ub.button = 0;
 		}
+		if(((dataIn.confirmRequest.uw) & CRCLEARDECO) != 0)
-		if(requestNecessary.ub.button == 1)
+		{
+			requestNecessary.ub.clearDeco = 0;
+		}
+		if(((dataIn.confirmRequest.uw) & CRDATE) != 0)
+		{
+			requestNecessary.ub.date = 0;
+		}
+		if(((dataIn.confirmRequest.uw) & CRTIME) != 0)
+		{
+			requestNecessary.ub.time = 0;
+		}
+		if(((dataIn.confirmRequest.uw) & CRCOMPASS) != 0)
+		{
+			requestNecessary.ub.compass = 0;
+		}
+		if(((dataIn.confirmRequest.uw) & CRDEVICEDATA) != 0)
+		{
+			requestNecessary.ub.devicedata = 0;
+		}
+		if(((dataIn.confirmRequest.uw) & CRBATTERY) != 0)
+		{
+			requestNecessary.ub.batterygauge = 0;
+		}
+		if(((dataIn.confirmRequest.uw) & CRACCIDENT) != 0)
+		{
+			requestNecessary.ub.accident = 0;
+		}
+		if(requestNecessary.ub.button == 1)	/* send button values to RTE */
 		{
 			setButtonResponsiveness(settingsGetPointer()->ButtonResponsiveness);
 		}
 	}
-	requestNecessary.uw = 0; // clear all
-	float meter = 0;
-	SSettings *pSettings;
 	/*	uint8_t IAmStolenPleaseKillMe;
 	 */
 	pSettings = settingsGetPointer();
 		pStateReal->pressure_uTick_local_new = HAL_GetTick();
 		pStateReal->lifeData.dateBinaryFormat = dataIn.data[dataIn.boolTimeData].localtime_rtc_dr;
 		pStateReal->lifeData.timeBinaryFormat = dataIn.data[dataIn.boolTimeData].localtime_rtc_tr;
 	}
-	dataOut.setAccidentFlag = 0;
 	if(pStateReal->data_old__lost_connection_to_slave == 0)
 	{
 		//Start of diveMode?
 		if(pStateReal->mode != MODE_DIVE && dataIn.mode == MODE_DIVE)
 		{
 			if(meter > pStateReal->lifeData.max_depth_meter)
 			  pStateReal->lifeData.max_depth_meter = meter;
 		}
-		if(dataIn.accidentFlags & ACCIDENT_DECOSTOP)
+		if(requestNecessary.ub.clearDeco == 0)		/* No "reset deco" is send to RTE ? */
-			pStateReal->decoMissed_at_the_end_of_dive = 1;
+		{
-		if(dataIn.accidentFlags & ACCIDENT_CNS)
+			if(dataIn.accidentFlags & ACCIDENT_DECOSTOP)
-			pStateReal->cnsHigh_at_the_end_of_dive = 1;
+			{
+				pStateReal->decoMissed_at_the_end_of_dive = 1;
+			}
+			else
+			{
+				pStateReal->decoMissed_at_the_end_of_dive = 0;
+			}
+			if(dataIn.accidentFlags & ACCIDENT_CNS)
+			{
+				pStateReal->cnsHigh_at_the_end_of_dive = 1;
+			}
+			else
+			{
+				pStateReal->cnsHigh_at_the_end_of_dive = 0;
+			}
+		}
 		pStateReal->lifeData.dive_time_seconds = (int32_t)dataIn.data[dataIn.boolTimeData].divetime_seconds;
 		pStateReal->lifeData.dive_time_seconds_without_surface_time = (int32_t)dataIn.data[dataIn.boolTimeData].dive_time_seconds_without_surface_time;
 		pStateReal->lifeData.counterSecondsShallowDepth = dataIn.data[dataIn.boolTimeData].counterSecondsShallowDepth;
 		pStateReal->lifeData.surface_time_seconds = (int32_t)dataIn.data[dataIn.boolTimeData].surfacetime_seconds;
 		}
 		/* sensorErrors
 		 */
 		pStateReal->sensorErrorsRTE = dataIn.sensorErrors;
+		/* data from CO2 sensor */
+		pStateReal->lifeData.CO2_data.CO2_ppm = dataIn.data[0].CO2_ppm;
+		pStateReal->lifeData.CO2_data.signalStrength = dataIn.data[0].CO2_signalStrength;
 	}
 	/* apnea specials
 	 */
 	if(pStateReal->diveSettings.diveMode == DIVEMODE_Apnea)
 	uint8_t retval;
 	retval = hw_Info.extADC;
 	return retval;
 }
+void DataEX_setExtInterface_Cmd(uint16_t Cmd)
+{
+	externalInterface_Cmd = Cmd;
+	return;
+}

Mercurial > public > ostc4

comparison Discovery/Src/data_exchange_main.c @ 662:1b995079c045 Betatest