Rename variables for manual control setpoint #922
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
…fix sending of manual control setpoint mavlink message
Conflicts: src/modules/commander/commander.cpp src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp src/modules/uORB/topics/manual_control_setpoint.h
|
Looks good @DrTon @julianoes @sjwilks Please review and comment. |
| pitch_sp = (-_manual.pitch * _parameters.man_pitch_max - _parameters.trim_pitch) + _parameters.pitchsp_offset_rad; | ||
| throttle_sp = _manual.throttle; | ||
| roll_sp = (_manual.y * _parameters.man_roll_max - _parameters.trim_roll) + _parameters.rollsp_offset_rad; | ||
| pitch_sp = (-_manual.x * _parameters.man_pitch_max - _parameters.trim_pitch) + _parameters.pitchsp_offset_rad; |
There was a problem hiding this comment.
Shouldn't it be + _parameters.trim_pitch here?
There was a problem hiding this comment.
Unrelated to the PR but correct (the - sign should go before the parenthesis )
There was a problem hiding this comment.
adressed in #931
|
So what's the state here - ready to merge? |
|
yes we can fix the wrong trim sign in another PR, it;s unrelated |
The Issues are fixed in a separate PR #931 |
|
Ok, so can we go ahead and get this one in? |
Conflicts: src/modules/fw_att_control/fw_att_control_main.cpp
|
merged master, ready for merging into master |
julianoes
added a commit
that referenced
this pull request
May 13, 2014
Rename variables for manual control setpoint
PX4BuildBot
added a commit
that referenced
this pull request
Jun 29, 2019
NuttX: - https://github.com/PX4-NuttX/nuttx/tree/master - PX4/NuttX@42b178f Changes from PX4/NuttX (PX4/NuttX@423371c) in current PX4/master (d1298f2) PX4/NuttX@423371c...42b178f 42b178f (HEAD, origin/master) tools/nxstyle.c: Bandaid-up logic that detects left brackets on the same line in global structure/enumeration types and initializers. 35521ab Fix some new warnings found in build testing. 005a077 tools/nxstyle.c: Tool depends on the file under test containing "Private Functions" or "Public Functions" block comments. Emit an error is neither are present. 61f3881 configs/pnev5180b/usbnsh-cdcecm: This new configuration includes a USB Composite Device with both CDC/ACM and CDC/ECM. NuttShell provides a terminal via CDC/ACM. A network interface (eth0) is provided via CDC/ECM. 2dd1b33 Merged in fbraghiroli/nuttx/fix_nrf24l01 (pull request #922) 3f9ef89 Various Kconfig files: Kconfig files should not select SCHED_WORKQUEUE since that is really only is only the logical OR if SCHED_LPWORK and SCHED_HPWORK. Selecting it has no effect other than to produce an erroneous configuration. 980a89b configs/pnev5180b/nsh-cdcecm/defconfig: CDC/ECM requires SCHED_LPWORK c2a383e drivers/sensors/vl53l1x.c: Remove the VL53L1x driver. It does not compile. df3ea97 sched/semaphore/sem_holder.c: Fix a bad assertion. The comments state correctly that we cannot make any assumptions about the number of holders of the semaphore, yet the code asserts if there are any holders. This makes the code behave closer to what the comments say. f4a21af configs/olimex-stm32-e407/src: Change initialization to match the way it is done with other boards. Apps: - https://github.com/PX4/NuttX-apps/tree/master - PX4/NuttX-apps@18a8032 Changes from PX4/NuttX-apps (PX4/NuttX-apps@7db2a35) in current PX4/master (d1298f2) PX4/NuttX-apps@7db2a35...18a8032 18a8032 (HEAD -> master, origin/master) examples/vl53l1x: Remove. The driver does not compile. 94ac7dc examples/vl53l1x: Add VL53L1X example demo. 27766d7 Merged in masayuki2009/nuttx.apps/fix_apps_industry (pull request #178) d2f3ad9 Merged in masayuki2009/nuttx.apps/wireless_gs2200m (pull request #177) 2c8e349 Merged in masayuki2009/nuttx.apps/add_system_gs2200m (pull request #176) 6561573 industry/abnt_codi, include/industry/abnt_code.h, examples.abntcodi: Adds support for ABNT CODI library. This is an energy meter protocol used in Brazil. bd14bf7 apps/netutils/json: Removed. Replaced with apps/netutils/cjson. 24e590b apps/nshlib/nsh_ddcmd.c: Seemingly nonsense change but somehow works around a compilation error using the ZDS-II toolchain. It was claiming that vtbl was undefined indd_outfopen(). 87c1083 apps/netutils/netinit: MAC address configuration was represented by type long long. That is a problem for architectures that do not support typle long long. Replaces by two long configuration items. 8c36ec3 nshlib/nsh_parse.c: Fix a warning about an uninitialized variable from the ZDS-II compiler.
PX4BuildBot
added a commit
that referenced
this pull request
Jun 30, 2019
NuttX: - https://github.com/PX4-NuttX/nuttx/tree/master - PX4/NuttX@923cb52 Changes from PX4/NuttX (PX4/NuttX@423371c) in current PX4/master (d1298f2) PX4/NuttX@423371c...923cb52 923cb52 (HEAD, origin/master) arch/arm/src/imxrt/imxrt_ehci.c: Add i.MXRT ECHI driver. f6221ae tools/nxstyle.c: Fix logic from commit 005a077 for the case of header files when contain no functions. 42b178f tools/nxstyle.c: Bandaid-up logic that detects left brackets on the same line in global structure/enumeration types and initializers. 35521ab Fix some new warnings found in build testing. 005a077 tools/nxstyle.c: Tool depends on the file under test containing "Private Functions" or "Public Functions" block comments. Emit an error is neither are present. 61f3881 configs/pnev5180b/usbnsh-cdcecm: This new configuration includes a USB Composite Device with both CDC/ACM and CDC/ECM. NuttShell provides a terminal via CDC/ACM. A network interface (eth0) is provided via CDC/ECM. 2dd1b33 Merged in fbraghiroli/nuttx/fix_nrf24l01 (pull request #922) 3f9ef89 Various Kconfig files: Kconfig files should not select SCHED_WORKQUEUE since that is really only is only the logical OR if SCHED_LPWORK and SCHED_HPWORK. Selecting it has no effect other than to produce an erroneous configuration. 980a89b configs/pnev5180b/nsh-cdcecm/defconfig: CDC/ECM requires SCHED_LPWORK c2a383e drivers/sensors/vl53l1x.c: Remove the VL53L1x driver. It does not compile. Apps: - https://github.com/PX4/NuttX-apps/tree/master - PX4/NuttX-apps@334b450 Changes from PX4/NuttX-apps (PX4/NuttX-apps@7db2a35) in current PX4/master (d1298f2) PX4/NuttX-apps@7db2a35...334b450 334b450 (HEAD -> master, origin/master) wireless/gs2200m/gs2200m_main.c: Fix a warning about an uninitialized return value found in build testing. 18a8032 examples/vl53l1x: Remove. The driver does not compile. 94ac7dc examples/vl53l1x: Add VL53L1X example demo. 27766d7 Merged in masayuki2009/nuttx.apps/fix_apps_industry (pull request #178) d2f3ad9 Merged in masayuki2009/nuttx.apps/wireless_gs2200m (pull request #177) 2c8e349 Merged in masayuki2009/nuttx.apps/add_system_gs2200m (pull request #176) 6561573 industry/abnt_codi, include/industry/abnt_code.h, examples.abntcodi: Adds support for ABNT CODI library. This is an energy meter protocol used in Brazil. bd14bf7 apps/netutils/json: Removed. Replaced with apps/netutils/cjson. 24e590b apps/nshlib/nsh_ddcmd.c: Seemingly nonsense change but somehow works around a compilation error using the ZDS-II toolchain. It was claiming that vtbl was undefined indd_outfopen(). 87c1083 apps/netutils/netinit: MAC address configuration was represented by type long long. That is a problem for architectures that do not support typle long long. Replaces by two long configuration items.
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.
As discussed in #910