Skip to content

Commit 4825534

Browse files
committed
Clean up defconfig architecture
Remove cf2p/cf2t defconfigs (should be runtime config) and convert sysid/wearable to platform-agnostic .conf overlays.
1 parent c9466a1 commit 4825534

6 files changed

Lines changed: 3 additions & 17 deletions

File tree

configs/cf2p_defconfig

Lines changed: 0 additions & 2 deletions
This file was deleted.

configs/cf2t_defconfig

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
CONFIG_PLATFORM_CF2=y
21
CONFIG_DECK_RPM=y
32
CONFIG_DECK_LOADCELL=y
43
CONFIG_DECK_ACS37800=y
5-
CONFIG_ENABLE_THRUST_BAT_COMPENSATED=y
6-
CONFIG_THRUST_BAT_COMPENSATION_TYPE=1
74
CONFIG_DECK_FORCE="bcRpm:bcLoadcell:bcACS37800"
85

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
CONFIG_PLATFORM_CF2=y
2-
31
CONFIG_ESTIMATOR_KALMAN=y
42
CONFIG_ESTIMATOR_KALMAN_GENERAL_PURPOSE=y

docs/building-and-flashing/build.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,6 @@ $ make cf21bl_defconfig
9191
```
9292
$ make bolt_defconfig
9393
```
94-
#### Wearable
95-
Wearable is a configuration intended for a Crazyflie with a Lighthouse deck that is used as a general purpose positioning device.
96-
```
97-
$ make wearable_defconfig
98-
```
9994

10095
### Building the firmware
10196
Then build the firmware with:
@@ -170,7 +165,6 @@ cf2_defconfig : Merge configuration options from `configs/cf2_defconfig` wi
170165
cf21bl_defconfig : Merge configuration options from `configs/cf21bl_defconfig` with default
171166
tag_defconfig : Merge configuration options from `configs/tag_defconfig` with default
172167
bolt_defconfig : Merge configuration options from `configs/bolt_defconfig` with default
173-
wearable_defconfig : Merge configuration options from `configs/wearaböe_defconfig` with default
174168
allyesconfig : Generate a `.config` with the all configuration options enabled
175169
allnoconfig : Generate a `.config` with the all configuration options disabled
176170
randconfig : Generate a `.config` with random valid values to all configuration options

tools/system_id/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ Mount CF upside down (to avoid downwash)
2424
### Common
2525

2626
1. Mount CF
27-
1. Build firmware with configuration `make sysid_defconfig` and `make -j$(nproc)`
27+
1. Merge `sysid.conf` with your platform default config: `./scripts/kconfig/merge_config.sh configs/sysid.conf configs/cf2_defconfig` (or `cf21bl_defconfig`, etc.)
28+
1. Compile (`make -j$(nproc)`)
2829
1. Flash firmware by bringing the Crazyflie into flash mode and running `make cload`
2930
1. Run `python3 calibscale.py --uri <URI>` and follow the prompts to calibrate the load cell. This will create an output file `calibration.yaml` with the calibration data. The other scripts will read this file (other name can be specified as command line argument). After changing the battery, you don't have to do a whole new calibration. Instead, you can simply set the 0 value for the new battery. It is assumed that the slope of the calibration is the same.
3031

@@ -62,7 +63,7 @@ The important parameters will be stored in `params_<COMB>.yaml`. We advise to ta
6263

6364
#### Verification
6465

65-
To verify the parameters, we need to add the new set of values to the firmware. In `motors.c`, we can find the arrays for the battery compensation called the same as in the yaml file (p_vmotor2thrust). After adding the new values and flashing, we run the data collection `mode = static_verification`, where the motors are again given random commands, but the thrust is battery compensated. Note: You need to set the correct compensation mode in the `sysid_defconfig`!
66+
To verify the parameters, we need to add the new set of values to the firmware. In `motors.c`, we can find the arrays for the battery compensation called the same as in the yaml file (p_vmotor2thrust). After adding the new values and flashing, we run the data collection `mode = static_verification`, where the motors are again given random commands, but the thrust is battery compensated.
6667

6768
In the system_id part, we should see all values beeing on the plane in the first plot or the line in the second plot. That means the battery compensation works.
6869

0 commit comments

Comments
 (0)