Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework project structure #126

Open
wants to merge 26 commits into
base: staging
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
efff0d7
Convert to workspace.
arron-speake-bluefruit Sep 1, 2022
2377527
Update Cargo.lock.
arron-speake-bluefruit Sep 1, 2022
a899d83
Add tool crates to workspace manifest.
arron-speake-bluefruit Sep 1, 2022
cb77f52
Move profile configs to workspace manifest.
arron-speake-bluefruit Sep 1, 2022
54b9f3f
Untrack .cargo-ok.
arron-speake-bluefruit Sep 1, 2022
f5e57df
Remove unneeded experimental feature declarations.
arron-speake-bluefruit Sep 1, 2022
dd3942a
Perform formatting pass.
arron-speake-bluefruit Sep 1, 2022
134f24b
Specify minimal versions in manifest files.
arron-speake-bluefruit Sep 1, 2022
a3dad0a
Pin commit for eframe dependency.
arron-speake-bluefruit Sep 1, 2022
27da012
Update dependencies.
arron-speake-bluefruit Sep 1, 2022
8424a2e
Use default rustfmt style.
arron-speake-bluefruit Sep 2, 2022
7019db3
Address linter warnings.
arron-speake-bluefruit Sep 2, 2022
3c1f5dd
Add x.py project front-end.
arron-speake-bluefruit Sep 5, 2022
f823ac2
Add x check subcommand.
arron-speake-bluefruit Sep 5, 2022
2006548
Update github action tests.
arron-speake-bluefruit Sep 5, 2022
cf37c9f
Fix github actions tests.
arron-speake-bluefruit Sep 5, 2022
21ef9f8
Add XCB dependencies to Docker image.
arron-speake-bluefruit Sep 5, 2022
32072fc
Fix bad fix for github actions.
arron-speake-bluefruit Sep 5, 2022
9e9bbc1
Move sample config files to own directory.
arron-speake-bluefruit Sep 5, 2022
044a7de
Refactor x.py.
arron-speake-bluefruit Sep 5, 2022
d449c86
Make x.py accept un-configured check and test subcommands.
arron-speake-bluefruit Sep 5, 2022
460f9bf
Add clippy to Docker image.
arron-speake-bluefruit Sep 6, 2022
2e8cae9
Move loadstone_front into tools directory.
arron-speake-bluefruit Sep 13, 2022
9a19f31
Add building documentation.
arron-speake-bluefruit Sep 13, 2022
322260c
Fix additional tests.
arron-speake-bluefruit Sep 13, 2022
32d5b1d
Un-comment cargo command aliases.
arron-speake-bluefruit Sep 14, 2022
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
Empty file removed .cargo-ok
Empty file.
20 changes: 8 additions & 12 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Tests
env:
LOADSTONE_CONFIG: ""
run: cargo test
- name: Loadstone tests
run: ./x.py test /dev/null
- name: Tool tests
run: cd tools && cargo test

clippy:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -40,20 +40,16 @@ jobs:
- name: Check sample stm32f4 build with external flash
env:
SCRIPT_MODE: true
LOADSTONE_CONFIG: "(port:Stm32F412,memory_configuration:(internal_memory_map:(bootloader_location:134217728,bootloader_length_kb:64,banks:[(start_address:134283264,size_kb:16,),(start_address:134299648,size_kb:850,),],bootable_index:Some(0),),external_memory_map:(banks:[(start_address:0,size_kb:7500,),],),external_flash:Some((name:\"Micronn25q128a\",internal:false,start:0,end:16777215,region_size:4096,)),golden_index:Some(2),),feature_configuration:(serial:Enabled(recovery_enabled:true,tx_pin:(peripheral:\"USART1\",bank:\"a\",index:15,af_index:6,),rx_pin:(peripheral:\"USART1\",bank:\"b\",index:3,af_index:7,),),boot_metrics:Enabled(timing:true,),update_signal: Disabled,greetings: Default,),security_configuration:(security_mode:Crc,verifying_key_raw:\"\",),)"
run: cargo check --features 'stm32f412' --target thumbv7em-none-eabihf
run: ./x.py check .github/workflows/examples/stm32f4_external.ron stm32f412
- name: Check sample stm32f4 build without external flash
env:
SCRIPT_MODE: true
LOADSTONE_CONFIG: "(port:Stm32F412,memory_configuration:(internal_memory_map:(bootloader_location:134217728,bootloader_length_kb:64,banks:[(start_address:134283264,size_kb:16,),(start_address:134299648,size_kb:850,),(start_address:135170048,size_kb:16,),],bootable_index:Some(0),),external_memory_map:(banks:[],),external_flash:None,golden_index:Some(2),),feature_configuration:(serial:Disabled,boot_metrics:Enabled(timing:true,),update_signal: Enabled,greetings: Custom( loadstone: \"hi\", demo: \"hello\",),),security_configuration:(security_mode:Crc,verifying_key_raw:\"\",),)"
run: cargo check --features 'stm32f412' --target thumbv7em-none-eabihf
run: ./x.py check .github/workflows/examples/stm32f4.ron stm32f412
- name: Check sample wgm160p build
env:
SCRIPT_MODE: true
LOADSTONE_CONFIG: "(port:Wgm160P,memory_configuration:(internal_memory_map:(bootloader_location:0,bootloader_length_kb:1,banks:[(start_address:4096,size_kb:4,),],bootable_index:Some(0),),external_memory_map:(banks:[],),external_flash:None,golden_index:Some(3),),feature_configuration:(serial:Disabled,boot_metrics:Enabled(timing:false,),update_signal: Enabled,greetings: Default,),security_configuration:(security_mode:Crc,verifying_key_raw:\"\",),)"
run: cargo check --features 'wgm160p' --target thumbv7em-none-eabihf
run: ./x.py check .github/workflows/examples/wgm160p.ron wgm160p
- name: Check sample stm32f4 build with encryption
env:
SCRIPT_MODE: true
LOADSTONE_CONFIG: "(port:Stm32F412,memory_configuration:(internal_memory_map:(bootloader_location:134217728,bootloader_length_kb:64,banks:[(start_address:134283264,size_kb:16,),],bootable_index:Some(0),),external_memory_map:(banks:[],),external_flash:None,golden_index:None,),feature_configuration:(serial:Enabled(recovery_enabled:false,tx_pin:(peripheral:\"USART1\",bank:\"a\",index:9,af_index:7,),rx_pin:(peripheral:\"USART1\",bank:\"b\",index:3,af_index:7,),),boot_metrics:Disabled,update_signal: Disabled,greetings: Default,),security_configuration:(security_mode:P256ECDSA,verifying_key_raw:\"-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEPdEmj0oKViN8nvnri0I6JZsy7PQp\nv7TUuHT5jFnFsx4xxOmA+MyGXk/fsZHnKiUfWb4smzrWxJCKKwI2vHBw8A==\n-----END PUBLIC KEY-----\n\",),)"
run: cargo check --features 'stm32f412,ecdsa-verify' --target thumbv7em-none-eabihf
run: ./x.py check .github/workflows/examples/stm32f4_encrypted.ron stm32f412 ecdsa-verify
2 changes: 2 additions & 0 deletions .github/workflows/examples/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Allow tracking of .ron files.
!*.ron
1 change: 1 addition & 0 deletions .github/workflows/examples/stm32f4.ron
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(port:Stm32F412,memory_configuration:(internal_memory_map:(bootloader_location:134217728,bootloader_length_kb:64,banks:[(start_address:134283264,size_kb:16,),(start_address:134299648,size_kb:850,),(start_address:135170048,size_kb:16,),],bootable_index:Some(0),),external_memory_map:(banks:[],),external_flash:None,golden_index:Some(2),),feature_configuration:(serial:Disabled,boot_metrics:Enabled(timing:true,),update_signal: Enabled,greetings: Custom( loadstone: "hi", demo: "hello",),),security_configuration:(security_mode:Crc,verifying_key_raw:"",),)
5 changes: 5 additions & 0 deletions .github/workflows/examples/stm32f4_encrypted.ron
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(port:Stm32F412,memory_configuration:(internal_memory_map:(bootloader_location:134217728,bootloader_length_kb:64,banks:[(start_address:134283264,size_kb:16,),],bootable_index:Some(0),),external_memory_map:(banks:[],),external_flash:None,golden_index:None,),feature_configuration:(serial:Enabled(recovery_enabled:false,tx_pin:(peripheral:"USART1",bank:"a",index:9,af_index:7,),rx_pin:(peripheral:"USART1",bank:"b",index:3,af_index:7,),),boot_metrics:Disabled,update_signal: Disabled,greetings: Default,),security_configuration:(security_mode:P256ECDSA,verifying_key_raw:"-----BEGIN PUBLIC KEY-----
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEPdEmj0oKViN8nvnri0I6JZsy7PQp
v7TUuHT5jFnFsx4xxOmA+MyGXk/fsZHnKiUfWb4smzrWxJCKKwI2vHBw8A==
-----END PUBLIC KEY-----
",),)
1 change: 1 addition & 0 deletions .github/workflows/examples/stm32f4_external.ron
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(port:Stm32F412,memory_configuration:(internal_memory_map:(bootloader_location:134217728,bootloader_length_kb:64,banks:[(start_address:134283264,size_kb:16,),(start_address:134299648,size_kb:850,),],bootable_index:Some(0),),external_memory_map:(banks:[(start_address:0,size_kb:7500,),],),external_flash:Some((name:"Micronn25q128a",internal:false,start:0,end:16777215,region_size:4096,)),golden_index:Some(2),),feature_configuration:(serial:Enabled(recovery_enabled:true,tx_pin:(peripheral:"USART1",bank:"a",index:15,af_index:6,),rx_pin:(peripheral:"USART1",bank:"b",index:3,af_index:7,),),boot_metrics:Enabled(timing:true,),update_signal: Disabled,greetings: Default,),security_configuration:(security_mode:Crc,verifying_key_raw:"",),)
1 change: 1 addition & 0 deletions .github/workflows/examples/wgm160p.ron
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(port:Wgm160P,memory_configuration:(internal_memory_map:(bootloader_location:0,bootloader_length_kb:1,banks:[(start_address:4096,size_kb:4,),],bootable_index:Some(0),),external_memory_map:(banks:[],),external_flash:None,golden_index:Some(3),),feature_configuration:(serial:Disabled,boot_metrics:Enabled(timing:false,),update_signal: Enabled,greetings: Default,),security_configuration:(security_mode:Crc,verifying_key_raw:"",),)
6 changes: 0 additions & 6 deletions .rustfmt.toml

This file was deleted.

Loading