mirror of
https://github.com/letscontrolit/ESPEasy.git
synced 2026-09-15 11:05:08 +00:00
[P113] Apply uncrustify source formatting
This commit is contained in:
Ton Huisman
+114
-110
@@ -1,8 +1,9 @@
|
||||
#include "_Plugin_Helper.h"
|
||||
#ifdef USES_P113
|
||||
//#######################################################################################################
|
||||
//########################### Plugin 113 VL53L1X I2C Ranging LIDAR #################################
|
||||
//#######################################################################################################
|
||||
|
||||
// #######################################################################################################
|
||||
// ########################### Plugin 113 VL53L1X I2C Ranging LIDAR #################################
|
||||
// #######################################################################################################
|
||||
|
||||
// Changelog:
|
||||
// 2021-04-06, tonhuisman: Remove Interval optional attribute to avoid system overload, cleanup source
|
||||
@@ -10,13 +11,13 @@
|
||||
|
||||
// needs SparkFun_VL53L1X library from https://github.com/sparkfun/SparkFun_VL53L1X_Arduino_Library
|
||||
|
||||
#include "src/PluginStructs/P113_data_struct.h"
|
||||
# include "src/PluginStructs/P113_data_struct.h"
|
||||
|
||||
#define PLUGIN_113
|
||||
#define PLUGIN_ID_113 113
|
||||
#define PLUGIN_NAME_113 "Distance - VL53L1X (400cm) [TESTING]"
|
||||
#define PLUGIN_VALUENAME1_113 "Distance"
|
||||
#define PLUGIN_VALUENAME2_113 "Ambient"
|
||||
# define PLUGIN_113
|
||||
# define PLUGIN_ID_113 113
|
||||
# define PLUGIN_NAME_113 "Distance - VL53L1X (400cm) [TESTING]"
|
||||
# define PLUGIN_VALUENAME1_113 "Distance"
|
||||
# define PLUGIN_VALUENAME2_113 "Ambient"
|
||||
|
||||
|
||||
boolean Plugin_113(byte function, struct EventStruct *event, String& string)
|
||||
@@ -26,136 +27,139 @@ boolean Plugin_113(byte function, struct EventStruct *event, String& string)
|
||||
switch (function)
|
||||
{
|
||||
case PLUGIN_DEVICE_ADD:
|
||||
{
|
||||
Device[++deviceCount].Number = PLUGIN_ID_113;
|
||||
Device[deviceCount].Type = DEVICE_TYPE_I2C;
|
||||
Device[deviceCount].VType = Sensor_VType::SENSOR_TYPE_SINGLE;
|
||||
Device[deviceCount].Ports = 0;
|
||||
Device[deviceCount].PullUpOption = false;
|
||||
Device[deviceCount].InverseLogicOption = false;
|
||||
Device[deviceCount].FormulaOption = true;
|
||||
Device[deviceCount].ValueCount = 2;
|
||||
Device[deviceCount].SendDataOption = true;
|
||||
Device[deviceCount].TimerOption = true;
|
||||
Device[deviceCount].GlobalSyncOption = true;
|
||||
break;
|
||||
}
|
||||
{
|
||||
Device[++deviceCount].Number = PLUGIN_ID_113;
|
||||
Device[deviceCount].Type = DEVICE_TYPE_I2C;
|
||||
Device[deviceCount].VType = Sensor_VType::SENSOR_TYPE_SINGLE;
|
||||
Device[deviceCount].Ports = 0;
|
||||
Device[deviceCount].PullUpOption = false;
|
||||
Device[deviceCount].InverseLogicOption = false;
|
||||
Device[deviceCount].FormulaOption = true;
|
||||
Device[deviceCount].ValueCount = 2;
|
||||
Device[deviceCount].SendDataOption = true;
|
||||
Device[deviceCount].TimerOption = true;
|
||||
Device[deviceCount].GlobalSyncOption = true;
|
||||
break;
|
||||
}
|
||||
|
||||
case PLUGIN_GET_DEVICENAME:
|
||||
{
|
||||
string = F(PLUGIN_NAME_113);
|
||||
break;
|
||||
}
|
||||
{
|
||||
string = F(PLUGIN_NAME_113);
|
||||
break;
|
||||
}
|
||||
|
||||
case PLUGIN_GET_DEVICEVALUENAMES:
|
||||
{
|
||||
strcpy_P(ExtraTaskSettings.TaskDeviceValueNames[0], PSTR(PLUGIN_VALUENAME1_113));
|
||||
strcpy_P(ExtraTaskSettings.TaskDeviceValueNames[1], PSTR(PLUGIN_VALUENAME2_113));
|
||||
break;
|
||||
}
|
||||
{
|
||||
strcpy_P(ExtraTaskSettings.TaskDeviceValueNames[0], PSTR(PLUGIN_VALUENAME1_113));
|
||||
strcpy_P(ExtraTaskSettings.TaskDeviceValueNames[1], PSTR(PLUGIN_VALUENAME2_113));
|
||||
break;
|
||||
}
|
||||
|
||||
case PLUGIN_WEBFORM_SHOW_I2C_PARAMS:
|
||||
{
|
||||
byte choice = PCONFIG(0);
|
||||
int optionValues[2] = { 0x29, 0x30 };
|
||||
addFormSelectorI2C(F("plugin_113_vl53l1x_i2c"), 2, optionValues, choice);
|
||||
// addFormNote(F("SDO Low=0x29, High=0x30"));
|
||||
break;
|
||||
}
|
||||
{
|
||||
byte choice = PCONFIG(0);
|
||||
int optionValues[2] = { 0x29, 0x30 };
|
||||
addFormSelectorI2C(F("plugin_113_vl53l1x_i2c"), 2, optionValues, choice);
|
||||
|
||||
// addFormNote(F("SDO Low=0x29, High=0x30"));
|
||||
break;
|
||||
}
|
||||
|
||||
case PLUGIN_WEBFORM_LOAD:
|
||||
{
|
||||
unsigned int choiceMode2 = PCONFIG(1);
|
||||
{
|
||||
unsigned int choiceMode2 = PCONFIG(1);
|
||||
{
|
||||
String optionsMode2[6];
|
||||
optionsMode2[0] = F("100ms (Normal)");
|
||||
optionsMode2[1] = F("20ms (Fastest)");
|
||||
optionsMode2[2] = F("33ms (Fast)");
|
||||
optionsMode2[3] = F("50ms");
|
||||
optionsMode2[4] = F("200ms (Accurate)");
|
||||
optionsMode2[5] = F("500ms");
|
||||
int optionValuesMode2[6] = { 100, 20, 33, 50, 200, 500 };
|
||||
addFormSelector(F("Timing"), F("plugin_113_vl53l1x_timing"), 6, optionsMode2, optionValuesMode2, choiceMode2);
|
||||
}
|
||||
|
||||
int choiceMode3 = PCONFIG(2);
|
||||
{
|
||||
String optionsMode3[2];
|
||||
optionsMode3[0] = F("Normal (~130cm)");
|
||||
optionsMode3[1] = F("Long (~400cm)");
|
||||
int optionValuesMode3[2] = {0, 1 };
|
||||
addFormSelector(F("Range"), F("plugin_113_vl53l1x_range"), 2, optionsMode3, optionValuesMode3, choiceMode3);
|
||||
}
|
||||
addFormCheckBox(F("Send event when value unchanged"), F("plugin_113_vl53l1x_notchanged"), PCONFIG(3) == 1);
|
||||
addFormNote(F("When checked, 'Trigger delta' setting is ignored!"));
|
||||
|
||||
addFormNumericBox(F("Trigger delta"), F("plugin_113_trigger_delta"), PCONFIG(4), 0, 100);
|
||||
addUnit(F("0-100mm"));
|
||||
addFormNote(F("Minimal change in Distance to trigger an event."));
|
||||
|
||||
success = true;
|
||||
break;
|
||||
String optionsMode2[6];
|
||||
optionsMode2[0] = F("100ms (Normal)");
|
||||
optionsMode2[1] = F("20ms (Fastest)");
|
||||
optionsMode2[2] = F("33ms (Fast)");
|
||||
optionsMode2[3] = F("50ms");
|
||||
optionsMode2[4] = F("200ms (Accurate)");
|
||||
optionsMode2[5] = F("500ms");
|
||||
int optionValuesMode2[6] = { 100, 20, 33, 50, 200, 500 };
|
||||
addFormSelector(F("Timing"), F("plugin_113_vl53l1x_timing"), 6, optionsMode2, optionValuesMode2, choiceMode2);
|
||||
}
|
||||
|
||||
int choiceMode3 = PCONFIG(2);
|
||||
{
|
||||
String optionsMode3[2];
|
||||
optionsMode3[0] = F("Normal (~130cm)");
|
||||
optionsMode3[1] = F("Long (~400cm)");
|
||||
int optionValuesMode3[2] = { 0, 1 };
|
||||
addFormSelector(F("Range"), F("plugin_113_vl53l1x_range"), 2, optionsMode3, optionValuesMode3, choiceMode3);
|
||||
}
|
||||
addFormCheckBox(F("Send event when value unchanged"), F("plugin_113_vl53l1x_notchanged"), PCONFIG(3) == 1);
|
||||
addFormNote(F("When checked, 'Trigger delta' setting is ignored!"));
|
||||
|
||||
addFormNumericBox(F("Trigger delta"), F("plugin_113_trigger_delta"), PCONFIG(4), 0, 100);
|
||||
addUnit(F("0-100mm"));
|
||||
addFormNote(F("Minimal change in Distance to trigger an event."));
|
||||
|
||||
success = true;
|
||||
break;
|
||||
}
|
||||
|
||||
case PLUGIN_WEBFORM_SAVE:
|
||||
{
|
||||
PCONFIG(0) = getFormItemInt(F("plugin_113_vl53l1x_i2c"));
|
||||
PCONFIG(1) = getFormItemInt(F("plugin_113_vl53l1x_timing"));
|
||||
PCONFIG(2) = getFormItemInt(F("plugin_113_vl53l1x_range"));
|
||||
PCONFIG(3) = isFormItemChecked(F("plugin_113_vl53l1x_notchanged")) ? 1 : 0;
|
||||
PCONFIG(4) = getFormItemInt(F("plugin_113_trigger_delta"));
|
||||
{
|
||||
PCONFIG(0) = getFormItemInt(F("plugin_113_vl53l1x_i2c"));
|
||||
PCONFIG(1) = getFormItemInt(F("plugin_113_vl53l1x_timing"));
|
||||
PCONFIG(2) = getFormItemInt(F("plugin_113_vl53l1x_range"));
|
||||
PCONFIG(3) = isFormItemChecked(F("plugin_113_vl53l1x_notchanged")) ? 1 : 0;
|
||||
PCONFIG(4) = getFormItemInt(F("plugin_113_trigger_delta"));
|
||||
|
||||
success = true;
|
||||
break;
|
||||
}
|
||||
success = true;
|
||||
break;
|
||||
}
|
||||
|
||||
case PLUGIN_INIT:
|
||||
{
|
||||
initPluginTaskData(event->TaskIndex, new (std::nothrow) P113_data_struct(PCONFIG(0), PCONFIG(1), PCONFIG(2) == 1));
|
||||
P113_data_struct *P113_data = static_cast<P113_data_struct *>(getPluginTaskData(event->TaskIndex));
|
||||
{
|
||||
initPluginTaskData(event->TaskIndex, new (std::nothrow) P113_data_struct(PCONFIG(0), PCONFIG(1), PCONFIG(2) == 1));
|
||||
P113_data_struct *P113_data = static_cast<P113_data_struct *>(getPluginTaskData(event->TaskIndex));
|
||||
|
||||
if (nullptr != P113_data) {
|
||||
success = P113_data->begin(); // Start the sensor
|
||||
}
|
||||
break;
|
||||
if (nullptr != P113_data) {
|
||||
success = P113_data->begin(); // Start the sensor
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case PLUGIN_EXIT:
|
||||
{
|
||||
success = true;
|
||||
break;
|
||||
}
|
||||
{
|
||||
success = true;
|
||||
break;
|
||||
}
|
||||
|
||||
case PLUGIN_READ:
|
||||
{
|
||||
P113_data_struct *P113_data = static_cast<P113_data_struct *>(getPluginTaskData(event->TaskIndex));
|
||||
{
|
||||
P113_data_struct *P113_data = static_cast<P113_data_struct *>(getPluginTaskData(event->TaskIndex));
|
||||
|
||||
if (nullptr != P113_data) {
|
||||
uint16_t dist = P113_data->readDistance();
|
||||
uint16_t ambient = P113_data->readAmbient();
|
||||
bool triggered = (dist > UserVar[event->BaseVarIndex] + PCONFIG(4)) || (dist < UserVar[event->BaseVarIndex] - PCONFIG(4));
|
||||
if (P113_data->isReadSuccessful() && (triggered || PCONFIG(3) == 1) && dist != 0xFFFF) {
|
||||
UserVar[event->BaseVarIndex + 0] = dist;
|
||||
UserVar[event->BaseVarIndex + 1] = ambient;
|
||||
success = true;
|
||||
}
|
||||
if (nullptr != P113_data) {
|
||||
uint16_t dist = P113_data->readDistance();
|
||||
uint16_t ambient = P113_data->readAmbient();
|
||||
bool triggered = (dist > UserVar[event->BaseVarIndex] + PCONFIG(4)) || (dist < UserVar[event->BaseVarIndex] - PCONFIG(4));
|
||||
|
||||
if (P113_data->isReadSuccessful() && (triggered || (PCONFIG(3) == 1)) && (dist != 0xFFFF)) {
|
||||
UserVar[event->BaseVarIndex + 0] = dist;
|
||||
UserVar[event->BaseVarIndex + 1] = ambient;
|
||||
success = true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case PLUGIN_FIFTY_PER_SECOND:
|
||||
{
|
||||
P113_data_struct *P113_data = static_cast<P113_data_struct *>(getPluginTaskData(event->TaskIndex));
|
||||
if (nullptr != P113_data) {
|
||||
if (P113_data->startRead()) {
|
||||
if (P113_data->readAvailable() && Settings.TaskDeviceTimer[event->TaskIndex] == 0) { // Trigger as soon as there's a valid measurement and the time-out is set to 0
|
||||
Scheduler.schedule_task_device_timer(event->TaskIndex, millis() + 10);
|
||||
}
|
||||
{
|
||||
P113_data_struct *P113_data = static_cast<P113_data_struct *>(getPluginTaskData(event->TaskIndex));
|
||||
|
||||
if (nullptr != P113_data) {
|
||||
if (P113_data->startRead()) {
|
||||
if (P113_data->readAvailable() && (Settings.TaskDeviceTimer[event->TaskIndex] == 0)) { // Trigger as soon as there's a valid
|
||||
// measurement and the time-out is set to 0
|
||||
Scheduler.schedule_task_device_timer(event->TaskIndex, millis() + 10);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
return success;
|
||||
}
|
||||
|
||||
@@ -4,11 +4,10 @@
|
||||
|
||||
P113_data_struct::P113_data_struct(uint8_t i2c_addr, int timing, bool range) : i2cAddress(i2c_addr), timing(timing), range(range) {}
|
||||
|
||||
//**************************************************************************/
|
||||
// **************************************************************************/
|
||||
// Initialize VL53L1X
|
||||
//**************************************************************************/
|
||||
// **************************************************************************/
|
||||
bool P113_data_struct::begin() {
|
||||
|
||||
initState = true;
|
||||
|
||||
sensor.setI2CAddress(i2cAddress); // Initialize for configured address
|
||||
@@ -36,30 +35,32 @@ bool P113_data_struct::startRead() {
|
||||
if (initState && !readActive) {
|
||||
sensor.startRanging();
|
||||
readActive = true;
|
||||
distance = -1;
|
||||
distance = -1;
|
||||
}
|
||||
return readActive;
|
||||
}
|
||||
|
||||
bool P113_data_struct::readAvailable() {
|
||||
bool ready = sensor.checkForDataReady();
|
||||
|
||||
if (ready) {
|
||||
distance = sensor.getDistance();
|
||||
sensor.clearInterrupt();
|
||||
sensor.stopRanging();
|
||||
|
||||
// readActive = false;
|
||||
}
|
||||
return ready;
|
||||
}
|
||||
|
||||
uint16_t P113_data_struct::readDistance() {
|
||||
|
||||
success = false;
|
||||
|
||||
#if defined(P113_DEBUG) || defined (P113_DEBUG_DEBUG)
|
||||
# if defined(P113_DEBUG) || defined(P113_DEBUG_DEBUG)
|
||||
String log;
|
||||
#endif
|
||||
#ifdef P113_DEBUG_DEBUG
|
||||
# endif // if defined(P113_DEBUG) || defined(P113_DEBUG_DEBUG)
|
||||
# ifdef P113_DEBUG_DEBUG
|
||||
|
||||
if (loglevelActiveFor(LOG_LEVEL_DEBUG)) {
|
||||
log = F("VL53L1X : idx: 0x");
|
||||
log += String(i2cAddress, HEX);
|
||||
@@ -67,20 +68,20 @@ uint16_t P113_data_struct::readDistance() {
|
||||
log += String(initState, BIN);
|
||||
addLog(LOG_LEVEL_DEBUG, log);
|
||||
}
|
||||
#endif // P113_DEBUG_DEBUG
|
||||
# endif // P113_DEBUG_DEBUG
|
||||
|
||||
success = true;
|
||||
success = true;
|
||||
readActive = false;
|
||||
|
||||
if ( distance >= 8190 ) {
|
||||
#ifdef P113_DEBUG_DEBUG
|
||||
if (distance >= 8190) {
|
||||
# ifdef P113_DEBUG_DEBUG
|
||||
addLog(LOG_LEVEL_DEBUG, "VL53L1X: NO MEASUREMENT");
|
||||
#endif // P113_DEBUG_DEBUG
|
||||
# endif // P113_DEBUG_DEBUG
|
||||
success = false;
|
||||
}
|
||||
|
||||
#ifdef P113_DEBUG
|
||||
log = F("VL53L1X: Address: 0x");
|
||||
# ifdef P113_DEBUG
|
||||
log = F("VL53L1X: Address: 0x");
|
||||
log += String(i2cAddress, HEX);
|
||||
log += F(" / Timing: ");
|
||||
log += String(timing, DEC);
|
||||
@@ -89,10 +90,10 @@ uint16_t P113_data_struct::readDistance() {
|
||||
log += F(" / Distance: ");
|
||||
log += distance;
|
||||
addLog(LOG_LEVEL_INFO, log);
|
||||
#endif // P113_DEBUG
|
||||
# endif // P113_DEBUG
|
||||
|
||||
return distance;
|
||||
};
|
||||
}
|
||||
|
||||
uint16_t P113_data_struct::readAmbient() {
|
||||
return sensor.getAmbientRate();
|
||||
@@ -100,6 +101,6 @@ uint16_t P113_data_struct::readAmbient() {
|
||||
|
||||
bool P113_data_struct::isReadSuccessful() {
|
||||
return success;
|
||||
};
|
||||
}
|
||||
|
||||
#endif // ifdef USES_P113
|
||||
|
||||
@@ -4,22 +4,24 @@
|
||||
#include "../../_Plugin_Helper.h"
|
||||
#ifdef USES_P113
|
||||
|
||||
#define P113_DEBUG // Enable debugging output (INFO loglevel)
|
||||
#define P113_DEBUG_DEBUG // Enable extended debugging output (DEBUG loglevel)
|
||||
# define P113_DEBUG // Enable debugging output (INFO loglevel)
|
||||
# define P113_DEBUG_DEBUG // Enable extended debugging output (DEBUG loglevel)
|
||||
|
||||
#ifdef LIMIT_BUILD_SIZE
|
||||
#ifdef P113_DEBUG_DEBUG
|
||||
#undef P113_DEBUG_DEBUG
|
||||
#endif
|
||||
#endif
|
||||
# ifdef LIMIT_BUILD_SIZE
|
||||
# ifdef P113_DEBUG_DEBUG
|
||||
# undef P113_DEBUG_DEBUG
|
||||
# endif // ifdef P113_DEBUG_DEBUG
|
||||
# endif // ifdef LIMIT_BUILD_SIZE
|
||||
|
||||
#include <Wire.h>
|
||||
#include <SparkFun_VL53L1X.h>
|
||||
# include <Wire.h>
|
||||
# include <SparkFun_VL53L1X.h>
|
||||
|
||||
struct P113_data_struct : public PluginTaskData_base {
|
||||
public:
|
||||
|
||||
P113_data_struct(uint8_t i2c_addr, int timing, bool range);
|
||||
P113_data_struct(uint8_t i2c_addr,
|
||||
int timing,
|
||||
bool range);
|
||||
|
||||
bool begin();
|
||||
bool startRead();
|
||||
@@ -33,7 +35,7 @@ private:
|
||||
SFEVL53L1X sensor;
|
||||
|
||||
uint8_t i2cAddress;
|
||||
bool initState = false;
|
||||
bool initState = false;
|
||||
int timing;
|
||||
bool range;
|
||||
bool success = false;
|
||||
|
||||
Reference in New Issue
Block a user