Skip to content

Commit 6905718

Browse files
authored
Merge pull request #21 from Neotron-Compute/test-spi-interface
Add keyboard polling
2 parents 4a48153 + 837fd6e commit 6905718

File tree

7 files changed

+1056
-124
lines changed

7 files changed

+1056
-124
lines changed

.vscode/extensions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// List of extensions which should be recommended for users of this workspace.
66
"recommendations": [
7-
"rust-lang.rust",
7+
"rust-lang.rust-analyzer",
88
"marus25.cortex-debug",
99
],
1010
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
## Unreleased Changes ([Source](https://github.com/neotron-compute/neotron-pico-bios/tree/develop) | [Changes](https://github.com/neotron-compute/neotron-pico-bios/compare/v0.3.0...develop))
44

5-
* None
5+
* Updated dependencies
6+
* Initial support for hardware other than VGA output
7+
* Basic keyboard support
68

79
## v0.3.0 ([Source](https://github.com/neotron-compute/neotron-pico-bios/tree/v0.3.0) | [Release](https://github.com/neotron-compute/neotron-pico-bios/release/tag/v0.3.0))
810

Cargo.toml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,35 @@ version = "0.3.0"
1111
# Useful Cortex-M specific functions (e.g. SysTick)
1212
cortex-m = "0.7"
1313
# The Raspberry Pi Pico HAL
14-
rp-pico = "0.3"
14+
rp-pico = "0.5"
1515
# Cortex-M run-time (or start-up) code
1616
cortex-m-rt = "0.7"
1717
# The BIOS to OS API
18-
neotron-common-bios = "0.5.0"
19-
# For time keeping/handling
20-
embedded-time = "0.12"
18+
neotron-common-bios = "0.7.0"
2119
# For the RP2040 bootloader
2220
rp2040-boot2 = "0.2"
2321
# For hardware abstraction traits
2422
embedded-hal ="0.2"
2523
# Gives us formatted PC-side logging
2624
defmt = "0.3"
2725
# Sends defmt logs to the SWD debugger
28-
defmt-rtt = "0.3"
26+
defmt-rtt = "0.4"
2927
# Send panics to the debugger
3028
panic-probe = "0.2"
3129
# RP2040 PIO assembler
3230
pio = "0.2"
3331
# Macros for RP2040 PIO assembler
3432
pio-proc = "0.2"
33+
# Hardware locks for sharing data with interrupts
34+
critical-section = "1.0"
35+
# Protocol for talking to a Neotron BMC. The tag is for the repo as a whole, of which the protocol crate is a small part.
36+
neotron-bmc-protocol = { version = "0.1.0", git = "https://github.com/neotron-compute/neotron-bmc", tag="v0.4.0" }
37+
# Time and frequency related functions
38+
fugit = "0.3"
39+
# PS/2 scancode decoding
40+
pc-keyboard = "0.6"
41+
# Useful queues and other structures
42+
heapless = "0.7"
3543

3644
[features]
3745
default = [

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ user@host ~ $ cargo install probe-rs
6060
We use the "neotron-os-pico.ld" linker script to link it at `0x1002_0000`.
6161

6262
```console
63-
user@host ~/neotron-os $ cargo build --release
63+
user@host ~/neotron-os $ cargo build --bin=flash1002 --release --target=thumbv6m-none-eabi
6464
user@host ~/neotron-os $ arm-none-eabi-objcopy -O binary ./target/thumbv6m-none-eabi/release/flash1002 ../neotron-pico-bios/src/flash1002.bin
6565
```
6666

src/flash1002.bin

10.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)