diff --git a/AdaptiveBrightnessFirmware/Inc/light_sensors.hpp b/AdaptiveBrightnessFirmware/Inc/light_sensors.hpp index 6542373..424840d 100644 --- a/AdaptiveBrightnessFirmware/Inc/light_sensors.hpp +++ b/AdaptiveBrightnessFirmware/Inc/light_sensors.hpp @@ -9,6 +9,8 @@ class LightSensors { public: + static constexpr auto MAX_VALUE = uint16_t{4095}; + static inline const std::array& getValues() { sampleLightSensors(); diff --git a/AdaptiveBrightnessFirmware/Inc/terminal.hpp b/AdaptiveBrightnessFirmware/Inc/terminal.hpp index 3b5538e..7d948f1 100644 --- a/AdaptiveBrightnessFirmware/Inc/terminal.hpp +++ b/AdaptiveBrightnessFirmware/Inc/terminal.hpp @@ -144,12 +144,16 @@ class Terminal { static void readSensors() { const auto sensorValues = m_lightSensors.getValues(); - m_serial << "Sensor values: "; - for(const auto& ldrValue: sensorValues) { - m_serial.txNumber(ldrValue); - m_serial << ", "; + m_serial << "Sensor values: " << detail::ENDL; + for(size_t i = 0; i < sensorValues.size(); ++i) { + m_serial << "LDR"; + m_serial.txNumber(i + 1); + m_serial << ": "; + m_serial.template txNumber(sensorValues[i]); + m_serial << " - "; + m_serial.template txNumber(sensorValues[i] * 100 / m_lightSensors.MAX_VALUE); + m_serial << "%" << detail::ENDL; } - m_serial << detail::ENDL; } static void printVersion() { m_serial << "AdaptiveBrightness v" << detail::VERSION << detail::ENDL; }