Mercurial > public > ostc4

annotate Small_CPU/Src/externalInterface.c @ 1066:eceb5cb2a8e3 Icon_Integration

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