fix mission topic bug, clearer naming #838
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LorenzMeier
added a commit
that referenced
this pull request
Apr 18, 2014
fix mission topic bug, clearer naming
PX4BuildBot
added a commit
that referenced
this pull request
Mar 11, 2019
NuttX: - https://github.com/PX4-NuttX/nuttx/tree/master - PX4/NuttX@db2310b Changes from PX4/NuttX (PX4/NuttX@1f2f6d8) in current PX4/master (2773fe6) PX4/NuttX@1f2f6d8...db2310b db2310b (HEAD, origin/master) lib_gethostbyaddrr.c edited online with Bitbucket f33ed3c *Merged in zhoukejun/nuttx_nucleo-f767zi (pull request #838) 20e7ee5 configs/omnibusf4/README.txt: Update README. aa4f7c9 graphics/nxmu/nxmu_start.c: Extend nxmu_start so that receives a display number as an argument. This makes it possible to have multiple instances of the NX server running on boards that support multiple displays. Also includes updates to boardctl() to accept display number paramters. f6b9fe5 tools/nxstyle.c: Add logic to detect a blank line following a left brace or a blank line preceding a right brace. 8be37f0 configs/omnibusf4/README.txt: Add README file for OmnibusFS target. c56ea62 arch/arm/src/imxrt/imxrt_clockconfig.c: If SDRAM is actived it was only running at 40MHz. This was becaus imxrt_clockconfig.c changed the SEMC clock divider after the DCD was configured. This commit corrects that. bd6b05f Update TODO and some comments. 2caf135 Merged in raiden00/nuttx_h7 (pull request #837) ffca6ba Squashed commit of the following: Apps: - https://github.com/PX4/NuttX-apps/tree/master - PX4/NuttX-apps@e063e93 Changes from PX4/NuttX-apps (PX4/NuttX-apps@7db2a35) in current PX4/master (2773fe6) PX4/NuttX-apps@7db2a35...e063e93 e063e93 (HEAD -> master, origin/master) apps/examples/nxterm: NxWM passed the size of the NxTK sub-window but nxterm example passed the size of the complete NxTK window. They must be made consistent. 66af5b4 apps/Nxwidgets: Fix some recently introduced errors found in build testing. e4e00f7 apps/examples/sx127x_demo/Kconfig: Fix misplaced 'if' c019c9d apps/examples/modbusmaster/mbmaster_main.c: eMBMasterRegHoldingCB cannot be static. 53e6f4b apps/examples/nxterm, graphics/NxWidgets: Replace illegal direct calls to nxterm_redraw() and nxterm_kbdin() with new boardctl() calls. 6529a84 apps/examples/nxterm: Most configuration options were not available in the Kconfig file. c341abf graphics/NxWidgets/nxwm/src/cnxterm.cxx: Part of the last change was still in he editor. 061b433 apps/examples/nxterm and graphics/NxWidgets/nxwm: Replace direct calls to nxtk_register with legal, indirect calls via boardctrl(BOARDIOC_NXTERM). Replace calls to (deleted) nxterm_unregister(). The correc way to delete a driver is by unlink'ing it. 2eaf2e0 (origin/px4_firmware_nuttx-7.28+_rt) aps/system/cu/Kconfig: CU term depends on TERMIOS and should select it. e54c456 (origin/px4_firmware_nuttx-7.28++) testing/ostest/setvbuf.c: Fix several errors in the setvbuf() test.
PX4BuildBot
added a commit
that referenced
this pull request
Mar 11, 2019
NuttX: - https://github.com/PX4-NuttX/nuttx/tree/master - PX4/NuttX@0a7f764 Changes from PX4/NuttX (PX4/NuttX@1f2f6d8) in current PX4/master (2773fe6) PX4/NuttX@1f2f6d8...0a7f764 0a7f764 (HEAD, origin/master) Merged in raiden00/nuttx_h7 (pull request #839) db2310b lib_gethostbyaddrr.c edited online with Bitbucket f33ed3c *Merged in zhoukejun/nuttx_nucleo-f767zi (pull request #838) 20e7ee5 configs/omnibusf4/README.txt: Update README. aa4f7c9 graphics/nxmu/nxmu_start.c: Extend nxmu_start so that receives a display number as an argument. This makes it possible to have multiple instances of the NX server running on boards that support multiple displays. Also includes updates to boardctl() to accept display number paramters. f6b9fe5 tools/nxstyle.c: Add logic to detect a blank line following a left brace or a blank line preceding a right brace. 8be37f0 configs/omnibusf4/README.txt: Add README file for OmnibusFS target. c56ea62 arch/arm/src/imxrt/imxrt_clockconfig.c: If SDRAM is actived it was only running at 40MHz. This was becaus imxrt_clockconfig.c changed the SEMC clock divider after the DCD was configured. This commit corrects that. bd6b05f Update TODO and some comments. 2caf135 Merged in raiden00/nuttx_h7 (pull request #837) Apps: - https://github.com/PX4/NuttX-apps/tree/master - PX4/NuttX-apps@e063e93 Changes from PX4/NuttX-apps (PX4/NuttX-apps@7db2a35) in current PX4/master (2773fe6) PX4/NuttX-apps@7db2a35...e063e93 e063e93 (HEAD -> master, origin/master) apps/examples/nxterm: NxWM passed the size of the NxTK sub-window but nxterm example passed the size of the complete NxTK window. They must be made consistent. 66af5b4 apps/Nxwidgets: Fix some recently introduced errors found in build testing. e4e00f7 apps/examples/sx127x_demo/Kconfig: Fix misplaced 'if' c019c9d apps/examples/modbusmaster/mbmaster_main.c: eMBMasterRegHoldingCB cannot be static. 53e6f4b apps/examples/nxterm, graphics/NxWidgets: Replace illegal direct calls to nxterm_redraw() and nxterm_kbdin() with new boardctl() calls. 6529a84 apps/examples/nxterm: Most configuration options were not available in the Kconfig file. c341abf graphics/NxWidgets/nxwm/src/cnxterm.cxx: Part of the last change was still in he editor. 061b433 apps/examples/nxterm and graphics/NxWidgets/nxwm: Replace direct calls to nxtk_register with legal, indirect calls via boardctrl(BOARDIOC_NXTERM). Replace calls to (deleted) nxterm_unregister(). The correc way to delete a driver is by unlink'ing it. 2eaf2e0 (origin/px4_firmware_nuttx-7.28+_rt) aps/system/cu/Kconfig: CU term depends on TERMIOS and should select it. e54c456 (origin/px4_firmware_nuttx-7.28++) testing/ostest/setvbuf.c: Fix several errors in the setvbuf() test.
PX4BuildBot
added a commit
that referenced
this pull request
Mar 12, 2019
NuttX: - https://github.com/PX4-NuttX/nuttx/tree/master - PX4/NuttX@f6b00e1 Changes from PX4/NuttX (PX4/NuttX@1f2f6d8) in current PX4/master (f794ee0) PX4/NuttX@1f2f6d8...f6b00e1 f6b00e1 (HEAD, origin/master) tools/nxstyle.c: Fix logic error that prevent detecion of '/' and '/=' as operators. net/: Minor updates resulting from testing tools/nxstyle. 0a7f764 Merged in raiden00/nuttx_h7 (pull request #839) db2310b lib_gethostbyaddrr.c edited online with Bitbucket f33ed3c *Merged in zhoukejun/nuttx_nucleo-f767zi (pull request #838) 20e7ee5 configs/omnibusf4/README.txt: Update README. aa4f7c9 graphics/nxmu/nxmu_start.c: Extend nxmu_start so that receives a display number as an argument. This makes it possible to have multiple instances of the NX server running on boards that support multiple displays. Also includes updates to boardctl() to accept display number paramters. f6b9fe5 tools/nxstyle.c: Add logic to detect a blank line following a left brace or a blank line preceding a right brace. 8be37f0 configs/omnibusf4/README.txt: Add README file for OmnibusFS target. c56ea62 arch/arm/src/imxrt/imxrt_clockconfig.c: If SDRAM is actived it was only running at 40MHz. This was becaus imxrt_clockconfig.c changed the SEMC clock divider after the DCD was configured. This commit corrects that. bd6b05f Update TODO and some comments. Apps: - https://github.com/PX4/NuttX-apps/tree/master - PX4/NuttX-apps@520bd6a Changes from PX4/NuttX-apps (PX4/NuttX-apps@7db2a35) in current PX4/master (f794ee0) PX4/NuttX-apps@7db2a35...520bd6a 520bd6a (HEAD -> master, origin/master) Merged in zhoukejun/apps_nucleo_f767zi (pull request #171) e063e93 apps/examples/nxterm: NxWM passed the size of the NxTK sub-window but nxterm example passed the size of the complete NxTK window. They must be made consistent. 66af5b4 apps/Nxwidgets: Fix some recently introduced errors found in build testing. e4e00f7 apps/examples/sx127x_demo/Kconfig: Fix misplaced 'if' c019c9d apps/examples/modbusmaster/mbmaster_main.c: eMBMasterRegHoldingCB cannot be static. 53e6f4b apps/examples/nxterm, graphics/NxWidgets: Replace illegal direct calls to nxterm_redraw() and nxterm_kbdin() with new boardctl() calls. 6529a84 apps/examples/nxterm: Most configuration options were not available in the Kconfig file. c341abf graphics/NxWidgets/nxwm/src/cnxterm.cxx: Part of the last change was still in he editor. 061b433 apps/examples/nxterm and graphics/NxWidgets/nxwm: Replace direct calls to nxtk_register with legal, indirect calls via boardctrl(BOARDIOC_NXTERM). Replace calls to (deleted) nxterm_unregister(). The correc way to delete a driver is by unlink'ing it. 2eaf2e0 (origin/px4_firmware_nuttx-7.28+_rt) aps/system/cu/Kconfig: CU term depends on TERMIOS and should select it.
PX4BuildBot
added a commit
that referenced
this pull request
Mar 12, 2019
NuttX: - https://github.com/PX4-NuttX/nuttx/tree/master - PX4/NuttX@82b276a Changes from PX4/NuttX (PX4/NuttX@1f2f6d8) in current PX4/master (6672284) PX4/NuttX@1f2f6d8...82b276a 82b276a (HEAD, origin/master) binfmt/nxflat.c: Trivial design simplification. 622202d binfmt/nxflat.c: Update to last NxFLAT change: The logic must respect the reference count before freeing the dspace memory region. ba8714d binfmt/nxflat.c: Correct a double free debug assertion. This occurs when groups are enabled: (1) once via binfmt_exit and unload_module, and (2) once via sched_releasetcb(). this was corrected by adding logic to free/unload the memory once and nullify the pointer so that cannot be freed a second time. This commit resolves Bitbucket issue #145. 043df95 arch/arm/include/nrf52/ and arch/arm/src/nrf52: 1. Added 52840 family support 2. Use common irq and memory layout header file for 52832 & 52840. f6b00e1 tools/nxstyle.c: Fix logic error that prevent detecion of '/' and '/=' as operators. net/: Minor updates resulting from testing tools/nxstyle. 0a7f764 Merged in raiden00/nuttx_h7 (pull request #839) db2310b lib_gethostbyaddrr.c edited online with Bitbucket f33ed3c *Merged in zhoukejun/nuttx_nucleo-f767zi (pull request #838) 20e7ee5 configs/omnibusf4/README.txt: Update README. aa4f7c9 graphics/nxmu/nxmu_start.c: Extend nxmu_start so that receives a display number as an argument. This makes it possible to have multiple instances of the NX server running on boards that support multiple displays. Also includes updates to boardctl() to accept display number paramters. Apps: - https://github.com/PX4/NuttX-apps/tree/master - PX4/NuttX-apps@520bd6a Changes from PX4/NuttX-apps (PX4/NuttX-apps@7db2a35) in current PX4/master (6672284) PX4/NuttX-apps@7db2a35...520bd6a 520bd6a (HEAD -> master, origin/master) Merged in zhoukejun/apps_nucleo_f767zi (pull request #171) e063e93 apps/examples/nxterm: NxWM passed the size of the NxTK sub-window but nxterm example passed the size of the complete NxTK window. They must be made consistent. 66af5b4 apps/Nxwidgets: Fix some recently introduced errors found in build testing. e4e00f7 apps/examples/sx127x_demo/Kconfig: Fix misplaced 'if' c019c9d apps/examples/modbusmaster/mbmaster_main.c: eMBMasterRegHoldingCB cannot be static. 53e6f4b apps/examples/nxterm, graphics/NxWidgets: Replace illegal direct calls to nxterm_redraw() and nxterm_kbdin() with new boardctl() calls. 6529a84 apps/examples/nxterm: Most configuration options were not available in the Kconfig file. c341abf graphics/NxWidgets/nxwm/src/cnxterm.cxx: Part of the last change was still in he editor. 061b433 apps/examples/nxterm and graphics/NxWidgets/nxwm: Replace direct calls to nxtk_register with legal, indirect calls via boardctrl(BOARDIOC_NXTERM). Replace calls to (deleted) nxterm_unregister(). The correc way to delete a driver is by unlink'ing it. 2eaf2e0 (origin/px4_firmware_nuttx-7.28+_rt) aps/system/cu/Kconfig: CU term depends on TERMIOS and should select it.
PX4BuildBot
added a commit
that referenced
this pull request
Mar 12, 2019
NuttX: - https://github.com/PX4-NuttX/nuttx/tree/master - PX4/NuttX@4802eb6 Changes from PX4/NuttX (PX4/NuttX@1f2f6d8) in current PX4/master (2ae2331) PX4/NuttX@1f2f6d8...4802eb6 4802eb6 (HEAD, origin/master) tools/nxstyle.c: Fix a bacward test in the previous commit. ba859ad tools/nxstyle.c: Don't complain about certain lowercase characters in otherwise uppercase pre-processor identifers: IPv6, IPv4, ICMPv6, IGMPv2, p as a decimal point, d signifying a divisor. It was a bad idea to let the door open a crack for there. While they improve readability, the inconsistently also causes other problems. 82b276a binfmt/nxflat.c: Trivial design simplification. 622202d binfmt/nxflat.c: Update to last NxFLAT change: The logic must respect the reference count before freeing the dspace memory region. ba8714d binfmt/nxflat.c: Correct a double free debug assertion. This occurs when groups are enabled: (1) once via binfmt_exit and unload_module, and (2) once via sched_releasetcb(). this was corrected by adding logic to free/unload the memory once and nullify the pointer so that cannot be freed a second time. This commit resolves Bitbucket issue #145. 043df95 arch/arm/include/nrf52/ and arch/arm/src/nrf52: 1. Added 52840 family support 2. Use common irq and memory layout header file for 52832 & 52840. f6b00e1 tools/nxstyle.c: Fix logic error that prevent detecion of '/' and '/=' as operators. net/: Minor updates resulting from testing tools/nxstyle. 0a7f764 Merged in raiden00/nuttx_h7 (pull request #839) db2310b lib_gethostbyaddrr.c edited online with Bitbucket f33ed3c *Merged in zhoukejun/nuttx_nucleo-f767zi (pull request #838) Apps: - https://github.com/PX4/NuttX-apps/tree/master - PX4/NuttX-apps@520bd6a Changes from PX4/NuttX-apps (PX4/NuttX-apps@7db2a35) in current PX4/master (2ae2331) PX4/NuttX-apps@7db2a35...520bd6a 520bd6a (HEAD -> master, origin/master) Merged in zhoukejun/apps_nucleo_f767zi (pull request #171) e063e93 apps/examples/nxterm: NxWM passed the size of the NxTK sub-window but nxterm example passed the size of the complete NxTK window. They must be made consistent. 66af5b4 apps/Nxwidgets: Fix some recently introduced errors found in build testing. e4e00f7 apps/examples/sx127x_demo/Kconfig: Fix misplaced 'if' c019c9d apps/examples/modbusmaster/mbmaster_main.c: eMBMasterRegHoldingCB cannot be static. 53e6f4b apps/examples/nxterm, graphics/NxWidgets: Replace illegal direct calls to nxterm_redraw() and nxterm_kbdin() with new boardctl() calls. 6529a84 apps/examples/nxterm: Most configuration options were not available in the Kconfig file. c341abf graphics/NxWidgets/nxwm/src/cnxterm.cxx: Part of the last change was still in he editor. 061b433 apps/examples/nxterm and graphics/NxWidgets/nxwm: Replace direct calls to nxtk_register with legal, indirect calls via boardctrl(BOARDIOC_NXTERM). Replace calls to (deleted) nxterm_unregister(). The correc way to delete a driver is by unlink'ing it. 2eaf2e0 (origin/px4_firmware_nuttx-7.28+_rt) aps/system/cu/Kconfig: CU term depends on TERMIOS and should select it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes the bug described in #837.
Thanks @benzeng.