Added temperature offsets

.github/workflows/draft-pdf.yml

@@ -13,12 +13,12 @@ jobs:
         with:
           journal: joss
           # This should be the path to the paper within your repo.
-          paper-path: joss_paper/paper.md
+          paper-path: docs/joss_paper/paper.md
       - name: Upload
         uses: actions/upload-artifact@v3
         with:
           name: paper
           # This is the output path where Pandoc will write the compiled
           # PDF. Note, this should be the same directory as the input
           # paper.md
-          path: joss_paper/paper.pdf
+          path: docs/joss_paper/paper.pdf

.gitignore

@@ -0,0 +1,5 @@
+.pio
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/ipch

.vscode/extensions.json

@@ -0,0 +1,10 @@
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
+}

README.md

@@ -1,14 +1,18 @@
 # BREAD-Local-Software (Butter)
+## v1 (WIP)
 
 <img src="Butter-Image.png">
 
 ## Installation And Use:
-1. Load files from the "Website Code on SD Card" folder onto the SD card and mount the card on the ESP32
-2. Upload the code in the .ino file in the "Arduino Code" folder to the ESP32
+1. Load files from the [`src/webpage`](src\webpage) folder onto the SD card and mount the card on the ESP32
+2. Upload the code in the .ino file under [`src/loafControl`](src\loafControl) folder to the ESP32
 4. Once uploaded, connect to the newly created Wi-Fi access point "BREAD-DARPA" with the password "12345678"
 5. Open the Arduino IDE serial monitor and copy the IP address
 6. Paste the IP address into a web browser like Google Chrome
 
-## Things To Change/Add In The Future:
-1. Use JSON objects to send and receive data to and from the ESP32
-2. Better CSS styling (To make it look pretty)
+# In-Progress
+1. Modularization of code and separation of code across multiple files
+2. CSS styling 
+
+## TODO
+1. Use JSON objects to send and receive data to and from the ESP32

RLHT_R2/RLHT_R2.ino

@@ -20,6 +20,10 @@
 long lastThermoRead = 0;
 long lastSerialPrint = 0;
 
+//Edit these offsets to calibrate thermocouples as needed
+double thermo1_offset = 4.0;
+double thermo2_offset = 4.0;
+
 bool E_STOP = false;
 
 CRGB led;
@@ -224,8 +228,8 @@ void measureThermocouples()
 {
   if(millis() - lastThermoRead >= THERMO_UPDATE_TIME_MS)
   {
-    RLHT.thermo1 = CH1.readCelsius();
-    RLHT.thermo2 = CH2.readCelsius();
+    RLHT.thermo1 = CH1.readCelsius() + thermo1_offset;
+    RLHT.thermo2 = CH2.readCelsius() + thermo2_offset;
     lastThermoRead = millis();
   }
 }
@@ -357,4 +361,4 @@ void setParametersRLHT(char *in_data)
       }
       break;
   }
-}
+}

docs/README

@@ -0,0 +1 @@
+# docs

docs/favicon_io/site.webmanifest

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

include/README

@@ -0,0 +1,39 @@
+
+This directory is intended for project header files.
+
+A header file is a file containing C declarations and macro definitions
+to be shared between several project source files. You request the use of a
+header file in your project source file (C, C++, etc) located in `src` folder
+by including it, with the C preprocessing directive `#include'.
+
+```src/main.c
+
+#include "header.h"
+
+int main (void)
+{
+ ...
+}
+```
+
+Including a header file produces the same results as copying the header file
+into each source file that needs it. Such copying would be time-consuming
+and error-prone. With a header file, the related declarations appear
+in only one place. If they need to be changed, they can be changed in one
+place, and programs that include the header file will automatically use the
+new version when next recompiled. The header file eliminates the labor of
+finding and changing all the copies as well as the risk that a failure to
+find one copy will result in inconsistencies within a program.
+
+In C, the usual convention is to give header files names that end with `.h'.
+It is most portable to use only letters, digits, dashes, and underscores in
+header file names, and at most one dot.
+
+Read more about using header files in official GCC documentation:
+
+* Include Syntax
+* Include Operation
+* Once-Only Headers
+* Computed Includes
+
+https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html

lib/README

@@ -0,0 +1,46 @@
+
+This directory is intended for project specific (private) libraries.
+PlatformIO will compile them to static libraries and link into executable file.
+
+The source code of each library should be placed in an own separate directory
+("lib/your_library_name/[here are source files]").
+
+For example, see a structure of the following two libraries `Foo` and `Bar`:
+
+|--lib
+|  |
+|  |--Bar
+|  |  |--docs
+|  |  |--examples
+|  |  |--src
+|  |     |- Bar.c
+|  |     |- Bar.h
+|  |  |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
+|  |
+|  |--Foo
+|  |  |- Foo.c
+|  |  |- Foo.h
+|  |
+|  |- README --> THIS FILE
+|
+|- platformio.ini
+|--src
+   |- main.c
+
+and a contents of `src/main.c`:
+```
+#include <Foo.h>
+#include <Bar.h>
+
+int main (void)
+{
+  ...
+}
+
+```
+
+PlatformIO Library Dependency Finder will find automatically dependent
+libraries scanning project source files.
+
+More information about PlatformIO Library Dependency Finder
+- https://docs.platformio.org/page/librarymanager/ldf.html

platformio.ini

@@ -0,0 +1,23 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; https://docs.platformio.org/page/projectconf.html
+
+[platformio]
+src_dir = src/spread-beta/main
+
+[env:sparkfun_esp32s2_thing_plus_c]
+platform = espressif32
+board = sparkfun_esp32s2_thing_plus_c
+monitor_speed = 115200
+framework = arduino
+lib_deps = 
+	esphome/AsyncTCP-esphome@^2.1.4
+	bblanchon/ArduinoJson@^7.2.0
+	fbiego/ESP32Time@^2.0.6
+	esphome/ESPAsyncWebServer-esphome@^3.2.2