mirror of
				https://github.com/subsurface/subsurface.git
				synced 2025-02-19 22:16:15 +00:00 
			
		
		
		
	Change 'sensor7' to 'dc_supplied_ppo2' for the dive computer supplied value.
Signed-off-by: Michael Keller <github@ike.ch>
This commit is contained in:
		
							parent
							
								
									9436f90a5b
								
							
						
					
					
						commit
						01dd0b74a5
					
				
					 4 changed files with 4 additions and 4 deletions
				
			
		| 
						 | 
				
			
			@ -585,7 +585,7 @@ static void parse_sample_keyvalue(void *_sample, const char *key, const std::str
 | 
			
		|||
		sample->o2sensor[5] = get_o2pressure(value.c_str());
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
	if (!strcmp(key, "sensor7")) {
 | 
			
		||||
	if (!strcmp(key, "dc_supplied_ppo2")) {
 | 
			
		||||
		sample->o2sensor[6] = get_o2pressure(value.c_str());
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -931,7 +931,7 @@ static void try_to_fill_sample(struct sample *sample, const char *name, char *bu
 | 
			
		|||
		return;
 | 
			
		||||
	if (MATCH("sensor6.sample", double_to_o2pressure, &sample->o2sensor[5])) // up to 6 CCR sensors
 | 
			
		||||
		return;
 | 
			
		||||
	if (MATCH("sensor7.sample", double_to_o2pressure, &sample->o2sensor[6])) // the dive computer calculated ppO2
 | 
			
		||||
	if (MATCH("dc_supplied_ppo2.sample", double_to_o2pressure, &sample->o2sensor[6])) // the dive computer calculated ppO2
 | 
			
		||||
		return;
 | 
			
		||||
	if (MATCH("po2.sample", double_to_o2pressure, &sample->setpoint))
 | 
			
		||||
		return;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -343,7 +343,7 @@ static void save_sample(struct membuffer *b, const struct sample &sample, struct
 | 
			
		|||
	}
 | 
			
		||||
 | 
			
		||||
	if ((sample.o2sensor[6].mbar) && (sample.o2sensor[6].mbar != old.o2sensor[6].mbar)) {
 | 
			
		||||
		put_milli(b, " sensor7=", sample.o2sensor[6].mbar, "bar");
 | 
			
		||||
		put_milli(b, " dc_supplied_ppo2=", sample.o2sensor[6].mbar, "bar");
 | 
			
		||||
		old.o2sensor[6] = sample.o2sensor[6];
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -328,7 +328,7 @@ static void save_sample(struct membuffer *b, const struct sample &sample, struct
 | 
			
		|||
	}
 | 
			
		||||
 | 
			
		||||
	if ((sample.o2sensor[6].mbar) && (sample.o2sensor[6].mbar != old.o2sensor[6].mbar)) {
 | 
			
		||||
		put_milli(b, " sensor7='", sample.o2sensor[6].mbar, " bar'");
 | 
			
		||||
		put_milli(b, " dc_supplied_ppo2='", sample.o2sensor[6].mbar, " bar'");
 | 
			
		||||
		old.o2sensor[6] = sample.o2sensor[6];
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue