-
Notifications
You must be signed in to change notification settings - Fork 479
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #716 from bitcraze/rik/pidconfigs
Support categorized default logging configurations, introduce PID tuning logging configurations
- Loading branch information
Showing
17 changed files
with
462 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| { | ||
| "logconfig": { | ||
| "logblock": { | ||
| "variables": [ | ||
| { | ||
| "name": "controller.pitch", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "controller.roll", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "controller.yaw", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "stateEstimate.pitch", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "stateEstimate.roll", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "stateEstimate.yaw", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| } | ||
| ], | ||
| "name": "Attitude", | ||
| "period": 10 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| { | ||
| "logconfig": { | ||
| "logblock": { | ||
| "variables": [ | ||
| { | ||
| "name": "controller.pitchRate", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "controller.rollRate", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "controller.yawRate", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "gyro.x", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "gyro.y", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "gyro.z", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| } | ||
| ], | ||
| "name": "Attitude rate", | ||
| "period": 10 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| { | ||
| "logconfig": { | ||
| "logblock": { | ||
| "variables": [ | ||
| { | ||
| "name": "posCtl.targetX", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "posCtl.targetY", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "posCtl.targetZ", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "stateEstimate.x", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "stateEstimate.y", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "stateEstimate.z", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| } | ||
| ], | ||
| "name": "Position", | ||
| "period": 10 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| { | ||
| "logconfig": { | ||
| "logblock": { | ||
| "variables": [ | ||
| { | ||
| "name": "posCtl.targetVX", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "posCtl.targetVY", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "posCtl.targetVZ", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "stateEstimate.vx", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "stateEstimate.vy", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "stateEstimate.vz", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| } | ||
| ], | ||
| "name": "Velocity", | ||
| "period": 10 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "logconfig": { | ||
| "logblock": { | ||
| "variables": [ | ||
| { | ||
| "name": "controller.pitch", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "stateEstimate.pitch", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| } | ||
| ], | ||
| "name": "Pitch", | ||
| "period": 10 | ||
| } | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
src/cfclient/configs/log/PID_tuning_components/Pitch_rate.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "logconfig": { | ||
| "logblock": { | ||
| "variables": [ | ||
| { | ||
| "name": "controller.pitchRate", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "gyro.y", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| } | ||
| ], | ||
| "name": "Pitch rate", | ||
| "period": 10 | ||
| } | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
src/cfclient/configs/log/PID_tuning_components/Position_x.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "logconfig": { | ||
| "logblock": { | ||
| "variables": [ | ||
| { | ||
| "name": "posCtl.targetX", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "stateEstimate.x", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| } | ||
| ], | ||
| "name": "Position x", | ||
| "period": 10 | ||
| } | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
src/cfclient/configs/log/PID_tuning_components/Position_y.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "logconfig": { | ||
| "logblock": { | ||
| "variables": [ | ||
| { | ||
| "name": "posCtl.targetY", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "stateEstimate.y", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| } | ||
| ], | ||
| "name": "Position y", | ||
| "period": 10 | ||
| } | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
src/cfclient/configs/log/PID_tuning_components/Position_z.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "logconfig": { | ||
| "logblock": { | ||
| "variables": [ | ||
| { | ||
| "name": "posCtl.targetZ", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "stateEstimate.z", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| } | ||
| ], | ||
| "name": "Position z", | ||
| "period": 10 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "logconfig": { | ||
| "logblock": { | ||
| "variables": [ | ||
| { | ||
| "name": "controller.roll", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "stateEstimate.roll", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| } | ||
| ], | ||
| "name": "Roll", | ||
| "period": 10 | ||
| } | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
src/cfclient/configs/log/PID_tuning_components/Roll_rate.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "logconfig": { | ||
| "logblock": { | ||
| "variables": [ | ||
| { | ||
| "name": "controller.rollRate", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "gyro.x", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| } | ||
| ], | ||
| "name": "Roll rate", | ||
| "period": 10 | ||
| } | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
src/cfclient/configs/log/PID_tuning_components/Velocity_x.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "logconfig": { | ||
| "logblock": { | ||
| "variables": [ | ||
| { | ||
| "name": "posCtl.targetVX", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| }, | ||
| { | ||
| "name": "stateEstimate.vx", | ||
| "stored_as": "", | ||
| "fetch_as": "float", | ||
| "type": "TOC" | ||
| } | ||
| ], | ||
| "name": "Velocity x", | ||
| "period": 10 | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.