Updated to deployed code

OPEnSLab-OSU · Jan 4, 2023 · c3a8893 · c3a8893
1 parent 6b91cd8
commit c3a8893
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 3 deletions.
diff --git a/Code/RainSavor_LoomV4_1_standby/RainSavor_LoomV4_1_standby.ino b/Code/RainSavor_LoomV4_1_standby/RainSavor_LoomV4_1_standby.ino
@@ -22,7 +22,7 @@
 #include <Sensors/I2C/Loom_SHT31/Loom_SHT31.h>
 #include <Sensors/I2C/Loom_ADS1115/Loom_ADS1115.h>
 
-Manager manager("RainSavor5_", 5);
+Manager manager("RS2_", 2);
 
 // Analog for reading battery voltage
 Loom_Analog analog(manager); //add , A0 if reading analog pin
@@ -40,8 +40,8 @@ Loom_ADS1115 ads(manager);
 //Declare Constants & Variables
 const byte VR_ADDR = 0x2E;  //I2C address for the AD5246 (variable resistor)
 const byte VR_VAL = 16; //1 = 150 Ohms, 127 = 400 Ohms; lower value = larger maximum reading
-const float EC_SLOPE = 0.014423;
-const float EC_INTERCEPT = -62.0963;
+const float EC_SLOPE = 0.013973; //RS1: 0.013814; RS2: 0.013973; RS3: 0.013253; RS4: 0.015562; RS5: 0.014423; RS6: 0.013836 
+const float EC_INTERCEPT = -51.2529; // RS1:-51.8934; RS2: -51.2529; RS3: -51.6423; RS4: -65.2051; RS5: -62.0963; RS6: -55.3435 
 const float TEMP_COEFF = 0.02;
 
 // Called when the interrupt is triggered 

diff --git a/Code/Loom4_modified__hypnos/Loom_Hypnos.cpp → ...ve/Loom4_modified__hypnos/Loom_Hypnos.cpp b/Code/Loom4_modified__hypnos/Loom_Hypnos.cpp → ...ve/Loom4_modified__hypnos/Loom_Hypnos.cpp
diff --git a/Code/Loom4_modified__hypnos/Loom_Hypnos.h → ...hive/Loom4_modified__hypnos/Loom_Hypnos.h b/Code/Loom4_modified__hypnos/Loom_Hypnos.h → ...hive/Loom4_modified__hypnos/Loom_Hypnos.h
diff --git a/...ainSavor_LoomV4_interrupt_ADC_standby.ino → ...ainSavor_LoomV4_interrupt_ADC_standby.ino b/...ainSavor_LoomV4_interrupt_ADC_standby.ino → ...ainSavor_LoomV4_interrupt_ADC_standby.ino
diff --git a/..._interrupt_ADC_standby_fixed_resistor.ino → ..._interrupt_ADC_standby_fixed_resistor.ino b/..._interrupt_ADC_standby_fixed_resistor.ino → ..._interrupt_ADC_standby_fixed_resistor.ino
diff --git a/...ADC/RainSavor_LoomV4_no_interrupt_ADC.ino → ...ADC/RainSavor_LoomV4_no_interrupt_ADC.ino b/...ADC/RainSavor_LoomV4_no_interrupt_ADC.ino → ...ADC/RainSavor_LoomV4_no_interrupt_ADC.ino
diff --git a/...omV4_standby/RainSavor_LoomV4_standby.ino → ...omV4_standby/RainSavor_LoomV4_standby.ino b/...omV4_standby/RainSavor_LoomV4_standby.ino → ...omV4_standby/RainSavor_LoomV4_standby.ino