BlackMark/AdaptiveBrightness
1
0
Fork 0
Code Issues Pull Requests Releases 5 Wiki Activity

Sample all ADC channels and add transmit indicator LED

Browse Source
This commit is contained in:
BlackMark 2020-06-28 17:05:29 +02:00
parent a5c15cd746
commit 67aa37561e
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
AdaptiveBrightnessFirmware/Src/main.cpp
View File

@ -8,11 +8,8 @@
#include "usbd_cdc_if.h" #include "usbd_cdc_if.h"
#include "utils.hpp" #include "utils.hpp"
template<size_t SensorID> std::array<uint16_t, 3> sampleLightSensors()
uint16_t readLightSensor()
{ {
static_assert(SensorID >= 0 && SensorID < 3, "Invalid light sensor ID");
std::array<uint16_t, 3> adcValues; std::array<uint16_t, 3> adcValues;
HAL_ADC_Start(&hadc); HAL_ADC_Start(&hadc);
@ -20,14 +17,14 @@ uint16_t readLightSensor()
util::for_constexpr( util::for_constexpr(
[&adcValues](const auto& idx) { [&adcValues](const auto& idx) {
constexpr auto i = idx.value; constexpr auto i = idx.value;
HAL_ADC_PollForConversion(&hadc, 100); HAL_ADC_PollForConversion(&hadc, HAL_MAX_DELAY);
adcValues[i] = HAL_ADC_GetValue(&hadc); adcValues[i] = HAL_ADC_GetValue(&hadc);
}, },
std::make_index_sequence<3>{}); std::make_index_sequence<adcValues.size()>{});
HAL_ADC_Stop(&hadc); HAL_ADC_Stop(&hadc);
return adcValues[SensorID]; return adcValues;
} }
int main() int main()
@ -45,20 +42,21 @@ int main()
HAL_GPIO_WritePin(BLUE_LED_GPIO_Port, BLUE_LED_Pin, GPIO_PIN_SET); HAL_GPIO_WritePin(BLUE_LED_GPIO_Port, BLUE_LED_Pin, GPIO_PIN_SET);
while(true) { while(true) {
// HAL_GPIO_WritePin(RED_LED_GPIO_Port, RED_LED_Pin, GPIO_PIN_RESET); const auto ldrValues = sampleLightSensors();
HAL_GPIO_WritePin(BLUE_LED_GPIO_Port, BLUE_LED_Pin, GPIO_PIN_RESET);
util::for_constexpr(
[](const auto& idx) {
constexpr auto i = idx.value;
const auto ldrVal = readLightSensor<i>();
std::array<uint8_t, 32> printBuffer; std::array<uint8_t, 32> printBuffer;
const auto bufLen = std::sprintf(reinterpret_cast<char*>(printBuffer.data()), "LDR%d: %d\r\n%s", i + 1, ldrVal, (i == 2) ? "\r\n" : "");
if(bufLen > 0)
CDC_Transmit_FS(printBuffer.data(), bufLen);
},
std::make_index_sequence<3>{});
// HAL_GPIO_WritePin(RED_LED_GPIO_Port, RED_LED_Pin, GPIO_PIN_SET); for(uint8_t i = 0; i < ldrValues.size(); ++i) {
const auto bufLen = std::sprintf(reinterpret_cast<char*>(printBuffer.data()), "LDR%d: %hu\r\n%s", i + 1, ldrValues[i], (i == 2) ? "\r\n" : "");
if(bufLen > 0) {
while(CDC_Transmit_FS(printBuffer.data(), bufLen) == USBD_BUSY)
;
}
}
HAL_GPIO_WritePin(BLUE_LED_GPIO_Port, BLUE_LED_Pin, GPIO_PIN_SET);
HAL_Delay(1000); HAL_Delay(1000);
} }