Skip to content

Commit 58a6758

Browse files
authored
Merge pull request #701 from bitcraze/ataffanel/s130-documentation
Update documentation for flashing bootloader
2 parents 86c1e1d + 38c428f commit 58a6758

File tree

3 files changed

+69
-41
lines changed

3 files changed

+69
-41
lines changed

docs/functional-areas/cfloader.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,15 @@ script:
5252

5353
python3 -m cfloader flash cf2.bin stm32-fw -w radio://0/10/2M/E7E7E7E701
5454

55+
## Supported targets
56+
57+
When flashing a .bin, the correct target needs to be specified. The followind targets are currently supported:
58+
59+
- stm32-fw: Stm32 firmware
60+
- nrf51-fw: nRF51 firmware
61+
- nrf51-bootloader+softdevice: nRF51 bootloader and softdevice bundle binary
62+
- Various decks-fw: Some deck can be flashed over the air. See the deck documentation.
63+
5564
## Crazyflie 2.X examples
5665

5766
Flashing new firmware for the nRF51 MCU:

docs/functional-areas/client.md

Lines changed: 59 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,49 +12,70 @@ firmwares are packaged together in a ZIP file that contains a manifest
1212
describing which files are used for what. Here\'s an example of a
1313
manifest, it should be called *manifest.json*:
1414

15-
{
16-
"version": 1,
17-
"files": {
18-
"cflie.bin": {
19-
"platform": "cf2",
20-
"target": "stm32",
21-
"type": "fw"
22-
},
23-
"nrf_cf2.bin": {
24-
"platform": "cf2",
25-
"target": "nrf51",
26-
"type": "fw"
27-
},
28-
"nrf_cload.bin": {
29-
"platform": "cf2",
30-
"target": "nrf51",
31-
"type": "bootloader"
32-
},
33-
"s110.bin": {
34-
"platform": "cf2",
35-
"target": "nrf51",
36-
"type": "softdevice"
37-
}
38-
"cf2_lua.bin": {
39-
"platform": "cf2",
40-
"target": "stm32",
41-
"type": "userapp",
42-
"origin": 524288
43-
}
44-
}
45-
}
15+
``` json
16+
{
17+
"version":2,
18+
"subversion":1,
19+
"fw_platform":"cf2",
20+
"release":"2024.2",
21+
"files":{
22+
"cf2-2023.11.bin":{
23+
"platform":"cf2",
24+
"target":"stm32",
25+
"type":"fw",
26+
"release":"2023.11",
27+
"repository":"crazyflie-firmware"
28+
},
29+
"cf2_nrf-2024.2.bin":{
30+
"platform":"cf2",
31+
"target":"nrf51",
32+
"type":"fw",
33+
"release":"2024.2",
34+
"repository":"crazyflie2-nrf-firmware",
35+
"requires":[
36+
"sd-s130"
37+
]
38+
},
39+
"sd130_bootloader-2024.2.bin":{
40+
"platform":"cf2",
41+
"target":"nrf51",
42+
"type":"bootloader+softdevice",
43+
"release":"2024.2",
44+
"repository":"crazyflie2-nrf-bootloader",
45+
"provides":[
46+
"sd-s130"
47+
]
48+
},
49+
"lighthouse.bin":{
50+
"platform":"deck",
51+
"target":"bcLighthouse4",
52+
"type":"fw",
53+
"release":"V6",
54+
"repository":"lighthouse-fpga"
55+
},
56+
"aideck_esp.bin":{
57+
"platform":"deck",
58+
"target":"bcAI:esp",
59+
"type":"fw",
60+
"release":"2023.06",
61+
"repository":"aideck-esp-firmware"
62+
}
63+
}
64+
}
65+
```
4666

4767
Each entry in the file describes one file, with the following
4868
attributes:
4969

5070

5171
| Attribute | Values |Comments|
5272
| --------------- | ------------------------------------- | ---------------------- |
53-
| platform | cf2, bolt, tag |Select the target platform (tag = Roadrunner) |
54-
| target | stm32, nrf51 |Select the target MCU on the target platform|
55-
| type | fw, bootloader, softdevice, userapp |Describe what\'s contained in the binary|
56-
| origin | N/A |Set the address where the app should be flashed|
73+
| platform | cf2, deck |Select the target platform, either the main board (CF2) or a deck |
74+
| target | stm32, nrf51, <deck>:<cpu> |Select the target MCU on the target platform|
75+
| type | fw, bootloader, bootloader+softdevice |Describe what\'s contained in the binary|
76+
| release | A version string | The release name of the file |
77+
| repository | A repository string | The binary's project git repository. If not a complete address, is on the Bitcraze's github project |
78+
| requires | A list of requirement | Requirement before flashing the firmware. Is used to specify a required softdevice |
79+
| provices | A requiremet provided by this file | Used to describe what a softdevice binary provides |
5780

58-
59-
Currently only platform=cf2, target=stm32, target=nrf51 and type=fw is
60-
supported.
81+
Currently only platform=cf2, target=stm32, target=nrf51 and type=fw, type=bootloader+softdevice is supported.

docs/installation/install.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ page_id: install
55

66
## Prerequisites
77

8-
This project requires Python 3.7 - 3.11.
9-
10-
> Python 3.12 is not supported as it has issues with missing packages (see [this ticket](https://github.com/bitcraze/crazyflie-lib-python/issues/425))
8+
This project requires Python 3.8 - 3.12.
119

1210
There are a few things to sort out on your machine before you can install the client. Please see the appropriate
1311
section depending on your environment.

0 commit comments

Comments
 (0)