use new cmake support in jd-c

Author: mmoskal

CMakeLists.txt

@@ -5,5 +5,17 @@ include($ENV{IDF_PATH}/tools/cmake/project.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)
 idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=panic_restart" APPEND)
+# force linking of ctrl.c
+idf_build_set_property(LINK_OPTIONS "-u app_get_device_class" APPEND)
 
 project(espjd)
+
+# this passes the esp-idf compile options down to jacdac-c build
+idf_build_get_property(compile_options COMPILE_OPTIONS GENERATOR_EXPRESSION)
+idf_build_get_property(c_compile_options C_COMPILE_OPTIONS GENERATOR_EXPRESSION)
+add_compile_options("${compile_options}")
+add_c_compile_options("${c_compile_options}")
+
+# location of jd_user_config.h
+set(JACDAC_USER_CONFIG_DIR "../main")
+add_subdirectory(jacdac-c)

jacdac-c

@@ -1,26 +1,14 @@
-file(GLOB JDC_FILES 
-  ../jacdac-c/jacscript/*.c
-  ../jacdac-c/source/*.c
-  ../jacdac-c/client/*.c
-  ../jacdac-c/storage/*.c
-  ../jacdac-c/storage/ff/*.c
+file(GLOB MAIN_FILES 
   *.c
 )
 
 idf_component_register(
   SRCS 
     "../build/version.c"
-    "../jacdac-c/source/interfaces/event_queue.c"
-    "../jacdac-c/source/interfaces/simple_rx.c"
-    "../jacdac-c/source/interfaces/tx_queue.c"
-    "../jacdac-c/services/jd_status_light.c"
-    "../jacdac-c/services/power.c"
-    "../jacdac-c/jacdac/dist/c/jd_spec_pack.c"
-    ${JDC_FILES}
+    ${MAIN_FILES}
 
   INCLUDE_DIRS 
     "."
-    "../jacdac-c/inc"
-    "../jacdac-c/jacscript"
-    "../jacdac-c"
-)
+)
+
+target_link_libraries(${COMPONENT_LIB} PUBLIC jacdac)

main/CMakeLists.txt

@@ -2,6 +2,8 @@
 #include <string.h>
 #include <stdbool.h>
 
+#include "sdkconfig.h"
+
 #include "dmesg.h"
 
 #include "freertos/FreeRTOS.h"

main/hw.h

@@ -4,15 +4,15 @@
 #define DEVICE_DMESG_BUFFER_SIZE 4096
 
 #include "dmesg.h"
-#include "sdkconfig.h"
 
 #define JD_LOG DMESG
 #define JD_WR_OVERHEAD 28
 
 #define JD_CLIENT 1
 
+#ifndef __XTENSA__
 
-#if defined(CONFIG_IDF_TARGET_ESP32C3)
+// ESP32-C3
 
 #define LED_R_MULT 250
 #define LED_G_MULT 250
@@ -39,6 +39,8 @@
 
 #else
 
+// ESP32-S2
+
 #define LED_R_MULT 250
 #define LED_G_MULT 60
 #define LED_B_MULT 150
@@ -73,4 +75,6 @@
 void jdesp_wake_main(void);
 #define JD_WAKE_MAIN() jdesp_wake_main()
 
+#define JD_SIMPLE_ALLOC 0
+
 #endif

main/jd_user_config.h

@@ -8,7 +8,7 @@ int jd_pin_num(void) {
     return PIN_JACDAC;
 }
 
-uint64_t jd_device_id(void) {
+uint64_t hw_device_id(void) {
     static uint64_t addr;
     if (!addr) {
         uint8_t mac[6];