Skip to content
This repository has been archived by the owner on Apr 19, 2023. It is now read-only.

CF/BF - Update configurator for API 1.33.0. #450

Merged
merged 25 commits into from
Apr 12, 2017
Merged

Conversation

hydra
Copy link
Contributor

@hydra hydra commented Mar 19, 2017

PR goals:

  • Add support for API 1.33.0.
  • Use specific commands instead of MSP_MISC and MSP_BF_CONFIG.
  • Drop support for all versions of CF < 2.0 and all version of BF < 3.0
  • Port and update the 'Power and Battery' tab from CF configurator v1.x
  • Add stick configuration (min/max) to RX tab (from CF configurator v1.x)
  • Move 3D throttle deadband to RX tab (from CF configurator v1.x)
  • Move RX configuration from Config tab to RX tab (from CF configurator v1.x)
  • Move RSSI configuration from Config tab to RX tab.
  • Delete any old code found along the way.
  • Support ILAP transponders via updated MSP_TRANSPONDER_CONFIG (See Support for next lap timer cleanflight#2580 and CF/BF - Cleanup transponder config after Arctimer merge. cleanflight#2690) - Additional PR required to add ARCITIMER transponder configuration.

Testing is currently being done with CF 2.0.0 master.

Although some items are marked as 'from CF configurator v1.x' not that much actual js code is being used due to recent changes, however the html/css/messages are mainly work ok so the porting is manual.

@hydra
Copy link
Contributor Author

hydra commented Mar 19, 2017

Currently the most tabs are working OK.

  • motors tab needs fixing.
  • blackbox tab needs fixing.

Copy link
Member

@mikeller mikeller left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Looks good.

js/fc.js Outdated
@@ -182,31 +225,50 @@ var FC = {
FC_CONFIG = {
loopTime: 0
};

MISC = {

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Space.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MISC will be deleted soon 😄

js/fc.js Outdated
deadband3d_low: 0,
deadband3d_high: 0,
neutral3d: 0,
deadband3d_throttle: 0
neutral: 0,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Space.

js/fc.js Outdated
midrc: 0,
mincheck: 0,
stick_max: 0,
stick_center: 0,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Space.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there will be many spaces, i did LOTS of search and replacing today. I'll go over it again after it's functional, no point aligning things at this stage.

@@ -148,6 +148,9 @@ var MSP = {
this.listeners = [];
},
send_message: function (code, data, callback_sent, callback_msp, callback_onerror) {
if (code === undefined) {
debugger;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Intentionally throwing an exception?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, to catch the stacktrace, will be removed from production code.

@@ -110,7 +110,7 @@ TABS.onboard_logging.initialize = function (callback) {
* The best we can do on those targets is check the BLACKBOX feature bit to identify support for Blackbox instead.
*/
if (BLACKBOX.supported || DATAFLASH.supported
|| semver.gte(CONFIG.flightControllerVersion, "1.5.0") && semver.lte(CONFIG.flightControllerVersion, "1.10.0") && BF_CONFIG.features.isEnabled('BLACKBOX')) {
|| semver.gte(CONFIG.flightControllerVersion, "1.5.0") && semver.lte(CONFIG.flightControllerVersion, "1.10.0") && FEATURE_CONFIG.features.isEnabled('BLACKBOX')) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be checking apiVersion instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably. I'll be stripping a out all the old conditional code that's not currently getting in the way in later commits.

@hydra hydra force-pushed the update-for-api-1.33.0 branch 3 times, most recently from c968978 to 5926b54 Compare March 23, 2017 21:23
@hydra
Copy link
Contributor Author

hydra commented Mar 24, 2017

current status, fully working but lacks the battery/power tab to configure current/voltage sensors and battery.

@hydra hydra force-pushed the update-for-api-1.33.0 branch 2 times, most recently from 391db81 to 0339208 Compare April 1, 2017 15:53
@hydra hydra mentioned this pull request Apr 1, 2017
@hydra hydra force-pushed the update-for-api-1.33.0 branch 2 times, most recently from b497434 to 0ebdeac Compare April 2, 2017 11:06
@hydra
Copy link
Contributor Author

hydra commented Apr 2, 2017

rebased against master.

I'm going to de-scope this PR. what's there is fine for a release, we can do the remainder of the tasks in this PR later.

@hydra
Copy link
Contributor Author

hydra commented Apr 2, 2017

currently the code is working, there's a few minor cleanups to do which I will do now before merging to master.

@hydra hydra force-pushed the update-for-api-1.33.0 branch from 4725f74 to 0b779ff Compare April 2, 2017 17:33
@hydra hydra force-pushed the update-for-api-1.33.0 branch from 0b779ff to 2540f17 Compare April 2, 2017 18:32
@hydra
Copy link
Contributor Author

hydra commented Apr 12, 2017

only thing really missing right now is current and voltage meter configuration. what's done so far needs to be released - will follow up with another PR for additional work/features.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants