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
3 changes: 2 additions & 1 deletion docs/io_config.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ Values shown are exactly how mappings are stored in `io_config.json`.
| `RPI_40` | `rpi_40` | `["/dev/gpiochip0",25] / ["/dev/gpiochip0",27] / ["/dev/gpiochip0",24]` | `KEY_UP ["/dev/gpiochip0",6,"pull_up"]`, `KEY_DOWN ["/dev/gpiochip0",19,"pull_up"]`, `KEY_LEFT ["/dev/gpiochip0",5,"pull_up"]`, `KEY_RIGHT ["/dev/gpiochip0",26,"pull_up"]`, `KEY_PRESS ["/dev/gpiochip0",13,"pull_up"]`, `KEY1 ["/dev/gpiochip0",21,"pull_up"]`, `KEY2 ["/dev/gpiochip0",20,"pull_up"]`, `KEY3 ["/dev/gpiochip0",16,"pull_up"]` | `480x480`, `4fps` |
| `RPI_26` | `rpi_26` | `["/dev/gpiochip0",25] / ["/dev/gpiochip0",27] / ["/dev/gpiochip0",24]` | `KEY_UP ["/dev/gpiochip0",3,"pull_up"]`, `KEY_DOWN ["/dev/gpiochip0",17,"pull_up"]`, `KEY_LEFT ["/dev/gpiochip0",2,"pull_up"]`, `KEY_RIGHT ["/dev/gpiochip0",22,"pull_up"]`, `KEY_PRESS ["/dev/gpiochip0",4,"pull_up"]`, `KEY1 ["/dev/gpiochip0",23,"pull_up"]`, `KEY2 ["/dev/gpiochip0",18,"pull_up"]`, `KEY3 ["/dev/gpiochip0",14,"pull_up"]` | `480x480`, `4fps` |
| `FOX_22` | `luckfox_22` | `["/dev/gpiochip1",20] / ["/dev/gpiochip1",19] / "disabled"` | `KEY_UP ["/dev/gpiochip1",25,"pull_up"]`, `KEY_DOWN ["/dev/gpiochip1",23,"pull_up"]`, `KEY_LEFT ["/dev/gpiochip1",24,"pull_up"]`, `KEY_RIGHT ["/dev/gpiochip0",4,"pull_up"]`, `KEY_PRESS ["/dev/gpiochip1",22,"pull_up"]`, `KEY1 ["/dev/gpiochip4",16,"pull_up"]`, `KEY2 ["/dev/gpiochip4",17,"pull_up"]`, `KEY3 ["/dev/gpiochip1",21,"pull_up"]` | `/dev/video12`, `GREY`, `6fps` |
| `FOX_40` | `luckfox_40` | `["/dev/gpiochip1",24] / ["/dev/gpiochip1",25] / ["/dev/gpiochip2",8]` | `KEY_UP ["/dev/gpiochip1",26,"pull_up"]`, `KEY_DOWN ["/dev/gpiochip1",21,"pull_up"]`, `KEY_LEFT ["/dev/gpiochip1",27,"pull_up"]`, `KEY_RIGHT ["/dev/gpiochip1",22,"pull_up"]`, `KEY_PRESS ["/dev/gpiochip1",20,"pull_up"]`, `KEY1 ["/dev/gpiochip1",23,"pull_up"]`, `KEY2 ["/dev/gpiochip1",11,"pull_up"]`, `KEY3 ["/dev/gpiochip1",10,"pull_up"]` | `/dev/video12`, `GREY`, `6fps` |
| `FOX_40` | `luckfox_40` | `["/dev/gpiochip2",8] / ["/dev/gpiochip1",24] / ["/dev/gpiochip1",25]` | `KEY_UP ["/dev/gpiochip2",9,"pull_up"]`, `KEY_DOWN ["/dev/gpiochip1",26,"pull_up"]`, `KEY_LEFT ["/dev/gpiochip1",19,"pull_up"]`, `KEY_RIGHT ["/dev/gpiochip1",20,"pull_up"]`, `KEY_PRESS ["/dev/gpiochip1",27,"pull_up"]`, `KEY1 ["/dev/gpiochip1",23,"pull_up"]`, `KEY2 ["/dev/gpiochip1",22,"pull_up"]`, `KEY3 ["/dev/gpiochip1",21,"pull_up"]` | `/dev/video12`, `GREY`, `6fps` |
| `FOX_PI` | `luckfox_pi` | `["/dev/gpiochip1",27] / ["/dev/gpiochip1",24] / ["/dev/gpiochip2",6]` | `KEY_UP ["/dev/gpiochip3",25,"pull_up"]`, `KEY_DOWN ["/dev/gpiochip0",1,"pull_up"]`, `KEY_LEFT ["/dev/gpiochip3",26,"pull_up"]`, `KEY_RIGHT ["/dev/gpiochip0",0,"pull_up"]`, `KEY_PRESS ["/dev/gpiochip1",20,"pull_up"]`, `KEY1 ["/dev/gpiochip4",17,"pull_up"]`, `KEY2 ["/dev/gpiochip3",27,"pull_up"]`, `KEY3 ["/dev/gpiochip1",23,"pull_up"]` | `/dev/video12`, `GREY`, `6fps` |
| `LC_LAFRITE` | `lc_lafrite` | `["/dev/gpiochip1",79] / ["/dev/gpiochip1",20] / ["/dev/gpiochip1",25]` | `KEY_UP ["/dev/gpiochip0",2,"pull_up"]`, `KEY_DOWN ["/dev/gpiochip1",86,"pull_up"]`, `KEY_LEFT ["/dev/gpiochip1",76,"pull_up"]`, `KEY_RIGHT ["/dev/gpiochip1",84,"pull_up"]`, `KEY_PRESS ["/dev/gpiochip1",85,"pull_up"]`, `KEY1 ["/dev/gpiochip1",83,"pull_up"]`, `KEY2 ["/dev/gpiochip1",82,"pull_up"]`, `KEY3 ["/dev/gpiochip1",81,"pull_up"]` | `/dev/video1`, `1280x720`, `YUYV`, `4fps` |

Expand Down Expand Up @@ -166,3 +166,4 @@ Values shown are exactly how mappings are stored in `io_config.json`.
6. Validate locally:
- `python -m json.tool src/seedsigner/hardware/io_config.json`
- `pytest -q tests/test_io_config_profiles.py tests/test_luckfox_camera_backend.py`

27 changes: 14 additions & 13 deletions src/seedsigner/hardware/io_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -239,44 +239,44 @@
],
"display": {
"dc": [
"/dev/gpiochip1",
24
"/dev/gpiochip2",
8
],
"rst": [
"/dev/gpiochip1",
25
24
],
"bl": [
"/dev/gpiochip2",
8
"/dev/gpiochip1",
25
],
"spi_bus": 0,
"spi_device": 0
},
"buttons": {
"KEY_UP": [
"/dev/gpiochip1",
26,
"/dev/gpiochip2",
9,
"pull_up"
],
"KEY_DOWN": [
"/dev/gpiochip1",
21,
26,
"pull_up"
],
"KEY_LEFT": [
"/dev/gpiochip1",
27,
19,
"pull_up"
],
"KEY_RIGHT": [
"/dev/gpiochip1",
22,
20,
"pull_up"
],
"KEY_PRESS": [
"/dev/gpiochip1",
20,
27,
"pull_up"
],
"KEY1": [
Expand All @@ -286,12 +286,12 @@
],
"KEY2": [
"/dev/gpiochip1",
11,
22,
"pull_up"
],
"KEY3": [
"/dev/gpiochip1",
10,
21,
"pull_up"
]
},
Expand Down Expand Up @@ -451,3 +451,4 @@
}
]
}

21 changes: 11 additions & 10 deletions tests/test_io_config_profiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,22 @@ def test_fox_22_buttons_use_gpiochip_pull_up_mapping():
def test_fox_40_display_uses_gpiochip_format():
mapping = get_hardware_pin_mapping("FOX_40")

assert mapping["display"]["dc"] == ["/dev/gpiochip1", 24]
assert mapping["display"]["rst"] == ["/dev/gpiochip1", 25]
assert mapping["display"]["bl"] == ["/dev/gpiochip2", 8]
assert mapping["display"]["dc"] == ["/dev/gpiochip2", 8]
assert mapping["display"]["rst"] == ["/dev/gpiochip1", 24]
assert mapping["display"]["bl"] == ["/dev/gpiochip1", 25]


def test_fox_40_buttons_use_gpiochip_pull_up_mapping():
mapping = get_hardware_pin_mapping("FOX_40")

assert mapping["buttons"]["KEY_UP"] == ["/dev/gpiochip1", 26, "pull_up"]
assert mapping["buttons"]["KEY_DOWN"] == ["/dev/gpiochip1", 21, "pull_up"]
assert mapping["buttons"]["KEY_LEFT"] == ["/dev/gpiochip1", 27, "pull_up"]
assert mapping["buttons"]["KEY_RIGHT"] == ["/dev/gpiochip1", 22, "pull_up"]
assert mapping["buttons"]["KEY_PRESS"] == ["/dev/gpiochip1", 20, "pull_up"]
assert mapping["buttons"]["KEY_UP"] == ["/dev/gpiochip2", 9, "pull_up"]
assert mapping["buttons"]["KEY_DOWN"] == ["/dev/gpiochip1", 26, "pull_up"]
assert mapping["buttons"]["KEY_LEFT"] == ["/dev/gpiochip1", 19, "pull_up"]
assert mapping["buttons"]["KEY_RIGHT"] == ["/dev/gpiochip1", 20, "pull_up"]
assert mapping["buttons"]["KEY_PRESS"] == ["/dev/gpiochip1", 27, "pull_up"]
assert mapping["buttons"]["KEY1"] == ["/dev/gpiochip1", 23, "pull_up"]
assert mapping["buttons"]["KEY2"] == ["/dev/gpiochip1", 11, "pull_up"]
assert mapping["buttons"]["KEY3"] == ["/dev/gpiochip1", 10, "pull_up"]
assert mapping["buttons"]["KEY2"] == ["/dev/gpiochip1", 22, "pull_up"]
assert mapping["buttons"]["KEY3"] == ["/dev/gpiochip1", 21, "pull_up"]


def test_lc_lafrite_display_config_is_st7789():
Expand Down Expand Up @@ -574,3 +574,4 @@ def test_st7789_does_not_swallow_non_einval_oserror():

# Only one SPI() call should have been made — no retry on non-EINVAL errors.
assert mock_spi_cls.call_count == 1