From 4fed32e8aa84240b02e84a27f05b9c834deb2282 Mon Sep 17 00:00:00 2001 From: nielsonm236 Date: Sat, 17 Dec 2022 12:55:30 -0700 Subject: [PATCH] Updated executables for 20221217 General Release --- NetworkModule/.Idea_Groups/Vector_File.grp | 2 +- NetworkModule/.Idea_Temp/IDEA.ERR | 10 ++++++---- NetworkModule/.Idea_Temp/IDEABLD.BAT | 2 +- NetworkModule/Main.c | 2 +- NetworkModule/uipopt.h | 8 ++++---- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/NetworkModule/.Idea_Groups/Vector_File.grp b/NetworkModule/.Idea_Groups/Vector_File.grp index 84ba277..ba84c19 100644 --- a/NetworkModule/.Idea_Groups/Vector_File.grp +++ b/NetworkModule/.Idea_Groups/Vector_File.grp @@ -1,5 +1,5 @@ # Group File Created by IDEA # Project: -# Sat Dec 17 06:53:38 2022 +# Sat Dec 17 12:53:46 2022 # "networkmodule_vector.o" diff --git a/NetworkModule/.Idea_Temp/IDEA.ERR b/NetworkModule/.Idea_Temp/IDEA.ERR index b43fbcb..52a1933 100644 --- a/NetworkModule/.Idea_Temp/IDEA.ERR +++ b/NetworkModule/.Idea_Temp/IDEA.ERR @@ -51,12 +51,14 @@ uip.o: uip_arp.o: uip_tcpapphub.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libisl0.sm8)memcmp.o: +(C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libisl0.sm8)memmov.o: +(C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libisl0.sm8)strcat0.o: +(C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libisl0.sm8)strcmp0.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libisl0.sm8)strlen0.o: -(C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libisl0.sm8)strncm.o: -(C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)fctcpy.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)bmulx.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)eeprom.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)itolx.o: +(C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)itoly.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)ladc.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)ladd.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)lcmp.o: @@ -69,6 +71,7 @@ uip_tcpapphub.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)lgor.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)lgsbc.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)lgsub.o: +(C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)lgursh.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)lneg.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)lreg.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)ltor.o: @@ -76,9 +79,8 @@ uip_tcpapphub.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)lumod.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)lzmp.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)rtol.o: +(C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)sdivx.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)smul.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)utolx.o: -(C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)vmul.o: -(C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)umul.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)xreg.o: (C:\Program Files (x86)\COSMIC\FSE_Compilers\CXSTM8\lib\libm0.sm8)yreg.o: diff --git a/NetworkModule/.Idea_Temp/IDEABLD.BAT b/NetworkModule/.Idea_Temp/IDEABLD.BAT index 75d0cc2..43d7e47 100644 --- a/NetworkModule/.Idea_Temp/IDEABLD.BAT +++ b/NetworkModule/.Idea_Temp/IDEABLD.BAT @@ -1,5 +1,5 @@ REM COMMAND FILE BUILT BY IDEA -REM Sat Dec 17 06:53:34 2022 +REM Sat Dec 17 12:53:42 2022 REM cxstm8 -v -l +strict +debug +modsl0 +split +warn "networkmodule_vector.c" cxstm8 -v -l +strict +debug +modsl0 +split +warn "ds18b20.c" "enc28j60.c" "gpio.c" "httpd.c" "i2c.c" "main.c" "mqtt.c" "mqtt_pal.c" "spi.c" "timer.c" "uart.c" "uip.c" "uip_arp.c" "uip_tcpapphub.c" diff --git a/NetworkModule/Main.c b/NetworkModule/Main.c index a7ce290..c9f5656 100644 --- a/NetworkModule/Main.c +++ b/NetworkModule/Main.c @@ -52,7 +52,7 @@ //---------------------------------------------------------------------------// //---------------------------------------------------------------------------// // IMPORTANT: The code_revision must be exactly 13 characters -const char code_revision[] = "20221213 0000"; // Normal Release Revision +const char code_revision[] = "20221217 1925"; // Normal Release Revision // const char code_revision[] = "20210529 1999"; // Browser Only test build // const char code_revision[] = "20210529 2999"; // MQTT test build // const char code_revision[] = "20210531 CU01"; // Code Uploader test build diff --git a/NetworkModule/uipopt.h b/NetworkModule/uipopt.h index 3144e25..0092895 100644 --- a/NetworkModule/uipopt.h +++ b/NetworkModule/uipopt.h @@ -345,9 +345,9 @@ // Code Uploader requires additional hardware in the form of an off-board I2C // EEPROM, thus OB_EEPROM_SUPPORT and I2C_SUPPORT must be enabled. // Un-comment ONLY ONE of the following: -// #define BUILD_SUPPORT MQTT_BUILD +#define BUILD_SUPPORT MQTT_BUILD // #define BUILD_SUPPORT BROWSER_ONLY_BUILD -#define BUILD_SUPPORT CODE_UPLOADER_BUILD +// #define BUILD_SUPPORT CODE_UPLOADER_BUILD // I2C_SUPPORT @@ -356,7 +356,7 @@ // and clock pins. // 0 = Not supported // 1 = Supported -#define I2C_SUPPORT 1 +#define I2C_SUPPORT 0 // OB_EEPROM_SUPPORT @@ -379,7 +379,7 @@ // b) Load the Runtime code // 0 = Not supported // 1 = Supported -#define OB_EEPROM_SUPPORT 1 +#define OB_EEPROM_SUPPORT 0 // DEBUG_SENSOR_SERIAL