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.

Sign up for GitHub

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

Jump to bottom

Push single wire operations into stm32_serial.c #95

Closed
wants to merge 4 commits into from
Closed

Push single wire operations into stm32_serial.c #95

wants to merge 4 commits into from

Conversation

sjwilks
Copy link
Contributor

@sjwilks sjwilks commented Dec 6, 2012

I have moved the STM32 serial calls into stm32_serial that will allow for enabling and disabling of single wire mode only.

To verify and illustrate how it is called I setup a test (tests hott_telemetry), which not only tests enabling/disabling single wire mode but tests HoTT telemetry in general. Just having a test for single wire didn't seem to justify a test class and it will be useful once HoTT is added into the codebase.

px4dev
px4dev reviewed Dec 23, 2012
View reviewed changes
nuttx/arch/arm/src/stm32/stm32_serial.c
case TIOCSRS485:
{
/* Change the TX port to be open-drain/push-pull */
if (arg == SER_RS485_ENABLED) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Are you sure that you want to use RS485 mode? Normally, RS485 drivers use separate Tx and Rx data pairs, and that's my understanding of the way that RS485 mode is implemented in the STM32 UART driver for NuttX.

I think you probably want a separate mode here; it's not RS485, and it's not LIN.

@px4dev px4dev mentioned this pull request Dec 23, 2012
Merged
@sjwilks
Copy link
Contributor Author

sjwilks commented Dec 23, 2012

I guess I misunderstood your comment via Email "There are some RS-485 ioctls being handled there already; you can track them back to the standard system header and allocate a new ioctl..." where you, I now see, meant add a new one, not base it on this. Yes, RS485 uses separate RX/TX.

@sjwilks
Copy link
Contributor Author

sjwilks commented Jan 21, 2013

Sorry for the long delay on this. Hopefully this is heading in the right direction.

@LorenzMeier
Copy link
Member

Can you merge master into this? The patch currently doesn't apply ;-).

LorenzMeier
LorenzMeier reviewed Jan 23, 2013
View reviewed changes
nuttx/arch/arm/src/stm32/stm32_serial.c
@@ -1401,6 +1401,27 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
}
break;
Copy link
Member

Choose a reason for hiding this comment

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

Currently giving this section an in-depth review with respect to mergeability back to NuttX mainline.

@LorenzMeier
Copy link
Member

This conflicts with the NuttX merge - can you update or close the request?

@sjwilks
Copy link
Contributor Author

sjwilks commented Jan 26, 2013

This has been merged into #67 and is therefore no longer required. Closing.

@sjwilks sjwilks closed this Jan 26, 2013
PX4BuildBot added a commit that referenced this pull request Feb 28, 2019
@PX4BuildBot
Update submodule jMAVSim to latest Thu Feb 28 12:38:33 UTC 2019
a1b6125 
    - jMAVSim in PX4/Firmware (0df34af): PX4/jMAVSim@0c25b7c
    - jMAVSim current upstream: PX4/jMAVSim@8b2f456
    - Changes: PX4/jMAVSim@0c25b7c...8b2f456

    8b2f456 2019-02-28 Julian Oes - Merge pull request #95 from PX4/shell-style
3d0174a 2019-02-27 Matthias Grob - Fix shell script style
PX4BuildBot added a commit that referenced this pull request Mar 1, 2019
@PX4BuildBot
Update submodule jMAVSim to latest Fri Mar 1 00:38:34 UTC 2019
dd5b8bf 
    - jMAVSim in PX4/Firmware (684e297): PX4/jMAVSim@0c25b7c
    - jMAVSim current upstream: PX4/jMAVSim@8b2f456
    - Changes: PX4/jMAVSim@0c25b7c...8b2f456

    8b2f456 2019-02-28 Julian Oes - Merge pull request #95 from PX4/shell-style
3d0174a 2019-02-27 Matthias Grob - Fix shell script style
PX4BuildBot added a commit that referenced this pull request Mar 1, 2019
@PX4BuildBot
Update submodule jMAVSim to latest Fri Mar 1 12:38:38 UTC 2019
163bfba 
    - jMAVSim in PX4/Firmware (6c3e79f): PX4/jMAVSim@0c25b7c
    - jMAVSim current upstream: PX4/jMAVSim@8b2f456
    - Changes: PX4/jMAVSim@0c25b7c...8b2f456

    8b2f456 2019-02-28 Julian Oes - Merge pull request #95 from PX4/shell-style
3d0174a 2019-02-27 Matthias Grob - Fix shell script style
PX4BuildBot added a commit that referenced this pull request Mar 2, 2019
@PX4BuildBot
Update submodule jMAVSim to latest Sat Mar 2 00:38:37 UTC 2019
356ab6c 
    - jMAVSim in PX4/Firmware (6c3e79f): PX4/jMAVSim@0c25b7c
    - jMAVSim current upstream: PX4/jMAVSim@8b2f456
    - Changes: PX4/jMAVSim@0c25b7c...8b2f456

    8b2f456 2019-02-28 Julian Oes - Merge pull request #95 from PX4/shell-style
3d0174a 2019-02-27 Matthias Grob - Fix shell script style
PX4BuildBot added a commit that referenced this pull request Mar 2, 2019
@PX4BuildBot
Update submodule jMAVSim to latest Sat Mar 2 12:38:30 UTC 2019
3b7f562 
    - jMAVSim in PX4/Firmware (dc50a56): PX4/jMAVSim@0c25b7c
    - jMAVSim current upstream: PX4/jMAVSim@8b2f456
    - Changes: PX4/jMAVSim@0c25b7c...8b2f456

    8b2f456 2019-02-28 Julian Oes - Merge pull request #95 from PX4/shell-style
3d0174a 2019-02-27 Matthias Grob - Fix shell script style
PX4BuildBot added a commit that referenced this pull request Mar 3, 2019
@PX4BuildBot
Update submodule jMAVSim to latest Sun Mar 3 12:38:26 UTC 2019
fff3095 
    - jMAVSim in PX4/Firmware (fc7c7ac): PX4/jMAVSim@0c25b7c
    - jMAVSim current upstream: PX4/jMAVSim@8b2f456
    - Changes: PX4/jMAVSim@0c25b7c...8b2f456

    8b2f456 2019-02-28 Julian Oes - Merge pull request #95 from PX4/shell-style
3d0174a 2019-02-27 Matthias Grob - Fix shell script style
PX4BuildBot added a commit that referenced this pull request Mar 4, 2019
@PX4BuildBot
Update submodule jMAVSim to latest Mon Mar 4 00:38:35 UTC 2019
4ceb94f 
    - jMAVSim in PX4/Firmware (fc7c7ac): PX4/jMAVSim@0c25b7c
    - jMAVSim current upstream: PX4/jMAVSim@8b2f456
    - Changes: PX4/jMAVSim@0c25b7c...8b2f456

    8b2f456 2019-02-28 Julian Oes - Merge pull request #95 from PX4/shell-style
3d0174a 2019-02-27 Matthias Grob - Fix shell script style
PX4BuildBot added a commit that referenced this pull request Mar 5, 2019
@PX4BuildBot
Update submodule jMAVSim to latest Tue Mar 5 00:38:32 UTC 2019
143e478 
    - jMAVSim in PX4/Firmware (1079ae3): PX4/jMAVSim@0c25b7c
    - jMAVSim current upstream: PX4/jMAVSim@8b2f456
    - Changes: PX4/jMAVSim@0c25b7c...8b2f456

    8b2f456 2019-02-28 Julian Oes - Merge pull request #95 from PX4/shell-style
3d0174a 2019-02-27 Matthias Grob - Fix shell script style
PX4BuildBot added a commit that referenced this pull request Mar 5, 2019
@PX4BuildBot
Update submodule jMAVSim to latest Tue Mar 5 12:38:36 UTC 2019
2a3d65a 
    - jMAVSim in PX4/Firmware (a97151f): PX4/jMAVSim@0c25b7c
    - jMAVSim current upstream: PX4/jMAVSim@8b2f456
    - Changes: PX4/jMAVSim@0c25b7c...8b2f456

    8b2f456 2019-02-28 Julian Oes - Merge pull request #95 from PX4/shell-style
3d0174a 2019-02-27 Matthias Grob - Fix shell script style
PX4BuildBot added a commit that referenced this pull request Mar 6, 2019
@PX4BuildBot
Update submodule jMAVSim to latest Wed Mar 6 00:38:35 UTC 2019
1a2b88e 
    - jMAVSim in PX4/Firmware (a97151f): PX4/jMAVSim@0c25b7c
    - jMAVSim current upstream: PX4/jMAVSim@8b2f456
    - Changes: PX4/jMAVSim@0c25b7c...8b2f456

    8b2f456 2019-02-28 Julian Oes - Merge pull request #95 from PX4/shell-style
3d0174a 2019-02-27 Matthias Grob - Fix shell script style
@dagar dagar mentioned this pull request Mar 6, 2019
Merged
dagar added a commit that referenced this pull request Mar 6, 2019
@dagar
Update submodule jMAVSim to latest Wed Mar 6 00:38:35 UTC 2019 (#11597)
37cda4e 
- jMAVSim in PX4/Firmware (a97151f): PX4/jMAVSim@0c25b7c
    - jMAVSim current upstream: PX4/jMAVSim@8b2f456
    - Changes: PX4/jMAVSim@0c25b7c...8b2f456

    8b2f456 2019-02-28 Julian Oes - Merge pull request #95 from PX4/shell-style
3d0174a 2019-02-27 Matthias Grob - Fix shell script style
PX4BuildBot added a commit that referenced this pull request Jan 14, 2020
@PX4BuildBot
PX4/NuttX branch test: master
0fe4412 
NuttX:
 - https://github.com/PX4-NuttX/nuttx/tree/master
 - PX4/NuttX@9babc64

Changes from PX4/NuttX (PX4/NuttX@c6ba2c1) in current PX4/master (4f362f5)
PX4/NuttX@c6ba2c1...9babc64

9babc64438 (HEAD, origin/master) Merge branch 'master' of github.com:apache/incubator-nuttx
21ea255 net/devif/devif_poll.c:  Correct a new warning found in build testing.  devif/devif_poll.c:768:7: warning: unused variable 'hsec' [-Wunused-variable] (#97)
aa6efbd800 Merge branch 'master' of bitbucket.org:nuttx/nuttx
81651f1357 Merge branch 'master' of github.com:apache/incubator-nuttx
f005698 Fix a few errors concerning use of section block comments in .c files: (#95)
3a8241ecd0 Merge branch 'master' of github.com:apache/incubator-nuttx
f8bcd58 Fix format warn (#96)
84153ad arch/mips/src/pic32mz/pic32mz-timer.c: Eliminate a warning found during testing.
4224038c6e Merge branch 'master' of github.com:apache/incubator-nuttx
e507ca4 imxrt1050-evk/include/board.h:  Add missing definitions.  Recent i.MXRT changes added the definition IMXRT_USB1_PLL_DIV_SELECT to the imxrt1020-evk and imxrt1060-evk board.h header files but NOT to the imxrt10%0-evk.  As a result EVERY i.MXR 1050 board configuration with USB enabled failed to compile during build testing.  Another day without a successfull build test 8( (#93)

Apps:
 - https://github.com/PX4/NuttX-apps/tree/master
 - PX4/NuttX-apps@561fc02

Changes from PX4/NuttX-apps (PX4/NuttX-apps@91b6ad6) in current PX4/master (4f362f5)
PX4/NuttX-apps@91b6ad6...561fc02

561fc02a (HEAD -> master, origin/master) netutils/ftpd/ftpd.c:  Fix an error introduced in PR10.  In error clean-up, it was trying to free memory on an error where we failed allocated memory.  Not good.
e6785097 apps/netutils/ftpd/ftpd.c:  Fixes several problems:
573f07f3 fix passwd.h:103:30: warning: passwd_verify with no effect [-Wunused-value]
7fd1b906 delete all characters from char to EOL
967e7e29 system: readline: Improve security
01e2b117 system: zmodem: Improve zmodem send performance
221a4587 system: zmodem: Fix compile error in zmodem host tool
437dba33 system: zmodem: Fix debug assert condition
5c936ce0 Various fixes (#6)
74ba8ff2 Merge pull request #5 from xiaoxiang781216/fix-void-cast
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sjwilks @LorenzMeier @px4dev