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 Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions app/cosmo/base.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ name = "task-net"
stacksize = 8000
priority = 5
features = ["mgmt", "h753", "cosmo", "vlan", "vpd-mac"]
max-sizes = {flash = 131072, ram = 65536, sram1_mac = 16384}
max-sizes = {flash = 131072, ram = 131072, sram1_mac = 16384}
default-ram = "dtcm"
sections = {eth_bulk = "sram1_mac"}
uses = ["eth", "tim16"]
Expand Down Expand Up @@ -171,10 +171,11 @@ notifications = ["timer"]
name = "task-hiffy"
features = ["h753", "stm32h7", "i2c", "gpio", "spi", "qspi", "hash", "sprot", "turbo"]
priority = 7
max-sizes = {flash = 32768, ram = 32768 }
max-sizes = {flash = 32768, ram = 65536 }
stacksize = 1200
start = true
task-slots = ["sys", "hf", "i2c_driver", "hash_driver", "update_server", "sprot"]
task-slots = ["sys", "hf", "i2c_driver", "hash_driver", "update_server", "sprot", "net"]
notifications = ["timer"]

[tasks.cosmo_seq]
name = "drv-cosmo-seq-server"
Expand Down
11 changes: 11 additions & 0 deletions app/cosmo/dev.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,20 @@ port = 998
tx = { packets = 3, bytes = 1024 }
rx = { packets = 3, bytes = 1024 }

[tasks.hiffy]
features = ["net", "vlan"]
notifications = ["socket"]

[config.net.sockets.fmc_test]
kind = "udp"
owner = {name = "fmc_demo", notification = "socket"}
port = 11114
tx = { packets = 3, bytes = 4096 }
rx = { packets = 3, bytes = 4096 }

[config.net.sockets.hiffy]
kind = "udp"
owner = {name = "hiffy", notification = "socket"}
port = 11115
tx = { packets = 3, bytes = 32 }
rx = { packets = 1, bytes = 4096 }
1 change: 1 addition & 0 deletions app/demo-stm32f4-discovery/app-f3.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ priority = 3
max-sizes = {flash = 16384, ram = 16384 }
stacksize = 2048
start = true
notifications = ["timer"]

[tasks.idle]
name = "task-idle"
Expand Down
1 change: 1 addition & 0 deletions app/demo-stm32f4-discovery/app.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ priority = 3
max-sizes = {flash = 16384, ram = 16384 }
stacksize = 2048
start = true
notifications = ["timer"]

[tasks.idle]
name = "task-idle"
Expand Down
1 change: 1 addition & 0 deletions app/demo-stm32g0-nucleo/app-g031.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ start = true
task-slots = ["sys"]
stacksize = 912
features = ["stm32g0", "gpio", "micro", "send"]
notifications = ["timer"]

[tasks.idle]
name = "task-idle"
Expand Down
1 change: 1 addition & 0 deletions app/demo-stm32g0-nucleo/app-g070.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ features = ["no-ipc-counters"]
priority = 3
max-sizes = {flash = 8192, ram = 8192 }
start = true
notifications = ["timer"]

[tasks.idle]
name = "task-idle"
Expand Down
1 change: 1 addition & 0 deletions app/demo-stm32g0-nucleo/app-g0b1.toml.noworky
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ name = "task-hiffy"
priority = 3
requires = {flash = 8192, ram = 8192 }
start = true
notifications = ["timer"]

[tasks.idle]
name = "task-idle"
Expand Down
1 change: 1 addition & 0 deletions app/demo-stm32h7-nucleo/app-h743.toml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ max-sizes = {flash = 32768, ram = 65536 }
stacksize = 2048
start = true
task-slots = ["sys", "i2c_driver"]
notifications = ["timer"]

[tasks.idle]
name = "task-idle"
Expand Down
1 change: 1 addition & 0 deletions app/demo-stm32h7-nucleo/app-h753.toml
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ max-sizes = {flash = 32768, ram = 65536 }
stacksize = 2048
start = true
task-slots = ["sys", "i2c_driver", "hf", "hash_driver"]
notifications = ["timer"]

[tasks.hf]
name = "drv-mock-gimlet-hf-server"
Expand Down
1 change: 1 addition & 0 deletions app/donglet/app-g031-i2c.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ start = true
task-slots = ["sys", "i2c_driver"]
stacksize = 912
features = ["stm32g0", "g031", "i2c", "gpio", "send", "no-ipc-counters"]
notifications = ["timer"]

[tasks.idle]
name = "task-idle"
Expand Down
1 change: 1 addition & 0 deletions app/donglet/app-g031.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ start = true
task-slots = ["sys"]
stacksize = 912
features = ["stm32g0", "g031", "gpio", "micro", "send"]
notifications = ["timer"]

[tasks.idle]
name = "task-idle"
Expand Down
1 change: 1 addition & 0 deletions app/gemini-bu/app.toml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ max-sizes = {flash = 32768, ram = 16384 }
stacksize = 2048
start = true
task-slots = ["sys", "i2c_driver", "hf", "hash_driver", "sprot", "update_server"]
notifications = ["timer"]

[tasks.sprot]
name = "drv-stm32h7-sprot-server"
Expand Down
1 change: 1 addition & 0 deletions app/gimlet/base.toml
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ max-sizes = {flash = 32768, ram = 32768 }
stacksize = 1200
start = true
task-slots = ["sys", "hf", "i2c_driver", "hash_driver", "update_server", "sprot"]
notifications = ["timer"]

[tasks.gimlet_seq]
name = "drv-gimlet-seq-server"
Expand Down
1 change: 1 addition & 0 deletions app/gimletlet/app-mgmt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ max-sizes = {flash = 32768, ram = 65536 }
stacksize = 2048
start = true
task-slots = ["sys", "user_leds"]
notifications = ["timer"]

[tasks.net]
name = "task-net"
Expand Down
1 change: 1 addition & 0 deletions app/gimletlet/base-gimletlet2.toml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ priority = 7
max-sizes = {flash = 32768, ram = 65536}
stacksize = 2048
start = true
notifications = ["timer"]

[tasks.validate]
name = "task-validate"
Expand Down
14 changes: 11 additions & 3 deletions app/grapefruit/base.toml
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,9 @@ priority = 7
max-sizes = {flash = 32768, ram = 65536}
stacksize = 2048
start = true
features = ["h753", "stm32h7", "i2c", "gpio", "sprot", "qspi", "hash", "turbo"]
task-slots = ["i2c_driver", "sys", "user_leds", "sprot", "hf", "hash_driver"]
features = ["h753", "stm32h7", "i2c", "gpio", "sprot", "qspi", "hash", "turbo", "net", "vlan"]
task-slots = ["i2c_driver", "sys", "user_leds", "sprot", "hf", "hash_driver", "net"]
notifications = ["timer", "socket"]

[tasks.validate]
name = "task-validate"
Expand Down Expand Up @@ -276,7 +277,7 @@ name = "task-net"
stacksize = 8000
priority = 3
features = ["h753", "vlan", "grapefruit"]
max-sizes = {flash = 131072, ram = 65536, sram1_mac = 16384}
max-sizes = {flash = 131072, ram = 131072, sram1_mac = 16384}
default-ram = "dtcm"
sections = {eth_bulk = "sram1_mac"}
uses = ["eth", "tim16"]
Expand Down Expand Up @@ -391,6 +392,13 @@ port = 11114
tx = { packets = 3, bytes = 4096 }
rx = { packets = 3, bytes = 4096 }

[config.net.sockets.hiffy]
kind = "udp"
owner = {name = "hiffy", notification = "socket"}
port = 11115
tx = { packets = 3, bytes = 4096 }
rx = { packets = 3, bytes = 4096 }

################################################################################

[config]
Expand Down
1 change: 1 addition & 0 deletions app/lpc55xpresso/app.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ max-sizes = {flash = 32768, ram = 16384 }
stacksize = 2048
start = true
task-slots = ["gpio_driver", "update_server"]
notifications = ["timer"]

[tasks.idle]
name = "task-idle"
Expand Down
1 change: 1 addition & 0 deletions app/medusa/base.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ stacksize = 2048
start = true
task-slots = ["sys", "i2c_driver"]
features = ["turbo"]
notifications = ["timer"]

[tasks.i2c_driver]
name = "drv-stm32xx-i2c-server"
Expand Down
1 change: 1 addition & 0 deletions app/minibar/base.toml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ max-sizes = {flash = 32768, ram = 32768 }
stacksize = 1200
start = true
task-slots = ["sys", "i2c_driver", "sprot"]
notifications = ["timer"]

[tasks.thermal]
name = "task-thermal"
Expand Down
1 change: 1 addition & 0 deletions app/oxcon2023g0/app.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ start = true
task-slots = ["sys", "i2c_driver"]
stacksize = 912
features = ["stm32g0", "gpio", "i2c", "g030", "micro"]
notifications = ["timer"]

[tasks.i2c_driver]
name = "drv-stm32xx-i2c-server"
Expand Down
1 change: 1 addition & 0 deletions app/oxide-rot-1/app-dev.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ max-sizes = {flash = 32768, ram = 16384 }
stacksize = 2048
start = true
task-slots = ["gpio_driver", "swd", "update_server"]
notifications = ["timer"]

[tasks.idle]
name = "task-idle"
Expand Down
1 change: 1 addition & 0 deletions app/psc/base.toml
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ max-sizes = {flash = 32768}
stacksize = 1200
start = true
task-slots = ["sys", "i2c_driver", "sprot"]
notifications = ["timer"]

[tasks.validate]
name = "task-validate"
Expand Down
1 change: 1 addition & 0 deletions app/rot-carrier/app.toml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ max-sizes = {flash = 32768, ram = 16384 }
stacksize = 2048
start = true
task-slots = ["gpio_driver", "update_server"]
notifications = ["timer"]

[tasks.attest]
name = "task-attest"
Expand Down
1 change: 1 addition & 0 deletions app/sidecar/base.toml
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ max-sizes = {flash = 32768, ram = 32768 }
stacksize = 1200
start = true
task-slots = ["sys", "i2c_driver", "sprot"]
notifications = ["timer"]

[tasks.sensor]
name = "task-sensor"
Expand Down
3 changes: 3 additions & 0 deletions task/hiffy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ drv-spi-api = { path = "../../drv/spi-api" }
drv-sprot-api = { path = "../../drv/sprot-api", optional = true }
drv-stm32xx-i2c = { path = "../../drv/stm32xx-i2c", optional = true }
drv-stm32xx-sys-api = { path = "../../drv/stm32xx-sys-api", optional = true }
task-net-api = { path = "../../task/net-api", optional = true }
hubris-num-tasks = { path = "../../sys/num-tasks", features = ["task-enum"] }
ringbuf = { path = "../../lib/ringbuf" }
static-cell = { path = "../../lib/static-cell" }
Expand Down Expand Up @@ -63,6 +64,8 @@ micro = ["no-ipc-counters"]
turbo = []
panic-messages = ["userlib/panic-messages"]
spctrl = ["drv-sp-ctrl-api"]
net = ["task-net-api"]
vlan = ["task-net-api?/vlan"]

# This section is here to discourage RLS/rust-analyzer from doing test builds,
# since test builds don't work for cross compilation.
Expand Down
4 changes: 3 additions & 1 deletion task/hiffy/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.

fn main() {
fn main() -> anyhow::Result<()> {
build_util::expose_target_board();
build_util::build_notifications()?;
Ok(())
}
Loading
Loading