TiltBridge v0.2

thorrak · Jun 19, 2020 · eef5406 · eef5406
2 parents 2e0c5e7 + f641ef9
commit eef5406
Show file tree

Hide file tree

Showing 51 changed files with 6,905 additions and 371 deletions.
diff --git a/.gitignore b/.gitignore
@@ -93,4 +93,9 @@ fabric.properties
 .idea/
 
 docs/.build/html/
-docs/.build/doctrees/
+docs/.build/doctrees/
+/.pio
+/.vscode
+
+cmake-build-*
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,41 +1,70 @@
+# !!! WARNING !!! AUTO-GENERATED FILE, PLEASE DO NOT MODIFY IT AND USE
+# https://docs.platformio.org/page/projectconf/section_env_build.html#build-flags
+#
+# If you need to override existing CMake configuration or add extra,
+# please create `CMakeListsUser.txt` in the root of project.
+# The `CMakeListsUser.txt` will not be overwritten by PlatformIO.
+
 cmake_minimum_required(VERSION 3.2)
-project(tiltbridge)
+project("tiltbridge")
 
 include(CMakeListsPrivate.txt)
 
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/CMakeListsUser.txt)
+include(CMakeListsUser.txt)
+endif()
+
 add_custom_target(
     PLATFORMIO_BUILD ALL
-    COMMAND ${PLATFORMIO_CMD} -f -c clion run
+    COMMAND ${PLATFORMIO_CMD} -f -c clion run "$<$<NOT:$<CONFIG:All>>:-e${CMAKE_BUILD_TYPE}>"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_custom_target(
+    PLATFORMIO_BUILD_VERBOSE ALL
+    COMMAND ${PLATFORMIO_CMD} -f -c clion run --verbose "$<$<NOT:$<CONFIG:All>>:-e${CMAKE_BUILD_TYPE}>"
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 add_custom_target(
     PLATFORMIO_UPLOAD ALL
-    COMMAND ${PLATFORMIO_CMD} -f -c clion run --target upload
+    COMMAND ${PLATFORMIO_CMD} -f -c clion run --target upload "$<$<NOT:$<CONFIG:All>>:-e${CMAKE_BUILD_TYPE}>"
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 add_custom_target(
     PLATFORMIO_CLEAN ALL
-    COMMAND ${PLATFORMIO_CMD} -f -c clion run --target clean
+    COMMAND ${PLATFORMIO_CMD} -f -c clion run --target clean "$<$<NOT:$<CONFIG:All>>:-e${CMAKE_BUILD_TYPE}>"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_custom_target(
+    PLATFORMIO_MONITOR ALL
+    COMMAND ${PLATFORMIO_CMD} -f -c clion device monitor "$<$<NOT:$<CONFIG:All>>:-e${CMAKE_BUILD_TYPE}>"
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 add_custom_target(
     PLATFORMIO_TEST ALL
-    COMMAND ${PLATFORMIO_CMD} -f -c clion test
+    COMMAND ${PLATFORMIO_CMD} -f -c clion test "$<$<NOT:$<CONFIG:All>>:-e${CMAKE_BUILD_TYPE}>"
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 add_custom_target(
     PLATFORMIO_PROGRAM ALL
-    COMMAND ${PLATFORMIO_CMD} -f -c clion run --target program
+    COMMAND ${PLATFORMIO_CMD} -f -c clion run --target program "$<$<NOT:$<CONFIG:All>>:-e${CMAKE_BUILD_TYPE}>"
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 add_custom_target(
     PLATFORMIO_UPLOADFS ALL
-    COMMAND ${PLATFORMIO_CMD} -f -c clion run --target uploadfs
+    COMMAND ${PLATFORMIO_CMD} -f -c clion run --target uploadfs "$<$<NOT:$<CONFIG:All>>:-e${CMAKE_BUILD_TYPE}>"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_custom_target(
+    PLATFORMIO_BUILD_DEBUG ALL
+    COMMAND ${PLATFORMIO_CMD} -f -c clion run --target debug "$<$<NOT:$<CONFIG:All>>:-e${CMAKE_BUILD_TYPE}>"
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
@@ -51,4 +80,10 @@ add_custom_target(
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-add_executable(${PROJECT_NAME} ${SRC_LIST})
+add_custom_target(
+    PLATFORMIO_DEVICE_LIST ALL
+    COMMAND ${PLATFORMIO_CMD} -f -c clion device list
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_executable(Z_DUMMY_TARGET ${SRC_LIST})
diff --git a/CMakeListsUser.txt b/CMakeListsUser.txt
@@ -0,0 +1,32 @@
+
+
+set(COPY_CMD "cp")
+set(RM_CMD "rm")
+
+
+add_custom_target(
+    PLATFORMIO_COPY_BUILT_FIRMWARE
+
+# TODO - Figure out how to ignore the return value if there aren't files already present with these filenames
+#    COMMAND ${RM_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/bin/lcd_ssd1306_firmware.bin"
+#    COMMAND ${RM_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/bin/lcd_ssd1306_partitions.bin"
+#    COMMAND ${RM_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/bin/lcd_ssd1306_spiffs.bin"
+
+    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/lcd_ssd1306/firmware.bin"   "${CMAKE_CURRENT_SOURCE_DIR}/bin/lcd_ssd1306_firmware.bin"
+    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/lcd_ssd1306/partitions.bin" "${CMAKE_CURRENT_SOURCE_DIR}/bin/lcd_ssd1306_partitions.bin"
+    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/lcd_ssd1306/spiffs.bin"     "${CMAKE_CURRENT_SOURCE_DIR}/bin/lcd_ssd1306_spiffs.bin"
+
+    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/d32_pro_tft/firmware.bin"   "${CMAKE_CURRENT_SOURCE_DIR}/bin/d32_pro_tft_firmware.bin"
+    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/d32_pro_tft/partitions.bin" "${CMAKE_CURRENT_SOURCE_DIR}/bin/d32_pro_tft_partitions.bin"
+    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/d32_pro_tft/spiffs.bin"     "${CMAKE_CURRENT_SOURCE_DIR}/bin/d32_pro_tft_spiffs.bin"
+
+#    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/m5_stack_tft/firmware.bin"   "${CMAKE_CURRENT_SOURCE_DIR}/bin/m5_stack_tft_firmware.bin"
+#    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/m5_stack_tft/partitions.bin" "${CMAKE_CURRENT_SOURCE_DIR}/bin/m5_stack_tft_partitions.bin"
+#    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/m5_stack_tft/spiffs.bin"     "${CMAKE_CURRENT_SOURCE_DIR}/bin/m5_stack_tft_spiffs.bin"
+
+    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/tft_espi/firmware.bin"   "${CMAKE_CURRENT_SOURCE_DIR}/bin/tft_espi_firmware.bin"
+    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/tft_espi/partitions.bin" "${CMAKE_CURRENT_SOURCE_DIR}/bin/tft_espi_partitions.bin"
+    COMMAND ${COPY_CMD} "${CMAKE_CURRENT_SOURCE_DIR}/.pio/build/tft_espi/spiffs.bin"     "${CMAKE_CURRENT_SOURCE_DIR}/bin/tft_espi_spiffs.bin"
+
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
diff --git a/README.md b/README.md
@@ -14,7 +14,9 @@ TiltBridge automatically logs your data to the following cloud data services:
 
 * [Fermentrack](https://www.fermentrack.com/)
 * [Brewer's Friend](http://www.brewersfriend.com/)
+* [Brewfather](https://brewfather.app)
 * Google Sheets
+* [Brewstatus](https://brewstat.us)
 
 
 #### Features
@@ -30,8 +32,17 @@ TiltBridge automatically logs your data to the following cloud data services:
 
 Building a TiltBridge is simple - the hardest decision in most cases is the enclosure. For more information, read the [documentation](http://docs.tiltbridge.com/).
 
+Once you've acquired your hardware, simply flash the TiltBridge firmware with [Fermentrack](http://www.fermentrack.com/) or [BrewFlasher](http://www.brewflasher.com/). Easy!
+
 
 #### Requirements
 
-TiltBridge requires an ESP32-based controller, properly flashed with the TiltBridge firmware.
+TiltBridge requires an ESP32-based controller properly flashed with the TiltBridge firmware.
+
+
+### Support TiltBridge
+
+Interested in supporting TiltBridge? Buy a [sticker](https://www.tindie.com/products/thorrak/tiltbridge-sticker/) (or a [magnet](https://www.tindie.com/products/thorrak/tiltbridge-magnet/))!
+
+
 
diff --git a/bin/boot_app0.bin b/bin/boot_app0.bin
diff --git a/bin/bootloader_dio_40m.bin b/bin/bootloader_dio_40m.bin
diff --git a/bin/d32_pro_tft_firmware.bin b/bin/d32_pro_tft_firmware.bin
diff --git a/bin/partitions.bin → bin/d32_pro_tft_partitions.bin b/bin/partitions.bin → bin/d32_pro_tft_partitions.bin
diff --git a/bin/d32_pro_tft_spiffs.bin b/bin/d32_pro_tft_spiffs.bin
diff --git a/bin/firmware.bin b/bin/firmware.bin
diff --git a/bin/lcd_ssd1306_firmware.bin b/bin/lcd_ssd1306_firmware.bin
diff --git a/bin/lcd_ssd1306_partitions.bin b/bin/lcd_ssd1306_partitions.bin
diff --git a/bin/lcd_ssd1306_spiffs.bin b/bin/lcd_ssd1306_spiffs.bin
diff --git a/bin/spiffs.bin b/bin/spiffs.bin
diff --git a/bin/tft_espi_firmware.bin b/bin/tft_espi_firmware.bin
diff --git a/bin/tft_espi_partitions.bin b/bin/tft_espi_partitions.bin
diff --git a/bin/tft_espi_spiffs.bin b/bin/tft_espi_spiffs.bin
diff --git a/data/about.htm b/data/about.htm
@@ -38,6 +38,9 @@
             <li class="nav-item">
                 <a class="nav-link" href="/settings/">Settings</a>
             </li>
+            <li class="nav-item">
+                <a class="nav-link" href="/calibration/">Calibration</a>
+            </li>
             <li class="nav-item active">
                 <a class="nav-link" href="/about/">About  <span class="sr-only">(current)</span></a>
             </li>
@@ -69,6 +72,8 @@ <h5 class="card-header">
                             <a href="https://www.reddit.com/user/lordfili">lordfili</a> on Reddit,
                             <a href="https://www.homebrewtalk.com/forum/members/thorrak.221138/">Thorrak</a> on the HBT forums, or
                             <a href="https://github.com/thorrak">Thorrak</a> on GitHub.
+                            Tilt calibration and temperature correction code
+                            provided by <a href="https://github.com/duncan-brown">duncan-brown</a>.
                         </p>
 
                         <p class="card-text"> TiltBridge documentation and support can be found at the following links:<br>
@@ -91,23 +96,22 @@ <h5 class="card-header">
                     </h5>
                     <div class="card-body">
                         <p class="card-text">
-                            Your TiltBridge can be updated over the internet to the latest version of the TiltBridge
-                            firmware by clicking the "Update Firmware" button below. Additionally, if you plan on
-                            relocating your TiltBridge to a new network, you can reset the WiFi connection settings by
-                            clicking "Reset WiFi".
+<!--                            Your TiltBridge can be updated over the internet to the latest version of the TiltBridge-->
+<!--                            firmware by clicking the "Update Firmware" button below.-->
+                            If you plan on relocating your TiltBridge to a new network, you can reset the WiFi
+                            connection settings by clicking "Reset WiFi".
                         </p>
 
                         <p class="card-text">
-                            <a href="/ota/" class="btn btn-danger">Update Firmware</a>
+<!--                            <a href="/ota/" class="btn btn-danger">Update Firmware</a>-->
+                            <a href="/restart/" class="btn btn-danger">Restart TiltBridge</a>
                             <a href="/wifi/" class="btn btn-danger">Reset WiFi</a>
                         </p>
 
                     </div>
                 </div>
             </div>
         </div>
-
-
     </div>
 
 </main>