Mercurial > public > ostc4
changeset 989:c317130aaafc GasConsumption
OSTC4/5 joined code:
In the previous version code differences between OSTC4/5 were identified using the ENABLE_GPIO_V2 compiler switch. In the new version this is done using the display version as indicator which OSTC model is in used. Since this is detected by Firmware the information is forwarded from there to the RTE. This causes a little delay in the GPIO initialization but this applies only to the cold start of the RTE which should not happen very often.
| author | ideenmodellierer |
|---|---|
| date | Tue, 08 Apr 2025 15:10:14 +0200 (10 days ago) |
| parents | d9290c76b840 |
| children | d63584d6428d |
| files | Common/Inc/configuration.h Common/Inc/data_exchange.h Discovery/Inc/simulation.h Discovery/Inc/tStructure.h |
| diffstat | 4 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Common/Inc/configuration.h Sun Apr 06 21:02:17 2025 +0200 +++ b/Common/Inc/configuration.h Tue Apr 08 15:10:14 2025 +0200 @@ -72,8 +72,11 @@ /* Enable to have CO2 sensor functionality available */ #define ENABLE_CO2_SUPPORT -/* Enable to have GPS sensor functionality available */ -/* #define ENABLE_GNSS_SUPPORT */ +/* Enable to have external GPS sensor functionality available */ +/* #define ENABLE_GNSS_EXTERN */ + +/* Enable to have internal (OSTC5) GPS sensor functionality available */ +#define ENABLE_GNSS_INTERN /* Enable to have Sentinel rebreather interface available */ /* #define ENABLE_SENTINEL_MODE */ @@ -90,9 +93,6 @@ /* Enable to have a faster transfer speed between bluetooth module and CPU */ #define ENABLE_FAST_COMM -/* Enable to have position sensor support active */ -/* #define ENABLE_GPIO_V2 */ - /* Enable RTE sleep mode debugging */ /* #define ENABLE_SLEEP_DEBUG */
--- a/Common/Inc/data_exchange.h Sun Apr 06 21:02:17 2025 +0200 +++ b/Common/Inc/data_exchange.h Tue Apr 08 15:10:14 2025 +0200 @@ -339,7 +339,7 @@ uint8_t revisionHardware; uint8_t revisionCRCx0x7A; - uint8_t spare1_3; + uint8_t displayVersion; uint8_t spare1_4; uint8_t setAccidentFlag;
--- a/Discovery/Inc/simulation.h Sun Apr 06 21:02:17 2025 +0200 +++ b/Discovery/Inc/simulation.h Tue Apr 08 15:10:14 2025 +0200 @@ -63,7 +63,11 @@ SDecoinfo* simulation_decoplaner_Bachelorarbeit_VPM(uint16_t depth_meter, uint16_t intervall_time_minutes, uint16_t dive_time_minutes, SgasChangeList *pGasChangeList); void simulation_gas_consumption(uint16_t *outputConsumptionList, uint16_t depth_meter, uint16_t dive_time_minutes, SDecoinfo *decoInfoInput, uint8_t gasConsumTravelInput, uint8_t gasConsumDecoInput, const SgasChangeList *pGasChangeList); void simulation_helper_change_points(SSimDataSummary *outputSummary, uint16_t depth_meter, uint16_t dive_time_minutes, SDecoinfo *decoInfoInput, const SgasChangeList *pGasChangeList); - +void simulation_evaluate_profil(uint16_t *outputConsumptionList, + SSimDataSummary *outputSummary, + uint16_t depth_meter, uint16_t dive_time_minutes,uint8_t gasConsumTravelInput, uint8_t gasConsumDecoInput, + SDecoinfo *decoInfoInput, + const SgasChangeList *pGasChangeList); void Sim_Descend (void); void Sim_Ascend (void);
--- a/Discovery/Inc/tStructure.h Sun Apr 06 21:02:17 2025 +0200 +++ b/Discovery/Inc/tStructure.h Tue Apr 08 15:10:14 2025 +0200 @@ -390,9 +390,7 @@ #define StMCustom5_CViewPortAmbient _MB(2,9,5,4,0) #define StMCustom5_CViewPortControl _MB(2,9,5,5,0) #endif -#ifdef ENABLE_GPIO_V2 #define StMCustom5_CViewWarningBuz _MB(2,9,5,1,0) -#endif /* PAGE 10 */ #define StMPLAN _MB(2,10,0,0,0)