From 8acfb8494c7575161b88dfa982819ecca2c79b3a Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Wed, 29 Jun 2022 09:57:22 +0100 Subject: ipa: raspberrypi: Use std::optional in DeviceStatus Switch the aperture, lens_position, and flash_intensity fields in the DeviceStatus structure to use std::optional instead of using invalid default values. Signed-off-by: Naushir Patuck Reviewed-by: Kieran Bingham Reviewed-by: David Plowman Signed-off-by: Kieran Bingham --- src/ipa/raspberrypi/controller/device_status.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/ipa/raspberrypi/controller/device_status.h') diff --git a/src/ipa/raspberrypi/controller/device_status.h b/src/ipa/raspberrypi/controller/device_status.h index eca3bf4b..b33f0d09 100644 --- a/src/ipa/raspberrypi/controller/device_status.h +++ b/src/ipa/raspberrypi/controller/device_status.h @@ -19,8 +19,7 @@ struct DeviceStatus { DeviceStatus() : shutter_speed(std::chrono::seconds(0)), frame_length(0), - analogue_gain(0.0), lens_position(0.0), aperture(0.0), - flash_intensity(0.0) + analogue_gain(0.0) { } @@ -32,11 +31,11 @@ struct DeviceStatus { uint32_t frame_length; double analogue_gain; /* 1.0/distance-in-metres, or 0 if unknown */ - double lens_position; + std::optional lens_position; /* 1/f so that brightness quadruples when this doubles, or 0 if unknown */ - double aperture; + std::optional aperture; /* proportional to brightness with 0 = no flash, 1 = maximum flash */ - double flash_intensity; + std::optional flash_intensity; /* Sensor reported temperature value (in degrees) */ std::optional sensor_temperature; }; -- cgit v1.2.1