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

Update board_types.txt #236

Merged
merged 3 commits into from
Aug 6, 2024
Merged

Conversation

ZeroOne-Aero
Copy link
Contributor

Add:
TARGET_HW_ZEROONE_X6 101
Reserved “ZEROONE_X6" 101
#IDs 5600-5699 reserved for ZeroOne
AP_HW_ZeroOne_X6 5600
AP_HW_ZeroOne_PMU 5601
AP_HW_ZeroOne_GNSS 5602

Add:
TARGET_HW_ZEROONE_X6                  101
Reserved “ZEROONE_X6"                 101
#IDs 5600-5699 reserved for ZeroOne
AP_HW_ZeroOne_X6                     5600
AP_HW_ZeroOne_PMU                    5601
AP_HW_ZeroOne_GNSS                   5602
board_types.txt Outdated
@@ -49,6 +49,7 @@ TARGET_HW_PDW_MAS_MAIN-V1 86
TARGET_HW_ATL_MANTIS_EDU 97
TARGET_HW_THE_PEACH_K1 212
TARGET_HW_THE_PEACH_R1 213
TARGET_HW_ZEROONE_X6 101
Copy link
Member

Choose a reason for hiding this comment

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

remove this - these are for F4-F7 bootloaders H7 are built in tree

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok,I have removed this.

@@ -206,6 +209,11 @@ AP_HW_CUBEBLACK_PERIPH 1401
AP_HW_PIXRACER_PERIPH 1402
AP_HW_SWBOOMBOARD_PERIPH 1403

#IDs 5600-5699 reserved for ZeroOne
AP_HW_ZeroOne_X6 5600
Copy link
Member

Choose a reason for hiding this comment

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

is AP_HW_ZeroOne_X6 and ZEROONE_X6 the same board? If so since you already have the AP id in Ardupilot, just add it here. Do not "Create" Ardupilot ID here that do not exist in Ardupilot yet.

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, this line already exists in the Ardupilot.

Comment on lines +214 to +215
AP_HW_ZeroOne_PMU 5601
AP_HW_ZeroOne_GNSS 5602
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
AP_HW_ZeroOne_PMU 5601
AP_HW_ZeroOne_GNSS 5602
AP_HW_ZeroOne_PMU 5601
AP_HW_ZeroOne_GNSS 5602

Add to AP first then document here.

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, these two lines have been added to the Ardupilot.

remove:TARGET_HW_ZEROONE_X6                  101
board_types.txt Outdated
@@ -64,6 +64,8 @@ Reserved "NXP ucans32k146" 34
Reserved "NXP FMURT1170-V1" 35 # AKA PX4 FMU V6XRT
Reserved "NXP Tropic" 36

Reserved “ZEROONE_X6" 101
Copy link
Member

Choose a reason for hiding this comment

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

We only want one entry - so delete this

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you mean we only need to add the following sentences?
#IDs 5600-5699 reserved for ZeroOne
AP_HW_ZeroOne_X6 5600
AP_HW_ZeroOne_PMU 5601
AP_HW_ZeroOne_GNSS 5602

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok,I have removed this line:
Reserved “ZEROONE_X6" 101

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@davids5 Do you think the modified version is OK?

Removed this line:
Reserved “ZEROONE_X6"                 101
@davids5 davids5 merged commit e40999b into PX4:main Aug 6, 2024
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants