Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hwdef: add CubeOrangePlus-ODID hwdef #27561

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Conversation

BryonOI
Copy link

@BryonOI BryonOI commented Jul 16, 2024

Bootloaders:
Add CubeOrangePlus-ODID hardware def bootloader files for remote ID support.

  • Follow ./waf board configure instructions to set hardware def for CubeOrangePlus.
  • Tested using CubeOrangePlus arduplane firmware

@BryonOI BryonOI changed the title Add CubeOrangePlus-ODID hwdef AP_HAL_ChibiOS: Add CubeOrangePlus-ODID hwdef Jul 16, 2024
define CORE_CM7
define SMPS_PWR

include ../CubeOrange/hwdef.inc
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this not including CubeOrangePlus/hwdef.dat?

Copy link
Author

Choose a reason for hiding this comment

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

I did not change this as this is how the original CubeOrangePlus hwdef file was formatted. This section is identical to the CubeOrangePlus hwdef aside from the updated board id. Does this need to be changed?

Copy link
Author

Choose a reason for hiding this comment

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

I have tested this to include CubeOrangePlus/hwdef.dat. These changes cause an error when configuring the board due to PF14 redefinition. I have not changed this file in the PR as it does not seem to reflect the original CubeOrangePlus build configurations. Please let me know if you have further questions or requests for this PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

So the concept is that you include CubeOrangePlus/hwdef.dat and put in just what you need to to do ODID.

Check out how CubeOrange-ODID does it.

Copy link
Contributor

Choose a reason for hiding this comment

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

@BryonOI you still haven't addressed this comment.

The entirety of this file can simply be:

# hw definition file for processing by chibios_hwdef.py

include ../CubeOrangePlus/hwdef.dat

undef APJ_BOARD_ID
APJ_BOARD_ID 11063

define AP_OPENDRONEID_ENABLED 1

Similarly for the -bl file.

@peterbarker
Copy link
Contributor

Please note our requirements on commit history - this should be a single commit titled hwdef: add CubeOrangePlus-ODID hwdef. Currently there are 9 commits in here.

@peterbarker
Copy link
Contributor

Could you outline how this fulfills your needs, please? My concern is that we have dozens of boards that could have ODID variants made for them, but often vendors believe they need to do more to satisfy ODID requirements.

The costs are (a) complication for maintenance of the project and (b) build time on our build server, which generates binaries for commits to our master branch (and for releases).

It's OK to merge this, but we do need to know it's doing someone some actual good.

@peterbarker peterbarker self-assigned this Sep 25, 2024
@BryonOI
Copy link
Author

BryonOI commented Oct 3, 2024

Could you outline how this fulfills your needs, please? My concern is that we have dozens of boards that could have ODID variants made for them, but often vendors believe they need to do more to satisfy ODID requirements.

The costs are (a) complication for maintenance of the project and (b) build time on our build server, which generates binaries for commits to our master branch (and for releases).

It's OK to merge this, but we do need to know it's doing someone some actual good.

Thank you for your reply!

Overhead Intelligence utilizes both the CubeOrange and CubeOrangePlus on our fleet of drones. Including the CubeOrangePlus-ODID firmware to the hwdef boardlist will allow us to quickly access the new firmware from the remote master branch of ArduPilot, which we are already working with. I have implemented the CubeOrangePlus-ODID firmware into many functioning ArduPilot platforms with no errors. Including the CubeOrangePlus-ODID firmware would allow Overhead Intelligence and many others using the CubeOrangePlus to easily upload the new ODID firmware to future drones using ArduPilot software.

@BryonOI BryonOI changed the title AP_HAL_ChibiOS: Add CubeOrangePlus-ODID hwdef hwdef: add CubeOrangePlus-ODID hwdef Oct 3, 2024
@Hwurzburg Hwurzburg requested a review from peterbarker November 6, 2024 13:14
Copy link
Contributor

@peterbarker peterbarker left a comment

Choose a reason for hiding this comment

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

@Hwurzburg do we need all of the documentation copied over into this new board or not?

@BryonOI you're still interested in chasing this?

define CORE_CM7
define SMPS_PWR

include ../CubeOrange/hwdef.inc
Copy link
Contributor

Choose a reason for hiding this comment

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

@BryonOI you still haven't addressed this comment.

The entirety of this file can simply be:

# hw definition file for processing by chibios_hwdef.py

include ../CubeOrangePlus/hwdef.dat

undef APJ_BOARD_ID
APJ_BOARD_ID 11063

define AP_OPENDRONEID_ENABLED 1

Similarly for the -bl file.

@Hwurzburg
Copy link
Collaborator

@peterbarker if this is simply an ODID version I don't think we need dup docs from the Plus

@BryonOI
Copy link
Author

BryonOI commented Nov 14, 2024

@Hwurzburg do we need all of the documentation copied over into this new board or not?

@BryonOI you're still interested in chasing this?

Yes it would be very beneficial to our team. I have modified the hwdef.dat and hwdef-bl.dat files accordingly. Please let me know if there is anything else needed for this merge request to be approved.

@BryonOI BryonOI requested a review from peterbarker November 14, 2024 21:02
@Hwurzburg
Copy link
Collaborator

@peterbarker ping

Comment on lines 1 to 11
# setup correct defaults for battery monitoring for cube power brick
BATT2_CURR_PIN 4
BATT2_VOLT_PIN 13
BATT_AMP_PERVLT 39.877
BATT_VOLT_MULT 12.02
BATT2_AMP_PERVLT 39.877
BATT2_VOLT_MULT 12.02
# setup ADSB
ADSB_TYPE 1
SERIAL5_BAUD 57
SERIAL5_PROTOCOL 1
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
# setup correct defaults for battery monitoring for cube power brick
BATT2_CURR_PIN 4
BATT2_VOLT_PIN 13
BATT_AMP_PERVLT 39.877
BATT_VOLT_MULT 12.02
BATT2_AMP_PERVLT 39.877
BATT2_VOLT_MULT 12.02
# setup ADSB
ADSB_TYPE 1
SERIAL5_BAUD 57
SERIAL5_PROTOCOL 1
@include ./CubeOrangePlus/defaults.parm

Copy link
Author

Choose a reason for hiding this comment

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

Made these suggested changes

GPS1_TYPE 1
GPS2_TYPE 0

EK2_PRIMARY 1
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
EK2_PRIMARY 1

... this parameter's never existed :-)

Comment on lines 17 to 20
GPS1_TYPE 1
GPS2_TYPE 0

EK2_PRIMARY 1
Copy link
Contributor

Choose a reason for hiding this comment

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

Really not sure what these are doing in here. I can see you've just swiped them in from the other file.... but still odd.

Copy link
Author

Choose a reason for hiding this comment

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

I removed these three parameters and committed the changes. Let me know if there is anything else you catch!

@Hwurzburg Hwurzburg added WikiNeeded needs wiki update and removed WikiNeeded needs wiki update labels Jan 15, 2025
Copy link
Collaborator

@Hwurzburg Hwurzburg left a comment

Choose a reason for hiding this comment

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

needs squash and library split on commits into a Tools commit and a hwdef commit

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

Successfully merging this pull request may close these issues.

3 participants