Skip to content

Commit 94efe7b

Browse files
committed
Merge commit 'refs/pull/1271/head' of https://github.com/BitBoxSwiss/bitbox02-firmware
2 parents e19b803 + fa6c437 commit 94efe7b

File tree

3 files changed

+32
-0
lines changed

3 files changed

+32
-0
lines changed

BUILD.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,28 @@ make dockerinit
3636
make dockerdev
3737
```
3838

39+
If you do not want to build the docker image locally, or are not working on it, it may be more straightforward to
40+
pull the image from docker instead of building it. This should be a bit faster and there should not be any issues with
41+
`make dockerdev` expecting specific version of the image.
42+
43+
```sh
44+
make dockerpull
45+
make dockerdev
46+
```
47+
48+
3949
The docker container will not allow you to access the hosts USB devices by default which means that
4050
it is necessary to flash the device in a terminal not running in docker.
4151

4252
> [!NOTE]
4353
> Current development container is defined in the file `.containerversion`
4454
55+
The docker container mounts the repo it was launched from, so you can freely edit your fork in your preferred IDE and
56+
the changes will be reflected in the docker container.
57+
58+
**It is highly recommended you develop using this docker container as not all of local setup is completely up to date
59+
with every Operating system.**
60+
4561
### Install development environment on macOS
4662

4763
Make sure you have [Homebrew](https://brew.sh) installed.

py/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ To use the scripts (`send_message.py`, `load_firmware.py` for example) go into t
44
directory and run `pip3 install .`.
55

66
If you plan to work on the scripts run `pip3 install -e .` instead.
7+
8+
It is highly recommended that you use the dockerized setup while developing, guide for setting it up
9+
can be found in [BUILD.md](../BUILD.md).

py/bitbox02/README.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,16 @@ bitbox02.
1515
In this folder is the Python API for communicating with the BitBox02 device.
1616

1717
The folder `generated` contains files generated by `python-protobuf`. Regenerate with `make`.
18+
19+
20+
### Development environment
21+
22+
It is highly recommended that you use the dockerized setup while developing, guide for setting it up
23+
can be found in [BUILD.md](../../BUILD.md).
24+
25+
If you intended to develop instead on your local environment be vary that some development procedures
26+
such as regenerating files have their libraries NOT in requirements.txt as they are not necessary for the bitbox02
27+
Python package.
28+
29+
It is highly advisable to use same version that is used in the [Dockerfile](../../Dockerfile) that is used in dockerized
30+
setup.

0 commit comments

Comments
 (0)