Removed DHT22 Portfix (was equired for old espressif fw)

Manuel-Sensate · Manuel-Sensate · commit 0ae112d19775 · 2020-12-16T12:14:33.000+01:00
diff --git a/src/controller/Bridge.cpp b/src/controller/Bridge.cpp
@@ -11,7 +11,7 @@
     SOURCE: https://github.com/sensate-io/firmware-esp8266.git
 
     @section  HISTORY
-    v36 - Added WiFi-Fix Auto-reboot
+    v36 - Greatly improved reliability of connectivity
     v35 - Added Support for VEML6075 and SI1145 UVI Sensors
     v34 - Added Generic Analog Sensor Support
     v33 - Added Digital Sensor Switch Support
diff --git a/src/input/onewire/SensorDHT.cpp b/src/input/onewire/SensorDHT.cpp
@@ -76,8 +76,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   {
     if(!initDHT0)
     {
-      if(type!=DHT11)
-        portFix(port);  
       initDHT0=true;
       dht0 = new DHT_Unified(0, type);
       dht0->begin();
@@ -88,8 +86,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   {
     if(!initDHT1)
     {    
-      if(type!=DHT11)
-        portFix(port);
       initDHT1=true;
       dht1 = new DHT_Unified(1, type);
       dht1->begin();
@@ -100,8 +96,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   {
     if(!initDHT2)
     {
-      if(type!=DHT11)
-        portFix(port);
       initDHT2=true;
       dht2 = new DHT_Unified(2, type);
       dht2->begin();
@@ -112,8 +106,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   {
     if(!initDHT3)
     {    
-      if(type!=DHT11)
-        portFix(port);
       initDHT3=true;
       dht3 = new DHT_Unified(3, type);
       dht3->begin();
@@ -127,8 +119,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   {
     if(!initDHT4)
     {    
-      if(type!=DHT11)
-        portFix(port);
       initDHT4=true;
       dht4 = new DHT_Unified(4, type);
       dht4->begin();
@@ -139,8 +129,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   {
     if(!initDHT5)
     {    
-      if(type!=DHT11)
-        portFix(port);
       initDHT5=true;
       dht5 = new DHT_Unified(5, type);
       dht5->begin();
@@ -154,8 +142,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   {
     if(!initDHT6)
     {    
-      if(type!=DHT11)
-        portFix(port);
       initDHT6=true;
       dht6 = new DHT_Unified(6, type);
       dht6->begin();
@@ -166,8 +152,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   {
     if(!initDHT7)
     {    
-      if(type!=DHT11)
-        portFix(port);
       initDHT7=true;
       dht7 = new DHT_Unified(7, type);
       dht7->begin();
@@ -178,8 +162,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   {
     if(!initDHT8)
     {    
-      if(type!=DHT11)
-        portFix(port);
       initDHT8=true;
       dht8 = new DHT_Unified(8, type);
       dht8->begin();
@@ -190,8 +172,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   {
     if(!initDHT9)
     {    
-      if(type!=DHT11)
-        portFix(port);
       initDHT9=true;
       dht9 = new DHT_Unified(9, type);
       dht9->begin();
@@ -205,8 +185,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   {
     if(!initDHT10)
     {    
-      if(type!=DHT11)
-        portFix(port);
       initDHT10=true;
       dht10 = new DHT_Unified(10, type);
       dht10->begin();
@@ -217,8 +195,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   {
     if(!initDHT11)
     {    
-      if(type!=DHT11)
-        portFix(port);
       initDHT11=true;
       dht11 = new DHT_Unified(11, type);
       dht11->begin();
@@ -229,8 +205,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   {
     if(!initDHT12)
     {    
-      if(type!=DHT11)
-        portFix(port);
       initDHT12=true;
       dht12 = new DHT_Unified(12, type);
       dht12->begin();
@@ -241,8 +215,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   {
     if(!initDHT13)
     {    
-      if(type!=DHT11)
-        portFix(port);
       initDHT13=true;
       dht13 = new DHT_Unified(13, type);
       dht13->begin();
@@ -253,8 +225,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   {
     if(!initDHT14)
     {    
-      if(type!=DHT11)
-        portFix(port);
       initDHT14=true;
       dht14 = new DHT_Unified(14, type);
       dht14->begin();
@@ -265,8 +235,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   {
     if(!initDHT15)
     {    
-      if(type!=DHT11)
-        portFix(port);
       initDHT15=true;
       dht15 = new DHT_Unified(15, type);
       dht15->begin();
@@ -277,8 +245,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   {
     if(!initDHT16)
     {    
-      if(type!=DHT11)
-        portFix(port);
       initDHT16=true;
       dht16 = new DHT_Unified(16, type);
       dht16->begin();
@@ -287,14 +253,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S
   }
 }
 
-void SensorDHT::portFix(uint8_t port)
-{
-  pinMode(port, OUTPUT);
-  digitalWrite(port, LOW);
-  delay(20);
-  pinMode(port, INPUT);
-}
-
 void SensorDHT::preCycle(int cycleId)
 {
 }
diff --git a/src/input/onewire/SensorDHT.h b/src/input/onewire/SensorDHT.h
@@ -62,7 +62,6 @@ class SensorDHT : public Sensor {
     static DHT_Unified* dht16;
     DHT_Unified* dht;
     float lastPostedValue = NAN;
-    static void portFix(uint8_t);
   protected:
     Data* read(bool);
     void preCycle(int);

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`76`	`76`	`{`
`77`	`77`	`if(!initDHT0)`
`78`	`78`	`{`
`79`		`- if(type!=DHT11)`
`80`		`- portFix(port);`
`81`	`79`	`initDHT0=true;`
`82`	`80`	`dht0 = new DHT_Unified(0, type);`
`83`	`81`	`dht0->begin();`
`@@ -88,8 +86,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`88`	`86`	`{`
`89`	`87`	`if(!initDHT1)`
`90`	`88`	`{`
`91`		`- if(type!=DHT11)`
`92`		`- portFix(port);`
`93`	`89`	`initDHT1=true;`
`94`	`90`	`dht1 = new DHT_Unified(1, type);`
`95`	`91`	`dht1->begin();`
`@@ -100,8 +96,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`100`	`96`	`{`
`101`	`97`	`if(!initDHT2)`
`102`	`98`	`{`
`103`		`- if(type!=DHT11)`
`104`		`- portFix(port);`
`105`	`99`	`initDHT2=true;`
`106`	`100`	`dht2 = new DHT_Unified(2, type);`
`107`	`101`	`dht2->begin();`
`@@ -112,8 +106,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`112`	`106`	`{`
`113`	`107`	`if(!initDHT3)`
`114`	`108`	`{`
`115`		`- if(type!=DHT11)`
`116`		`- portFix(port);`
`117`	`109`	`initDHT3=true;`
`118`	`110`	`dht3 = new DHT_Unified(3, type);`
`119`	`111`	`dht3->begin();`
`@@ -127,8 +119,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`127`	`119`	`{`
`128`	`120`	`if(!initDHT4)`
`129`	`121`	`{`
`130`		`- if(type!=DHT11)`
`131`		`- portFix(port);`
`132`	`122`	`initDHT4=true;`
`133`	`123`	`dht4 = new DHT_Unified(4, type);`
`134`	`124`	`dht4->begin();`
`@@ -139,8 +129,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`139`	`129`	`{`
`140`	`130`	`if(!initDHT5)`
`141`	`131`	`{`
`142`		`- if(type!=DHT11)`
`143`		`- portFix(port);`
`144`	`132`	`initDHT5=true;`
`145`	`133`	`dht5 = new DHT_Unified(5, type);`
`146`	`134`	`dht5->begin();`
`@@ -154,8 +142,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`154`	`142`	`{`
`155`	`143`	`if(!initDHT6)`
`156`	`144`	`{`
`157`		`- if(type!=DHT11)`
`158`		`- portFix(port);`
`159`	`145`	`initDHT6=true;`
`160`	`146`	`dht6 = new DHT_Unified(6, type);`
`161`	`147`	`dht6->begin();`
`@@ -166,8 +152,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`166`	`152`	`{`
`167`	`153`	`if(!initDHT7)`
`168`	`154`	`{`
`169`		`- if(type!=DHT11)`
`170`		`- portFix(port);`
`171`	`155`	`initDHT7=true;`
`172`	`156`	`dht7 = new DHT_Unified(7, type);`
`173`	`157`	`dht7->begin();`
`@@ -178,8 +162,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`178`	`162`	`{`
`179`	`163`	`if(!initDHT8)`
`180`	`164`	`{`
`181`		`- if(type!=DHT11)`
`182`		`- portFix(port);`
`183`	`165`	`initDHT8=true;`
`184`	`166`	`dht8 = new DHT_Unified(8, type);`
`185`	`167`	`dht8->begin();`
`@@ -190,8 +172,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`190`	`172`	`{`
`191`	`173`	`if(!initDHT9)`
`192`	`174`	`{`
`193`		`- if(type!=DHT11)`
`194`		`- portFix(port);`
`195`	`175`	`initDHT9=true;`
`196`	`176`	`dht9 = new DHT_Unified(9, type);`
`197`	`177`	`dht9->begin();`
`@@ -205,8 +185,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`205`	`185`	`{`
`206`	`186`	`if(!initDHT10)`
`207`	`187`	`{`
`208`		`- if(type!=DHT11)`
`209`		`- portFix(port);`
`210`	`188`	`initDHT10=true;`
`211`	`189`	`dht10 = new DHT_Unified(10, type);`
`212`	`190`	`dht10->begin();`
`@@ -217,8 +195,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`217`	`195`	`{`
`218`	`196`	`if(!initDHT11)`
`219`	`197`	`{`
`220`		`- if(type!=DHT11)`
`221`		`- portFix(port);`
`222`	`198`	`initDHT11=true;`
`223`	`199`	`dht11 = new DHT_Unified(11, type);`
`224`	`200`	`dht11->begin();`
`@@ -229,8 +205,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`229`	`205`	`{`
`230`	`206`	`if(!initDHT12)`
`231`	`207`	`{`
`232`		`- if(type!=DHT11)`
`233`		`- portFix(port);`
`234`	`208`	`initDHT12=true;`
`235`	`209`	`dht12 = new DHT_Unified(12, type);`
`236`	`210`	`dht12->begin();`
`@@ -241,8 +215,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`241`	`215`	`{`
`242`	`216`	`if(!initDHT13)`
`243`	`217`	`{`
`244`		`- if(type!=DHT11)`
`245`		`- portFix(port);`
`246`	`218`	`initDHT13=true;`
`247`	`219`	`dht13 = new DHT_Unified(13, type);`
`248`	`220`	`dht13->begin();`
`@@ -253,8 +225,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`253`	`225`	`{`
`254`	`226`	`if(!initDHT14)`
`255`	`227`	`{`
`256`		`- if(type!=DHT11)`
`257`		`- portFix(port);`
`258`	`228`	`initDHT14=true;`
`259`	`229`	`dht14 = new DHT_Unified(14, type);`
`260`	`230`	`dht14->begin();`
`@@ -265,8 +235,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`265`	`235`	`{`
`266`	`236`	`if(!initDHT15)`
`267`	`237`	`{`
`268`		`- if(type!=DHT11)`
`269`		`- portFix(port);`
`270`	`238`	`initDHT15=true;`
`271`	`239`	`dht15 = new DHT_Unified(15, type);`
`272`	`240`	`dht15->begin();`
`@@ -277,8 +245,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`277`	`245`	`{`
`278`	`246`	`if(!initDHT16)`
`279`	`247`	`{`
`280`		`- if(type!=DHT11)`
`281`		`- portFix(port);`
`282`	`248`	`initDHT16=true;`
`283`	`249`	`dht16 = new DHT_Unified(16, type);`
`284`	`250`	`dht16->begin();`
`@@ -287,14 +253,6 @@ SensorDHT::SensorDHT (long id, String category, String shortName, String name, S`
`287`	`253`	`}`
`288`	`254`	`}`
`289`	`255`
`290`		`-void SensorDHT::portFix(uint8_t port)`
`291`		`-{`
`292`		`- pinMode(port, OUTPUT);`
`293`		`- digitalWrite(port, LOW);`
`294`		`- delay(20);`
`295`		`- pinMode(port, INPUT);`
`296`		`-}`
`297`		`-`
`298`	`256`	`void SensorDHT::preCycle(int cycleId)`
`299`	`257`	`{`
`300`	`258`	`}`