Mercurial > public > ostc4

comparison Discovery/Src/show_logbook.c @ 1020:b0d3e8b84966 GasConsumption

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix: Add Missing Compass Heading to the Logbook Reader. Fix: Add Missing Scrubber State to the Logbook Reader.
author heinrichsweikamp
date Fri, 20 Jun 2025 07:59:32 +0200
parents bad5561c0c59
children
comparison
equal deleted inserted replaced
1019:67e3dbc4d212 1020:b0d3e8b84966
453 uint16_t bottlePressureEnd = 0; 453 uint16_t bottlePressureEnd = 0;
454 uint16_t loop = 0; 454 uint16_t loop = 0;
455 #endif 455 #endif
456 456
457 uint16_t dataLength = 0; 457 uint16_t dataLength = 0;
458 dataLength = logbook_readSampleData(StepBackwards, 1000, depthdata,gasdata, tempdata, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tankdata, &posCoord, NULL); 458 dataLength = logbook_readSampleData(StepBackwards, 1000, depthdata,gasdata, tempdata, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tankdata, NULL, &posCoord, NULL, NULL);
459 459
460 //Print Date 460 //Print Date
461 uint8_t year = logbookHeader.dateYear; 461 uint8_t year = logbookHeader.dateYear;
462 uint8_t month = logbookHeader.dateMonth; 462 uint8_t month = logbookHeader.dateMonth;
463 uint8_t day = logbookHeader.dateDay; 463 uint8_t day = logbookHeader.dateDay;
750 uint8_t gasdata[1000]; 750 uint8_t gasdata[1000];
751 int16_t tempdata[1000]; 751 int16_t tempdata[1000];
752 uint16_t decoDepthdata[1000]; 752 uint16_t decoDepthdata[1000];
753 uint16_t *pDecoDepthData = 0; 753 uint16_t *pDecoDepthData = 0;
754 754
755 dataLength = logbook_readSampleData(StepBackwards, 1000, depthdata,gasdata, tempdata, NULL, NULL, NULL, NULL, NULL, NULL, NULL, decoDepthdata, NULL, NULL, NULL); 755 dataLength = logbook_readSampleData(StepBackwards, 1000, depthdata,gasdata, tempdata, NULL, NULL, NULL, NULL, NULL, NULL, NULL, decoDepthdata, NULL, NULL, NULL, NULL, NULL);
756 756
757 for(int i = 0; i<dataLength; i++) 757 for(int i = 0; i<dataLength; i++)
758 { 758 {
759 if(decoDepthdata[i] >= 300) 759 if(decoDepthdata[i] >= 300)
760 { 760 {
916 916
917 logbook_getHeader(StepBackwards, &logbookHeader); 917 logbook_getHeader(StepBackwards, &logbookHeader);
918 uint16_t dataLength = 0; 918 uint16_t dataLength = 0;
919 uint16_t depthdata[1000]; 919 uint16_t depthdata[1000];
920 uint8_t gasdata[1000]; 920 uint8_t gasdata[1000];
921 dataLength = logbook_readSampleData(StepBackwards, 1000, depthdata,gasdata, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); 921 dataLength = logbook_readSampleData(StepBackwards, 1000, depthdata,gasdata, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
922 922
923 char msg[MSG_LENGTH]; 923 char msg[MSG_LENGTH];
924 char gas_name[15]; 924 char gas_name[15];
925 int j = 0; 925 int j = 0;
926 926
1046 uint16_t *sensor1 = ppO2data; 1046 uint16_t *sensor1 = ppO2data;
1047 uint8_t sensorDataAvailable[] = {0,0,0}; 1047 uint8_t sensorDataAvailable[] = {0,0,0};
1048 1048
1049 1049
1050 if(!isLoopMode(logbookHeader.diveMode)) 1050 if(!isLoopMode(logbookHeader.diveMode))
1051 dataLength = logbook_readSampleData(StepBackwards, 1000, depthdata,gasdata, NULL, ppO2data, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); 1051 dataLength = logbook_readSampleData(StepBackwards, 1000, depthdata,gasdata, NULL, ppO2data, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1052 else 1052 else
1053 { 1053 {
1054 switch(logbookHeader.CCRmode) 1054 switch(logbookHeader.CCRmode)
1055 { 1055 {
1056 case CCRMODE_FixedSetpoint: 1056 case CCRMODE_FixedSetpoint:
1057 default: dataLength = logbook_readSampleData(StepBackwards, 1000, depthdata, gasdata, NULL, NULL, setpoint, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); 1057 default: dataLength = logbook_readSampleData(StepBackwards, 1000, depthdata, gasdata, NULL, NULL, setpoint, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1058 break; 1058 break;
1059 case CCRMODE_Sensors: dataLength = logbook_readSampleData(StepBackwards, 1000, depthdata, gasdata, NULL, NULL, NULL, sensor1, sensor2, sensor3, NULL, NULL, NULL, NULL, NULL, NULL); 1059 case CCRMODE_Sensors: dataLength = logbook_readSampleData(StepBackwards, 1000, depthdata, gasdata, NULL, NULL, NULL, sensor1, sensor2, sensor3, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1060 if(!check_data_array_empty(sensor1)) 1060 if(!check_data_array_empty(sensor1))
1061 { 1061 {
1062 sensorDataAvailable[0] = 1; 1062 sensorDataAvailable[0] = 1;
1063 } 1063 }
1064 if(!check_data_array_empty(sensor2)) 1064 if(!check_data_array_empty(sensor2))
1071 } 1071 }
1072 if((logbookHeader.diveMode == DIVEMODE_PSCR) && (sensorDataAvailable[0] + sensorDataAvailable[1] + sensorDataAvailable[2] != 3)) /*insert sim data if not all three sensors are in use*/ 1072 if((logbookHeader.diveMode == DIVEMODE_PSCR) && (sensorDataAvailable[0] + sensorDataAvailable[1] + sensorDataAvailable[2] != 3)) /*insert sim data if not all three sensors are in use*/
1073 { 1073 {
1074 if(sensorDataAvailable[0] == 0) 1074 if(sensorDataAvailable[0] == 0)
1075 { 1075 {
1076 logbook_readSampleData(StepBackwards, 1000, depthdata,gasdata, NULL, sensor1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); 1076 logbook_readSampleData(StepBackwards, 1000, depthdata,gasdata, NULL, sensor1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1077 sensorDataAvailable[0] = 1; 1077 sensorDataAvailable[0] = 1;
1078 } 1078 }
1079 else if(sensorDataAvailable[1] == 0) 1079 else if(sensorDataAvailable[1] == 0)
1080 { 1080 {
1081 logbook_readSampleData(StepBackwards, 1000, depthdata,gasdata, NULL, sensor2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); 1081 logbook_readSampleData(StepBackwards, 1000, depthdata,gasdata, NULL, sensor2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1082 sensorDataAvailable[1] = 1; 1082 sensorDataAvailable[1] = 1;
1083 } 1083 }
1084 else if(sensorDataAvailable[2] == 0) 1084 else if(sensorDataAvailable[2] == 0)
1085 { 1085 {
1086 logbook_readSampleData(StepBackwards, 1000, depthdata,gasdata, NULL, sensor3, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); 1086 logbook_readSampleData(StepBackwards, 1000, depthdata,gasdata, NULL, sensor3, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1087 sensorDataAvailable[2] = 1; 1087 sensorDataAvailable[2] = 1;
1088 } 1088 }
1089 } 1089 }
1090 break; 1090 break;
1091 case CCRMODE_Simulation: dataLength = logbook_readSampleData(StepBackwards, 1000, depthdata,gasdata, NULL, ppO2data, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); 1091 case CCRMODE_Simulation: dataLength = logbook_readSampleData(StepBackwards, 1000, depthdata,gasdata, NULL, ppO2data, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
1092 break; 1092 break;
1093 } 1093 }
1094 } 1094 }
1095 1095
1096 1096