nrfconnect · DematteisGiacomo · Feb 26, 2025 · Feb 25, 2025
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -12,11 +12,13 @@ project("Asset Tracker Template")
 # Include files that are common for all modules
 add_subdirectory(src/common)
 
+# Add main application source
+target_sources(app PRIVATE src/main.c)
+
 # Include mandatory module source folders
 add_subdirectory(src/modules/network)
 add_subdirectory(src/modules/cloud)
 add_subdirectory(src/modules/location)
-add_subdirectory(src/modules/app)
 add_subdirectory(src/modules/fota)
 add_subdirectory(src/modules/button)
 

diff --git a/app/Kconfig b/app/Kconfig
@@ -13,12 +13,12 @@ config APP_PAYLOAD_CHANNEL_BUFFER_MAX_SIZE
 	  Maximum size of the buffer sent over the payload channel.
 	  Contains encoded CBOR data sampled and encoded in the various modules.
 
+rsource "src/Kconfig.main"
 rsource "src/modules/battery/Kconfig.battery"
 rsource "src/modules/network/Kconfig.network"
 rsource "src/modules/cloud/Kconfig.cloud"
 rsource "src/modules/location/Kconfig.location"
 rsource "src/modules/led/Kconfig.led"
-rsource "src/modules/app/Kconfig.app"
 rsource "src/modules/fota/Kconfig.fota"
 rsource "src/modules/environmental/Kconfig.environmental"
 rsource "src/modules/shell/Kconfig.shell"

diff --git a/app/src/modules/app/Kconfig.app → app/src/Kconfig.main b/app/src/modules/app/Kconfig.app → app/src/Kconfig.main
diff --git a/app/src/modules/app/app.c → app/src/main.c b/app/src/modules/app/app.c → app/src/main.c
diff --git a/app/src/modules/app/CMakeLists.txt b/app/src/modules/app/CMakeLists.txt
diff --git a/tests/module/app/CMakeLists.txt → tests/module/main/CMakeLists.txt b/tests/module/app/CMakeLists.txt → tests/module/main/CMakeLists.txt
@@ -17,7 +17,7 @@ target_sources(app
 	PRIVATE
 	src/main.c
 	src/checks.c
-	${ASSET_TRACKER_TEMPLATE_DIR}/app/src/modules/app/app.c
+	${ASSET_TRACKER_TEMPLATE_DIR}/app/src/main.c
 	${ASSET_TRACKER_TEMPLATE_DIR}/app/src/common/message_channel.c
 )
 
@@ -40,7 +40,7 @@ target_link_options(app PRIVATE --whole-archive)
 
 add_compile_options(-Wno-return-type)
 
-set_property(SOURCE ${ASSET_TRACKER_TEMPLATE_DIR}/app/src/modules/app/app.c PROPERTY COMPILE_FLAGS
+set_property(SOURCE ${ASSET_TRACKER_TEMPLATE_DIR}/app/src/main.c PROPERTY COMPILE_FLAGS
 	     "-include ${CMAKE_CURRENT_SOURCE_DIR}/src/redef.h")
 
 # Options that cannot be passed through Kconfig fragments

diff --git a/tests/module/app/VERSION → tests/module/main/VERSION b/tests/module/app/VERSION → tests/module/main/VERSION
diff --git a/tests/module/app/prj.conf → tests/module/main/prj.conf b/tests/module/app/prj.conf → tests/module/main/prj.conf
diff --git a/tests/module/app/src/checks.c → tests/module/main/src/checks.c b/tests/module/app/src/checks.c → tests/module/main/src/checks.c
diff --git a/tests/module/app/src/checks.h → tests/module/main/src/checks.h b/tests/module/app/src/checks.h → tests/module/main/src/checks.h
diff --git a/tests/module/app/src/main.c → tests/module/main/src/main.c b/tests/module/app/src/main.c → tests/module/main/src/main.c
diff --git a/tests/module/app/src/redef.h → tests/module/main/src/redef.h b/tests/module/app/src/redef.h → tests/module/main/src/redef.h
diff --git a/tests/module/app/testcase.yaml → tests/module/main/testcase.yaml b/tests/module/app/testcase.yaml → tests/module/main/testcase.yaml
@@ -1,5 +1,5 @@
 tests:
-  asset_tracker_template.fw.app:
+  asset_tracker_template.fw.main:
     platform_allow:
       - native_sim
       - native_sim/native/64