diff --git a/Arduino/CanGrow/include/CanGrow_Sensor.h b/Arduino/CanGrow/include/CanGrow_Sensor.h index a8b229a..958ce3c 100644 --- a/Arduino/CanGrow/include/CanGrow_Sensor.h +++ b/Arduino/CanGrow/include/CanGrow_Sensor.h @@ -51,53 +51,43 @@ struct Sensor_Index { * */ const char name[32]; - const byte * reading[SENSOR_MAX_READING]; - byte max; + const byte reading[SENSOR_MAX_READING]; + //byte max; }; const byte SensorIndex_length = 4; Sensor_Index SensorIndex[] { // 0 is for unset in config - { "unset", - {{}}, - 255, - }, + { "unset", { + {}, + }}, // 1 - internal ADC - { SENSOR_01_NAME, - SENSOR_01_READINGS, - ADC_BUILTIN_MAX, - }, + { SENSOR_01_NAME, { + SENSOR_READING_RAW, + }}, - { SENSOR_02_NAME, - SENSOR_02_READINGS, - ADC_BUILTIN_MAX, - }, // 2 - BME280 - //{ SENSOR_02_NAME, - //{ - //SENSOR_READING_TEMP, - //SENSOR_READING_HUMIDITY, - //SENSOR_READING_PRESSURE }, - //SENSOR_02_READINGS, - //3, - //}, + { "BME280", { + SENSOR_READING_TEMP, + SENSOR_READING_HUMIDITY, + SENSOR_READING_PRESSURE, + }}, // 3 - //{ "Chirp", { - //SENSOR_READING_MOISTURE, - //SENSOR_READING_TEMP, - //SENSOR_READING_RAW }, - //4, - //}, + { "Chirp", { + SENSOR_READING_MOISTURE, + SENSOR_READING_TEMP, + SENSOR_READING_RAW, + }}, // 4 - //{ "ADS1115", { - //SENSOR_READING_RAW, - //SENSOR_READING_RAW, - //SENSOR_READING_RAW, - //SENSOR_READING_RAW - //}}, + { "ADS1115", { + SENSOR_READING_RAW, + SENSOR_READING_RAW, + SENSOR_READING_RAW, + SENSOR_READING_RAW + }}, // 5