Added new DSHOT debug modes #3262

damosvil · 2023-01-21T01:02:49Z

This pr matches functionality in betaflight/betaflight#12170 and betaflight/betaflight#11694

Added new DSHOT EDT modes to blackbox tab. As their names are longer than usual I made the drop down list controls wider.
Also added FAILSAFE mode I found in blackbox explorer.

It can be used with Bluejay 0.20.1 RC2 or above.

Depends on https://github.com/betaflight/betaflight/pull/12170

McGiverGim · 2023-01-21T08:03:21Z

Something is wrong, you are modifying a lot of files, including different languages files.

damosvil · 2023-01-21T08:25:12Z

@McGiverGim This pr adds:

Extended dshot telemetry (EDT) checkbox enable in motors tab, so translation files need to be updated (Feature/dshot extended telemetry on unused ranges betaflight#11694)
New debug modes to include (Added demag and stall events to edt status frame betaflight#12170):
-- ESC temperature
-- voltage
-- current
-- demag event
-- desync event
-- stall event
-- demag metric max
-- demag metric current
-- other ESC debugging signals
Sensors/debug functionality with new debug modes (Added demag and stall events to edt status frame betaflight#12170)

This is a work in progress/draft pr. Other functionality may be added over time.

damosvil · 2023-01-21T08:38:55Z

@McGiverGim I am new at adding new features to Configurator, so I may be breaking some rules I don't know.
Please, could you let me know why is this wrong?

McGiverGim · 2023-01-21T10:10:42Z

You don't must change the locales files, only the English one. The translations are made at Crowdin and will update the others languages automatically.

damosvil · 2023-01-21T11:31:00Z

@McGiverGim Ok, I will restore them

sonarcloud · 2023-01-22T21:08:52Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
2 Code Smells

No Coverage information
0.0% Duplication

chmelevskij · 2023-01-23T06:26:54Z

src/js/utils/generate_filename.js

@@ -1,6 +1,6 @@
 import semver from "semver";
 import FC from "../fc";
-import { API_VERSION_1_45 } from "../data_storage";
+import { API_VERSION_1_46 } from "../data_storage";


Usually the bump version is done by ours, but this is a draft so I think is needed to see how the code looks. When final version of Configurator is released, we will bump the version and a rebase will fix the issue.

I just like ppl using modules 🤓

I rolled back this change, because the import was not used in this module

McGiverGim · 2023-01-24T08:41:58Z

src/js/tabs/motors.js

            escprotocol:        FC.PID_ADVANCED_CONFIG.fast_pwm_protocol + 1,
-            feature3:           FC.FEATURE_CONFIG.features.isEnabled('MOTOR_STOP'),
+            feature4:           FC.FEATURE_CONFIG.features.isEnabled('MOTOR_STOP'),
            feature9:           FC.FEATURE_CONFIG.features.isEnabled('3D'),
-            feature20:          FC.FEATURE_CONFIG.features.isEnabled('ESC_SENSOR'),
+            feature23:          FC.FEATURE_CONFIG.features.isEnabled('ESC_SENSOR'),


This change in the number of feature is because we have some bug in the actual code?

~~Yes, feature 3 corresponds to previous feature 0, and feature 23 corresponds to old feature 20~~

@McGiverGim should I make a separate bugfix for this?

With all the changes done in firmware/configurator I'm not too sure how affects this, but if it is wrong I suppose than yes.

This change should not be made looking at the table:

feature bit group name

0 0 rxMode RX_PPM

1 2 other INFLIGHT_ACC_CALL

2 3 rxMode RX_SERIAL

3 4 escMotorStop MOTOR_STOP

4 5 other SERVO_TILT

5 6 other SOFTSERIAL

6 7 gps GPS

7 9 other SONAR

8 10 telemetry TELEMETRY

9 12 3D 3D

10 13 rxMode RX_PARALLEL_PWM

11 14 rxMode RX_MSP

12 15 rssi RSSI_ADC

13 16 other LED_STRIP

14 17 other DISPLAY

15 18 other OSD

16 20 other CHANNEL_FORWARDING

17 21 other TRANSPONDER

18 22 other AIRMODE

19 25 rxMode RX_SPI

20 27 escSensor ESC_SENSOR

21 28 antiGravity ANTI_GRAVITY

https://github.com/betaflight/betaflight/blob/b1433123c56598ce8ea14357d05adc9e6e1c28ca/src/main/config/feature.h#L32-L57

typedef enum {
FEATURE_RX_PPM = 1 << 0,
FEATURE_INFLIGHT_ACC_CAL = 1 << 2,
FEATURE_RX_SERIAL = 1 << 3,
FEATURE_MOTOR_STOP = 1 << 4,
FEATURE_SERVO_TILT = 1 << 5,
FEATURE_SOFTSERIAL = 1 << 6,
FEATURE_GPS = 1 << 7,
FEATURE_RANGEFINDER = 1 << 9,
FEATURE_TELEMETRY = 1 << 10,
FEATURE_3D = 1 << 12,
FEATURE_RX_PARALLEL_PWM = 1 << 13,
FEATURE_RX_MSP = 1 << 14,
FEATURE_RSSI_ADC = 1 << 15,
FEATURE_LED_STRIP = 1 << 16,
FEATURE_DASHBOARD = 1 << 17,
FEATURE_OSD = 1 << 18,
FEATURE_CHANNEL_FORWARDING = 1 << 20,
FEATURE_TRANSPONDER = 1 << 21,
FEATURE_AIRMODE = 1 << 22,
FEATURE_RX_SPI = 1 << 25,
//FEATURE_SOFTSPI = 1 << 26, (removed)
FEATURE_ESC_SENSOR = 1 << 27,
FEATURE_ANTI_GRAVITY = 1 << 28,
//FEATURE_DYNAMIC_FILTER = 1 << 29, (removed)
} features_e;

🤔 This should be 27

updated according to #3382

damosvil · 2023-03-17T23:46:08Z

@McGiverGim @haslinghuis rebased to master, ready for review

haslinghuis · 2023-11-26T16:10:34Z

src/js/tabs/motors.js

+            if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) {
+                $('.checkboxDshotEdt').toggle(protocolConfigured && digitalProtocol && dshotBidirElement.is(':checked') && !$("input[name='ESC_SENSOR']").is(':checked'));
+            } else {
+                $('.checkboxDshotEdt').toggle(false);
+            }


Maybe just

Suggested change

if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) {

$('.checkboxDshotEdt').toggle(protocolConfigured && digitalProtocol && dshotBidirElement.is(':checked') && !$("input[name='ESC_SENSOR']").is(':checked'));

} else {

$('.checkboxDshotEdt').toggle(false);

}

$('.checkboxDshotEdt').toggle(protocolConfigured && digitalProtocol && dshotBidirElement.is(':checked') && !$("input[name='ESC_SENSOR']").is(':checked') && semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46));

ctzsnooze · 2023-12-04T23:16:06Z

Thanks for keeping active here. I look forward to testing this with a suitable bluejay version.
Would it be possible to include a link in the opening comment to a suitable ESC firmware to test with?

Added checkbox to activate edt Restore other translation files than the english one Added logic to handle DSHOT edt checkbox in motors tab. Bumped API_VERSION to 1.46. Added dshot_edt setting to MSP_MOTOR_CONFIG frame. Added dshot_edt setting to MSP_SET_MOTOR_CONFIG frame. Updated API_VERSION in generate_filename. Fixed features in motors tab. Added exclusive selection between ESC_SENSOR and EDT options. Fixed a bug Fixed review findings Removed unecessary imports Fixed review findings Fixed review findings Added debug mode to match edt_events Betaflight branch Fixed RPM_LIMIT debug mode name Small refactoring to be coherent to current code style

sonarcloud · 2023-12-13T14:46:24Z

Quality Gate failed

Failed conditions

4.3% Duplication on New Code (required ≤ 3%)

See analysis details on SonarCloud

github-actions · 2023-12-13T15:00:09Z

Do you want to test this code? Here you have an automated build:
Betaflight-Configurator-Android
Betaflight-Configurator-Linux
Betaflight-Configurator-macOS
Betaflight-Configurator-Windows
WARNING: It may be unstable and result in corrupted configurations or data loss. Use only for testing!

chmelevskij · 2023-12-13T20:57:50Z

src/js/tabs/motors.js

+                const dshotEdtElement = $('input[id="dshotEdt"]');
+
+                dshotEdtElement.prop('checked', FC.MOTOR_CONFIG.use_dshot_edt).trigger("change");
+                dshotEdtElement.on("change", function () {
+                    const value = dshotEdtElement.is(':checked');
+                    const newValue = (value !== FC.MOTOR_CONFIG.use_dshot_edt) ? 'On' : 'Off';
+
+                    self.analyticsChanges['DshotEdt'] = newValue;
+                    FC.MOTOR_CONFIG.use_dshot_edt = value;
+                });


Not sure about the code style here.

Better to use this or similar way to get the info about the actual order, sometimes things get weird with closures in js.

Also, not sure what triggering change event and then adding on handler does here 🤔

Something like the following is a bit more streamlined/usual in js land

Suggested change

const dshotEdtElement = $('input[id="dshotEdt"]');

dshotEdtElement.prop('checked', FC.MOTOR_CONFIG.use_dshot_edt).trigger("change");

dshotEdtElement.on("change", function () {

const value = dshotEdtElement.is(':checked');

const newValue = (value !== FC.MOTOR_CONFIG.use_dshot_edt) ? 'On' : 'Off';

self.analyticsChanges['DshotEdt'] = newValue;

FC.MOTOR_CONFIG.use_dshot_edt = value;

});

const dshotEditCheckbox = $('#dshotEdt');

dshotEditCheckbox.prop('checked', FC.MOTOR_CONFIG.use_dshot_edt)

.on("change", function () {

const isChecked = $(this).is(':checked');

const newValue = isChecked !== FC.MOTOR_CONFIG.use_dshot_edt ? 'On' : 'Off';

self.analyticsChanges['DshotEdt'] = newValue;

FC.MOTOR_CONFIG.use_dshot_edt = isChecked;

})

.trigger("change");

chmelevskij · 2023-12-13T20:59:43Z

src/tabs/motors.html

+                                    <div style="float: left; height: 20px; margin-right: 14px; margin-left: 3px;" class="checkboxDshotEdt">
+                                        <input type="checkbox" id="dshotEdt" class="toggle" />
+	                                    <span class="freelabel" id="dshotEdtLabel" i18n="configurationDshotEdt"></span>


Ooof, these floats look painful 🫠 But probably better for style consistency. More of a note to self/team 🙈

damosvil marked this pull request as draft January 21, 2023 01:02

damosvil force-pushed the edt_events branch from c62304f to d1bb24f Compare January 21, 2023 07:59

damosvil force-pushed the edt_events branch from d1bb24f to 17c1d82 Compare January 21, 2023 18:44

haslinghuis assigned damosvil Jan 21, 2023

haslinghuis added the RN: IMPROVEMENT label Jan 21, 2023

haslinghuis added this to the 10.10.0 milestone Jan 21, 2023

This comment has been minimized.

Sign in to view

damosvil force-pushed the edt_events branch 2 times, most recently from 7b5e4cf to cc01eec Compare January 22, 2023 21:06

chmelevskij reviewed Jan 23, 2023

View reviewed changes

McGiverGim reviewed Jan 24, 2023

View reviewed changes

damosvil mentioned this pull request Feb 1, 2023

Extended dshot telemetry data parsing and presentation betaflight/blackbox-log-viewer#625

Open

damosvil force-pushed the edt_events branch from cc01eec to f69924c Compare March 17, 2023 23:43

damosvil marked this pull request as ready for review March 17, 2023 23:44

damosvil requested review from McGiverGim, chmelevskij and haslinghuis and removed request for McGiverGim, chmelevskij and haslinghuis March 17, 2023 23:46

damosvil requested review from chmelevskij and McGiverGim November 26, 2023 10:03

This comment has been minimized.

Sign in to view

haslinghuis reviewed Nov 26, 2023

View reviewed changes

haslinghuis modified the milestones: 10.10.0, 11.0 Nov 28, 2023

damosvil force-pushed the edt_events branch from ff02f92 to 2deb5eb Compare December 4, 2023 21:41

haslinghuis added the Rebase Required label Dec 5, 2023

haslinghuis modified the milestones: 11.0, 10.10.0 Dec 5, 2023

damosvil force-pushed the edt_events branch from 2deb5eb to 217e6ac Compare December 5, 2023 18:10

haslinghuis removed the Rebase Required label Dec 5, 2023

haslinghuis approved these changes Dec 5, 2023

View reviewed changes

This comment has been minimized.

Sign in to view

haslinghuis modified the milestones: 10.10.0, 11.0 Dec 5, 2023

damosvil force-pushed the edt_events branch from 217e6ac to 6eb7409 Compare December 13, 2023 14:45

McGiverGim approved these changes Dec 13, 2023

View reviewed changes

chmelevskij reviewed Dec 13, 2023

View reviewed changes

chmelevskij approved these changes Dec 13, 2023

View reviewed changes

damosvil mentioned this pull request Jan 15, 2024

4.5 RC2 - ESC temps available but stuck at 0 on OSD betaflight/betaflight#13298

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added new DSHOT debug modes #3262

Added new DSHOT debug modes #3262

damosvil commented Jan 21, 2023 •

edited

McGiverGim commented Jan 21, 2023

damosvil commented Jan 21, 2023 •

edited

damosvil commented Jan 21, 2023 •

edited

McGiverGim commented Jan 21, 2023

damosvil commented Jan 21, 2023

This comment has been minimized.

sonarcloud bot commented Jan 22, 2023

chmelevskij Jan 23, 2023

McGiverGim Jan 23, 2023

chmelevskij Jan 23, 2023

damosvil Mar 18, 2023 •

edited

McGiverGim Jan 24, 2023

damosvil Jan 24, 2023 •

edited

haslinghuis Jan 24, 2023

McGiverGim Jan 24, 2023

haslinghuis Jan 24, 2023

haslinghuis Mar 18, 2023

damosvil Mar 18, 2023

damosvil commented Mar 17, 2023

This comment has been minimized.

haslinghuis Nov 26, 2023

damosvil Dec 4, 2023

ctzsnooze commented Dec 4, 2023 •

edited

This comment has been minimized.

sonarcloud bot commented Dec 13, 2023

github-actions bot commented Dec 13, 2023

chmelevskij Dec 13, 2023

chmelevskij Dec 13, 2023

feature	bit	group	name
0	0	rxMode	RX_PPM
1	2	other	INFLIGHT_ACC_CALL
2	3	rxMode	RX_SERIAL
3	4	escMotorStop	MOTOR_STOP
4	5	other	SERVO_TILT
5	6	other	SOFTSERIAL
6	7	gps	GPS
7	9	other	SONAR
8	10	telemetry	TELEMETRY
9	12	3D	3D
10	13	rxMode	RX_PARALLEL_PWM
11	14	rxMode	RX_MSP
12	15	rssi	RSSI_ADC
13	16	other	LED_STRIP
14	17	other	DISPLAY
15	18	other	OSD
16	20	other	CHANNEL_FORWARDING
17	21	other	TRANSPONDER
18	22	other	AIRMODE
19	25	rxMode	RX_SPI
20	27	escSensor	ESC_SENSOR
21	28	antiGravity	ANTI_GRAVITY

Added new DSHOT debug modes #3262

Are you sure you want to change the base?

Added new DSHOT debug modes #3262

Conversation

damosvil commented Jan 21, 2023 • edited

McGiverGim commented Jan 21, 2023

damosvil commented Jan 21, 2023 • edited

damosvil commented Jan 21, 2023 • edited

McGiverGim commented Jan 21, 2023

damosvil commented Jan 21, 2023

This comment has been minimized.

sonarcloud bot commented Jan 22, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

damosvil Mar 18, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

damosvil Jan 24, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

damosvil commented Mar 17, 2023

This comment has been minimized.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ctzsnooze commented Dec 4, 2023 • edited

This comment has been minimized.

sonarcloud bot commented Dec 13, 2023

Quality Gate failed

github-actions bot commented Dec 13, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

damosvil commented Jan 21, 2023 •

edited

damosvil commented Jan 21, 2023 •

edited

damosvil commented Jan 21, 2023 •

edited

damosvil Mar 18, 2023 •

edited

damosvil Jan 24, 2023 •

edited

ctzsnooze commented Dec 4, 2023 •

edited