From eb796291e37afcf70b6d0e507cade6d0b1865847 Mon Sep 17 00:00:00 2001
From: Ta180m
Date: Wed, 19 Feb 2020 16:17:49 -0600
Subject: Update Detector_Building.ino

---
 Detector_Building/Detector_Building.ino | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Detector_Building/Detector_Building.ino b/Detector_Building/Detector_Building.ino
index bd8dce4..4826f18 100644
--- a/Detector_Building/Detector_Building.ino
+++ b/Detector_Building/Detector_Building.ino
@@ -17,9 +17,9 @@ const int LED_R = 4, LED_G = 3, LED_B = 2, THERM = 0; // Device component pins
 const double R_k = 10000, V_in = 5, analog_max = 1023; // Device constants
 
 // Calibration data
-const int n = 3, m = n / 3; // Number of data points, MUST be multiple of 3
-double V[n] = { 2.12, 3.26, 3.96 }; // Voltage measurements
-double T[n] = { 22.0, 39.15, 60 }; // Temperature measurements
+const int n = 6, m = n / 3; // Number of data points, MUST be multiple of 3
+double V[n] = { 2.81, 3.31, 3.36, 3.81, 4.03, 4.21 }; // Voltage measurements
+double T[n] = { 18.5, 29.1, 33.1, 48.0, 59.0, 70.0 }; // Temperature measurements
 double V_mid[m]; // Stores each piecewise segment for binary search
 double A[m], B[m], C[m]; // Coefficients for each piecewise component
 
@@ -74,7 +74,7 @@ void calculate() {
     B[i / 3] = G[i + 1] - C[i / 3] * (L[i] * L[i] + L[i] * L[i + 1] + L[i + 1] * L[i + 1]);
     A[i / 3] = Y[i] - L[i] * (B[i / 3] + L[i] * L[i] * C[i / 3]);
   }
-  for (int i = 0; i < n; i += 3) V_mid[i / 3] = (i ? (V[i - 1] + V[i]) / 2 : V[i]);
+  for (int i = 0; i < n; i += 3) V_mid[i / 3] = (i ? (V[i - 1] + V[i]) / 2 : 0);
 }
 
 
@@ -98,7 +98,7 @@ void setup() {
   calculate();
 
   // Debug stuff
-  /*for (int i = 0; i < n; i++) {
+  for (int i = 0; i < n; i++) {
     Serial.print(V[i]);
     Serial.print(" ");
     Serial.print(T[i]);
@@ -107,9 +107,9 @@ void setup() {
   Serial.println();
   for (int i = 0; i < m; i++) {
     Serial.print("Segment lower bound: ");
-    Serial.print(i ? V_mid[i - 1] : 0);
-    Serial.print(" Segment upper bound: ");
     Serial.print(V_mid[i]);
+    Serial.print(" Segment upper bound: ");
+    Serial.print(V_mid[i + 1]);
     Serial.print(" A: ");
     Serial.print(A[i], 12);
     Serial.print(" B: ");
@@ -117,7 +117,7 @@ void setup() {
     Serial.print(" C: ");
     Serial.print(C[i], 12);
     Serial.println();
-  }*/
+  }
 }
 
 
@@ -185,10 +185,10 @@ void loop() {
   //Serial.print(F);
   
   // Debug stuff
-  /*Serial.print(" Segment lower bound: ");
-  Serial.print(s ? V_mid[s - 1] : 0);
+  Serial.print(" Segment lower bound: ");
+  Serial.print(V_mid[s]);
   Serial.print(" Segment upper bound: ");
-  Serial.print(V_mid[s]);*/
+  Serial.print(V_mid[s + 1]);
 
   Serial.println();
   delay(500);
-- 
cgit v1.2.3-70-g09d2


From 1a090a4063beac5be0fbf1891e554bcb5dd373d2 Mon Sep 17 00:00:00 2001
From: Ta180m
Date: Wed, 19 Feb 2020 16:22:23 -0600
Subject: Update Detector_Building.ino

---
 Detector_Building/Detector_Building.ino | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Detector_Building/Detector_Building.ino b/Detector_Building/Detector_Building.ino
index 4826f18..5081381 100644
--- a/Detector_Building/Detector_Building.ino
+++ b/Detector_Building/Detector_Building.ino
@@ -98,7 +98,7 @@ void setup() {
   calculate();
 
   // Debug stuff
-  for (int i = 0; i < n; i++) {
+  /*for (int i = 0; i < n; i++) {
     Serial.print(V[i]);
     Serial.print(" ");
     Serial.print(T[i]);
@@ -117,7 +117,7 @@ void setup() {
     Serial.print(" C: ");
     Serial.print(C[i], 12);
     Serial.println();
-  }
+  }*/
 }
 
 
@@ -185,12 +185,12 @@ void loop() {
   //Serial.print(F);
   
   // Debug stuff
-  Serial.print(" Segment lower bound: ");
+  /*Serial.print(" Segment lower bound: ");
   Serial.print(V_mid[s]);
   Serial.print(" Segment upper bound: ");
   Serial.print(V_mid[s + 1]);
 
-  Serial.println();
+  Serial.println();*/
   delay(500);
   return;
 }
-- 
cgit v1.2.3-70-g09d2