Merge branch 'master' of https://github.com/tablatronix/arduino_utils

Author: tablatronix

include_sensor_libraries.h

@@ -0,0 +1,58 @@
+#include<Average.h>// https:github.com/MajenkoLibraries/Average
+
+
+#include<log.h>
+#include<Syslog.h>//https://github.com/arcao/Syslog.git
+#include<log_syslog.h>
+#include<StreamUtils.h>// https://github.com/bblanchon/ArduinoStreamUtils.git
+
+
+#include<Genv_asset.h>
+
+#include<Wire.h>
+
+#include<OneWire.h>// https://github.com/
+#include<DallasTemperature.h>// https://github.com/
+#include<SoftwareSerial.h>// https://github.com/
+#include<PMserial.h>// https://github.com/avaldebe/PMserial
+#include<Adafruit_VEML6070.h>// https://github.com/adafruit/Adafruit_VEML6070
+#include<Adafruit_PCF8591.h>// https://github.com/adafruit/Adafruit_PCF8591
+#include<Adafruit_INA219.h>// https://github.com/adafruit/Adafruit_INA219
+#include<Adafruit_MPU6050.h>// https://github.com/adafruit/Adafruit_MPU6050
+#include<Adafruit_Sensor.h>// https://github.com/adafruit/Adafruit_Sensor
+#include<Adafruit_APDS9960.h>// https://github.com/adafruit/Adafruit_APDS9960
+#include<Adafruit_SHT31.h>// https://github.com/adafruit/Adafruit_SHT31
+#include<Adafruit_BMP280.h>// https://github.com/adafruit/Adafruit_BMP280
+#include<Adafruit_CCS811.h>// https://github.com/adafruit/Adafruit_CCS811
+#include<Adafruit_BMP085.h.h>// https://github.com/adafruit/Adafruit_BMP085
+#include<BH1750.h>// https://github.com/claws/BH1750
+#include<GP2YDustSensor.h>// https://github.com/
+#include<LM75A.h>// https://github.com/QuentinCG/Arduino-LM75A-Temperature-Sensor-Library
+#include<HTU21D.h>// https://github.com/adafruit/Adafruit_HTU21DF_Library
+#include<SensirionI2CScd4x.h>// https://github.com/
+
+// #include <hp_BH1750.h> //inlude the library
+// 
+// 
+[env:esp32doit-devkit-v1]
+platform=espressif32
+board=esp32doit-devkit-v1
+framework=arduino
+lib_deps=
+avaldebe/PMSerial@^1.2.0
+https://github.com/adafruit/Adafruit_INA219
+https://github.com/adafruit/Adafruit_MPU6050
+https://github.com/avaldebe/PMserial
+https://github.com/adafruit/Adafruit_VEML6070
+https://github.com/adafruit/Adafruit_PCF8591
+https://github.com/adafruit/Adafruit_INA219
+https://github.com/adafruit/Adafruit_Sensor
+https://github.com/adafruit/Adafruit_APDS9960
+https://github.com/adafruit/Adafruit_SHT31
+https://github.com/adafruit/Adafruit_BMP280
+https://github.com/adafruit/Adafruit_CCS811
+ ; https://github.com/adafruit/Adafruit_HTU21DF_Library
+ ; https://github.com/RobTillaart/SHT2x
+https://github.com/enjoyneering/HTU21D
+https://github.com/claws/BH1750
+lib_extra_dirs= /Users/alverson/projects/microcontrollers/dev/libraries

oled_i2c.h

@@ -8,8 +8,8 @@
 #include<Adafruit_SSD1306.h>
 
 // #define SH1106_128_64
-#defineSCREEN_WIDTH64 // OLED display width, in pixels
-#defineSCREEN_HEIGHT48 // OLED display height, in pixels
+#defineSCREEN_WIDTH32 // OLED display width, in pixels
+#defineSCREEN_HEIGHT128 // OLED display height, in pixels
 
 #defineOLED_RESET -1
 // Adafruit_SSD1306 lcd(OLED_RESET);

sense_env.h

@@ -1237,44 +1237,65 @@ float getVoltage(){
 SensirionI2CScd4x scd4x;
 // CO2 0x62
 voidinit_scd4x(){
-bool ret = false;
- Wire.begin(); 
+uint16_t error;
+char errorMessage[256];
+ Wire.begin();
  scd4x.begin(Wire);
 
 // stop potentially previously started measurement
- ret != scd4x.stopPeriodicMeasurement();
-// if (ret){
-// Serial.print("Error trying to execute stopPeriodicMeasurement(): ");
-// errorToString(error, errorMessage, 256);
-// Serial.println(errorMessage);
-// } else ret = true;
-
- ret != scd4x.startPeriodicMeasurement();
-
-if(!ret){
+ error = scd4x.stopPeriodicMeasurement();
+if (error){
+ Serial.print("Error trying to execute stopPeriodicMeasurement(): ");
+errorToString(error, errorMessage, 256);
+ Serial.println(errorMessage);
+ } else error = true;
+
+ error = scd4x.startPeriodicMeasurement();
+
+if(error){
+ Serial.print("Error trying to execute startPeriodicMeasurement(): ");
+errorToString(error, errorMessage, 256);
+ Serial.println(errorMessage);
  Logger.println("[ERROR] SCD4X init FAILED");
  }
 else Logger.println("[ENV] SCD4X is ACTIVE");
 // return ret; 
 }
 
-voidprint_scd4x(){
+floatget_scd4x(uint8_t channel = 0,bool update=true){
+staticuint16_t scd4x_co2;
+staticfloat scd4x_temperature;
+staticfloat scd4x_humidity;
+staticuint16_t scd4x_error = 0;
+if(update){
+char errorMessage[256];
+ scd4x_error = scd4x.readMeasurement(scd4x_co2, scd4x_temperature, scd4x_humidity);
+if(scd4x_error){
+ Serial.print("Error trying to execute readMeasurement(): ");
+errorToString(scd4x_error, errorMessage, 256);
+ Serial.println(errorMessage);
+ }
+ }
+if(channel == 0) return scd4x_co2;
+if(channel == 1) return scd4x_temperature;
+if(channel == 2) return scd4x_humidity;
+if(channel == 3) return scd4x_error;
+return0;
 }
 
-floatget_scd4x(uint8_t channel = 0){
-uint16_t co2;
-float temperature;
-float humidity;
-uint16_t error;
-
- error = scd4x.readMeasurement(co2, temperature, humidity);
+voidprint_scd4x(){
 
-// print_env();
-if(channel == 0) return co2;
-if(channel == 1) return temperature;
-if(channel == 2) return humidity;
-return0;
+ Serial.print(__FUNCTION__);
+ Serial.print(" co2: ");
+ Serial.print(get_scd4x(0));
+ Serial.print(" temp: ");
+ Serial.print(get_scd4x(1,false));
+ Serial.print(" humidity: ");
+ Serial.print(get_scd4x(2,false));
+ Serial.print(" error: ");
+ Serial.println();
 }
+
 #endif