Restructure sources

The python and C modules that are supposed to be built into the firmware
image (i.e. those that are in manifest.py or in USER_C_MODULES) have
been moved to the software/modules directory.

The software/src directory should now only contain python scripts and
other files that should be installed to the Picos flash filesystem. The
idea is that these should be those scripts that implement the
application behaviour, as these are the ones that a user who does not
want to build the whole firmware themself wants to modify.

.gitignore

@@ -5,3 +5,4 @@ hardware/tonberry-pico/tonberry-pico-backups/
 software/build
 compile_commands.json
 .dir-locals.el
+.cache

software/CMakeLists.txt

@@ -50,7 +50,7 @@ add_test(NAME generate-xml-report
 set_tests_properties(clean-reports PROPERTIES FIXTURES_SETUP "Report")
 set_tests_properties(generate-xml-report PROPERTIES FIXTURES_CLEANUP "Report")
 
-add_subdirectory(src/audiocore)
+add_subdirectory(modules/audiocore)
 
 add_custom_target(check-format
     find . -iname '*.[ch]' -exec clang-format -Werror --dry-run {} +

software/boards/RPI_PICO_W/manifest.py

@@ -5,7 +5,7 @@ require("bundle-networking")
 # Bluetooth
 require("aioble")
 
-module("rp2_neopixel.py", "../../src")
+module("rp2_neopixel.py", "../../modules")
 require("sdcard")
 require("aiorepl")
 
@@ -14,5 +14,4 @@ module("mfrc522.py", "../../lib/micropython-mfrc522/")
 module("microdot.py", "../../lib/microdot/src/microdot/")
 
 # TonberryPico modules
-module("audiocore.py", "../../src/audiocore")
-package("nfc", base_path="../../src/")
+module("audiocore.py", "../../modules/audiocore")

software/build.sh

@@ -8,7 +8,7 @@ set -eu
   make -C mpy-cross -j "$(nproc)"
   make -C ports/rp2 BOARD=TONBERRY_RPI_PICO_W BOARD_DIR="$TOPDIR"/boards/RPI_PICO_W clean
   make -C ports/rp2 BOARD=TONBERRY_RPI_PICO_W BOARD_DIR="$TOPDIR"/boards/RPI_PICO_W \
-       USER_C_MODULES="$TOPDIR"/src/micropython.cmake -j "$(nproc)"
+       USER_C_MODULES="$TOPDIR"/modules/micropython.cmake -j "$(nproc)"
 )
 
 ( cd tools/mklittlefs