Tk joystik control #2
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
ViktorBraichenko
approved these changes
May 27, 2024
…n light buttons and fixing logic of toggling light
src/Vehicle/Vehicle.h
Outdated
| @@ -1142,7 +1152,7 @@ private slots: | |||
| QTimer _csvLogTimer; | |||
| QFile _csvLogFile; | |||
|
|
|||
| bool _joystickEnabled = false; | |||
| bool _joystickEnabled = false; | |||
Comment on lines
+11
to
+12
| <file alias="DayLightActions.qml">src/ui/toolbar/DayLightActions.qml</file> | ||
| <file alias="NightLightActions.qml">src/ui/toolbar/NightLightActions.qml</file> |
Comment on lines
+44
to
+89
| void ServoControl::dayLightEnable(int _defaultComponentId) { | ||
| // _defaultComponentId | ||
| _vehicle->sendCommand( | ||
| _defaultComponentId, | ||
| MAV_CMD_DO_SET_SERVO, | ||
| true, | ||
| DAY_LIGHT_SERVO, | ||
| SERVO_PWM_ON | ||
| ); | ||
| }; | ||
|
|
||
| // ---------------------------------------------------------------------------- | ||
| void ServoControl::dayLightDisable(int _defaultComponentId) { | ||
| // _defaultComponentId | ||
| _vehicle->sendCommand( | ||
| _defaultComponentId, | ||
| MAV_CMD_DO_SET_SERVO, | ||
| true, | ||
| DAY_LIGHT_SERVO, | ||
| SERVO_PWM_OFF | ||
| ); | ||
| }; | ||
|
|
||
| // ---------------------------------------------------------------------------- | ||
| void ServoControl::nightLightEnable(int _defaultComponentId) { | ||
| // _defaultComponentId | ||
| _vehicle->sendCommand( | ||
| _defaultComponentId, | ||
| MAV_CMD_DO_SET_SERVO, | ||
| true, | ||
| NIGHT_LIGHT_SERVO, | ||
| SERVO_PWM_ON | ||
| ); | ||
| }; | ||
|
|
||
| // ---------------------------------------------------------------------------- | ||
| void ServoControl::nightLightDisable(int _defaultComponentId) { | ||
| // _defaultComponentId | ||
| _vehicle->sendCommand( | ||
| _defaultComponentId, | ||
| MAV_CMD_DO_SET_SERVO, | ||
| true, | ||
| NIGHT_LIGHT_SERVO, | ||
| SERVO_PWM_OFF | ||
| ); | ||
| }; |
There was a problem hiding this comment.
Let's think about ternary operator here. Can we make it?
src/Servo/ServoControl.cc
Outdated
Comment on lines
18
to
19
| #define DAY_LIGHT_SERVO 3 | ||
| #define NIGHT_LIGHT_SERVO 11 |
There was a problem hiding this comment.
Note for next release: Need to make all of this fields flexible throw GUI
src/Vehicle/Vehicle.cc
Outdated
|
|
||
| // emit servoChannelsChanged(pwmServoValues); | ||
| // } | ||
|
|
There was a problem hiding this comment.
What is this? Why it's commented? Need to add small comments about this functionality
| @@ -992,7 +1000,8 @@ public slots: | |||
| /// @param channelCount Number of available channels, cMaxRcChannels max | |||
| /// @param pwmValues -1 signals channel not available | |||
| void rcChannelsChanged (int channelCount, int pwmValues[cMaxRcChannels]); | |||
|
|
|||
| // void servoChannelsChanged (int pwmServoValues[ServoControl::cMaxServoPackets]); | |||
|
|
|||
There was a problem hiding this comment.
The same - non understandable functionality
| { | ||
| _addFact(&_dayLightFact, _dayLightFactName); | ||
| _addFact(&_nightLightFact, _nightLightFactName); | ||
|
|
There was a problem hiding this comment.
This is servo functionality status, correct?
There was a problem hiding this comment.
this is fact group classes, it part of logic of handling events from mavlink and updating states
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.
Description
Test Steps
Checklist:
Related Issue
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.