[libcamera-devel,3/3] ipa: raspberrypi: imx477: Get sensor temperature from embedded data
diff mbox series

Message ID 20220623144410.20725-4-naush@raspberrypi.com
State Superseded
Headers show
Series
  • Add SensorTemperature control
Related show

Commit Message

Naushir Patuck June 23, 2022, 2:44 p.m. UTC 
Fetch the sensor temperature value from the embedded data buffer and add it to
the DeviceStatus structure in CamHelperImx477::PopulateMetadata().

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
---
 src/ipa/raspberrypi/cam_helper_imx477.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Kieran Bingham June 23, 2022, 4:21 p.m. UTC | #1 
Quoting Naushir Patuck via libcamera-devel (2022-06-23 15:44:10)
> Fetch the sensor temperature value from the embedded data buffer and add it to
> the DeviceStatus structure in CamHelperImx477::PopulateMetadata().
> 
> Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
> ---
>  src/ipa/raspberrypi/cam_helper_imx477.cpp | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/src/ipa/raspberrypi/cam_helper_imx477.cpp b/src/ipa/raspberrypi/cam_helper_imx477.cpp
> index 338fdc0c416a..0e1c0dbd142f 100644
> --- a/src/ipa/raspberrypi/cam_helper_imx477.cpp
> +++ b/src/ipa/raspberrypi/cam_helper_imx477.cpp
> @@ -5,6 +5,7 @@
>   * cam_helper_imx477.cpp - camera helper for imx477 sensor
>   */
>  
> +#include <algorithm>
>  #include <assert.h>
>  #include <cmath>
>  #include <stddef.h>
> @@ -34,8 +35,9 @@ constexpr uint32_t gainHiReg = 0x0204;
>  constexpr uint32_t gainLoReg = 0x0205;
>  constexpr uint32_t frameLengthHiReg = 0x0340;
>  constexpr uint32_t frameLengthLoReg = 0x0341;
> +constexpr uint32_t temperatureReg = 0x013a;
>  constexpr std::initializer_list<uint32_t> registerList =
> -       { expHiReg, expLoReg, gainHiReg, gainLoReg, frameLengthHiReg, frameLengthLoReg  };
> +       { expHiReg, expLoReg, gainHiReg, gainLoReg, frameLengthHiReg, frameLengthLoReg, temperatureReg  };
>  
>  class CamHelperImx477 : public CamHelper
>  {
> @@ -171,6 +173,7 @@ void CamHelperImx477::PopulateMetadata(const MdParser::RegisterMap &registers,
>         deviceStatus.shutter_speed = Exposure(registers.at(expHiReg) * 256 + registers.at(expLoReg));
>         deviceStatus.analogue_gain = Gain(registers.at(gainHiReg) * 256 + registers.at(gainLoReg));
>         deviceStatus.frame_length = registers.at(frameLengthHiReg) * 256 + registers.at(frameLengthLoReg);
> +       deviceStatus.sensor_temperature = std::clamp<int8_t>(registers.at(temperatureReg), -20, 80);

I don't think this code changes even if the sensor_temperature was a
std::optional<>, so:

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>


>  
>         metadata.Set("device.status", deviceStatus);
>  }
> -- 
> 2.25.1
>

Patch
diff mbox series 

diff --git a/src/ipa/raspberrypi/cam_helper_imx477.cpp b/src/ipa/raspberrypi/cam_helper_imx477.cpp
index 338fdc0c416a..0e1c0dbd142f 100644
--- a/src/ipa/raspberrypi/cam_helper_imx477.cpp
+++ b/src/ipa/raspberrypi/cam_helper_imx477.cpp
@@ -5,6 +5,7 @@ 
  * cam_helper_imx477.cpp - camera helper for imx477 sensor
  */
 
+#include <algorithm>
 #include <assert.h>
 #include <cmath>
 #include <stddef.h>
@@ -34,8 +35,9 @@  constexpr uint32_t gainHiReg = 0x0204;
 constexpr uint32_t gainLoReg = 0x0205;
 constexpr uint32_t frameLengthHiReg = 0x0340;
 constexpr uint32_t frameLengthLoReg = 0x0341;
+constexpr uint32_t temperatureReg = 0x013a;
 constexpr std::initializer_list<uint32_t> registerList =
-	{ expHiReg, expLoReg, gainHiReg, gainLoReg, frameLengthHiReg, frameLengthLoReg  };
+	{ expHiReg, expLoReg, gainHiReg, gainLoReg, frameLengthHiReg, frameLengthLoReg, temperatureReg  };
 
 class CamHelperImx477 : public CamHelper
 {
@@ -171,6 +173,7 @@  void CamHelperImx477::PopulateMetadata(const MdParser::RegisterMap &registers,
 	deviceStatus.shutter_speed = Exposure(registers.at(expHiReg) * 256 + registers.at(expLoReg));
 	deviceStatus.analogue_gain = Gain(registers.at(gainHiReg) * 256 + registers.at(gainLoReg));
 	deviceStatus.frame_length = registers.at(frameLengthHiReg) * 256 + registers.at(frameLengthLoReg);
+	deviceStatus.sensor_temperature = std::clamp<int8_t>(registers.at(temperatureReg), -20, 80);
 
 	metadata.Set("device.status", deviceStatus);
 }