add -nojacs build

Author: mmoskal

.github/workflows/build.yml

@@ -29,6 +29,16 @@ jobs:
         target: esp32s2
         command: make dist clean
 
+    - run: echo 'TARGET=esp32s2-nojacs' > Makefile.user
+    - run: make prep
+
+    - name: esp-idf build
+      uses: espressif/esp-idf-ci-action@main
+      with:
+        esp_idf_version: v4.4.1
+        target: esp32s2
+        command: make dist clean
+
     - run: echo 'TARGET=esp32c3' > Makefile.user
     - run: make prep
 

CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+include(build/options.cmake)
 
 idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=esp_panic_handler" APPEND)
 idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=uart_hal_write_txfifo" APPEND)

Makefile

@@ -8,6 +8,12 @@ include Makefile.user
 
 MON_PORT ?= $(SERIAL_PORT)
 
+ifeq ($(TARGET),esp32s2-nojacs)
+TARGET := esp32s2
+TARGET_SUFF := -nojacs
+COMPILE_OPTIONS += -DNO_JACSCRIPT=1
+endif
+
 ifeq ($(TARGET),esp32s2)
 GCC_PREF = xtensa-esp32s2-elf
 UF2 = 1
@@ -40,6 +46,7 @@ all: check-export prep
 
 sdkconfig.defaults: Makefile.user
 	cat config/sdkconfig.$(TARGET) config/sdkconfig.common > sdkconfig.defaults
+	echo "idf_build_set_property(COMPILE_OPTIONS "$(COMPILE_OPTIONS)" APPEND)" > build/options.cmake
 
 clean:
 	rm -rf sdkconfig sdkconfig.defaults build
@@ -89,12 +96,12 @@ FW_VERSION = $(shell sh jacdac-c/scripts/git-version.sh)
 dist: all
 	mkdir -p dist
 ifeq ($(UF2),1)
-	cp build/espjd.uf2 dist/jacscript-$(TARGET).uf2
+	cp build/espjd.uf2 dist/jacscript-$(TARGET)$(TARGET_SUFF).uf2
 else
-	cp build/combined.bin dist/jacscript-$(TARGET)-0x0.bin
+	cp build/combined.bin dist/jacscript-$(TARGET)$(TARGET_SUFF)-0x0.bin
 endif
 	# also keep ELF file for addr2line
-	cp build/espjd.elf dist/jacscript-$(TARGET).elf
+	cp build/espjd.elf dist/jacscript-$(TARGET)$(TARGET_SUFF).elf
 
 bump:
 	sh ./scripts/bump.sh

jacdac-c

@@ -8,7 +8,14 @@
 #define JD_LOG DMESG
 #define JD_WR_OVERHEAD 28
 
+#ifndef NO_JACSCRIPT
 #define JD_CLIENT 1
+#endif
+
+#define JD_MS_TIMER 1
+#define JD_FREE_SUPPORTED 1
+#define JD_ADVANCED_STRING 1
+#define JD_LSTORE 1
 
 #ifndef __XTENSA__
 

main/jd_user_config.h

@@ -180,12 +180,14 @@ void app_init_services(void) {
         pwr_cfg.en_active_high = 1;
     power_init(&pwr_cfg);
 #endif
+#ifndef NO_JACSCRIPT
     jd_role_manager_init();
     init_jacscript_manager();
-#if 1
+#endif
     wifi_init();
     azureiothub_init();
     jacscloud_init(&azureiothub_cloud);
+#ifndef NO_JACSCRIPT
     tsagg_init(&azureiothub_cloud);
 #endif
 }