Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .codespell-ignore-words.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
comIn
Ines
rsource
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module ReferenceDeployment {
priority 3

instance cmdSeq: Svc.CmdSequencer base id 0x10006000 \
queue size Default.QUEUE_SIZE \
queue size Default.QUEUE_SIZE * 2 \
stack size Default.STACK_SIZE \
priority 15

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
zephyr,flash = &flash0;
zephyr,console = &cdc_acm_uart0;
zephyr,shell-uart = &cdc_acm_uart0;
zephyr,code-partition = &code_partition;
};

fstab {
Expand Down Expand Up @@ -58,34 +57,7 @@ zephyr_udc0: &usbd {
};

&flash0 {
reg = <0x10000000 DT_SIZE_M(4)>;

partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;

/* Reserved memory for an image definition block. The block is much
* smaller than 256 bytes, but in practice the linker places the vector
* table at a much larger alignment offset.
*/
image_def: partition@0 {
label = "image_def";
reg = <0x00000000 0x100>;
read-only;
};

/*
* Usable flash. Starts at 0x100, after the image definition block.
* The partition size is 4MB minus the 0x100 bytes taken by the
* image definition.
*/
code_partition: partition@100 {
label = "code-partition";
reg = <0x100 (DT_SIZE_M(4) - 0x100)>;
read-only;
};
};
reg = <0x10000000 DT_SIZE_M(4)>;
};

&timer0 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
source "../../../boards/bronco_space/proves_flight_control_board_v5/Kconfig.defconfig"
rsource "../../../boards/bronco_space/proves_flight_control_board_v5/Kconfig.defconfig"
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,15 @@ CONFIG_SERIAL=y
CONFIG_UART_CONSOLE=y
CONFIG_UART_INTERRUPT_DRIVEN=y
CONFIG_USE_DT_CODE_PARTITION=y
CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_PRODUCT="PROVES Flight Control Board v5c"
CONFIG_USB_DEVICE_VID=0x0028

# USB Next Stack
CONFIG_USBD_CDC_ACM_CLASS=y
CONFIG_USB_DEVICE_STACK_NEXT=y
CONFIG_CDC_ACM_SERIAL_ENABLE_AT_BOOT=y
CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y
CONFIG_CDC_ACM_SERIAL_PID=0x000F
CONFIG_CDC_ACM_SERIAL_VID=0x0028
CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="PROVES Flight Control Board v5c"

# Sensors
CONFIG_LSM6DSO=y
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ config BOARD_PROVES_FLIGHT_CONTROL_BOARD_V5D
bool "PROVES Flight Control Board v5d"
default y

source "../../../boards/bronco_space/proves_flight_control_board_v5/Kconfig.defconfig"
rsource "../../../boards/bronco_space/proves_flight_control_board_v5/Kconfig.defconfig"
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,15 @@ CONFIG_SERIAL=y
CONFIG_UART_CONSOLE=y
CONFIG_UART_INTERRUPT_DRIVEN=y
CONFIG_USE_DT_CODE_PARTITION=y
CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_DEVICE_PRODUCT="PROVES Flight Control Board v5d"
CONFIG_USB_DEVICE_VID=0x0028

# USB Next Stack
CONFIG_USBD_CDC_ACM_CLASS=y
CONFIG_USB_DEVICE_STACK_NEXT=y
CONFIG_CDC_ACM_SERIAL_ENABLE_AT_BOOT=y
CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y
CONFIG_CDC_ACM_SERIAL_PID=0x000F
CONFIG_CDC_ACM_SERIAL_VID=0x0028
CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="PROVES Flight Control Board v5d"

# Sensors
CONFIG_LSM6DSO=y
Expand Down
2 changes: 1 addition & 1 deletion lib/fprime
2 changes: 1 addition & 1 deletion lib/zephyr-workspace/zephyr
Submodule zephyr updated 16672 files
12 changes: 4 additions & 8 deletions prj.conf
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
#### Configure Device VID and PID --> Uncomment the desired device definitions ####

#### From Raspberry Pi Pico2 USB Definitions ####
CONFIG_USB_DEVICE_PID=0x000F
CONFIG_USB_DEVICE_VID=0x2E8A

#### F Prime C++ Dependencies ####
CONFIG_CPP=y
CONFIG_REQUIRES_FULL_LIBCPP=y
Expand All @@ -15,9 +11,9 @@ CONFIG_POSIX_API=y
CONFIG_REBOOT=y

#### Native USB ####
CONFIG_USB_DEVICE_STACK=y
CONFIG_USB_CDC_ACM=y
CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y
#CONFIG_USB_DEVICE_STACK=y
#CONFIG_USB_CDC_ACM=y
#CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y
CONFIG_UART_INTERRUPT_DRIVEN=y

#### Serial and I/O ####
Expand All @@ -36,7 +32,7 @@ CONFIG_DYNAMIC_THREAD=y
CONFIG_KERNEL_MEM_POOL=y
CONFIG_DYNAMIC_THREAD_ALLOC=n
CONFIG_DYNAMIC_THREAD_PREFER_POOL=y
CONFIG_DYNAMIC_THREAD_POOL_SIZE=20
CONFIG_DYNAMIC_THREAD_POOL_SIZE=30
# Num threads in the thread pool
CONFIG_DYNAMIC_THREAD_STACK_SIZE=8192
# Size of thread stack in thread pool, must be >= Thread Pool size in F'
Expand Down
4 changes: 3 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
pip
west

patool
semver
tqdm
-r lib/fprime/requirements.txt
29 changes: 9 additions & 20 deletions west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,25 @@ manifest:
# Zephyr RTOS core
- name: zephyr
repo-path: zephyr
revision: v4.2.0
revision: v4.3.0
path: lib/zephyr-workspace/zephyr
west-commands: scripts/west-commands.yml
import:
# Import specific submanifests only (instead of all submanifests)
name-allowlist:
- cmsis # ARM CMSIS support (required for Cortex-M)
- cmsis_6 # ARM CMSIS 6 support (required for RPI)
- hal_rpi_pico # Raspberry Pi Pico HAL (REQUIRED for RP2040/RP2350)
- picolibc # C library
- mbedtls # Crypto library
- tinycrypt # Lightweight crypto library
- mcuboot # Bootloader support
- fatfs # FatFS (file system) support
- hal_st # Required for certain sensors

- name: loramac-node
revision: fb00b383072518c918e2258b0916c996f2d4eebe
path: lib/zephyr-workspace/modules/lib/loramac-node

# Core modules required for RP2040/RP2350
- name: cmsis
Expand All @@ -46,7 +53,7 @@ manifest:

- name: hal_rpi_pico
path: lib/zephyr-workspace/modules/hal/rpi_pico
revision: 7b57b24588797e6e7bf18b6bda168e6b96374264
revision: 09e957522da60581cf7958b31f8e625d969c69a5
groups:
- hal

Expand All @@ -60,10 +67,6 @@ manifest:
path: lib/zephyr-workspace/modules/lib/picolibc
revision: 560946f26db075c296beea5b39d99e6de43c9010

- name: loramac-node
revision: fb00b383072518c918e2258b0916c996f2d4eebe
path: lib/zephyr-workspace/modules/lib/loramac-node

# Crypto libraries (commonly used)
- name: mbedtls
revision: 85440ef5fffa95d0e9971e9163719189cf34d979
Expand All @@ -77,20 +80,6 @@ manifest:
groups:
- crypto

# Bootloader support (optional - remove if not needed)
- name: mcuboot
revision: 4eba8087fa606db801455f14d185255bc8c49467
path: lib/zephyr-workspace/bootloader/mcuboot
groups:
- bootloader

# FAT Filesystem support
- name: fatfs
revision: 16245c7c41d2b79e74984f49b5202551786b8a9b
path: lib/zephyr-workspace/modules/fs/fatfs
groups:
- fs

self:
path: .
west-commands: west-commands.yml