annotate Small_CPU/Src/externalInterface.c @ 1064:449e0f8f23d0 Icon_Integration

Code cleanup co2 sensor: In the very first implementation the co2 sensor was directly switch by the main CPU via command request. Since the sensor map implementation this function was replaced and the old function are no longer needed => have been removed.
author Ideenmodellierer
date Mon, 16 Feb 2026 21:11:59 +0100
parents a3f42192da0f
children 1f2067cad41b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
1 /**
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
2 ******************************************************************************
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
3 * @file externalInterface.c
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
4 * @author heinrichs weikamp gmbh
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
5 * @version V0.0.1
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
6 * @date 07-Nov-2020
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
7 * @brief Interface functionality to proceed external analog signal via i2c connection
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
8 *
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
9 @verbatim
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
10 ==============================================================================
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
11 ##### stm32f4xx_hal_i2c.c modification #####
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
12 ==============================================================================
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
13 The LTC2942 requires an repeated start condition without stop condition
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
14 for data reception.
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
15
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
16 @endverbatim
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
17 ******************************************************************************
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
18 * @attention
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
19 *
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
20 * <h2><center>&copy; COPYRIGHT(c) 2014 heinrichs weikamp</center></h2>
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
21 *
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
22 ******************************************************************************
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
23 */
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
24 /* Includes ------------------------------------------------------------------*/
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
25
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
26 #include <math.h>
714
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
27 #include <string.h>
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
28 #include "data_central.h"
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
29 #include "i2c.h"
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
30 #include "externalInterface.h"
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
31 #include "scheduler.h"
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
32 #include "uart.h"
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
33 #include "data_exchange.h"
747
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
34 #include "pressure.h"
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
35 #include "uartProtocol_O2.h"
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
36 #include "uartProtocol_Co2.h"
842
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
37 #include "uartProtocol_Sentinel.h"
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
38 #include "uartProtocol_GNSS.h"
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
39
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
40 extern SGlobal global;
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
41 extern UART_HandleTypeDef huart1;
932
effadaa3a1f7 Cleanup Gnss UART implementation:
Ideenmodellierer
parents: 921
diff changeset
42 extern sUartComCtrl Uart1Ctrl;
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
43
921
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
44 #define ADC_ANSWER_LENGTH (5u) /* 3424 will provide addr + 4 data bytes */
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
45 #define ADC_TIMEOUT (10u) /* conversion stuck for unknown reason => restart */
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
46 #define ADC_REF_VOLTAGE_MV (2048.0f) /* reference voltage of MPC3424*/
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
47 #define ADC_CYCLE_INTERVAL_MS (1000u) /* start adc read out once per second*/
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
48
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
49 #define ADC_START_CONVERSION (0x80)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
50 #define ADC_GAIN_4 (0x02)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
51 #define ADC_GAIN_4_VALUE (4.0f)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
52 #define ADC_GAIN_8 (0x03)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
53 #define ADC_GAIN_8_VALUE (8.0f)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
54 #define ADC_RESOLUTION_16BIT (0x08)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
55 #define ADC_RESOLUTION_16BIT_VALUE (16u)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
56 #define ADC_RESOLUTION_18BIT (0x0C)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
57 #define ADC_RESOLUTION_18BIT_VALUE (18u)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
58
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
59 #define ANSWER_CONFBYTE_INDEX (4u)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
60
747
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
61 #define LOOKUP_CO2_CORR_TABLE_SCALE (1000u)
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
62 #define LOOKUP_CO2_CORR_TABLE_MAX (30000u)
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
63
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
64 #define REQUEST_INT_SENSOR_MS (1500) /* Minimum time interval for cyclic sensor data requests per sensor (UART mux) */
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
65 #define COMMAND_TX_DELAY (30u) /* The time the sensor needs to recover from a invalid command request */
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
66 #define TIMEOUT_SENSOR_ANSWER (300) /* Time till a request is repeated if no answer was received */
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
67
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
68 #define activeSensorId (activeUartChannel + EXT_INTERFACE_MUX_OFFSET) /* Used if UART channels are applied to Sensor map */
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
69
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
70 static uint8_t activeChannel = 0; /* channel which is in request */
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
71 static uint8_t recBuf[ADC_ANSWER_LENGTH];
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
72 static uint8_t timeoutCnt = 0;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
73 static uint8_t externalInterfacePresent = 0;
861
ad96f99ebc78 Synchronize ADC and UART activities:
Ideenmodellierer
parents: 842
diff changeset
74 static uint8_t delayAdcConversion = 0;
921
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
75 static uint32_t startTickADC = 0;
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
76
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
77 float externalChannel_mV[MAX_ADC_CHANNEL];
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
78 static uint8_t externalV33_On = 0;
691
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
79 static uint8_t externalADC_On = 0;
704
f1b40364b0af Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents: 691
diff changeset
80 static uint8_t externalUART_Protocol = 0;
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
81 static uint16_t externalCO2Value;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
82 static uint16_t externalCO2SignalStrength;
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
83 static uint16_t externalCO2Status = 0;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
84 static float externalCO2Scale = 0.0;
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
85
1062
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
86 static uint8_t externalBottleBar[PRESSURE_BOTTLE_CNT] = {0,0};
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
87
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
88 static uint8_t lastSensorDataId = 0;
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
89 static SSensorDataDiveO2 sensorDataDiveO2[EXT_INTERFACE_SENSOR_CNT];
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
90 static externalInterfaceAutoDetect_t externalAutoDetect = DETECTION_OFF;
747
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
91 static externalInterfaceSensorType SensorMap[EXT_INTERFACE_SENSOR_CNT] ={ SENSOR_OPTIC, SENSOR_OPTIC, SENSOR_OPTIC, SENSOR_NONE, SENSOR_NONE};
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
92 static externalInterfaceSensorType tmpSensorMap[EXT_INTERFACE_SENSOR_CNT];
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
93 static externalInterfaceSensorType MasterSensorMap[EXT_INTERFACE_SENSOR_CNT];
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
94 static externalInterfaceSensorType foundSensorMap[EXT_INTERFACE_SENSOR_CNT];
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
95 static uint8_t Mux2ADCMap[MAX_ADC_CHANNEL];
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
96 static uint8_t externalInterface_SensorState[EXT_INTERFACE_SENSOR_CNT];
714
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
97
747
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
98 static float LookupCO2PressureCorrection[LOOKUP_CO2_CORR_TABLE_MAX / LOOKUP_CO2_CORR_TABLE_SCALE]; /* lookup table for pressure compensation values */
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
99
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
100 static uint16_t externalInterfaceMuxReqIntervall = 0xffff; /* delay between switching from one MUX channel to the next */
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
101 static uint8_t activeUartChannel = 0xff;
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
102
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
103
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
104 static void externalInface_MapUartToLegacyADC(uint8_t* pMap);
809
9602a7338f28 DevBugfix CO2 sensor in streaming mode:
Ideenmodellierer
parents: 804
diff changeset
105 static void externalInterface_CheckBaudrate(uint8_t sensorType);
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
106
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
107 void externalInterface_Init(void)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
108 {
747
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
109 uint16_t index;
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
110 uint16_t coeff;
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
111 activeChannel = 0;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
112 timeoutCnt = 0;
861
ad96f99ebc78 Synchronize ADC and UART activities:
Ideenmodellierer
parents: 842
diff changeset
113 delayAdcConversion = 0;
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
114 if(externalInterface_StartConversion(activeChannel) == HAL_OK)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
115 {
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
116 externalInterfacePresent = 1;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
117 global.deviceDataSendToMaster.hw_Info.extADC = 1;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
118 }
559
84a4e1200726 Check if HW evaluation was performed:
Ideenmodellierer
parents: 554
diff changeset
119 global.deviceDataSendToMaster.hw_Info.checkADC = 1;
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
120
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
121
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
122
747
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
123 /* Create a lookup table based on GSS application note AN001: PRESSURE COMPENSATION OF A CO2 SENSOR */
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
124 /* The main purpose of the sensor in the dive application is to be a warning indicator */
753
4a28402e4aca Updated outdated comment
Ideenmodellierer
parents: 747
diff changeset
125 /* => no exact values necessary => a lookup table with 1000ppm scaling should be sufficient */
747
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
126 LookupCO2PressureCorrection [0] = -0.0014;
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
127 for(index = 1; index < (LOOKUP_CO2_CORR_TABLE_MAX / LOOKUP_CO2_CORR_TABLE_SCALE); index++)
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
128 {
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
129 coeff = index * LOOKUP_CO2_CORR_TABLE_SCALE;
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
130 LookupCO2PressureCorrection[index] = 2.811*pow(10,-38)*pow(coeff,6)- 9.817*pow(10,-32)*pow(coeff,5)+1.304*pow(10,-25)*pow(coeff,4)-8.216*pow(10,-20)*pow(coeff,3)+2.311*pow(10,-14)*pow(coeff,2) - 2.195*pow(10,-9)*coeff - 1.471*pow(10,-3);
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
131 }
738
30717de00f3a Added data init function for external interface:
Ideenmodellierer
parents: 731
diff changeset
132 externalInterface_InitDatastruct();
30717de00f3a Added data init function for external interface:
Ideenmodellierer
parents: 731
diff changeset
133 }
30717de00f3a Added data init function for external interface:
Ideenmodellierer
parents: 731
diff changeset
134
30717de00f3a Added data init function for external interface:
Ideenmodellierer
parents: 731
diff changeset
135 void externalInterface_InitDatastruct(void)
30717de00f3a Added data init function for external interface:
Ideenmodellierer
parents: 731
diff changeset
136 {
30717de00f3a Added data init function for external interface:
Ideenmodellierer
parents: 731
diff changeset
137 uint8_t index = 0;
30717de00f3a Added data init function for external interface:
Ideenmodellierer
parents: 731
diff changeset
138 /* init data values */
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
139 externalUART_Protocol = 0;
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
140 externalCO2Value = 0;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
141 externalCO2SignalStrength = 0;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
142 externalCO2Status = 0;
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
143 externalCO2Scale = 0.0;
1062
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
144 externalBottleBar[0] = 0;
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
145 externalBottleBar[1] = 0;
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
146 externalAutoDetect = DETECTION_OFF;
738
30717de00f3a Added data init function for external interface:
Ideenmodellierer
parents: 731
diff changeset
147
30717de00f3a Added data init function for external interface:
Ideenmodellierer
parents: 731
diff changeset
148 for(index = 0; index < MAX_ADC_CHANNEL; index++)
30717de00f3a Added data init function for external interface:
Ideenmodellierer
parents: 731
diff changeset
149 {
30717de00f3a Added data init function for external interface:
Ideenmodellierer
parents: 731
diff changeset
150 externalChannel_mV[index] = 0.0;
30717de00f3a Added data init function for external interface:
Ideenmodellierer
parents: 731
diff changeset
151 }
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
152 memset(externalInterface_SensorState,UART_COMMON_INIT,sizeof(externalInterface_SensorState));
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
153 externalInface_MapUartToLegacyADC(SensorMap);
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
154 activeUartChannel = 0xFF;
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
155 }
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
156
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
157
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
158 uint8_t externalInterface_StartConversion(uint8_t channel)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
159 {
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
160 uint8_t retval = 0;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
161 uint8_t confByte = 0;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
162
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
163 if(channel < MAX_ADC_CHANNEL)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
164 {
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
165 confByte = ADC_START_CONVERSION | ADC_RESOLUTION_16BIT | ADC_GAIN_8;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
166 confByte |= channel << 5;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
167 retval = I2C_Master_Transmit(DEVICE_EXTERNAL_ADC, &confByte, 1);
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
168 }
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
169 return retval;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
170 }
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
171
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
172 /* Check if conversion is done and trigger measurement of next channel */
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
173 uint8_t externalInterface_ReadAndSwitch()
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
174 {
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
175 uint8_t retval = EXTERNAL_ADC_NO_DATA;
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
176 uint8_t nextChannel;
731
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
177 uint8_t* psensorMap = externalInterface_GetSensorMapPointer(0);
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
178
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
179 if(externalADC_On)
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
180 {
921
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
181 if(time_elapsed_ms(startTickADC, HAL_GetTick()) > ADC_CYCLE_INTERVAL_MS)
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
182 {
921
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
183 if(delayAdcConversion)
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
184 {
921
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
185 if(UART_isComActive(activeUartChannel) == 0)
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
186 {
921
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
187 externalInterface_StartConversion(activeChannel);
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
188 delayAdcConversion = 0;
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
189 }
921
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
190 }
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
191 else if(I2C_Master_Receive(DEVICE_EXTERNAL_ADC, recBuf, ADC_ANSWER_LENGTH) == HAL_OK)
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
192 {
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
193 if((recBuf[ANSWER_CONFBYTE_INDEX] & ADC_START_CONVERSION) == 0) /* !ready set => received data contains new value */
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
194 {
921
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
195 retval = activeChannel; /* return channel number providing new data */
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
196 nextChannel = activeChannel + 1;
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
197 if(nextChannel == MAX_ADC_CHANNEL)
704
f1b40364b0af Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents: 691
diff changeset
198 {
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
199 nextChannel = 0;
704
f1b40364b0af Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents: 691
diff changeset
200 }
921
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
201
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
202 while((psensorMap[nextChannel] != SENSOR_ANALOG) && (nextChannel != activeChannel))
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
203 {
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
204 if(nextChannel == MAX_ADC_CHANNEL)
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
205 {
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
206 nextChannel = 0;
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
207 startTickADC = HAL_GetTick();
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
208 }
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
209 else
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
210 {
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
211 nextChannel++;
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
212 }
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
213 }
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
214
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
215 activeChannel = nextChannel;
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
216 if(activeChannel == 0)
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
217 {
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
218 delayAdcConversion = 1; /* wait for next cycle interval */
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
219 }
704
f1b40364b0af Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents: 691
diff changeset
220 else
f1b40364b0af Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents: 691
diff changeset
221 {
921
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
222 if(UART_isComActive(activeUartChannel) == 0)
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
223 {
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
224 externalInterface_StartConversion(activeChannel);
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
225 }
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
226 else
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
227 {
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
228 delayAdcConversion = 1;
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
229 }
704
f1b40364b0af Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents: 691
diff changeset
230 }
921
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
231 timeoutCnt = 0;
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
232 }
921
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
233 }
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
234
861
ad96f99ebc78 Synchronize ADC and UART activities:
Ideenmodellierer
parents: 842
diff changeset
235 if(timeoutCnt++ >= ADC_TIMEOUT)
ad96f99ebc78 Synchronize ADC and UART activities:
Ideenmodellierer
parents: 842
diff changeset
236 {
ad96f99ebc78 Synchronize ADC and UART activities:
Ideenmodellierer
parents: 842
diff changeset
237 externalInterface_StartConversion(activeChannel);
ad96f99ebc78 Synchronize ADC and UART activities:
Ideenmodellierer
parents: 842
diff changeset
238 delayAdcConversion = 0;
ad96f99ebc78 Synchronize ADC and UART activities:
Ideenmodellierer
parents: 842
diff changeset
239 timeoutCnt = 0;
581
011d8f9f5ddb Added ex Interface measurement restart in case of i2c disturbance:
Ideenmodellierer
parents: 559
diff changeset
240 }
921
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
241 }
554
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
242 }
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
243 return retval;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
244 }
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
245 float externalInterface_CalculateADCValue(uint8_t channel)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
246 {
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
247 int32_t rawvalue = 0;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
248 float retValue = 0.0;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
249 if(channel < MAX_ADC_CHANNEL)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
250 {
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
251
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
252 rawvalue = ((recBuf[0] << 16) | (recBuf[1] << 8) | (recBuf[2]));
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
253
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
254 switch(recBuf[3] & 0x0C) /* confbyte => Resolution bits*/
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
255 {
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
256 case ADC_RESOLUTION_16BIT: rawvalue = rawvalue >> 8; /* only 2 databytes received shift out confbyte*/
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
257 if(rawvalue & (0x1 << (ADC_RESOLUTION_16BIT_VALUE-1))) /* MSB set => negative number */
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
258 {
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
259 rawvalue |= 0xFFFF0000; /* set MSB for int32 */
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
260 }
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
261 else
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
262 {
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
263 rawvalue &= 0x0000FFFF;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
264 }
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
265 externalChannel_mV[channel] = ADC_REF_VOLTAGE_MV * 2.0 / (float) pow(2,ADC_RESOLUTION_16BIT_VALUE); /* calculate bit resolution */
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
266 break;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
267 case ADC_RESOLUTION_18BIT: if(rawvalue & (0x1 << (ADC_RESOLUTION_18BIT_VALUE-1))) /* MSB set => negative number */
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
268 {
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
269 rawvalue |= 0xFFFE0000; /* set MSB for int32 */
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
270 }
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
271 externalChannel_mV[channel] = ADC_REF_VOLTAGE_MV * 2.0 / (float) pow(2,ADC_RESOLUTION_18BIT_VALUE); /* calculate bit resolution */
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
272 break;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
273 default: rawvalue = 0;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
274 break;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
275 }
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
276 externalChannel_mV[channel] = externalChannel_mV[channel] * rawvalue / ADC_GAIN_8_VALUE;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
277 retValue = externalChannel_mV[channel];
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
278 }
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
279 return retValue;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
280 }
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
281 float getExternalInterfaceChannel(uint8_t channel)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
282 {
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
283 float retval = 0;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
284
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
285 if(channel < MAX_ADC_CHANNEL)
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
286 {
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
287 retval = externalChannel_mV[channel];
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
288 }
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
289 return retval;
3328189786e7 Added external ADC interface functionality (MCP3424):
Ideenmodellierer
parents:
diff changeset
290 }
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
291
691
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
292 uint8_t setExternalInterfaceChannel(uint8_t channel, float value)
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
293 {
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
294 uint8_t retval = 0;
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
295 uint8_t localId = channel;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
296 uint8_t index = 0;
691
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
297
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
298 if(localId >= MAX_ADC_CHANNEL) /* at the moment sensor visualization is focused on the three ADC channels => map Mux sensors */
691
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
299 {
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
300 for(index = 0; index < MAX_ADC_CHANNEL; index++)
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
301 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
302 if(Mux2ADCMap[index] == localId)
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
303 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
304 localId = index;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
305 break;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
306 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
307 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
308 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
309
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
310 if(localId < MAX_ADC_CHANNEL)
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
311 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
312 externalChannel_mV[localId] = value;
691
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
313 retval = 1;
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
314 }
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
315 return retval;
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
316 }
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
317
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
318 void externalInterface_InitPower33(void)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
319 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
320 GPIO_InitTypeDef GPIO_InitStructure;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
321
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
322 GPIO_InitStructure.Pin = GPIO_PIN_7;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
323 GPIO_InitStructure.Mode = GPIO_MODE_OUTPUT_PP;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
324 GPIO_InitStructure.Pull = GPIO_PULLUP;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
325 GPIO_InitStructure.Speed = GPIO_SPEED_LOW;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
326 HAL_GPIO_Init(GPIOC, &GPIO_InitStructure);
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
327 HAL_GPIO_WritePin(GPIOC,GPIO_PIN_7,GPIO_PIN_SET);
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
328 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
329
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
330
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
331 uint8_t externalInterface_isEnabledPower33()
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
332 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
333 return externalV33_On;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
334 }
691
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
335
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
336 uint8_t externalInterface_isEnabledADC()
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
337 {
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
338 return externalADC_On;
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
339 }
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
340
704
f1b40364b0af Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents: 691
diff changeset
341 uint8_t externalInterface_GetUARTProtocol()
f1b40364b0af Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents: 691
diff changeset
342 {
f1b40364b0af Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents: 691
diff changeset
343 return externalUART_Protocol;
f1b40364b0af Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents: 691
diff changeset
344 }
f1b40364b0af Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents: 691
diff changeset
345
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
346 void externalInterface_SwitchPower33(uint8_t state)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
347 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
348 if(state != externalV33_On)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
349 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
350 if(state)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
351 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
352 HAL_GPIO_WritePin(GPIOC,GPIO_PIN_7,GPIO_PIN_RESET);
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
353 externalV33_On = 1;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
354 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
355 else
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
356 {
731
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
357 if(externalAutoDetect == DETECTION_OFF)
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
358 {
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
359 HAL_GPIO_WritePin(GPIOC,GPIO_PIN_7,GPIO_PIN_SET);
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
360 externalV33_On = 0;
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
361 externalInterface_SetCO2Value(0);
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
362 externalInterface_SetCO2SignalStrength(0);
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
363 }
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
364 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
365 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
366 }
691
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
367 void externalInterface_SwitchADC(uint8_t state)
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
368 {
714
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
369 uint8_t loop = 0;
691
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
370 if((state) && (externalInterfacePresent))
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
371 {
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
372 if(externalADC_On == 0)
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
373 {
921
eb4109d7d1e9 Improved mix mode ADC conversion:
Ideenmodellierer
parents: 918
diff changeset
374 startTickADC = HAL_GetTick();
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
375 activeChannel = 0;
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
376 externalInterface_StartConversion(activeChannel);
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
377 externalADC_On = 1;
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
378 }
691
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
379 }
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
380 else
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
381 {
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
382 if(externalAutoDetect == DETECTION_OFF) /* block deactivation requests if auto detection is active */
714
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
383 {
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
384 externalADC_On = 0;
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
385 for(loop = 0; loop < MAX_ADC_CHANNEL; loop++)
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
386 {
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
387 externalChannel_mV[loop] = 0;
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
388 }
714
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
389 }
691
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
390 }
52d68cf9994c Improvment external interface usage:
Ideenmodellierer
parents: 662
diff changeset
391 }
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
392
704
f1b40364b0af Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents: 691
diff changeset
393 void externalInterface_SwitchUART(uint8_t protocol)
f1b40364b0af Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents: 691
diff changeset
394 {
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
395 switch(protocol)
704
f1b40364b0af Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents: 691
diff changeset
396 {
839
061174d88af9 Code cleanup: UART protocol definitions
Ideenmodellierer
parents: 809
diff changeset
397 case EXT_INTERFACE_UART_OFF:
061174d88af9 Code cleanup: UART protocol definitions
Ideenmodellierer
parents: 809
diff changeset
398 case EXT_INTERFACE_UART_CO2:
061174d88af9 Code cleanup: UART protocol definitions
Ideenmodellierer
parents: 809
diff changeset
399 case EXT_INTERFACE_UART_O2:
061174d88af9 Code cleanup: UART protocol definitions
Ideenmodellierer
parents: 809
diff changeset
400 case EXT_INTERFACE_UART_SENTINEL:
918
f72613a152dd Switch external interface tx communication to DMA:
Ideenmodellierer
parents: 916
diff changeset
401 case EXT_INTERFACE_UART_GNSS:
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
402 if((externalAutoDetect <= DETECTION_START)
839
061174d88af9 Code cleanup: UART protocol definitions
Ideenmodellierer
parents: 809
diff changeset
403 || ((protocol == EXT_INTERFACE_UART_O2) && (externalAutoDetect >= DETECTION_UARTMUX) && (externalAutoDetect <= DETECTION_DIGO2_3))
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
404
746
7e84ae1513b6 Code cleanup sensors under development:
Ideenmodellierer
parents: 742
diff changeset
405 #ifdef ENABLE_CO2_SUPPORT
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
406 || ((externalAutoDetect >= DETECTION_CO2_0) && (externalAutoDetect <= DETECTION_CO2_3))
746
7e84ae1513b6 Code cleanup sensors under development:
Ideenmodellierer
parents: 742
diff changeset
407 #endif
988
d9290c76b840 OSTC4/5 joined code:
ideenmodellierer
parents: 976
diff changeset
408 #ifdef ENABLE_GNSS_EXTERN
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
409 || ((externalAutoDetect >= DETECTION_GNSS_0) && (externalAutoDetect <= DETECTION_GNSS_3))
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
410 #endif
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
411
746
7e84ae1513b6 Code cleanup sensors under development:
Ideenmodellierer
parents: 742
diff changeset
412 #ifdef ENABLE_SENTINEL_MODE
839
061174d88af9 Code cleanup: UART protocol definitions
Ideenmodellierer
parents: 809
diff changeset
413 || ((protocol == EXT_INTERFACE_UART_SENTINEL) && (externalAutoDetect == DETECTION_SENTINEL))
746
7e84ae1513b6 Code cleanup sensors under development:
Ideenmodellierer
parents: 742
diff changeset
414 #endif
7e84ae1513b6 Code cleanup sensors under development:
Ideenmodellierer
parents: 742
diff changeset
415 )
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
416 {
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
417 lastSensorDataId = 0;
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
418 externalUART_Protocol = protocol;
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
419 MX_USART1_UART_DeInit();
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
420 if( protocol != 0)
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
421 {
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
422 MX_USART1_UART_Init();
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
423 }
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
424 }
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
425 break;
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
426 default:
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
427 break;
704
f1b40364b0af Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents: 691
diff changeset
428 }
f1b40364b0af Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents: 691
diff changeset
429 }
f1b40364b0af Added protocol functions for UART DiveO2 sensor:
Ideenmodellierer
parents: 691
diff changeset
430
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
431 uint8_t externalInterface_GetActiveUartSensor()
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
432 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
433 return activeUartChannel;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
434 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
435
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
436 void externalInterface_SetSensorState(uint8_t sensorIdx, uint8_t state)
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
437 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
438 if(sensorIdx < EXT_INTERFACE_SENSOR_CNT)
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
439 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
440 externalInterface_SensorState[sensorIdx] = state;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
441 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
442 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
443
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
444 uint8_t externalInterface_GetSensorState(uint8_t sensorIdx)
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
445 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
446 uint8_t ret = COMMON_SENSOR_STATE_INVALID;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
447 if(sensorIdx < EXT_INTERFACE_SENSOR_CNT)
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
448 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
449 ret = externalInterface_SensorState[sensorIdx];
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
450 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
451 return ret;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
452 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
453
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
454 /* The supported sensors from GSS have different scaling factors depending on their accuracy. The factor may be read out of the sensor */
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
455 void externalInterface_SetCO2Scale(float CO2Scale)
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
456 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
457 if((CO2Scale == 10) || (CO2Scale == 100))
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
458 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
459 externalCO2Scale = CO2Scale;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
460 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
461 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
462 float externalInterface_GetCO2Scale()
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
463 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
464 return externalCO2Scale;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
465 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
466
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
467 void externalInterface_SetCO2Value(uint16_t CO2_ppm)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
468 {
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
469 float local_ppm = CO2_ppm * externalCO2Scale;
747
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
470
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
471 #ifndef ENABLE_EXTERNAL_PRESSURE
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
472 float local_corr = 0.0;
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
473
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
474 if (local_ppm >= LOOKUP_CO2_CORR_TABLE_MAX)
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
475 {
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
476 local_corr = -0.0014;
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
477 }
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
478 else
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
479 {
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
480 local_corr = LookupCO2PressureCorrection[((uint16_t) (local_ppm / LOOKUP_CO2_CORR_TABLE_SCALE))];
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
481 }
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
482 local_ppm = local_ppm / (1.0 + (local_corr * (get_surface_mbar() - get_pressure_mbar())));
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
483 #else
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
484 /* The external pressure value is passed via ADC channel2 and calibration is done at firmware => just forward sensor data */
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
485 /* compensation is done at firmware side. This is for testing only. Take care the the same algorithm is taken as used for the lookup table */
df0d43da1614 Added pressure compensation to CO2 detection:
Ideenmodellierer
parents: 746
diff changeset
486 #endif
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
487 externalCO2Value = local_ppm / externalCO2Scale;
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
488 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
489
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
490 void externalInterface_SetCO2SignalStrength(uint16_t LED_qa)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
491 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
492 externalCO2SignalStrength = LED_qa;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
493 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
494
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
495 uint16_t externalInterface_GetCO2Value(void)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
496 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
497 return externalCO2Value;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
498 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
499
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
500 uint16_t externalInterface_GetCO2SignalStrength(void)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
501 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
502 return externalCO2SignalStrength;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
503 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
504
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
505
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
506 void externalInterface_SetCO2State(uint16_t state)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
507 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
508 externalCO2Status = state;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
509 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
510
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
511 uint16_t externalInterface_GetCO2State(void)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
512 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
513 return externalCO2Status;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
514 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
515
1062
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
516 void externalInterface_SetBottlePressure(uint8_t bottle, uint8_t bar)
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
517 {
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
518 if(bottle < PRESSURE_BOTTLE_CNT)
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
519 {
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
520 externalBottleBar[bottle] = bar;
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
521 }
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
522 }
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
523
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
524 uint8_t externalInterface_GetBottlePressure(uint8_t bottle)
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
525 {
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
526 uint8_t ret = 0;
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
527
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
528 if(bottle < PRESSURE_BOTTLE_CNT)
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
529 {
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
530 ret = externalBottleBar[bottle];
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
531 }
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
532 return ret;
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
533 }
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
534
714
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
535
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
536 uint8_t externalInterface_GetSensorData(uint8_t sensorId, uint8_t* pDataStruct)
714
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
537 {
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
538 uint8_t index = 0;
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
539 uint8_t localId = sensorId;
786
19ab6f3ed52a Cleanup sensor data interface:
Ideenmodellierer
parents: 784
diff changeset
540 if(localId == 0xFF)
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
541 {
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
542 localId = lastSensorDataId;
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
543 }
714
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
544
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
545 if((pDataStruct != NULL) && (localId <= EXT_INTERFACE_SENSOR_CNT))
714
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
546 {
786
19ab6f3ed52a Cleanup sensor data interface:
Ideenmodellierer
parents: 784
diff changeset
547 memcpy(pDataStruct, &sensorDataDiveO2[localId], sizeof(SSensorDataDiveO2));
19ab6f3ed52a Cleanup sensor data interface:
Ideenmodellierer
parents: 784
diff changeset
548 }
19ab6f3ed52a Cleanup sensor data interface:
Ideenmodellierer
parents: 784
diff changeset
549 else
19ab6f3ed52a Cleanup sensor data interface:
Ideenmodellierer
parents: 784
diff changeset
550 {
19ab6f3ed52a Cleanup sensor data interface:
Ideenmodellierer
parents: 784
diff changeset
551 localId = 0xFF;
714
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
552 }
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
553 if(localId > MAX_ADC_CHANNEL) /* at the moment sensor visualization is focused on the three ADC channels => map Mux sensors */
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
554 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
555 for(index = 0; index < MAX_ADC_CHANNEL; index++)
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
556 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
557 if(Mux2ADCMap[index] == localId)
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
558 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
559 localId = index;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
560 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
561 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
562 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
563
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
564 return localId;
714
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
565 }
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
566
786
19ab6f3ed52a Cleanup sensor data interface:
Ideenmodellierer
parents: 784
diff changeset
567 void externalInterface_SetSensorData(uint8_t sensorId, uint8_t* pDataStruct)
714
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
568 {
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
569 uint8_t index = 0;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
570
714
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
571 if(pDataStruct != NULL)
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
572 {
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
573 if((sensorId != 0xFF) && (sensorId < EXT_INTERFACE_SENSOR_CNT))
714
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
574 {
786
19ab6f3ed52a Cleanup sensor data interface:
Ideenmodellierer
parents: 784
diff changeset
575 memcpy(&sensorDataDiveO2[sensorId], pDataStruct, sizeof(SSensorDataDiveO2));
19ab6f3ed52a Cleanup sensor data interface:
Ideenmodellierer
parents: 784
diff changeset
576 lastSensorDataId = sensorId;
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
577 if(sensorId >= MAX_ADC_CHANNEL)
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
578 {
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
579 for(index = 0; index < MAX_ADC_CHANNEL; index++)
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
580 {
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
581 if(Mux2ADCMap[index] == sensorId)
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
582 {
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
583 memcpy(&sensorDataDiveO2[index], pDataStruct, sizeof(SSensorDataDiveO2));
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
584 lastSensorDataId = index;
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
585 break;
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
586 }
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
587 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
588 }
714
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
589 }
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
590 else
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
591 {
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
592 memset(&sensorDataDiveO2,0,sizeof(sensorDataDiveO2));
786
19ab6f3ed52a Cleanup sensor data interface:
Ideenmodellierer
parents: 784
diff changeset
593 lastSensorDataId = 0xFF;
714
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
594 }
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
595 }
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
596 }
045ff7800501 Added customizable data area for specific sensor data:
Ideenmodellierer
parents: 704
diff changeset
597
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
598 void externalInface_SetSensorMap(uint8_t* pMap)
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
599 {
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
600 if(pMap != NULL)
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
601 {
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
602 memcpy(MasterSensorMap, pMap, EXT_INTERFACE_SENSOR_CNT); /* the map is not directly copied. Copy is done via cmd request */
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
603 }
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
604
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
605 }
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
606
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
607 void externalInface_MapUartToLegacyADC(uint8_t* pMap)
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
608 {
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
609 uint8_t index, index2;
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
610
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
611 memset(Mux2ADCMap,0xFF, sizeof(Mux2ADCMap));
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
612
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
613 for(index2 = 0; index2 < MAX_ADC_CHANNEL; index2++) /* Unmap old mirror instances */
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
614 {
918
f72613a152dd Switch external interface tx communication to DMA:
Ideenmodellierer
parents: 916
diff changeset
615 if((pMap[index2] == SENSOR_DIGO2M) || (pMap[index2] == SENSOR_CO2M) || (pMap[index2] == SENSOR_GNSSM))
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
616 {
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
617 pMap[index2] = SENSOR_NONE;
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
618 }
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
619 }
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
620
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
621 /* Map Mux O2 sensors to ADC Slot if ADC slot is not in use */
918
f72613a152dd Switch external interface tx communication to DMA:
Ideenmodellierer
parents: 916
diff changeset
622 for(index = EXT_INTERFACE_MUX_OFFSET; index < EXT_INTERFACE_SENSOR_CNT-1; index++)
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
623 {
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
624 if(pMap[index] == SENSOR_DIGO2)
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
625 {
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
626 for(index2 = 0; index2 < MAX_ADC_CHANNEL; index2++)
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
627 {
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
628 if(pMap[index2] == SENSOR_NONE)
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
629 {
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
630 pMap[index2] = SENSOR_DIGO2M; /* store a mirror instance needed for visualization */
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
631 Mux2ADCMap[index2] = index;
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
632 break;
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
633 }
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
634 }
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
635 }
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
636 }
918
f72613a152dd Switch external interface tx communication to DMA:
Ideenmodellierer
parents: 916
diff changeset
637 for(index = EXT_INTERFACE_MUX_OFFSET; index < EXT_INTERFACE_SENSOR_CNT-1; index++)
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
638 {
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
639 if(pMap[index] == SENSOR_CO2)
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
640 {
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
641 for(index2 = 0; index2 < MAX_ADC_CHANNEL; index2++)
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
642 {
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
643 if(pMap[index2] == SENSOR_NONE)
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
644 {
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
645 pMap[index2] = SENSOR_CO2M; /* store a mirror instance needed for visualization */
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
646 Mux2ADCMap[index2] = index;
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
647 break;
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
648 }
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
649 }
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
650 }
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
651 }
918
f72613a152dd Switch external interface tx communication to DMA:
Ideenmodellierer
parents: 916
diff changeset
652 for(index = EXT_INTERFACE_MUX_OFFSET; index < EXT_INTERFACE_SENSOR_CNT-1; index++)
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
653 {
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
654 if(pMap[index] == SENSOR_GNSS)
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
655 {
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
656 for(index2 = 0; index2 < MAX_ADC_CHANNEL; index2++)
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
657 {
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
658 if(pMap[index2] == SENSOR_NONE)
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
659 {
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
660 pMap[index2] = SENSOR_GNSSM; /* store a mirror instance needed for visualization */
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
661 Mux2ADCMap[index2] = index;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
662 break;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
663 }
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
664 }
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
665 }
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
666 }
842
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
667 #ifdef ENABLE_SENTINEL_MODE
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
668 if(pMap[EXT_INTERFACE_MUX_OFFSET] == SENSOR_SENTINEL)
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
669 {
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
670 for(index2 = 0; index2 < MAX_ADC_CHANNEL; index2++)
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
671 {
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
672 pMap[index2] = SENSOR_SENTINELM; /* store a mirror instance needed for visualization */
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
673 Mux2ADCMap[index2] = index2 + EXT_INTERFACE_MUX_OFFSET;
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
674 }
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
675 }
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
676 #endif
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
677 }
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
678
731
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
679 uint8_t* externalInterface_GetSensorMapPointer(uint8_t finalMap)
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
680 {
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
681 uint8_t* pret;
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
682
731
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
683 if((externalAutoDetect != DETECTION_OFF) && (!finalMap))
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
684 {
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
685 pret = tmpSensorMap;
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
686 }
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
687 else
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
688 {
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
689 pret = SensorMap;
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
690 }
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
691 return pret;
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
692 }
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
693
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
694 void externalInterface_AutodetectSensor()
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
695 {
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
696 static uint8_t sensorIndex = 0;
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
697 static uint8_t uartMuxChannel = 0;
988
d9290c76b840 OSTC4/5 joined code:
ideenmodellierer
parents: 976
diff changeset
698 #ifdef ENABLE_GNSS_EXTERN
918
f72613a152dd Switch external interface tx communication to DMA:
Ideenmodellierer
parents: 916
diff changeset
699 static uint8_t detectionDelayCnt = 0;
f72613a152dd Switch external interface tx communication to DMA:
Ideenmodellierer
parents: 916
diff changeset
700 #endif
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
701 uint8_t index = 0;
918
f72613a152dd Switch external interface tx communication to DMA:
Ideenmodellierer
parents: 916
diff changeset
702
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
703 uint8_t cntSensor = 0;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
704 uint8_t cntUARTSensor = 0;
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
705 #ifdef ENABLE_CO2_SUPPORT
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
706 uint8_t cmdString[10];
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
707 uint8_t cmdLength = 0;
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
708 #endif
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
709
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
710 if(externalAutoDetect != DETECTION_OFF)
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
711 {
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
712 switch(externalAutoDetect)
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
713 {
975
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
714 case DETECTION_INIT: externalInterfaceMuxReqIntervall = 0xffff;
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
715 sensorIndex = 0;
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
716 uartMuxChannel = 0;
731
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
717 tmpSensorMap[0] = SENSOR_OPTIC;
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
718 tmpSensorMap[1] = SENSOR_OPTIC;
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
719 tmpSensorMap[2] = SENSOR_OPTIC;
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
720 tmpSensorMap[3] = SENSOR_NONE;
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
721 tmpSensorMap[4] = SENSOR_NONE;
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
722 tmpSensorMap[5] = SENSOR_NONE;
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
723 tmpSensorMap[6] = SENSOR_NONE;
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
724 tmpSensorMap[7] = SENSOR_NONE;
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
725
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
726 memset(foundSensorMap, SENSOR_NONE, sizeof(foundSensorMap));
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
727 memset(externalInterface_SensorState,UART_COMMON_INIT,sizeof(externalInterface_SensorState));
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
728 memset(Mux2ADCMap,0, sizeof(Mux2ADCMap));
781
01b3eb9d55c3 Update real multiplexer implementation:
Ideenmodellierer
parents: 779
diff changeset
729
731
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
730 if(externalInterfacePresent)
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
731 {
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
732 externalInterface_SwitchPower33(0);
839
061174d88af9 Code cleanup: UART protocol definitions
Ideenmodellierer
parents: 809
diff changeset
733 externalInterface_SwitchUART(EXT_INTERFACE_UART_OFF);
731
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
734 for(index = 0; index < MAX_ADC_CHANNEL; index++)
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
735 {
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
736 externalChannel_mV[index] = 0;
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
737 }
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
738 externalAutoDetect = DETECTION_START;
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
739 }
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
740 else
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
741 {
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
742 externalAutoDetect = DETECTION_DONE; /* without external interface O2 values may only be received via optical port => return default sensor map */
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
743 }
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
744 break;
731
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
745 case DETECTION_START: tmpSensorMap[0] = SENSOR_ANALOG;
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
746 tmpSensorMap[1] = SENSOR_ANALOG;
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
747 tmpSensorMap[2] = SENSOR_ANALOG;
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
748 externalInterface_SwitchPower33(1);
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
749 externalInterface_SwitchADC(1);
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
750 externalAutoDetect = DETECTION_ANALOG1;
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
751 break;
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
752 case DETECTION_ANALOG1: externalAutoDetect = DETECTION_ANALOG2; /* do a second loop to make sure all adc channels could be processed */
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
753 break;
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
754 case DETECTION_ANALOG2: for(index = 0; index < MAX_ADC_CHANNEL; index++)
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
755 {
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
756 if(externalChannel_mV[index] > MIN_ADC_VOLTAGE_MV)
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
757 {
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
758 tmpSensorMap[sensorIndex++] = SENSOR_ANALOG;
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
759 foundSensorMap[index] = SENSOR_ANALOG;
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
760 }
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
761 else
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
762 {
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
763 tmpSensorMap[sensorIndex++] = SENSOR_NONE;
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
764 }
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
765 }
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
766 externalInterfaceMuxReqIntervall = 1100;
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
767 externalAutoDetect = DETECTION_UARTMUX;
839
061174d88af9 Code cleanup: UART protocol definitions
Ideenmodellierer
parents: 809
diff changeset
768 externalInterface_SwitchUART(EXT_INTERFACE_UART_O2);
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
769 externalInterface_CheckBaudrate(SENSOR_DIGO2);
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
770 UART_MUX_SelectAddress(MAX_MUX_CHANNEL);
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
771 uartO2_SetChannel(MAX_MUX_CHANNEL);
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
772 activeUartChannel = MAX_MUX_CHANNEL;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
773 tmpSensorMap[EXT_INTERFACE_SENSOR_CNT-1] = SENSOR_MUX;
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
774 break;
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
775 case DETECTION_UARTMUX: if(uartO2_isSensorConnected())
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
776 {
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
777 uartMuxChannel = 1;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
778 tmpSensorMap[EXT_INTERFACE_SENSOR_CNT-1] = SENSOR_MUX;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
779 foundSensorMap[EXT_INTERFACE_SENSOR_CNT-1] = SENSOR_MUX;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
780 }
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
781 else
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
782 {
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
783 tmpSensorMap[EXT_INTERFACE_SENSOR_CNT-1] = SENSOR_NONE;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
784 }
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
785 externalAutoDetect = DETECTION_DIGO2_0;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
786 uartO2_SetChannel(0);
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
787 activeUartChannel = 0;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
788 tmpSensorMap[EXT_INTERFACE_MUX_OFFSET] = SENSOR_DIGO2;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
789 externalInterface_SensorState[EXT_INTERFACE_MUX_OFFSET] = UART_COMMON_INIT;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
790 externalInterface_SwitchUART(EXT_INTERFACE_UART_O2);
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
791 if(foundSensorMap[EXT_INTERFACE_SENSOR_CNT-1] == SENSOR_MUX)
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
792 {
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
793 UART_MUX_SelectAddress(0);
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
794 }
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
795 break;
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
796 case DETECTION_DIGO2_0:
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
797 case DETECTION_DIGO2_1:
781
01b3eb9d55c3 Update real multiplexer implementation:
Ideenmodellierer
parents: 779
diff changeset
798 case DETECTION_DIGO2_2:
01b3eb9d55c3 Update real multiplexer implementation:
Ideenmodellierer
parents: 779
diff changeset
799 case DETECTION_DIGO2_3:
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
800 if(uartO2_isSensorConnected())
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
801 {
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
802 foundSensorMap[externalAutoDetect - DETECTION_DIGO2_0 + EXT_INTERFACE_MUX_OFFSET] = SENSOR_DIGO2;
781
01b3eb9d55c3 Update real multiplexer implementation:
Ideenmodellierer
parents: 779
diff changeset
803 }
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
804 tmpSensorMap[EXT_INTERFACE_MUX_OFFSET] = SENSOR_NONE;
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
805 if(uartMuxChannel)
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
806 {
839
061174d88af9 Code cleanup: UART protocol definitions
Ideenmodellierer
parents: 809
diff changeset
807 externalInterface_SwitchUART(EXT_INTERFACE_UART_O2);
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
808 UART_MUX_SelectAddress(uartMuxChannel);
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
809 externalInterface_SensorState[uartMuxChannel + EXT_INTERFACE_MUX_OFFSET] = UART_COMMON_INIT;
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
810 uartO2_SetChannel(uartMuxChannel);
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
811 activeUartChannel = uartMuxChannel;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
812 tmpSensorMap[uartMuxChannel - 1 + EXT_INTERFACE_MUX_OFFSET] = SENSOR_NONE;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
813 tmpSensorMap[uartMuxChannel + EXT_INTERFACE_MUX_OFFSET] = SENSOR_DIGO2;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
814
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
815 if(uartMuxChannel < MAX_MUX_CHANNEL - 1)
784
95af969fe0ae Bugfixloop UART multiplexer integration:
Ideenmodellierer
parents: 781
diff changeset
816 {
95af969fe0ae Bugfixloop UART multiplexer integration:
Ideenmodellierer
parents: 781
diff changeset
817 uartMuxChannel++;
95af969fe0ae Bugfixloop UART multiplexer integration:
Ideenmodellierer
parents: 781
diff changeset
818 }
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
819 }
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
820 else
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
821 {
781
01b3eb9d55c3 Update real multiplexer implementation:
Ideenmodellierer
parents: 779
diff changeset
822 externalAutoDetect = DETECTION_DIGO2_3; /* skip detection of other serial sensors */
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
823 }
742
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
824 externalAutoDetect++;
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
825 #ifdef ENABLE_CO2_SUPPORT
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
826 if(externalAutoDetect == DETECTION_CO2_0)
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
827 {
809
9602a7338f28 DevBugfix CO2 sensor in streaming mode:
Ideenmodellierer
parents: 804
diff changeset
828 tmpSensorMap[uartMuxChannel + EXT_INTERFACE_MUX_OFFSET] = SENSOR_NONE;
9602a7338f28 DevBugfix CO2 sensor in streaming mode:
Ideenmodellierer
parents: 804
diff changeset
829 if(foundSensorMap[EXT_INTERFACE_SENSOR_CNT-1] == SENSOR_MUX)
9602a7338f28 DevBugfix CO2 sensor in streaming mode:
Ideenmodellierer
parents: 804
diff changeset
830 {
9602a7338f28 DevBugfix CO2 sensor in streaming mode:
Ideenmodellierer
parents: 804
diff changeset
831 UART_MUX_SelectAddress(0);
9602a7338f28 DevBugfix CO2 sensor in streaming mode:
Ideenmodellierer
parents: 804
diff changeset
832 }
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
833 activeUartChannel = 0;
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
834 tmpSensorMap[uartMuxChannel - 1 + EXT_INTERFACE_MUX_OFFSET] = SENSOR_NONE;
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
835 uartMuxChannel = 1;
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
836 tmpSensorMap[EXT_INTERFACE_MUX_OFFSET] = SENSOR_CO2;
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
837 externalInterface_SensorState[EXT_INTERFACE_MUX_OFFSET] = UART_COMMON_INIT;
809
9602a7338f28 DevBugfix CO2 sensor in streaming mode:
Ideenmodellierer
parents: 804
diff changeset
838 externalInterface_CheckBaudrate(SENSOR_CO2);
1063
a3f42192da0f Always use polling mode for CO2 operation:
Ideenmodellierer
parents: 1062
diff changeset
839 uartCo2_SendCmd(CO2CMD_MODE_POLL, cmdString, &cmdLength);
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
840 }
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
841 break;
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
842 case DETECTION_CO2_0:
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
843 case DETECTION_CO2_1:
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
844 case DETECTION_CO2_2:
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
845 case DETECTION_CO2_3: if(uartCo2_isSensorConnected())
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
846 {
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
847 foundSensorMap[EXT_INTERFACE_MUX_OFFSET + activeUartChannel] = SENSOR_CO2;
988
d9290c76b840 OSTC4/5 joined code:
ideenmodellierer
parents: 976
diff changeset
848 #ifdef ENABLE_GNSS_EXTERN
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
849 externalAutoDetect = DETECTION_GNSS_0; /* only one CO2 sensor supported */
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
850 #else
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
851 externalAutoDetect = DETECTION_DONE; /* only one CO2 sensor supported */
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
852 #endif
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
853 }
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
854 else if(foundSensorMap[EXT_INTERFACE_SENSOR_CNT-1] == SENSOR_MUX)
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
855 {
809
9602a7338f28 DevBugfix CO2 sensor in streaming mode:
Ideenmodellierer
parents: 804
diff changeset
856 externalInterface_CheckBaudrate(SENSOR_DIGO2);
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
857 UART_MUX_SelectAddress(uartMuxChannel);
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
858 activeUartChannel = uartMuxChannel;
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
859 tmpSensorMap[uartMuxChannel - 1 + EXT_INTERFACE_MUX_OFFSET] = SENSOR_NONE;
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
860 tmpSensorMap[EXT_INTERFACE_MUX_OFFSET + uartMuxChannel] = SENSOR_CO2;
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
861 externalInterface_SensorState[EXT_INTERFACE_MUX_OFFSET + uartMuxChannel] = UART_COMMON_INIT;
809
9602a7338f28 DevBugfix CO2 sensor in streaming mode:
Ideenmodellierer
parents: 804
diff changeset
862 externalInterface_CheckBaudrate(SENSOR_CO2);
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
863 uartCo2_SendCmd(CO2CMD_MODE_POLL, cmdString, &cmdLength);
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
864 externalAutoDetect++;
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
865 uartMuxChannel++;
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
866 }
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
867 else
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
868 {
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
869
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
870
988
d9290c76b840 OSTC4/5 joined code:
ideenmodellierer
parents: 976
diff changeset
871 #if defined ENABLE_SENTINEL_MODE || defined ENABLE_GNSS_EXTERN
d9290c76b840 OSTC4/5 joined code:
ideenmodellierer
parents: 976
diff changeset
872 #ifdef ENABLE_GNSS_EXTERN
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
873 externalAutoDetect = DETECTION_GNSS_0;
918
f72613a152dd Switch external interface tx communication to DMA:
Ideenmodellierer
parents: 916
diff changeset
874 externalInterface_SwitchUART(EXT_INTERFACE_UART_GNSS);
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
875 #else
842
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
876 #ifdef ENABLE_SENTINEL_MODE
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
877 externalAutoDetect = DETECTION_SENTINEL;
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
878 #endif
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
879 #endif
842
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
880 #else
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
881 externalAutoDetect = DETECTION_DONE;
842
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
882 #endif
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
883 }
742
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
884 #endif
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
885
988
d9290c76b840 OSTC4/5 joined code:
ideenmodellierer
parents: 976
diff changeset
886 #ifdef ENABLE_GNSS_EXTERN
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
887 if(externalAutoDetect == DETECTION_GNSS_0)
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
888 {
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
889 tmpSensorMap[uartMuxChannel + EXT_INTERFACE_MUX_OFFSET] = SENSOR_NONE;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
890 if(foundSensorMap[EXT_INTERFACE_SENSOR_CNT-1] == SENSOR_MUX)
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
891 {
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
892 externalInterface_CheckBaudrate(SENSOR_DIGO2);
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
893 UART_MUX_SelectAddress(0);
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
894 }
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
895 activeUartChannel = 0;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
896 tmpSensorMap[uartMuxChannel - 1 + EXT_INTERFACE_MUX_OFFSET] = SENSOR_NONE;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
897 uartMuxChannel = 1;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
898 tmpSensorMap[EXT_INTERFACE_MUX_OFFSET] = SENSOR_GNSS;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
899 externalInterface_SensorState[EXT_INTERFACE_MUX_OFFSET] = UART_COMMON_INIT;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
900 externalInterface_CheckBaudrate(SENSOR_GNSS);
918
f72613a152dd Switch external interface tx communication to DMA:
Ideenmodellierer
parents: 916
diff changeset
901 externalInterfaceMuxReqIntervall = 500; /* iterations needed for module config */
f72613a152dd Switch external interface tx communication to DMA:
Ideenmodellierer
parents: 916
diff changeset
902 detectionDelayCnt = 6;
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
903 }
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
904 break;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
905 case DETECTION_GNSS_0:
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
906 case DETECTION_GNSS_1:
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
907 case DETECTION_GNSS_2:
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
908 case DETECTION_GNSS_3: if(detectionDelayCnt == 0)
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
909 {
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
910 if(uartGnss_isSensorConnected())
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
911 {
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
912 foundSensorMap[EXT_INTERFACE_MUX_OFFSET + activeUartChannel] = SENSOR_GNSS;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
913 #ifdef ENABLE_SENTINEL_MODE
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
914 externalAutoDetect = DETECTION_SENTINEL; /* only one GNSS sensor supported */
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
915 #else
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
916 externalAutoDetect = DETECTION_DONE; /* only one GNSS sensor supported */
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
917 #endif
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
918 }
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
919 else if(foundSensorMap[EXT_INTERFACE_SENSOR_CNT-1] == SENSOR_MUX)
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
920 {
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
921 externalInterface_CheckBaudrate(SENSOR_DIGO2);
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
922 UART_MUX_SelectAddress(uartMuxChannel);
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
923 activeUartChannel = uartMuxChannel;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
924 tmpSensorMap[uartMuxChannel - 1 + EXT_INTERFACE_MUX_OFFSET] = SENSOR_NONE;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
925 tmpSensorMap[EXT_INTERFACE_MUX_OFFSET + uartMuxChannel] = SENSOR_CO2;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
926 externalInterface_SensorState[EXT_INTERFACE_MUX_OFFSET + uartMuxChannel] = UART_COMMON_INIT;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
927 externalInterface_CheckBaudrate(SENSOR_CO2);
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
928 // uartGnss_SendCmd(GNSSCMD_MODE_POLL, cmdString, &cmdLength);
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
929 externalAutoDetect++;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
930 detectionDelayCnt = 3;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
931 uartMuxChannel++;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
932 }
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
933 else
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
934 {
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
935 #ifdef ENABLE_SENTINEL_MODE
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
936 externalAutoDetect = DETECTION_SENTINEL;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
937 #else
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
938 externalAutoDetect = DETECTION_DONE;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
939 #endif
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
940 }
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
941 }
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
942 else
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
943 {
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
944 detectionDelayCnt--;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
945 }
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
946 #endif
742
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
947 #ifdef ENABLE_SENTINEL_MODE
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
948 if(externalAutoDetect == DETECTION_SENTINEL)
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
949 {
842
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
950 externalInterface_SensorState[EXT_INTERFACE_MUX_OFFSET] = UART_COMMON_INIT;
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
951 uartO2_SetChannel(0);
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
952 activeUartChannel = 0;
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
953 tmpSensorMap[EXT_INTERFACE_MUX_OFFSET] = SENSOR_SENTINEL;
839
061174d88af9 Code cleanup: UART protocol definitions
Ideenmodellierer
parents: 809
diff changeset
954 externalInterface_SwitchUART(EXT_INTERFACE_UART_SENTINEL);
842
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
955 externalInterface_CheckBaudrate(SENSOR_SENTINEL);
932
effadaa3a1f7 Cleanup Gnss UART implementation:
Ideenmodellierer
parents: 921
diff changeset
956 UART_StartDMA_Receiption(&Uart1Ctrl);
779
0b5f45448eb6 Added UART multiplexer support for DiveO2:
Ideenmodellierer
parents: 753
diff changeset
957 }
742
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
958 break;
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
959
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
960 case DETECTION_SENTINEL:
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
961 case DETECTION_SENTINEL2:
842
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
962 if(uartSentinel_isSensorConnected())
742
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
963 {
842
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
964 for(index = EXT_INTERFACE_MUX_OFFSET; index < EXT_INTERFACE_MUX_OFFSET+3; index++)
742
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
965 {
842
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
966 foundSensorMap[index] = SENSOR_SENTINEL;
742
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
967 }
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
968 }
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
969 externalAutoDetect++;
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
970 #endif
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
971 break;
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
972 case DETECTION_DONE: externalAutoDetect = DETECTION_OFF;
839
061174d88af9 Code cleanup: UART protocol definitions
Ideenmodellierer
parents: 809
diff changeset
973 externalInterface_SwitchUART(EXT_INTERFACE_UART_OFF);
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
974 activeUartChannel = 0xFF;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
975 cntSensor = 0;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
976 cntUARTSensor = 0;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
977 for(index = 0; index < EXT_INTERFACE_SENSOR_CNT-1; index++)
731
2a801cfe23ab Improvment sensor Autodetection:
Ideenmodellierer
parents: 729
diff changeset
978 {
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
979 if((foundSensorMap[index] >= SENSOR_ANALOG) && (foundSensorMap[index] < SENSOR_MUX))
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
980 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
981 cntSensor++;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
982 }
784
95af969fe0ae Bugfixloop UART multiplexer integration:
Ideenmodellierer
parents: 781
diff changeset
983
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
984 if((foundSensorMap[index] == SENSOR_DIGO2) || (foundSensorMap[index] == SENSOR_CO2) || (foundSensorMap[index] == SENSOR_GNSS))
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
985 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
986 cntUARTSensor++;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
987 }
842
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
988 #ifdef ENABLE_SENTINEL_MODE
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
989 if(foundSensorMap[index] == SENSOR_SENTINEL) /* The Sentinel has a fixed setup */
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
990 {
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
991 cntSensor = 3;
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
992 cntUARTSensor = 1;
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
993 break;
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
994 }
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
995 #endif
786
19ab6f3ed52a Cleanup sensor data interface:
Ideenmodellierer
parents: 784
diff changeset
996 }
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
997 externalInface_MapUartToLegacyADC(foundSensorMap);
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
998 externalInterfaceMuxReqIntervall = 0xFFFF;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
999 if(cntSensor == 0) /* return default sensor map if no sensor at all has been detected */
784
95af969fe0ae Bugfixloop UART multiplexer integration:
Ideenmodellierer
parents: 781
diff changeset
1000 {
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1001 foundSensorMap[0] = SENSOR_OPTIC;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1002 foundSensorMap[1] = SENSOR_OPTIC;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1003 foundSensorMap[2] = SENSOR_OPTIC;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1004 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1005 else
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1006 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1007 if(cntUARTSensor != 0)
784
95af969fe0ae Bugfixloop UART multiplexer integration:
Ideenmodellierer
parents: 781
diff changeset
1008 {
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1009 externalInterfaceMuxReqIntervall = REQUEST_INT_SENSOR_MS / cntUARTSensor;
1062
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1010 if(foundSensorMap[0] == SENSOR_SENTINELM) /* special case: Sentinel sends combined data */
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1011 {
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1012 externalInterfaceMuxReqIntervall = 4000;
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1013 }
784
95af969fe0ae Bugfixloop UART multiplexer integration:
Ideenmodellierer
parents: 781
diff changeset
1014 }
95af969fe0ae Bugfixloop UART multiplexer integration:
Ideenmodellierer
parents: 781
diff changeset
1015 }
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1016 memcpy(SensorMap, foundSensorMap, sizeof(foundSensorMap));
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1017 memset(externalInterface_SensorState, UART_COMMON_INIT, sizeof(externalInterface_SensorState));
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
1018 break;
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
1019 default:
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
1020 break;
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
1021 }
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
1022 }
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
1023 }
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
1024
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
1025
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
1026 void externalInterface_ExecuteCmd(uint16_t Cmd)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
1027 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
1028 char cmdString[10];
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
1029 uint8_t cmdLength = 0;
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
1030 uint8_t index;
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1031 uint8_t cntUARTSensor = 0;
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
1032
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
1033 switch(Cmd & 0x00FF) /* lower byte is reserved for commands */
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
1034 {
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
1035 case EXT_INTERFACE_AUTODETECT: externalAutoDetect = DETECTION_INIT;
742
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
1036 for(index = 0; index < 3; index++)
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
1037 {
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
1038 SensorMap[index] = SENSOR_SEARCH;
e23fe82cbf8c Update Sentinel protocol:
Ideenmodellierer
parents: 738
diff changeset
1039 }
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
1040 break;
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
1041 case EXT_INTERFACE_COPY_SENSORMAP: if(externalAutoDetect == DETECTION_OFF)
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
1042 {
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1043 memcpy(SensorMap, MasterSensorMap, sizeof(MasterSensorMap));
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1044 for(index = 0; index < EXT_INTERFACE_SENSOR_CNT; index++)
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
1045 {
1062
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1046 if((SensorMap[index] == SENSOR_DIGO2) || (SensorMap[index] == SENSOR_CO2) || (SensorMap[index] == SENSOR_GNSS) || (SensorMap[index] == SENSOR_SENTINEL))
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1047 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1048 cntUARTSensor++;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1049 }
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
1050 }
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
1051 externalInface_MapUartToLegacyADC(SensorMap);
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1052 if(cntUARTSensor > 0)
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1053 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1054 externalInterfaceMuxReqIntervall = REQUEST_INT_SENSOR_MS / cntUARTSensor;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1055 activeUartChannel = 0xFF;
1062
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1056
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1057 if(SensorMap[0] == SENSOR_SENTINELM) /* special case: Sentinel sends compined data */
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1058 {
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1059 externalInterfaceMuxReqIntervall = 4000;
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1060 }
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1061 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1062 else
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1063 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1064 externalInterfaceMuxReqIntervall = 0xFFFF;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1065 }
729
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
1066 }
d646a0f724a7 Added auto detection functionality for sensors connected to the external interface:
Ideenmodellierer
parents: 714
diff changeset
1067 break;
957
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1068 case EXT_INTERFACE_CO2_CALIB: index = (Cmd >> 8) & 0x000F;
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1069 if(SensorMap[index] == SENSOR_CO2M)
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1070 {
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1071 index = Mux2ADCMap[index];
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1072 }
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1073 if(SensorMap[index] == SENSOR_CO2)
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1074 {
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1075 externalInterface_SensorState[index] = UART_CO2_CALIBRATE;
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1076 }
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1077 break;
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1078 case EXT_INTERFACE_O2_INDICATE: index = (Cmd >> 8) & 0x000F;
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1079 if(SensorMap[index] == SENSOR_DIGO2M)
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1080 {
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1081 index = Mux2ADCMap[index];
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1082 }
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1083 if(SensorMap[index] == SENSOR_DIGO2)
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1084 {
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1085 externalInterface_SensorState[index] = UART_O2_CHECK;
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1086 }
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1087 break;
3420e3ba698d External sensor commands: Add sensor ID to command:
Ideenmodellierer
parents: 956
diff changeset
1088
662
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
1089 default:
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
1090 break;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
1091 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
1092 if(cmdLength != 0)
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
1093 {
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
1094 HAL_UART_Transmit(&huart1,(uint8_t*)cmdString,cmdLength,10);
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
1095 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
1096 return;
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
1097 }
1b995079c045 PSCR Mode
heinrichs weikamp
parents: 581
diff changeset
1098
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1099 uint8_t ExternalInterface_SelectUsedMuxChannel(uint8_t currentChannel)
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1100 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1101 uint8_t index = currentChannel;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1102 uint8_t newChannel = index;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1103 uint8_t *pmap = externalInterface_GetSensorMapPointer(0);
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1104
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1105 do
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1106 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1107 index++;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1108 if(index == MAX_MUX_CHANNEL)
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1109 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1110 index = 0;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1111 }
918
f72613a152dd Switch external interface tx communication to DMA:
Ideenmodellierer
parents: 916
diff changeset
1112 if(((pmap[index + EXT_INTERFACE_MUX_OFFSET] == SENSOR_DIGO2)
f72613a152dd Switch external interface tx communication to DMA:
Ideenmodellierer
parents: 916
diff changeset
1113 || (pmap[index + EXT_INTERFACE_MUX_OFFSET] == SENSOR_CO2)
f72613a152dd Switch external interface tx communication to DMA:
Ideenmodellierer
parents: 916
diff changeset
1114 || (pmap[index + EXT_INTERFACE_MUX_OFFSET] == SENSOR_GNSS))
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1115 && (index != activeUartChannel))
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1116 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1117 newChannel = index;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1118 break;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1119 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1120 } while(index != currentChannel);
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1121
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1122 return newChannel;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1123 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1124
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1125 void externalInterface_CheckBaudrate(uint8_t sensorType)
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1126 {
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1127 uint32_t newBaudrate = 0;
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1128
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1129 switch(sensorType)
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1130 {
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
1131 case SENSOR_GNSS:
842
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
1132 case SENSOR_SENTINEL:
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1133 case SENSOR_CO2: newBaudrate = 9600;
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1134 break;
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1135 case SENSOR_DIGO2:
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1136 default: newBaudrate = 19200;
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1137 break;
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1138 }
809
9602a7338f28 DevBugfix CO2 sensor in streaming mode:
Ideenmodellierer
parents: 804
diff changeset
1139 if(huart1.Init.BaudRate != newBaudrate)
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1140 {
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1141 UART_ChangeBaudrate(newBaudrate);
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1142 }
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1143 }
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1144
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1145 void externalInterface_HandleUART()
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1146 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1147 static uint8_t retryRequest = 0;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1148 static uint32_t lastRequestTick = 0;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1149 static uint32_t TriggerTick = 0;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1150 uint8_t index = 0;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1151 static uint8_t timeToTrigger = 0;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1152 uint32_t tick = HAL_GetTick();
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1153 uint8_t *pmap = externalInterface_GetSensorMapPointer(0);
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
1154 uint8_t forceMuxChannel = 0;
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1155
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1156
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1157 if(externalInterfaceMuxReqIntervall != 0xFFFF)
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1158 {
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
1159 if(activeUartChannel == 0xFF)
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
1160 {
809
9602a7338f28 DevBugfix CO2 sensor in streaming mode:
Ideenmodellierer
parents: 804
diff changeset
1161 MX_USART1_UART_Init();
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
1162 activeUartChannel = ExternalInterface_SelectUsedMuxChannel(0);
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
1163 uartO2_SetChannel(activeUartChannel);
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
1164
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
1165 switch(pmap[activeUartChannel + EXT_INTERFACE_MUX_OFFSET])
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
1166 {
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
1167 case SENSOR_DIGO2:
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
1168 case SENSOR_GNSS:
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
1169 case SENSOR_CO2:
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
1170 case SENSOR_SENTINEL: externalInterface_CheckBaudrate(pmap[activeUartChannel + EXT_INTERFACE_MUX_OFFSET]);
842
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
1171 break;
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
1172 default: externalInterface_CheckBaudrate(SENSOR_DIGO2);
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
1173 break;
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
1174 }
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
1175 if(pmap[EXT_INTERFACE_SENSOR_CNT-1] == SENSOR_MUX)
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
1176 {
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
1177 HAL_Delay(10); /* make sure MUX is available for reception after wakeup */
804
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
1178 UART_MUX_SelectAddress(activeUartChannel);
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
1179 }
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
1180 }
391b3d420a39 Cleanup initialisation code:
Ideenmodellierer
parents: 798
diff changeset
1181
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
1182 if(externalInterface_SensorState[activeSensorId] != UART_COMMON_INIT)
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
1183 {
976
0b81ac558e89 Devbugfix UART buffer cleaning:
Ideenmodellierer
parents: 975
diff changeset
1184 UART_ReadData(pmap[activeSensorId], 0);
932
effadaa3a1f7 Cleanup Gnss UART implementation:
Ideenmodellierer
parents: 921
diff changeset
1185 UART_WriteData(&Uart1Ctrl);
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
1186 }
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1187 if(externalInterface_SensorState[activeSensorId] == UART_COMMON_INIT)
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1188 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1189 lastRequestTick = tick;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1190 TriggerTick = tick - 10; /* just to make sure control is triggered */
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1191 timeToTrigger = 1;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1192 retryRequest = 0;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1193 }
1062
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1194 else if(((retryRequest == 0) && (pmap[activeUartChannel + EXT_INTERFACE_MUX_OFFSET] != SENSOR_SENTINEL) /* timeout or error */
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1195 && (((time_elapsed_ms(lastRequestTick,tick) > (TIMEOUT_SENSOR_ANSWER)) && (externalInterface_SensorState[activeSensorId] != UART_O2_IDLE)) /* retry if no answer after half request interval */
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1196 || (externalInterface_SensorState[activeSensorId] == UART_O2_ERROR))))
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1197 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1198 /* The channel switch will cause the sensor to respond with an error message. */
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1199 /* The sensor needs ~30ms to recover before he is ready to receive the next command => transmission delay needed */
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1200
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1201 TriggerTick = tick;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1202 timeToTrigger = COMMAND_TX_DELAY;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1203 retryRequest = 1;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1204 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1205 else if(time_elapsed_ms(lastRequestTick,tick) > externalInterfaceMuxReqIntervall) /* switch sensor and / or trigger next request */
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1206 {
975
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1207 if(timeToTrigger == 0) /* no pending action */
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1208 {
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1209 TriggerTick = tick;
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1210 retryRequest = 0;
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1211 timeToTrigger = 1;
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1212
975
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1213 if((externalInterface_SensorState[activeSensorId] == UART_O2_REQ_O2) /* timeout */
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1214 || (externalInterface_SensorState[activeSensorId] == UART_O2_REQ_RAW)
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1215 || (externalInterface_SensorState[activeSensorId] == UART_CO2_OPERATING)
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1216 || (externalInterface_SensorState[activeSensorId] == UART_GNSS_GET_PVT)
1062
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1217 || (externalInterface_SensorState[activeSensorId] == UART_GNSS_GET_SAT)
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1218 || (externalInterface_SensorState[activeSensorId] == UART_SENTINEL_OPERATING))
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1219 {
975
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1220 forceMuxChannel = 1;
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1221 externalInterface_SensorState[activeSensorId] = UART_O2_IDLE;
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1222 switch(pmap[activeSensorId])
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1223 {
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1224 case SENSOR_DIGO2: setExternalInterfaceChannel(activeSensorId,0.0);
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1225 break;
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1226 case SENSOR_CO2: externalInterface_SetCO2Value(0.0);
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1227 externalInterface_SetCO2State(0);
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1228 break;
1062
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1229 case SENSOR_SENTINEL: setExternalInterfaceChannel(0,0.0);
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1230 setExternalInterfaceChannel(1,0.0);
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1231 setExternalInterfaceChannel(2,0.0);
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1232 externalInterface_SetBottlePressure(0,0);
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1233 externalInterface_SetBottlePressure(1,0);
785772303f9c Added pressure sensors in Sentnel mode:
Ideenmodellierer
parents: 988
diff changeset
1234 break;
975
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1235 default:
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1236 break;
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1237 }
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1238 }
975
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1239 if((externalInterface_SensorState[activeSensorId] == UART_CO2_SETUP) /* timeout while setting up sensors */
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1240 || (externalInterface_SensorState[activeSensorId] == UART_O2_CHECK))
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1241 {
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1242 forceMuxChannel = 1;
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1243 }
956
083afabc6578 Bugfix UART sensor MUX channel selection after sleep:
Ideenmodellierer
parents: 932
diff changeset
1244
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1245
975
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1246 if(pmap[EXT_INTERFACE_SENSOR_CNT-1] == SENSOR_MUX) /* select next sensor if mux is connected */
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1247 {
975
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1248 if(activeUartChannel < MAX_MUX_CHANNEL)
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1249 {
975
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1250 index = ExternalInterface_SelectUsedMuxChannel(activeUartChannel);
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1251 if((index != activeUartChannel) || (forceMuxChannel))
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1252 {
975
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1253 forceMuxChannel = 0;
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1254 timeToTrigger = 100;
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1255 activeUartChannel = index;
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1256 switch(pmap[index + EXT_INTERFACE_MUX_OFFSET])
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1257 {
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1258 case SENSOR_DIGO2: uartO2_SetChannel(activeUartChannel);
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1259 /* no break */
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1260 case SENSOR_CO2:
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1261 case SENSOR_GNSS: externalInterface_CheckBaudrate(SENSOR_MUX);
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1262 UART_MUX_SelectAddress(activeUartChannel);
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1263 externalInterface_CheckBaudrate(pmap[activeUartChannel + EXT_INTERFACE_MUX_OFFSET]);
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1264 break;
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1265 default:
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1266 break;
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1267 }
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1268 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1269 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1270 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1271 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1272 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1273 if((timeToTrigger != 0) && (time_elapsed_ms(TriggerTick,tick) > timeToTrigger))
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1274 {
975
142f3d0363b3 Workaround single DiveO2 startup:
Ideenmodellierer
parents: 957
diff changeset
1275 lastRequestTick = tick;
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1276 timeToTrigger = 0;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1277 switch (pmap[activeSensorId])
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1278 {
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1279 case SENSOR_MUX:
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1280 case SENSOR_DIGO2: uartO2_Control();
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1281 break;
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1282 #ifdef ENABLE_CO2_SUPPORT
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1283 case SENSOR_CO2: uartCo2_Control();
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1284 break;
798
e9eba334b942 Migrated CO2 protocol implementation to new format:
Ideenmodellierer
parents: 794
diff changeset
1285 #endif
988
d9290c76b840 OSTC4/5 joined code:
ideenmodellierer
parents: 976
diff changeset
1286 #ifdef ENABLE_GNSS_EXTERN
916
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
1287 case SENSOR_GNSS: uartGnss_Control();
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
1288 break;
4832981f9af8 External sensor UART: Switch to DMA TX transfers:
Ideenmodellierer
parents: 861
diff changeset
1289 #endif
842
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
1290 #ifdef ENABLE_SENTINEL_MODE
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
1291 case SENSOR_SENTINEL: uartSentinel_Control();
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
1292 break;
c3dd461ca3f9 Migrated Sentinel protocol to new UART structure:
Ideenmodellierer
parents: 839
diff changeset
1293 #endif
794
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1294 default:
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1295 break;
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1296 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1297 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1298 }
bb37d4f3e50e Restructure UART based sensor handling:
Ideenmodellierer
parents: 786
diff changeset
1299 }