Replies: 1 comment
-
You need
BTW, even if you add diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7381a5c..5899a35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,26 +1,6 @@
-set(FLUIDD_DIR ${CMAKE_CURRENT_LIST_DIR} CACHE PATH "root directory")
-
cmake_minimum_required(VERSION 3.13.1)
-
-list(INSERT OVERLAY_CONFIG 0 overlay-ot-defaults.conf)
-
-if (NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE ZDebug)
-endif()
-
-# Point to the build type and common config files
-set(CONF_FILE "prj.${CMAKE_BUILD_TYPE}.conf" "prj.common.conf")
-
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-
-add_subdirectory(modules)
-
project(fluidd_firmware)
-FILE(GLOB app_sources src/*.c)
-
-target_sources(app PRIVATE ${app_sources})
-
-
-#target_include_directories(app PRIVATE interface)
+target_sources(app PRIVATE src/main.c)
diff --git a/Kconfig b/Kconfig
deleted file mode 100644
index 93d6b88..0000000
--- a/Kconfig
+++ /dev/null
@@ -1,33 +0,0 @@
-menu "Zephyr Kernel"
-source "Kconfig.zephyr"
-endmenu
-
-module = FLUIDD
-module-str = Fluidd Firmware
-source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
-
-module = OT_COAP_UTILS
-module-str = OpenThread CoAP utils
-source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
-
-config LOG
- default y
-
-config LOG_PRINTK
- default y
-
-config SPI
- default y
-
-config I2C
- default y
-
-config SENSOR_LOG_LEVEL
- default 4
-
-config APPLICATION_WORKQUEUE_PRIORITY
- int "Application workqueue priority"
- default SYSTEM_WORKQUEUE_PRIORITY
-
-
-rsource “modules/Kconfig”
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/modules/modules.cmake b/modules/modules.cmake
index f23d7a1..c70dcb0 100644
--- a/modules/modules.cmake
+++ b/modules/modules.cmake
@@ -1,2 +1,2 @@
set(ZEPHYR_CJSON_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR}/cjson)
-set(ZEPHYR_CJSON_KCONFIG ${CMAKE_CURRENT_LIST_DIR}/cjson/Kconfig)
\ No newline at end of file
+set(ZEPHYR_CJSON_KCONFIG ${CMAKE_CURRENT_LIST_DIR}/cjson/Kconfig)
diff --git a/overlay-ot-defaults.conf b/overlay-ot-defaults.conf
deleted file mode 100644
index 77e2953..0000000
--- a/overlay-ot-defaults.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# OpenThread
-
-# Enable OpenThread shell
-CONFIG_NET_L2_OPENTHREAD=y
-CONFIG_SHELL=y
-CONFIG_OPENTHREAD_SHELL=y
-CONFIG_OPENTHREAD_FTD=y
-CONFIG_OPENTHREAD_L2_DEBUG=y
-CONFIG_NETWORKING=y
-
-# Enable OpenThread CoAP support API
-CONFIG_OPENTHREAD_COAP=y
-CONFIG_OPENTHREAD_COAP_OBSERVE=y
-CONFIG_OPENTHREAD_ENABLE_SERVICE=y
-#CONFIG_OPENTHREAD_SRP_CLIENT=y
-#CONFIG_OPENTHREAD_ECDSA=y
-
-# Kernel options
-CONFIG_MAIN_STACK_SIZE=2048
-CONFIG_INIT_STACKS=y
-CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
-
-
-
-# Same network Master Key for client and server
-CONFIG_OPENTHREAD_MASTERKEY="00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff"
-CONFIG_OPENTHREAD_PANID=4660
-CONFIG_OPENTHREAD_CHANNEL=15
-CONFIG_OPENTHREAD_THREAD_VERSION_1_2=y
-
-
-# Disable certain parts of Zephyr IPv6 stack
-CONFIG_NET_IPV6_NBR_CACHE=n
-CONFIG_NET_IPV6_MLD=n
-
-# Stack sizes configuration
-CONFIG_NET_TX_STACK_SIZE=1200
-CONFIG_NET_RX_STACK_SIZE=1500
-
-# Network buffers
-CONFIG_NET_PKT_RX_COUNT=10
-CONFIG_NET_PKT_TX_COUNT=16
-CONFIG_NET_BUF_RX_COUNT=16
-CONFIG_NET_BUF_TX_COUNT=16
-
-CONFIG_MBEDTLS_HEAP_SIZE=10240
diff --git a/prj.ZDebug.conf b/prj.ZDebug.conf
deleted file mode 100644
index e2642ca..0000000
--- a/prj.ZDebug.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Optimize for debug
-CONFIG_DEBUG_OPTIMIZATIONS=y
\ No newline at end of file
diff --git a/prj.ZRelease.conf b/prj.ZRelease.conf
deleted file mode 100644
index e5aff23..0000000
--- a/prj.ZRelease.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Optimize for speed. See https://docs.zephyrproject.org/latest/reference/kconfig/choice_471.html#choice-471 for other options
-CONFIG_SPEED_OPTIMIZATIONS=y
-# Disable assertions in the Zephyr Kernel. This improves the execution speed and prevents a CMake configure warning. See https://docs.zephyrproject.org/latest/reference/kconfig/CONFIG_ASSERT.html
-CONFIG_ASSERT=n
\ No newline at end of file
diff --git a/prj.common.conf b/prj.common.conf
deleted file mode 100644
index 1cec88f..0000000
--- a/prj.common.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-CONFIG_GPIO=y
-CONFIG_SERIAL=y
-CONFIG_CONSOLE=y
-CONFIG_UART_CONSOLE=y
-CONFIG_GPIO_AS_PINRESET=y
-
-
-# JSON Encoder
-CONFIG_CJSON_LIB=y
-
-# NEWLIB C
-CONFIG_NEWLIB_LIBC=y
-CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y
-
-# Configure sensors
-CONFIG_SENSOR=y
-CONFIG_SPI=y
-#CONFIG_SPI_2=y
-CONFIG_BME280=n
-CONFIG_SI7006=y
-CONFIG_I2C=y
-CONFIG_I2C_NRFX=y
-CONFIG_GPIO=y
-CONFIG_I2C_SHELL=y
-CONFIG_SENSOR_LOG_LEVEL_DBG=y
-CONFIG_CBPRINTF_COMPLETE=y
-CONFIG_LOG_BACKEND_UART=y
\ No newline at end of file
diff --git a/zephyr/modules.yml b/zephyr/modules.yml
deleted file mode 100644
index ac38eb0..0000000
--- a/zephyr/modules.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-build:
- cmake: .
- kconfig: Kconfig
- settings:
- board_root: .
- dts_root: .
- module_ext_root: . |
Beta Was this translation helpful? Give feedback.
0 replies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
-
Hey all
I'd love a set of eyes on this if I could, I've been beating my head against this one.
I'm using Zephyr 2.6 and trying to pull in the newly created cJSON module from the Nordic SDK. It's failing to set up the build environment and I can't figure out what I'm missing, or is there some secret sauce in the nrf SDK that's not in vanilla Zephyr.
I've created a simple repro of the issue here: https://github.com/Ideacraftteam/zephyrrepro
Essentially when I generate the build, I get an error:
but pulling in other modules works. I've googled all I can, and read through all the CMake files I can find, and I'm stumped. The responses I've seen recommend doing a clean and West update and I've tried all of those things.
Any advice?
Beta Was this translation helpful? Give feedback.
All reactions