adafruit-mirror/Adafruit_Wippersnapper_Arduino
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

🐛 WIP, analogio - bring in

Browse source 
#635
This commit is contained in:
brentru 2024-10-03 12:06:08 -04:00
parent 067c220e87
commit 549874a2f0
3 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/analogIO/controller.cpp
View file

@ -240,16 +240,15 @@ void AnalogIOController::update() {
continue;
// Pins timer has expired, lets read the pin
// Read the pin's raw value
uint16_t value = _analogio_hardware->GetPinValue(pin.name);
if (pin.read_mode == wippersnapper_sensor_SensorType_SENSOR_TYPE_RAW) {
// Since we already read the raw value, encode and publish it to the
// broker
// Read the pin's raw value
uint16_t value = _analogio_hardware->GetPinValue(pin.name);
// Encode and publish it to the broker
EncodePublishPinValue(pin.name, value);
} else if (pin.read_mode ==
wippersnapper_sensor_SensorType_SENSOR_TYPE_VOLTAGE) {
// Convert the raw value into voltage
float pin_value = _analogio_hardware->CalculatePinVoltage(value);
float pin_value = _analogio_hardware->GetPinVoltage(pin.name);
// Encode and publish the voltage value to the broker
EncodePublishPinVoltage(pin.name, pin_value);
} else {

27
src/components/analogIO/hardware.cpp
View file

@ -75,8 +75,13 @@ void AnalogIOHardware::SetNativeADCResolution() {
analogReadResolution(16);
_native_adc_resolution = 12;
#elif defined(ARDUINO_ARCH_ESP32)
_is_adc_resolution_scaled = true;
_native_adc_resolution = 13;
_is_adc_resolution_scaled = false; // Defined in esp32-arduino BSP
#if defined(ESP32S3)
_native_adc_resolution = 13; // The ESP32-S3 ADC uses 13-bit resolution
#else
_native_adc_resolution =
12; // The ESP32, ESP32-S2, ESP32-C3 ADCs uses 12-bit resolution
#endif
#elif defined(ARDUINO_ARCH_RP2040)
_is_adc_resolution_scaled = true;
_native_adc_resolution = 10;
@ -125,7 +130,6 @@ void AnalogIOHardware::CalculateScaleFactor() {
*/
/*************************************************************************/
uint16_t AnalogIOHardware::GetPinValue(uint8_t pin) {
// Get the pin's value using Arduino API
uint16_t value = analogRead(pin);
// Scale the pins value
if (_is_adc_resolution_scaled) {
@ -140,13 +144,16 @@ uint16_t AnalogIOHardware::GetPinValue(uint8_t pin) {
/*************************************************************************/
/*!
@brief Calculates the voltage of an analog pin.
@param raw_value
The pin's raw value.
@return The pin's voltage, in Volts.
@brief Gets the voltage of an analog pin.
@param pin
The requested pin.
@return The pin's voltage.
*/
/*************************************************************************/
float AnalogIOHardware::CalculatePinVoltage(uint16_t raw_value) {
float voltage = raw_value * _voltage_scale_factor;
return voltage;
float AnalogIOHardware::GetPinVoltage(uint8_t pin) {
#ifdef ARDUINO_ARCH_ESP32
return analogReadMilliVolts(pin) / 1000.0;
#else
return getPinValue(pin) * _ref_voltage / 65536;
#endif // ARDUINO_ARCH_ESP32
}

2
src/components/analogIO/hardware.h
View file

@ -33,7 +33,7 @@ public:
void InitPin(uint8_t pin);
void DeinitPin(uint8_t pin);
uint16_t GetPinValue(uint8_t pin);
float CalculatePinVoltage(uint16_t raw_voltage);
float GetPinVoltage(uint8_t pin);
private:
uint8_t _native_adc_resolution; ///< Hardware's native ADC resolution.