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

AP_HAL_ChibiOS: Added support for ZeroOne_Air flight controller #29022

Merged

Conversation

ZeroOne-Aero
Copy link
Contributor

AP_HAL_ChibiOS: Added support for our new ZeroOne_Air flight controller

Copy link
Collaborator

@andyp1per andyp1per left a comment

Choose a reason for hiding this comment

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

LGTM

libraries/AP_HAL_ChibiOS/hwdef/ZeroOneX6_Air/hwdef.dat Outdated Show resolved Hide resolved
@peterbarker
Copy link
Contributor

Commit list needs cleaning up before merge.

@ZeroOne-Aero ZeroOne-Aero requested a review from andyp1per January 9, 2025 08:36
@ZeroOne-Aero
Copy link
Contributor Author

We've changed the content, please help us review it again, thanks

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.

The pinout diagram has many errors:

  1. no debug port shown or labelled
  2. TELEM1: TX1 should be TX7, etc.
  3. GPS2/I2C: should be TX8/RX8
  4. GPS1/Safety: should be TX1/RX1
  5. UART4: should be TX4/RX6
  6. should label the boot button

libraries/AP_HAL_ChibiOS/hwdef/ZeroOneX6_Air/README.md Outdated Show resolved Hide resolved
libraries/AP_HAL_ChibiOS/hwdef/ZeroOneX6_Air/README.md Outdated Show resolved Hide resolved
libraries/AP_HAL_ChibiOS/hwdef/ZeroOneX6_Air/README.md Outdated Show resolved Hide resolved
| SERIAL3 | GPS1 | USART1 |DMA Enabled |
| SERIAL4 | GPS2 | UART8 |DMA Enabled |
| SERIAL5 | Telem3 | USART2 |DMA Enabled |
| SERIAL6 | UART4 | UART4 |DMA Enabled |
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
| SERIAL6 | UART4 | UART4 |DMA Enabled |
| SERIAL6 | User | UART4 |DMA Enabled |
| SERIAL7 | Debug | UART3 |DMA Enabled |

Copy link
Collaborator

Choose a reason for hiding this comment

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

note: debug port is not shown on ports image....where is it?

Copy link
Collaborator

@Hwurzburg Hwurzburg Feb 7, 2025

Choose a reason for hiding this comment

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

still have question on where debug port is located

libraries/AP_HAL_ChibiOS/hwdef/ZeroOneX6_Air/README.md Outdated Show resolved Hide resolved
libraries/AP_HAL_ChibiOS/hwdef/ZeroOneX6_Air/README.md Outdated Show resolved Hide resolved
libraries/AP_HAL_ChibiOS/hwdef/ZeroOneX6_Air/hwdef-bl.dat Outdated Show resolved Hide resolved
libraries/AP_HAL_ChibiOS/hwdef/ZeroOneX6_Air/hwdef.dat Outdated Show resolved Hide resolved
@ZeroOne-Aero
Copy link
Contributor Author

Hello, the content has been modified according to your requirements, please confirm again.

@Hwurzburg
Copy link
Collaborator

Hwurzburg commented Feb 7, 2025

aside from the debug port location question...looks good...needs squashing, see https://youtu.be/iMUWQUD_Rsg

@ZeroOne-Aero
Copy link
Contributor Author

I've tried to squashing using the method in your video, but I haven't used it before, so it's not very successful, can I merge it in the form of a new PR

@Hwurzburg
Copy link
Collaborator

I can do it for you this weekend...what about my debug port question?

@Hwurzburg Hwurzburg force-pushed the pr-ZeroOneX6_Air_Series-250103 branch from 34eb4b7 to e850491 Compare February 8, 2025 19:19
@Hwurzburg
Copy link
Collaborator

the problem is you kept merging master into this branch.....in the future don't do that....you can update your local master branch to the ArduPilot upstream, and then do a git rebase master on the PR branch if you want it rebased on things that have been added to the master...but don't merge them....I had to remove ~20 master branch commits interspersed between your commits...then do a squash and library split....it good now

@ZeroOne-Aero
Copy link
Contributor Author

Thanks, I see, I'll pay attention next time about this issue. Regarding the problem of debug interface, I need to explain to you that our series of controllers are small in size, the size of an egg, so we reserve a debug test point at the bottom of the flight controller, and we have designed a programming tooling separately for programming and testing.
Uploading d1416b1bdd137329b816502dbae3e65.jpg…

@ZeroOne-Aero
Copy link
Contributor Author

d1416b1bdd137329b816502dbae3e65

@peterbarker peterbarker merged commit ad97fe6 into ArduPilot:master Feb 10, 2025
49 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants