# HG changeset patch # User Michiel Broek # Date 1556824790 -7200 # Node ID e5900c9b9a7ba6ea9446caa1d651d54ae73e3ad5 # Parent 537ffe2807757de89c3e6e60253db1709bd81a44 Use PROJECT_VER for version number. Updated README and info screen. diff -r 537ffe280775 -r e5900c9b9a7b Makefile --- a/Makefile Thu May 02 17:12:06 2019 +0200 +++ b/Makefile Thu May 02 21:19:50 2019 +0200 @@ -3,7 +3,7 @@ # project subdirectory. # -PROJECT_VER := 0.3.0 +PROJECT_VER := "0.3.0.a" PROJECT_NAME := brewboard include $(IDF_PATH)/make/project.mk diff -r 537ffe280775 -r e5900c9b9a7b README.md --- a/README.md Thu May 02 17:12:06 2019 +0200 +++ b/README.md Thu May 02 21:19:50 2019 +0200 @@ -65,29 +65,21 @@ enkele aanpassingen voor dit project en daarom zijn die projecten volledig geimporteerd in brewboard. -Voor de VNC client: https://github.com/novnc/noVNC.git. Losse VNC clients -kunnen verbinden met poort 5900. Niet alle clients doen het goed omdat ze een -16 bits full color VNC server verwachten en niet goed downgraden naar 8 bits -kleuren. TigerVNC doet het goed. Voor deze applicatie is 16 bits kleur geen -optie omdat de schermbuffer dan niet meer in het geheugen past. - De PID library: http://playground.arduino.cc/Code/PIDLibrary by Brett Beauregard. De 1-wire bus: https://www.github.com/DavidAntliff/esp32-owb De DS18B20 sensoren: https://www.github.com/DavidAntliff/esp32-ds18b20 -De webserver en websockets server. Websockets worden gebruikt voor de VNC -web client. Hiervoor heb je geen losse VNC client nodig zoals bijvoorbeeld -de TigerVNC viewer maar wordt de VNC code in je browser gezet met javascript. +De webserver en websockets server. Websockets worden gebruikt voor de web +client. Deze web client probeert een kopie te zijn van het touch scherm. https://github.com/Molorius/esp32-websocket.git components/websocket -De javascript VNC client is aangepast voor deze applicatie. Het schema voor dit project staat op EasyDA. Zie https://easyeda.com/mbroek/ESP32_experiments-3ec1c1b17c3b41378ba4493ea69fa5c3. Belangrijk als je dit gaat bouwen: koop het juiste ESP32 devkit board. De meeste boards hebben niet genoeg aansluitingen naar buiten, je hebt echt de -36 pens versie van Geekcreit®nodig. +36 pens versie van Geekcreit® nodig. @@ -95,6 +87,6 @@ TODO: - Nosleep js code toevoegen. - - Web client zonder VNC, of toch niet. + - Web client zonder VNC, of toch niet. In progress. diff -r 537ffe280775 -r e5900c9b9a7b components/spidriver/spi_master_lobo.c --- a/components/spidriver/spi_master_lobo.c Thu May 02 17:12:06 2019 +0200 +++ b/components/spidriver/spi_master_lobo.c Thu May 02 21:19:50 2019 +0200 @@ -65,7 +65,7 @@ #include "soc/spi_reg.h" #include "soc/dport_reg.h" #include "soc/rtc_cntl_reg.h" -#include "rom/ets_sys.h" +#include "esp32/rom/ets_sys.h" #include "esp_types.h" #include "esp_attr.h" #include "esp_log.h" diff -r 537ffe280775 -r e5900c9b9a7b main/brewboard.c --- a/main/brewboard.c Thu May 02 17:12:06 2019 +0200 +++ b/main/brewboard.c Thu May 02 21:19:50 2019 +0200 @@ -22,7 +22,7 @@ int Main_Screen = MAIN_MODE_UNKNOWN; ///< Screen number int Old_Screen = MAIN_MODE_UNKNOWN; ///< Previous screen number bool System_TimeOk = false; ///< System time status - +const esp_app_desc_t *app_desc = NULL; void app_main() @@ -36,7 +36,8 @@ TFT_setFont(DEJAVU24_FONT, NULL); _fg = TFT_YELLOW; tempy = TFT_getfontheight() + 4; - sprintf(temp, "BrewBoard %s", VERSION); + app_desc = esp_ota_get_app_description(); + sprintf(temp, "BrewBoard %s", app_desc->version); TFT_print(temp, CENTER, 4); TFT_setFont(DEJAVU18_FONT, NULL); diff -r 537ffe280775 -r e5900c9b9a7b main/config.h --- a/main/config.h Thu May 02 17:12:06 2019 +0200 +++ b/main/config.h Thu May 02 21:19:50 2019 +0200 @@ -79,9 +79,6 @@ #include "task_http.h" -#define VERSION "0.2.10" ///< Application version - - /** * @brief Main mode different screens diff -r 537ffe280775 -r e5900c9b9a7b main/task_tft.c --- a/main/task_tft.c Thu May 02 17:12:06 2019 +0200 +++ b/main/task_tft.c Thu May 02 21:19:50 2019 +0200 @@ -30,6 +30,7 @@ extern bool _NewMinute; extern bool _UseHLT; extern bool System_TimeOk; +extern const esp_app_desc_t *app_desc; static const char *TAG = "task_tft"; @@ -557,7 +558,7 @@ break; case MAIN_INFO: - sprintf(temp_buf, "BrewBoard %s", VERSION); + sprintf(temp_buf, "BrewBoard %s", app_desc->version); TopMessage(temp_buf); _fg = TFT_YELLOW; TFT_setFont(UBUNTU16_FONT, NULL); @@ -565,7 +566,7 @@ // ------------------------------------- _fg = TFT_ORANGE; TFT_print("Parts are written by Chris Morgan,\r\n", 0, LASTY); - TFT_print("Brett Beauregard, Chris Garry, LoBo,\r\n", 0, LASTY); + TFT_print("Brett Beauregard, Blake Felt, LoBo,\r\n", 0, LASTY); TFT_print("and David Antliff.\r\n", 0, LASTY); ShowInteger(1,140, "Free memory", " bytes", esp_get_free_heap_size()); ShowText(1,158, "IDF version", (char *)esp_get_idf_version()); diff -r 537ffe280775 -r e5900c9b9a7b sdkconfig --- a/sdkconfig Thu May 02 17:12:06 2019 +0200 +++ b/sdkconfig Thu May 02 21:19:50 2019 +0200 @@ -11,7 +11,7 @@ CONFIG_SDK_PYTHON="python" CONFIG_SDK_MAKE_WARN_UNDEFINED_VARIABLES=y CONFIG_APP_COMPILE_TIME_DATE=y -CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=y +# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set # CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set # CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set # CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set