From 8786263734556d4a86ca9b28e21b351e731e9222 Mon Sep 17 00:00:00 2001
From: Jimmy C <jimmyc.iphone+git@gmail.com>
Date: Fri, 11 Jan 2019 00:10:05 +1100
Subject: [PATCH] Moved tempsensor.begin to top - Added code to scan for
 DS18B20 sensor Corrected wifi ap mode gateway address - Now 192.168.100.1

---
 Arduino/BTCDieselHeater/BTCDieselHeater.ino  | 69 ++++++++++++++++++--
 Arduino/BTCDieselHeater/src/WiFi/BTCWifi.cpp |  2 +-
 2 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/Arduino/BTCDieselHeater/BTCDieselHeater.ino b/Arduino/BTCDieselHeater/BTCDieselHeater.ino
index ff6e9fe..2fec4ca 100644
--- a/Arduino/BTCDieselHeater/BTCDieselHeater.ino
+++ b/Arduino/BTCDieselHeater/BTCDieselHeater.ino
@@ -133,7 +133,7 @@ void checkDisplayUpdate();
 void checkDebugCommands();
 
 // DS18B20 temperature sensor support
-OneWire  ds(DS18B20_Pin);  // on pin 5 (a 4.7K resistor is necessary)
+OneWire  ds(15);  // on pin 5 (a 4.7K resistor is necessary)
 DallasTemperature TempSensor(&ds);
 long lastTemperatureTime;            // used to moderate DS18B20 access
 float fFilteredTemperature = -100;   // -100: force direct update uopn first pass
@@ -231,8 +231,23 @@ void parentKeyHandler(uint8_t event)
   ScreenManager.keyHandler(event);   // call into the Screen Manager
 }
 
-void setup() {
+// Added additional t
 
+int numberOfDevices; // Number of temperature devices found
+DeviceAddress tempDeviceAddress;
+
+void printAddress(DeviceAddress deviceAddress)
+{
+  for (uint8_t i = 0; i < 8; i++)
+  {
+    if (deviceAddress[i] < 16) DebugPort.print("0");
+    DebugPort.print(deviceAddress[i], HEX);
+  }
+}
+void setup() {
+  TempSensor.begin();
+ DebugPort.print("Temperature for the device 1 (index 0) is: ");
+  DebugPort.println(TempSensor.getTempCByIndex(0));
   // initialise TelnetSpy (port 23) as well as Serial to 115200 
   // Serial is the usual USB connection to a PC
   // DO THIS BEFORE WE TRY AND SEND DEBUG INFO!
@@ -254,9 +269,45 @@ void setup() {
   Clock.begin();
   
   // initialise DS18B20 temperature sensor(s)
-  TempSensor.begin();
-  TempSensor.setWaitForConversion(false);
-  TempSensor.requestTemperatures();
+    // Grab a count of devices on the wire
+  numberOfDevices = TempSensor.getDeviceCount();
+  
+  // locate devices on the bus
+  DebugPort.print("Locating devices...");
+  
+  DebugPort.print("Found ");
+  DebugPort.print(numberOfDevices, DEC);
+  DebugPort.println(" devices.");
+
+  // report parasite power requirements
+  DebugPort.print("Parasite power is: "); 
+  if (TempSensor.isParasitePowerMode()) Serial.println("ON");
+  else DebugPort.println("OFF");
+  
+  // Loop through each device, print out address
+  for(int i=0;i<numberOfDevices; i++)
+  {
+    // Search the wire for address
+    if(TempSensor.getAddress(tempDeviceAddress, i))
+  {
+    DebugPort.print("Found device ");
+    DebugPort.print(i, DEC);
+    DebugPort.print(" with address: ");
+    printAddress(tempDeviceAddress);
+    DebugPort.println();
+    
+    
+     DebugPort.print("Resolution actually set to: ");
+    DebugPort.print(TempSensor.getResolution(tempDeviceAddress), DEC); 
+    DebugPort.println();
+  }else{
+    DebugPort.print("Found ghost device at ");
+    DebugPort.print(i, DEC);
+    DebugPort.print(" but could not detect address. Check power and cabling");
+  }
+  }
+ // TempSensor.setWaitForConversion(false);
+ // TempSensor.requestTemperatures();
   lastTemperatureTime = millis();
   lastAnimationTime = millis();
   
@@ -606,7 +657,7 @@ void loop()
       // synchronised with serial reception as interrupts do get disabled in the OneWire library
       tDelta = timenow - lastTemperatureTime;
       if(tDelta > TEMPERATURE_INTERVAL) {               // maintain a minimum holdoff period
-        lastTemperatureTime += TEMPERATURE_INTERVAL;    // reset time to observe temeprature
+        lastTemperatureTime += TEMPERATURE_INTERVAL;    // reset time to observe temeprature        
         fTemperature = TempSensor.getTempCByIndex(0);    // read sensor
         // initialise filtered temperature upon very first pass
         if(fFilteredTemperature <= -90) {              // avoid FP exactness issues
@@ -615,7 +666,11 @@ void loop()
         // exponential mean to stabilse readings
         fFilteredTemperature = fFilteredTemperature * fAlpha + (1-fAlpha) * fTemperature;
         DefaultBTCParams.setTemperature_Actual((unsigned char)(fFilteredTemperature + 0.5));  // update [BTC] frame to send
+        // Added DISABLE INTERRUPTS to test for parasitic fix.
+        portDISABLE_INTERRUPTS();
         TempSensor.requestTemperatures();               // prep sensor for future reading
+        portENABLE_INTERRUPTS();
+
         ScreenManager.reqUpdate();
       }
       CommState.set(CommStates::Idle);
@@ -954,4 +1009,4 @@ const char* getBlueWireStatStr()
 bool hasOEMcontroller()
 {
   return bHasOEMController;
-}
\ No newline at end of file
+}
diff --git a/Arduino/BTCDieselHeater/src/WiFi/BTCWifi.cpp b/Arduino/BTCDieselHeater/src/WiFi/BTCWifi.cpp
index 9bbd106..5231bad 100644
--- a/Arduino/BTCDieselHeater/src/WiFi/BTCWifi.cpp
+++ b/Arduino/BTCDieselHeater/src/WiFi/BTCWifi.cpp
@@ -59,7 +59,7 @@ void initWifi(int initpin,const char *failedssid, const char *failedpassword)
     DebugPort.println("Setting up ESP as AP");
     isAP = WiFi.softAP(failedssid, failedpassword);
     if(isAP) {
-      WiFi.softAPConfig(IPAddress(192, 168, 100, 1), IPAddress(192, 168, 100, 0), IPAddress(255,255,255,0));
+      WiFi.softAPConfig(IPAddress(192, 168, 100, 1), IPAddress(192, 168, 100, 1), IPAddress(255,255,255,0));
     }
   } 
   else {