kueller
/
PelletsTank
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Definition für die US Sensor Pins (Echo und Trigger) ist jetzt im 

config.h. damit sollte es auch möglich sein US und Laser Sensoren
gleichzeitig zu verwenden
This commit is contained in:
Harald Küller 2023-04-04 11:17:19 +02:00
parent 08ed4c6a98
commit 479703ddf8
3 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Fuellstandssensor/FSSensor.cc
View File

@ -4,19 +4,6 @@
FSSensor::FSSensor() {
void *ptr;
#if defined HCSR04
#if defined ( __XTENSA__ )
EchoPin[0] = 14;
TrigPin[0] = 2;
EchoPin[1] = 12;
TrigPin[1] = 13;
#elif defined ( __AVR__ )
EchoPin[0] = 1;
TrigPin[0] = 2;
EchoPin[1] = 3;
TrigPin[1] = 4;
#endif
#endif
#if defined ( __XTENSA__ )
#if defined SENS_VL53L0X
for ( int i=0; i<=NUM_SENS-1; i++) {
@ -40,19 +27,6 @@ FSSensor::FSSensor() {
#if defined DHT11_SENSOR
FSSensor::FSSensor(DHT *dht11) {
#if defined HCSR04
#if defined ( __XTENSA__ )
EchoPin[0] = 14;
TrigPin[0] = 2;
EchoPin[1] = 12;
TrigPin[1] = 13;
#elif defined ( __AVR__ )
EchoPin[0] = 1;
TrigPin[0] = 2;
EchoPin[1] = 3;
TrigPin[1] = 4;
#endif
#endif
#if defined SENS_VL53L0X
void *ptr;
for ( int i=0; i<=NUM_SENS-1; i++) {

4
Fuellstandssensor/FSSensor.h
View File

@ -18,8 +18,8 @@
class FSSensor {
private:
#if defined HCSR04
int EchoPin[NUM_SENS];
int TrigPin[NUM_SENS];
int EchoPin[NUM_SENS]=ECHOPINS;
int TrigPin[NUM_SENS]=TRIGGERPINS;
#endif
#if defined SENS_VL53L0X
VL53L0X *tof_sens[NUM_SENS];

12
Fuellstandssensor/config.h
View File

@ -6,7 +6,7 @@
#define MY_NTP_SERVER "ladon.compuextreme.de"
#define MY_TZ "CET-1CEST,M3.5.0,M10.5.0/3"
//#define DEBUG
#define VERS "r86"
#define VERS "v87"
//if using a DHT11 Temperatur sensor
//for more accurate sonic speed
#define DHT11_SENSOR 0
@ -33,6 +33,16 @@
#define REFRESHRATE 10
#ifdef HCSR04
#if defined ( __XTENSA__ )
//define the pins for the Trigger signal for ESP8266
#define TRIGGERPINS { 2, 13 }
//define the pins for the ECHO Signal
#define ECHOPINS { 14, 12 }
#elif defined ( __AVR__ )
//define the pins for the Trigger signal for Arduino
#define TRIGGERPINS { 2, 4 }
#define ECHOPINS { 1, 3 }
#endif
//Die software macht mehrere messungen
//und versucht nur die höchsten Werte zu nehmen
//Anzahl dieser Messungen wird hier definiert