Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Side by Side Diff: device/generic_sensor/linux/platform_sensor_utils_linux.cc

Issue 2492773002: [sensors][CrOS/Linux] Implementation of motion sensors for CrOS/Linux platforms (Closed)
Patch Set: rebased Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "device/generic_sensor/linux/platform_sensor_utils_linux.h" 5 #include "device/generic_sensor/linux/platform_sensor_utils_linux.h"
6 6
7 #include "base/files/file_enumerator.h" 7 #include "base/files/file_enumerator.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "base/threading/thread_restrictions.h" 11 #include "base/threading/thread_restrictions.h"
12 #include "device/generic_sensor/linux/sensor_data_linux.h"
13 #include "device/generic_sensor/public/cpp/sensor_reading.h" 12 #include "device/generic_sensor/public/cpp/sensor_reading.h"
14 13
15 namespace device { 14 namespace device {
16 15
17 namespace { 16 namespace {
18 17
19 bool InitSensorPaths(const std::vector<std::string>& input_names, 18 bool InitSensorPaths(const std::vector<std::string>& input_names,
20 const char* base_path, 19 const char* base_path,
21 std::vector<base::FilePath>* sensor_paths) { 20 std::vector<base::FilePath>* sensor_paths) {
22 // Search the iio/devices directory for a subdirectory (eg "device0" or 21 // Search the iio/devices directory for a subdirectory (eg "device0" or
(...skipping 22 matching lines...) Expand all
45 // treated as a non-existing one. 44 // treated as a non-existing one.
46 for (auto const& file_names : data.sensor_file_names) { 45 for (auto const& file_names : data.sensor_file_names) {
47 // Supply InitSensorPaths() with a set of files. 46 // Supply InitSensorPaths() with a set of files.
48 // Only one file from each set should be found. 47 // Only one file from each set should be found.
49 if (!InitSensorPaths(file_names, data.base_path_sensor_linux, sensor_paths)) 48 if (!InitSensorPaths(file_names, data.base_path_sensor_linux, sensor_paths))
50 return false; 49 return false;
51 } 50 }
52 return true; 51 return true;
53 } 52 }
54 53
54 // Returns -1 if unable to read a scaling value, 1 if scaling value is not
55 // found. Otherwise, returns a scaling value read from a file.
56 double GetSensorScalingValue(const base::FilePath& scale_file_path) {
57 if (!base::PathExists(scale_file_path))
58 return 1;
59
60 std::string value;
61 if (!base::ReadFileToString(scale_file_path, &value))
62 return -1;
63
64 double scaling_value;
65 base::TrimWhitespaceASCII(value, base::TRIM_ALL, &value);
66 if (!base::StringToDouble(value, &scaling_value))
67 return -1;
68 return scaling_value;
69 }
70
55 } // namespace 71 } // namespace
56 72
57 // static 73 // static
58 std::unique_ptr<SensorReader> SensorReader::Create( 74 std::unique_ptr<SensorReader> SensorReader::Create(
59 const SensorDataLinux& data) { 75 const SensorDataLinux& data) {
60 base::ThreadRestrictions::AssertIOAllowed(); 76 base::ThreadRestrictions::AssertIOAllowed();
61 std::vector<base::FilePath> sensor_paths; 77 std::vector<base::FilePath> sensor_paths;
62 if (!GetSensorFilePaths(data, &sensor_paths)) 78 if (!GetSensorFilePaths(data, &sensor_paths))
63 return nullptr; 79 return nullptr;
64 return base::WrapUnique(new SensorReader(std::move(sensor_paths))); 80
81 DCHECK(!sensor_paths.empty());
82 const base::FilePath scale_file_path =
83 sensor_paths.back().DirName().Append(data.sensor_scale_name);
84 double scaling_value = GetSensorScalingValue(scale_file_path);
85
86 // A file with a scaling value is found, but couldn't be read.
87 if (scaling_value == -1)
88 return nullptr;
89
90 return base::WrapUnique(new SensorReader(
91 std::move(sensor_paths), scaling_value, data.apply_scaling_func));
65 } 92 }
66 93
67 SensorReader::SensorReader(std::vector<base::FilePath> sensor_paths) 94 SensorReader::SensorReader(
68 : sensor_paths_(std::move(sensor_paths)) { 95 std::vector<base::FilePath> sensor_paths,
96 double scaling_value,
97 const SensorDataLinux::ReaderFunctor& apply_scaling_func)
98 : sensor_paths_(std::move(sensor_paths)),
99 scaling_value_(scaling_value),
100 apply_scaling_func_(apply_scaling_func) {
69 DCHECK(!sensor_paths_.empty()); 101 DCHECK(!sensor_paths_.empty());
70 } 102 }
71 103
72 SensorReader::~SensorReader() = default; 104 SensorReader::~SensorReader() = default;
73 105
74 bool SensorReader::ReadSensorReading(SensorReading* reading) { 106 bool SensorReader::ReadSensorReading(SensorReading* reading) {
75 base::ThreadRestrictions::AssertIOAllowed(); 107 base::ThreadRestrictions::AssertIOAllowed();
76 SensorReading readings; 108 SensorReading readings;
77 DCHECK_LE(sensor_paths_.size(), arraysize(readings.values)); 109 DCHECK_LE(sensor_paths_.size(), arraysize(readings.values));
78 int i = 0; 110 int i = 0;
79 for (const auto& path : sensor_paths_) { 111 for (const auto& path : sensor_paths_) {
80 std::string new_read_value; 112 std::string new_read_value;
81 if (!base::ReadFileToString(path, &new_read_value)) 113 if (!base::ReadFileToString(path, &new_read_value))
82 return false; 114 return false;
83 115
84 double new_value = 0; 116 double new_value = 0;
85 base::TrimWhitespaceASCII(new_read_value, base::TRIM_ALL, &new_read_value); 117 base::TrimWhitespaceASCII(new_read_value, base::TRIM_ALL, &new_read_value);
86 if (!base::StringToDouble(new_read_value, &new_value)) 118 if (!base::StringToDouble(new_read_value, &new_value))
87 return false; 119 return false;
88 readings.values[i++] = new_value; 120 readings.values[i++] = new_value;
89 } 121 }
122 if (!apply_scaling_func_.is_null())
123 apply_scaling_func_.Run(scaling_value_, readings);
90 *reading = readings; 124 *reading = readings;
91 return true; 125 return true;
92 } 126 }
93 127
94 } // namespace device 128 } // namespace device
OLDNEW
« no previous file with comments | « device/generic_sensor/linux/platform_sensor_utils_linux.h ('k') | device/generic_sensor/linux/sensor_data_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698