oof

Author: jr1221

compose.yml

@@ -1,7 +1,7 @@
 services:
     odysseus:
         build: .
-        image: ghcr.io/northeastern-electric-racing/odysseus:develop-stability-and-improvements
+        image: ghcr.io/northeastern-electric-racing/odysseus:mesh
         command: /bin/bash
         tty: true
         stdin_open: true

docker_scripts/setup_env.sh

@@ -9,7 +9,7 @@ make -C /home/odysseus/build/buildroot O=/home/odysseus/outputs/iroh BR2_EXTERNA
 make -C /home/odysseus/build/buildroot O=/home/odysseus/outputs/ap-pi5 BR2_EXTERNAL=/home/odysseus/build/odysseus_tree raspberrypi5_ap_defconfig
 make -C /home/odysseus/build/buildroot O=/home/odysseus/outputs/tpu-cm5 BR2_EXTERNAL=/home/odysseus/build/odysseus_tree raspberrypicm5io_tpu_defconfig
 make -C /home/odysseus/build/buildroot O=/home/odysseus/outputs/wheel-cm5 BR2_EXTERNAL=/home/odysseus/build/odysseus_tree raspberrypicm5io_wheel_defconfig
-make -C /home/odysseus/build/buildroot O=/home/odysseus/outputs/mesh BR2_EXTERNAL=/home/odysseus/build/odysseus_tree raspberrypizero2w_mesh_defconfig
+make -C /home/odysseus/build/buildroot O=/home/odysseus/outputs/mesh BR2_EXTERNAL=/home/odysseus/build/odysseus_tree raspberrypizero2w_64_mesh_defconfig
 
 
 cat << "EOF"

odysseus_tree/Config.in

@@ -13,7 +13,9 @@ source "$BR2_EXTERNAL_ODY_TREE_PATH/package/rpi-utils/Config.in"
 source "$BR2_EXTERNAL_ODY_TREE_PATH/package/python-gmqtt/Config.in"
 source "$BR2_EXTERNAL_ODY_TREE_PATH/package/odysseus-daemon/Config.in"
 source "$BR2_EXTERNAL_ODY_TREE_PATH/package/wheel-buttons/Config.in"
-source "$BR2_EXTERNAL_ODY_TREE_PATH/package/morse/Config.in"
+source "$BR2_EXTERNAL_ODY_TREE_PATH/package/mm6108-driver/Config.in"
+source "$BR2_EXTERNAL_ODY_TREE_PATH/package/mm6108-firmware/Config.in"
+source "$BR2_EXTERNAL_ODY_TREE_PATH/package/morse-cli/Config.in"
 source "$BR2_EXTERNAL_ODY_TREE_PATH/package/rpi-libpisp/Config.in"
 source "$BR2_EXTERNAL_ODY_TREE_PATH/package/rpi-libcamera/Config.in"
 source "$BR2_EXTERNAL_ODY_TREE_PATH/package/rpicam-apps/Config.in"

…ee/package/morse/mm6108-driver/Config.in …eus_tree/package/mm6108-driver/Config.inodysseus_tree/package/morse/mm6108-driver/Config.in renamed to odysseus_tree/package/mm6108-driver/Config.in odysseus_tree/package/morse/mm6108-driver/Config.in renamed to odysseus_tree/package/mm6108-driver/Config.in

@@ -1,4 +1,4 @@
-MM6108_DRIVER_VERSION = $(MORSE_VERSION)
+MM6108_DRIVER_VERSION = 1.17.9
 MM6108_DRIVER_SITE = https://github.com/MorseMicro/morse_driver
 MM6108_DRIVER_SITE_METHOD = git
 MM6108_DRIVER_GIT_SUBMODULES = YES

…age/morse/mm6108-driver/mm6108-driver.mk …e/package/mm6108-driver/mm6108-driver.mkodysseus_tree/package/morse/mm6108-driver/mm6108-driver.mk renamed to odysseus_tree/package/mm6108-driver/mm6108-driver.mk odysseus_tree/package/morse/mm6108-driver/mm6108-driver.mk renamed to odysseus_tree/package/mm6108-driver/mm6108-driver.mk

@@ -2,3 +2,5 @@ config BR2_PACKAGE_MM6108_FIRMWARE
 	bool "mm6108-firmware"
 	help
 		This is the firmware for the MM6108 Wifi HaLow SoC
+
+		Note like the upstream, this package does not respect Morse Micro versions

…/package/morse/mm6108-firmware/Config.in …s_tree/package/mm6108-firmware/Config.inodysseus_tree/package/morse/mm6108-firmware/Config.in renamed to odysseus_tree/package/mm6108-firmware/Config.in odysseus_tree/package/morse/mm6108-firmware/Config.in renamed to odysseus_tree/package/mm6108-firmware/Config.in

@@ -1,4 +1,4 @@
-MM6108_FIRMWARE_VERSION = $(MORSE_VERSION_MAJOR)
+MM6108_FIRMWARE_VERSION = ea18605f53387281c1029ea9eb8e0de2bda7bae2
 MM6108_FIRMWARE_SITE = https://github.com/MorseMicro/morse-firmware
 MM6108_FIRMWARE_SITE_METHOD = git
 MM6108_FIRMWARE_LICENSE = GPLv2

…morse/mm6108-firmware/mm6108-firmware.mk …ckage/mm6108-firmware/mm6108-firmware.mkodysseus_tree/package/morse/mm6108-firmware/mm6108-firmware.mk renamed to odysseus_tree/package/mm6108-firmware/mm6108-firmware.mk odysseus_tree/package/morse/mm6108-firmware/mm6108-firmware.mk renamed to odysseus_tree/package/mm6108-firmware/mm6108-firmware.mk

@@ -1,4 +1,4 @@
-MORSE_CLI_VERSION = $(MORSE_VERSION)
+MORSE_CLI_VERSION = 1.17.8
 MORSE_CLI_SITE = https://github.com/MorseMicro/morse_cli
 MORSE_CLI_SITE_METHOD = git
 MORSE_CLI_GIT_SUBMODULES = YES