Skip to content

Commit d5d0146

Browse files
mikellermikeller
authored
Merge pull request #2296 from limonspb/esc_dshot_reverse
2 parents f6087f3 + ca09909 commit d5d0146

File tree

20 files changed

+1255
-103
lines changed

20 files changed

+1255
-103
lines changed

‎locales/en/messages.json‎

Lines changed: 77 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2577,7 +2577,7 @@
25772577
"message": "<strong>Safety notice</strong><br /><strong class=\"message-negative\">Remove all propellers to prevent injury!</strong><br />The motors will <strong>spin up!</strong>"
25782578
},
25792579
"motorsRemapDialogExplanations": {
2580-
"message": "<strong>Information notice</strong><br />Motors will spin up one by one and you will be able to select which motor is spinning. The battery should be plugged in, correct ESC protocol should be selected. This utility can only re-arrange currently active motors. More complex re-mapping requires the CLI Resource command. Refer to this <a href=\"https://github.com/betaflight/betaflight/wiki/Betaflight-resource-remapping\" target=\"_blank\" rel=\"noopener noreferrer\">Wiki page</a>."
2580+
"message": "<strong>Information notice</strong><br />Motors will spin up one by one and you will be able to select which motor is spinning. The battery should be plugged in, correct ESC protocol should be selected. This utility can only re-arrange currently active motors. More complex re-mapping requires the CLI Resource command. Refer to this <a href=\"https://github.com/betaflight/betaflight/wiki/Betaflight-resource-remapping\" target=\"_blank\" rel=\"noopener noreferrer\">Wiki page</a>."
25812581
},
25822582
"motorsRemapDialogSave": {
25832583
"message": "Save"
@@ -2586,6 +2586,82 @@
25862586
"message": "Start over"
25872587
},
25882588

2589+
"escDshotDirectionDialog-Title": {
2590+
"message": "Motor Direction - <strong class=\"message-negative-italic\">Warning: Ensure props are removed!</strong>"
2591+
},
2592+
"escDshotDirectionDialog-SelectMotor": {
2593+
"message": "Select one or all motors"
2594+
},
2595+
"escDshotDirectionDialog-SelectMotorSafety": {
2596+
"message": "Motors will spin when selected!"
2597+
},
2598+
"escDshotDirectionDialog-RiskNotice": {
2599+
"message": "<strong>Safety notice</strong><br /><strong class=\"message-negative-italic\">Remove all propellers to prevent injury!</strong><br />The motors will <strong>spin up</strong> immediately when selected!"
2600+
},
2601+
"escDshotDirectionDialog-UnderstandRisks": {
2602+
"message": "<strong>I understand the risks</strong>,<br />all propellers are removed."
2603+
},
2604+
"escDshotDirectionDialog-InformationNotice": {
2605+
"message": "<strong>Information notice</strong><br />To change the motor directions, the battery must be plugged in and the correct ESC protocol must be set up in the $t(tabConfiguration.message) tab. Note that not all Dshot ESCs will work with this dialog. Check your ESC firmware."
2606+
},
2607+
"escDshotDirectionDialog-NormalInformationNotice": {
2608+
"message": "Set motor spin direction by selecting and spinning each motor individually."
2609+
},
2610+
"escDshotDirectionDialog-WizardInformationNotice": {
2611+
"message": "Resets all motor spin directions, then allows the user to choose which to reverse."
2612+
},
2613+
"escDshotDirectionDialog-Open": {
2614+
"message": "Motor direction"
2615+
},
2616+
"escDshotDirectionDialog-CommandNormal": {
2617+
"message": "Normal"
2618+
},
2619+
"escDshotDirectionDialog-CommandReverse": {
2620+
"message": "Reverse"
2621+
},
2622+
"escDshotDirectionDialog-CommandSpin": {
2623+
"message": "Test motor"
2624+
},
2625+
"escDshotDirectionDialog-ReleaseButtonToStop": {
2626+
"message": "Release button to stop"
2627+
},
2628+
"escDshotDirectionDialog-ReleaseToStop": {
2629+
"message": "Release to stop"
2630+
},
2631+
"escDshotDirectionDialog-Start": {
2632+
"message": "Individually"
2633+
},
2634+
"escDshotDirectionDialog-StartWizard": {
2635+
"message": "Wizard"
2636+
},
2637+
"escDshotDirectionDialog-SetDirectionHint": {
2638+
"message": "Change direction of selected motor(s)"
2639+
},
2640+
"escDshotDirectionDialog-SetDirectionHintSafety": {
2641+
"message": "Motors will spin when setting the direction!"
2642+
},
2643+
"escDshotDirectionDialog-WrongProtocolText": {
2644+
"message": "Feature works with DSHOT ESCs only.<br />Verify that your ESC (electric speed controller) supports DSHOT protocol and change it on $t(tabConfiguration.message) tab."
2645+
},
2646+
"escDshotDirectionDialog-WrongMixerText": {
2647+
"message": "Number of motors is 0.<br />Verify the current Mixer on $t(tabConfiguration.message) tab or setup a custom one through CLI. Refer to this <a href=\"https://github.com/betaflight/betaflight/blob/master/docs/Mixer.md\" target=\"_blank\" rel=\"noopener noreferrer\">Wiki page</a>."
2648+
},
2649+
"escDshotDirectionDialog-WrongFirmwareText": {
2650+
"message": "Update the firmware.<br /> Make sure you are using the latest firmware: Betaflight 4.3 or newer."
2651+
},
2652+
"escDshotDirectionDialog-WizardActionHint": {
2653+
"message": "Click on motor numbers individually to change spin direction"
2654+
},
2655+
"escDshotDirectionDialog-WizardActionHintSecondLine": {
2656+
"message": "Verify all motors are spinning correctly"
2657+
},
2658+
"escDshotDirectionDialog-SpinWizard": {
2659+
"message": "Start / spin motors"
2660+
},
2661+
"escDshotDirectionDialog-StopWizard": {
2662+
"message": "Stop motors"
2663+
},
2664+
25892665
"sensorsInfo": {
25902666
"message": "Keep in mind that using fast update periods and rendering multiple graphs at the same time is resource heavy and will burn your battery quicker if you use a laptop.<br />We recommend to only render graphs for sensors you are interested in while using reasonable update periods."
25912667
},

‎src/components/EscDshotDirection/Body.html‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<div class="escDshotDirection-Component">
2+
<h3 i18n="escDshotDirectionDialog-Title" class="escDshotDirection-ComponentHeader"></h3>
3+
<div class="componentContent" id="escDshotDirectionDialog-ConfigErrors">
4+
<div class="escDshotDirectionErrorTextBlock" id="escDshotDirectionDialog-WrongProtocol" i18n="escDshotDirectionDialog-WrongProtocolText"></div>
5+
<div class="escDshotDirectionErrorTextBlock" id="escDshotDirectionDialog-WrongMixer" i18n="escDshotDirectionDialog-WrongMixerText"></div>
6+
<div class="escDshotDirectionErrorTextBlock" id="escDshotDirectionDialog-WrongFirmware" i18n="escDshotDirectionDialog-WrongFirmwareText"></div>
7+
</div>
8+
<div class="componentContent" id="escDshotDirectionDialog-MainContent">
9+
<div id="escDshotDirectionDialog-MixerPreview" class="grey">
10+
<img id="escDshotDirectionDialog-MixerPreviewImg" alt="" src="./resources/motor_order/custom.svg" />
11+
</div>
12+
<div id="escDshotDirectionDialog-NormalDialog" class="display-contents">
13+
<h4 id="escDshotDirectionDialog-ActionHint" i18n="escDshotDirectionDialog-SelectMotor"></h4>
14+
<h4 id="escDshotDirectionDialog-ActionHintSafety" i18n="escDshotDirectionDialog-SelectMotorSafety"></h4>
15+
<div id="escDshotDirectionDialog-SelectMotorButtonsWrapper">
16+
</div>
17+
<div id = "escDshotDirectionDialog-SecondActionBlock" class="display-contents">
18+
<h4 id="escDshotDirectionDialog-SecondHint" i18n="escDshotDirectionDialog-SetDirectionHint"></h4>
19+
<h4 id="escDshotDirectionDialog-SecondHintSafety" i18n="escDshotDirectionDialog-SetDirectionHintSafety"></h4>
20+
<div id="escDshotDirectionDialog-CommandsWrapper">
21+
<a href="#" id="escDshotDirectionDialog-RotationNormal" class="regular-button" i18n="escDshotDirectionDialog-CommandNormal"></a>
22+
<a href="#" id="escDshotDirectionDialog-RotationReverse" class="regular-button" i18n="escDshotDirectionDialog-CommandReverse"></a>
23+
</div>
24+
</div>
25+
</div>
26+
<div id="escDshotDirectionDialog-WizardDialog" class="display-contents">
27+
<a href="#" id="escDshotDirectionDialog-SpinWizard" class="regular-button" i18n="escDshotDirectionDialog-SpinWizard"></a>
28+
<div id="escDshotDirectionDialog-SpinningWizard" class="display-contents">
29+
<h4 id="escDshotDirectionDialog-WizardActionHint" i18n="escDshotDirectionDialog-WizardActionHint"></h4>
30+
<h4 id="escDshotDirectionDialog-WizardActionHintSecondLine" i18n="escDshotDirectionDialog-WizardActionHintSecondLine"></h4>
31+
<div id="escDshotDirectionDialog-WizardMotorButtons">
32+
</div>
33+
<a href="#" id="escDshotDirectionDialog-StopWizard" class="regular-button" i18n="escDshotDirectionDialog-StopWizard"></a>
34+
</div>
35+
</div>
36+
</div>
37+
<div class="componentContent" id="escDshotDirectionDialog-Warning">
38+
<div>
39+
<p class="escDshotDirectionDialog-RiskNoticeText" i18n="escDshotDirectionDialog-RiskNotice"></p>
40+
<div class="escDshotDirectionToggleParentContainer">
41+
<div class="escDshotDirectionToggleNarrow">
42+
<input id="escDshotDirectionDialog-safetyCheckbox" type="checkbox" class="toggle"/>
43+
</div>
44+
<div class="escDshotDirectionDialog-ToggleWide">
45+
<span class="motorsEnableTestMode escDshotDirectionDialog-RiskNoticeText" i18n="escDshotDirectionDialog-UnderstandRisks"></span>
46+
</div>
47+
</div>
48+
<div class="escDshotDirectionDialog-InformationNotice" i18n="escDshotDirectionDialog-InformationNotice"></div>
49+
50+
<div id="escDshotDirectionDialog-StartWizardBlock" class="escDshotDirectionDialog-StartBlock">
51+
<div class="escDshotDirectionDialog-Buttons">
52+
<a href="#" id="escDshotDirectionDialog-StartWizard" class="regular-button escDshotDirectionDialog-StartButton" i18n="escDshotDirectionDialog-StartWizard"></a>
53+
</div>
54+
<div class="escDshotDirectionDialog-Description" i18n="escDshotDirectionDialog-WizardInformationNotice"></div>
55+
</div>
56+
57+
<div id="escDshotDirectionDialog-StartNormalBlock" class="escDshotDirectionDialog-StartBlock">
58+
<div class="escDshotDirectionDialog-Buttons">
59+
<a href="#" id="escDshotDirectionDialog-Start" class="regular-button escDshotDirectionDialog-StartButton" i18n="escDshotDirectionDialog-Start"></a>
60+
</div>
61+
<div class="escDshotDirectionDialog-Description" i18n="escDshotDirectionDialog-NormalInformationNotice"></div>
62+
</div>
63+
64+
</div>
65+
</div>
66+
</div>

‎src/components/EscDshotDirection/EscDshotCommandQueue.js‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
'use strict';
2+
3+
class EscDshotCommandQueue
4+
{
5+
constructor (intervalMs)
6+
{
7+
this._intervalId = null;
8+
this._interval = intervalMs;
9+
this._queue = [];
10+
this._purging = false;
11+
}
12+
13+
pushCommand(command, buffer)
14+
{
15+
this._queue.push([command, buffer]);
16+
}
17+
18+
pushPause(milliseconds)
19+
{
20+
const counter = Math.ceil(milliseconds / this._interval);
21+
22+
for (let i = 0; i < counter; i++) {
23+
this.pushCommand(null, null);
24+
}
25+
}
26+
27+
start()
28+
{
29+
if (null === this._intervalId) {
30+
this._intervalId = setInterval(
31+
() => { this._checkQueue(); },
32+
this._interval);
33+
}
34+
}
35+
36+
stop()
37+
{
38+
if(null !== this._intervalId) {
39+
clearInterval(this._intervalId);
40+
this._intervalId = null;
41+
}
42+
}
43+
44+
stopWhenEmpty()
45+
{
46+
this._purging = true;
47+
}
48+
49+
clear()
50+
{
51+
this._queue = [];
52+
}
53+
54+
_checkQueue()
55+
{
56+
if (0 !== this._queue.length) {
57+
const command = this._queue.shift();
58+
59+
if (null !== command[0]) {
60+
MSP.send_message(command[0], command[1]);
61+
}
62+
} else if (this._purging) {
63+
this._purging = false;
64+
this.stop();
65+
}
66+
}
67+
}

0 commit comments

Comments
 (0)