Expo version of code

.gitignore

@@ -0,0 +1 @@
+/home/backup/HomeAir/backup4-4-25.zip

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-  "cmake.configureOnOpen": false
+  "cmake.configureOnOpen": false,
+  "idf.portWin": "COM14"
 }

Firmware/FSBrowser/FSBrowser.ino

@@ -39,8 +39,19 @@
 #include <SPIFFS.h>
 #endif
 
+#define CAPSTONE_LAB
+// #define ZANE_HOUSE
+
+
+#ifdef CAPSTONE_LAB
 const char* ssid = "CapstoneWifi";
 const char* password = "RuleNumber9";
+#endif
+
+#ifdef ZANE_HOUSE
+const char* ssid = "NastyWiFi";
+const char* password = "PurplePanda420";
+#endif
 const char* host = "esp32fs";
 WebServer server(80);
 //holds the current upload
@@ -224,18 +235,28 @@ void setup(void) {
   DBG_OUTPUT_PORT.begin(115200);
   DBG_OUTPUT_PORT.print("\n");
   DBG_OUTPUT_PORT.setDebugOutput(true);
+  delay(1000);
 
-  FILESYSTEM.begin();
+  SPIFFS.begin(false);
   Serial.println("Opening spiffs.");
-  File root = FILESYSTEM.open("/");
+  File root = SPIFFS.open("/");
   File file = root.openNextFile();
+  if(!root){
+    Serial.println("Unable to mount spiffs");
+  }
   while (file) {
     String fileName = file.name();
     size_t fileSize = file.size();
     DBG_OUTPUT_PORT.printf("FS File: %s, size: %s\n", fileName.c_str(), formatBytes(fileSize).c_str());
     file = root.openNextFile();
   }
-  DBG_OUTPUT_PORT.printf("\n");
+  // DBG_OUTPUT_PORT.printf("\n");
+  // Serial.println("Deleting datalog.txt");
+  // FILESYSTEM.remove("/datalog.txt");
+  // FILESYSTEM.remove("/dest_bin");
+  // Serial.println("deleted");
+  delay(3000);
+
 
 
 

Firmware/FirmwareREADME.md

@@ -13,5 +13,3 @@ The firmware will upload 11 datapoints to the application. They are stored in th
 10: AQI - Computed onboard using PPM 2.5 and other values
 
 Data size calculations can be found on this spreadsheet: https://docs.google.com/spreadsheets/d/1_EFeLgpe8HF9_ko5QajpB0fkfWvWioJkB7S2AnPqzwQ/edit?usp=sharing
-
-

Firmware/HomeAir/AQI.cpp

@@ -55,7 +55,9 @@ uint16_t getPPM25AQI(float ppm25) {
     breakpointHigh = 500;
     breakpointLow = 350.5;
   }
-  return (((indexHigh - indexLow) / (breakpointHigh - breakpointLow)) * (ppm25 - breakpointLow) + indexLow);
+  return (((indexHigh - indexLow) / (breakpointHigh - breakpointLow)) *
+              (ppm25 - breakpointLow) +
+          indexLow);
 }
 
 uint16_t getPPM10AQI(float ppm10) {
@@ -99,15 +101,17 @@ uint16_t getPPM10AQI(float ppm10) {
     breakpointHigh = 604;
     breakpointLow = 505;
   }
-  return (((indexHigh - indexLow) / (breakpointHigh - breakpointLow)) * (ppm10 - breakpointLow) + indexLow);
+  return (((indexHigh - indexLow) / (breakpointHigh - breakpointLow)) *
+              (ppm10 - breakpointLow) +
+          indexLow);
 }
 
 uint16_t getCOAQI(float CO) {
 
   float indexHigh, indexLow;
   float breakpointHigh, breakpointLow;
 
-  if (CO > 0 && CO < 4.4) {
+  if (CO >= 0 && CO < 4.4) {
     indexHigh = 50;
     indexLow = 0;
     breakpointHigh = 4.4;
@@ -143,22 +147,26 @@ uint16_t getCOAQI(float CO) {
     breakpointHigh = 50.4;
     breakpointLow = 40.5;
   }
-  return (((indexHigh - indexLow) / (breakpointHigh - breakpointLow)) * (CO - breakpointLow) + indexLow);
+  return (((indexHigh - indexLow) / (breakpointHigh - breakpointLow)) *
+              (CO - breakpointLow) +
+          indexLow);
 }
 
 float aqiGetCompositeAQI(float ppm25, float ppm10, float CO) {
   float AQI25 = getPPM25AQI(ppm25);
   float AQI10 = getPPM10AQI(ppm10);
-  float AQICO = getCOAQI(CO);
-
-  if (AQI25 > AQI10 && AQI25 > AQICO) {
-    // Serial.println("AQI Source: PPM 2.5");
-    return AQI25;
-  } else if (AQI10 > AQI25 && AQI10 > AQICO) {
-    // Serial.println("AQI Source: PPM 10.0");
-    return AQI10;
-  } else {
-    // Serial.println("AQI Source: CO");
-    return AQICO;
-  }
+  // float AQICO = getCOAQI(CO);
+
+  return (AQI25 >= AQI10) ? AQI25 : AQI10;
+
+  // if (AQI25 > AQI10 && AQI25 > AQICO) {
+  //   // Serial.println("AQI Source: PPM 2.5");
+  //   return AQI25;
+  // } else if (AQI10 > AQI25 && AQI10 > AQICO) {
+  //   // Serial.println("AQI Source: PPM 10.0");
+  //   return AQI10;
+  // } else {
+  //   // Serial.println("AQI Source: CO");
+  //   return AQICO;
+  // }
 }