Mercurial > public > ostc4
diff Common/Inc/data_exchange.h @ 662:1b995079c045 Betatest
PSCR Mode
author | heinrichs weikamp |
---|---|
date | Tue, 14 Dec 2021 15:36:10 +0100 |
parents | 84a4e1200726 |
children | 52d68cf9994c |
line wrap: on
line diff
--- a/Common/Inc/data_exchange.h Mon Nov 01 12:39:34 2021 +0100 +++ b/Common/Inc/data_exchange.h Tue Dec 14 15:36:10 2021 +0100 @@ -31,6 +31,10 @@ #include "settings.h" #include "stm32f4xx_hal.h" +/* Command definitions for contral of external interface */ +#define EXT_INTERFACE_33V_ON (0x8000u) /* Bit set to enable 3.3V power interface */ +#define EXT_INTERFACE_CO2_CALIB (0x0001u) /* Request calibration of CO2Sensor */ + enum MODE { MODE_SURFACE = 0, @@ -80,9 +84,11 @@ #define CRBUTTON (0x01) #define CRDATE (0x02) #define CRTIME (0x04) -#define CRCLEARDECO (0x08) -#define CRCOMPASS (0x10) -#define CRDEVICEDATA (0x20) +#define CRCLEARDECO (0x08) +#define CRCOMPASS (0x10) +#define CRDEVICEDATA (0x20) +#define CRBATTERY (0x40) +#define CRACCIDENT (0x80) typedef union{ confirmbit8_t ub; @@ -148,7 +154,10 @@ uint16_t ambient_light_level; uint16_t SPARE_ALIGN32; float extADC_voltage[3]; - uint8_t SPARE_OldWireless[50]; /* 64 - 12 for extADC */ + uint16_t CO2_ppm; + uint16_t CO2_signalStrength; + uint16_t externalInterface_CmdAnswer; + uint8_t SPARE_OldWireless[44]; /* 64 - 12 for extADC - 6 for CO2 */ // PIC data uint8_t button_setting[4]; /* see dependency to SLiveData->buttonPICdata */ uint8_t SPARE1; @@ -166,8 +175,7 @@ int8_t offsetPressureSensor_mbar; int8_t offsetTemperatureSensor_centiDegree; - uint8_t SPARE1; - uint8_t SPARE2; + uint16_t externalInterface_Cmd; float UNUSED1[16-1];//VPM_adjusted_critical_radius_he[16]; float UNUSED2[16];//VPM_adjusted_critical_radius_n2[16];