commit 6b1f2a531f2b9c07fd56639c8ac9a7fb651127bd
author Yuval Peress <peress@google.com> Tue Aug 13 17:36:56 2024 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 13 17:36:56 2024 +0000
tree 223a25c8cfe7d7233b3c8531e540eb619c5024b9
parent c2590490a8081d34699260fa2b55c24af0e2c23e

air_sensor: Move common reading code to function

I erased 2 that were the same. And I copied it in another place called
a function. I used the function to read the sensor.

- Tali

Change-Id: I4e4a97b03891e2455839ca302040b3dc3f504a10
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/showcase/sense/+/229291
Reviewed-by: Taylor Cramer <cramertj@google.com>
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
Commit-Queue: Yuval Peress <peress@google.com>

modules/air_sensor/service.cc

diff --git a/modules/air_sensor/service.cc b/modules/air_sensor/service.cc
index f12e931..2426393 100644
--- a/modules/air_sensor/service.cc
+++ b/modules/air_sensor/service.cc
@@ -24,14 +24,19 @@
   air_sensor_ = &air_sensor;
 }
 
-pw::Status AirSensorService::Measure(const pw_protobuf_Empty&,
-                                     air_sensor_Measurement& response) {
-  PW_TRY(air_sensor_->Measure(notification_));
-  notification_.acquire();
+void AirSensorService::FillMeasurement(air_sensor_Measurement& response) {
   response.temperature = air_sensor_->temperature();
   response.pressure = air_sensor_->pressure();
   response.humidity = air_sensor_->humidity();
   response.gas_resistance = air_sensor_->gas_resistance();
+  response.score = air_sensor_->score();
+}
+
+pw::Status AirSensorService::Measure(const pw_protobuf_Empty&,
+                                     air_sensor_Measurement& response) {
+  PW_TRY(air_sensor_->Measure(notification_));
+  notification_.acquire();
+  FillMeasurement(response);
   return pw::OkStatus();
 }
 
@@ -60,19 +65,11 @@
 }
 
 void AirSensorService::SampleCallback(pw::chrono::SystemClock::time_point) {
-  float temperature = air_sensor_->temperature();
-  float pressure = air_sensor_->pressure();
-  float humidity = air_sensor_->humidity();
-  float gas_resistance = air_sensor_->gas_resistance();
-  uint16_t score = air_sensor_->score();
+  air_sensor_Measurement response;
 
-  pw::Status status = sample_writer_.Write({
-      .temperature = temperature,
-      .pressure = pressure,
-      .humidity = humidity,
-      .gas_resistance = gas_resistance,
-      .score = score,
-  });
+  FillMeasurement(response);
+
+  pw::Status status = sample_writer_.Write(response);
   if (status.ok()) {
     ScheduleSample();
   } else {

modules/air_sensor/service.h

diff --git a/modules/air_sensor/service.h b/modules/air_sensor/service.h
index 18e0093..6331075 100644
--- a/modules/air_sensor/service.h
+++ b/modules/air_sensor/service.h
@@ -47,6 +47,8 @@
 
   void ScheduleSample();
 
+  void FillMeasurement(air_sensor_Measurement& response);
+
   Worker* worker_ = nullptr;
   AirSensor* air_sensor_ = nullptr;
   pw::sync::ThreadNotification notification_;