shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Add docker-build make target, adjust instructions, remove Python2 support

Browse Source
This commit is contained in:
Nicolas Stalder 2019-01-29 02:55:04 +01:00 committed by Nicolas Stalder
parent 13424fdbcd
commit b3d76d56e0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -26,7 +26,7 @@ RUN . solo/env3/bin/activate && cd solo/targets/stm32l432 && \
make cbor && \ make cbor && \
make build-hacker make build-hacker
# Would prefer `FROM scratch`, not sure how to copy firmware out though? # would prefer `FROM scratch`, not sure how to copy firmware out though?
FROM alpine FROM alpine
COPY --from=0 /solo/targets/stm32l432/solo.elf . COPY --from=0 /solo/targets/stm32l432/solo.elf .
COPY --from=0 /solo/targets/stm32l432/solo.hex . COPY --from=0 /solo/targets/stm32l432/solo.hex .

6
README.md
View File

@ -35,7 +35,7 @@ Solo for Hacker is a special version of Solo that let you customize its firmware
You can only buy Solo for Hacker at [solokeys.com](https://solokeys.com), as we don't sell it on Amazon and other places to avoid confusing customers. If you buy a Hacker, you can permanently lock it into a regular Solo, but viceversa you can NOT take a regular Solo and turn it a Hacker. You can only buy Solo for Hacker at [solokeys.com](https://solokeys.com), as we don't sell it on Amazon and other places to avoid confusing customers. If you buy a Hacker, you can permanently lock it into a regular Solo, but viceversa you can NOT take a regular Solo and turn it a Hacker.
If you have a Solo for Hacker, here's how you can load your own code on it. You can find more details, including how to permanently lock it, in our [documentation](https://docs.solokeys.io/solo/building/). If you have a Solo for Hacker, here's how you can load your own code on it. You can find more details, including how to permanently lock it, in our [documentation](https://docs.solokeys.io/solo/building/). We only support Python3.
```bash ```bash
git clone --recurse-submodules https://github.com/solokeys/solo git clone --recurse-submodules https://github.com/solokeys/solo
@ -43,7 +43,7 @@ cd solo
cd targets/stm32l432 cd targets/stm32l432
make cbor make cbor
make all-hacker make build-hacker
cd ../.. cd ../..
make venv make venv
@ -51,6 +51,8 @@ source venv/bin/activate
python tools/solotool.py program targets/stm32l432/solo.hex python tools/solotool.py program targets/stm32l432/solo.hex
``` ```
Alternatively, run `make docker-build` and use the firmware generated in `/tmp`.
If you forgot the `--recurse-submodules` when cloning, simply `git submodule update --init --recursive`. If you forgot the `--recurse-submodules` when cloning, simply `git submodule update --init --recursive`.
For example, if you want to turn off any blue light emission, you can edit [`led_rgb()`](https://github.com/solokeys/solo/blob/master/targets/stm32l432/src/led.c#L15) and force: For example, if you want to turn off any blue light emission, you can edit [`led_rgb()`](https://github.com/solokeys/solo/blob/master/targets/stm32l432/src/led.c#L15) and force: