Added new features elements

asizon · Aug 11, 2020 · 5a76d4b · 5a76d4b
1 parent d0e3e94
commit 5a76d4b
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 20 deletions.
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -163,14 +163,20 @@
     "escPPMCenterThrottle": {
         "message": "PPM Center Throttle"
     },
-    "escAsync24khzPWMFrequency": {
-        "message": "24kHz Frecuency Options"
+    "escAsyncPWMFrequency": {
+        "message": "Async-PWM Frecuency"
     },
-    "escAsync48khzPWMFrequency": {
-        "message": "48kHz Frecuency Options"
+    "escSync24khzPWMFrequency": {
+        "message": "24kHz Sync-PWM + CE(Commutation Enhancement)"
     },
-    "escAsync96khzPWMFrequency": {
-        "message": "96kHz Frecuency Options"
+    "escSync48khzPWMFrequency": {
+        "message": "48kHz Sync-PWM + CE(Commutation Enhancement)"
+    },
+    "escSync96khzPWMFrequency": {
+        "message": "96kHz Sync-PWM + CE(Commutation Enhancement)"
+    },
+    "escSyncEscFfBrake": {
+        "message": "ESC Acceleration/Brake"
     },
     "escProgrammingByTX": {
         "message": "Programming by TX"

diff --git a/js/blheli_settings_description.js b/js/blheli_settings_description.js
@@ -3,9 +3,15 @@
 // layout 33, 16.3, 16.4, 16.5 16.9
 var BLHELI_S_SETTINGS_LAYOUT_33 = [
     {
-        name: 'PPM_MAX_THROTTLE', type: 'enum', label: 'escAsync24khzPWMFrequency',
+        name: 'PPM_MAX_THROTTLE', type: 'enum', label: 'escAsyncPWMFrequency',
         options: [
-            { value: '128', label: 'Async-PWM' }, { value: '129', label: '3%CE' }, { value: '130', label: '6%CE' }, { value: '131', label: '9%CE' },
+            { value: '', label: 'OFF' }, { value: '128', label: '24kHz' }, { value: '160', label: '48kHz' }, { value: '192', label: '96kHz' }
+        ]
+    },
+    {
+        name: 'PPM_MAX_THROTTLE', type: 'enum', label: 'escSync24khzPWMFrequency',
+        options: [
+            { value: '', label: 'OFF' }, { value: '129', label: '3%CE' }, { value: '130', label: '6%CE' }, { value: '131', label: '9%CE' },
             { value: '132', label: '12%CE' }, { value: '133', label: '15%CE' }, { value: '134', label: '18%CE' }, { value: '135', label: '21%CE' },, { value: '136', label: '24%CE' },
             { value: '137', label: '27%CE' }, { value: '138', label: '30%CE' }, { value: '139', label: '33%CE' }, { value: '140', label: '37%CE' },, { value: '141', label: '40%CE' },
             { value: '142', label: '44%CE' }, { value: '143', label: '47%CE' }, { value: '144', label: '50%CE' }, { value: '145', label: '53%CE' },, { value: '146', label: '56%CE' },
@@ -15,9 +21,9 @@ var BLHELI_S_SETTINGS_LAYOUT_33 = [
         ]
     },
     {
-        name: 'PPM_MAX_THROTTLE', type: 'enum', label: 'escAsync48khzPWMFrequency',
+        name: 'PPM_MAX_THROTTLE', type: 'enum', label: 'escSync48khzPWMFrequency',
         options: [
-            { value: '128', label: 'OFF' }, { value: '160', label: 'Async-PWM' }, { value: '161', label: '3%CE' }, { value: '162', label: '6%CE' }, { value: '163', label: '9%CE' },
+            { value: '', label: 'OFF' }, { value: '161', label: '3%CE' }, { value: '162', label: '6%CE' }, { value: '163', label: '9%CE' },
             { value: '164', label: '12%CE' }, { value: '165', label: '15%CE' }, { value: '166', label: '18%CE' }, { value: '167', label: '21%CE' },, { value: '168', label: '24%CE' },
             { value: '169', label: '27%CE' }, { value: '170', label: '30%CE' }, { value: '171', label: '33%CE' }, { value: '172', label: '37%CE' },, { value: '173', label: '40%CE' },
             { value: '174', label: '44%CE' }, { value: '175', label: '47%CE' }, { value: '176', label: '50%CE' }, { value: '177', label: '53%CE' },, { value: '178', label: '56%CE' },
@@ -27,9 +33,9 @@ var BLHELI_S_SETTINGS_LAYOUT_33 = [
         ]
     },
     {
-        name: 'PPM_MAX_THROTTLE', type: 'enum', label: 'escAsync96khzPWMFrequency',
+        name: 'PPM_MAX_THROTTLE', type: 'enum', label: 'escSync96khzPWMFrequency',
         options: [
-            { value: '128', label: 'OFF' }, { value: '192', label: 'Async-PWM' }, { value: '193', label: '3%CE' }, { value: '194', label: '6%CE' }, { value: '195', label: '9%CE' },
+            { value: '', label: 'OFF' }, { value: '193', label: '3%CE' }, { value: '194', label: '6%CE' }, { value: '195', label: '9%CE' },
             { value: '196', label: '12%CE' }, { value: '197', label: '15%CE' }, { value: '198', label: '18%CE' }, { value: '199', label: '21%CE' },, { value: '200', label: '24%CE' },
             { value: '201', label: '27%CE' }, { value: '202', label: '30%CE' }, { value: '203', label: '33%CE' }, { value: '204', label: '37%CE' },, { value: '205', label: '40%CE' },
             { value: '206', label: '44%CE' }, { value: '207', label: '47%CE' }, { value: '208', label: '50%CE' }, { value: '209', label: '53%CE' },, { value: '210', label: '56%CE' },
@@ -38,6 +44,19 @@ var BLHELI_S_SETTINGS_LAYOUT_33 = [
             { value: '221', label: '90%CE' }, { value: '222', label: '95%CE' }, { value: '223', label: '100%CE' }
         ]
     },
+    {
+        name: 'PPM_MIN_THROTTLE', type: 'enum', label: 'escSyncEscFFBrake',
+        options: [
+            { value: '37', label: 'OFF' }, { value: '20', label: 'Low/Normal-Brake(25%)' }, { value: '21', label: 'Low/Normal-Brake(50%)' }, { value: '22', label: 'Low/Normal-Brake(75%)' },
+            { value: '23', label: 'Low/Normal-Brake(100%)' }, { value: '24', label: 'Low/Double-Brake(25%)' }, { value: '25', label: 'Low/Double-Brake(50%)' }, { value: '26', label: 'Low/Double-Brake(75%)' },
+            { value: '27', label: 'Low/Double-Brake(100%)' }, { value: '30', label: 'Medium/Normal-Brake(25%)' }, { value: '31', label: 'Medium/Normal-Brake(50%)' }, { value: '32', label: 'Medium/Normal-Brake(75%)' },
+            { value: '33', label: 'Medium/Normal-Brake(100%)' }, { value: '34', label: 'Medium/Double-Brake(50%)' }, { value: '35', label: 'Medium/Double-Brake(75%)' }, { value: '36', label: 'Medium/Double-Brake(100%)' },
+            { value: '40', label: 'Medium-High/Normal-Brake(25%)' }, { value: '41', label: 'Medium-High/Normal-Brake(50%)' }, { value: '42', label: 'Medium-High/Normal-Brake(75%)' }, { value: '43', label: 'Medium-High/Normal-Brake(100%)' },
+            { value: '44', label: 'Medium-High/Double-Brake(25%)' }, { value: '45', label: 'Medium-High/Double-Brake(50%)' }, { value: '46', label: 'Medium-High/Double-Brake(75%)' }, { value: '47', label: 'Medium-High/Double-Brake(100%)' },
+            { value: '50', label: 'High/Normal-Brake(25%)' }, { value: '51', label: 'High/Normal-Brake(50%)' }, { value: '52', label: 'High/Normal-Brake(75%)' }, { value: '53', label: 'High/Normal-Brake(100%)' },
+            { value: '54', label: 'High/Double-Brake(25%)' }, { value: '55', label: 'High/Double-Brake(50%)' }, { value: '56', label: 'High/Double-Brake(75%)' }, { value: '57', label: 'High/Double-Brake(100%)' }
+        ]
+    },
     {
         name: 'PROGRAMMING_BY_TX', type: 'bool', label: 'escProgrammingByTX'
     },
@@ -603,9 +622,15 @@ var BLHELI_S_INDIVIDUAL_SETTINGS = [
         ]
     },
     {
-        name: 'PPM_MAX_THROTTLE', type: 'enum', label: 'escAsync24khzPWMFrequency',
+        name: 'PPM_MAX_THROTTLE', type: 'enum', label: 'escAsyncPWMFrequency',
         options: [
-            { value: '128', label: 'Async-PWM' }, { value: '129', label: '3%CE' }, { value: '130', label: '6%CE' }, { value: '131', label: '9%CE' },
+            { value: '', label: 'OFF' }, { value: '128', label: '24kHz' }, { value: '160', label: '48kHz' }, { value: '192', label: '96kHz' }
+        ]
+    },
+    {
+        name: 'PPM_MAX_THROTTLE', type: 'enum', label: 'escSync24khzPWMFrequency',
+        options: [
+            { value: '', label: 'OFF' }, { value: '129', label: '3%CE' }, { value: '130', label: '6%CE' }, { value: '131', label: '9%CE' },
             { value: '132', label: '12%CE' }, { value: '133', label: '15%CE' }, { value: '134', label: '18%CE' }, { value: '135', label: '21%CE' },, { value: '136', label: '24%CE' },
             { value: '137', label: '27%CE' }, { value: '138', label: '30%CE' }, { value: '139', label: '33%CE' }, { value: '140', label: '37%CE' },, { value: '141', label: '40%CE' },
             { value: '142', label: '44%CE' }, { value: '143', label: '47%CE' }, { value: '144', label: '50%CE' }, { value: '145', label: '53%CE' },, { value: '146', label: '56%CE' },
@@ -615,9 +640,9 @@ var BLHELI_S_INDIVIDUAL_SETTINGS = [
         ]
     },
     {
-        name: 'PPM_MAX_THROTTLE', type: 'enum', label: 'escAsync48khzPWMFrequency',
+        name: 'PPM_MAX_THROTTLE', type: 'enum', label: 'escSync48khzPWMFrequency',
         options: [
-            { value: '128', label: 'OFF' }, { value: '160', label: 'Async-PWM' }, { value: '161', label: '3%CE' }, { value: '162', label: '6%CE' }, { value: '163', label: '9%CE' },
+            { value: '', label: 'OFF' }, { value: '161', label: '3%CE' }, { value: '162', label: '6%CE' }, { value: '163', label: '9%CE' },
             { value: '164', label: '12%CE' }, { value: '165', label: '15%CE' }, { value: '166', label: '18%CE' }, { value: '167', label: '21%CE' },, { value: '168', label: '24%CE' },
             { value: '169', label: '27%CE' }, { value: '170', label: '30%CE' }, { value: '171', label: '33%CE' }, { value: '172', label: '37%CE' },, { value: '173', label: '40%CE' },
             { value: '174', label: '44%CE' }, { value: '175', label: '47%CE' }, { value: '176', label: '50%CE' }, { value: '177', label: '53%CE' },, { value: '178', label: '56%CE' },
@@ -627,16 +652,29 @@ var BLHELI_S_INDIVIDUAL_SETTINGS = [
         ]
     },
     {
-        name: 'PPM_MAX_THROTTLE', type: 'enum', label: 'escAsync96khzPWMFrequency',
+        name: 'PPM_MAX_THROTTLE', type: 'enum', label: 'escSync96khzPWMFrequency',
         options: [
-            { value: '128', label: 'OFF' }, { value: '192', label: 'Async-PWM' }, { value: '193', label: '3%CE' }, { value: '194', label: '6%CE' }, { value: '195', label: '9%CE' },
+            { value: '', label: 'OFF' }, { value: '193', label: '3%CE' }, { value: '194', label: '6%CE' }, { value: '195', label: '9%CE' },
             { value: '196', label: '12%CE' }, { value: '197', label: '15%CE' }, { value: '198', label: '18%CE' }, { value: '199', label: '21%CE' },, { value: '200', label: '24%CE' },
             { value: '201', label: '27%CE' }, { value: '202', label: '30%CE' }, { value: '203', label: '33%CE' }, { value: '204', label: '37%CE' },, { value: '205', label: '40%CE' },
             { value: '206', label: '44%CE' }, { value: '207', label: '47%CE' }, { value: '208', label: '50%CE' }, { value: '209', label: '53%CE' },, { value: '210', label: '56%CE' },
             { value: '211', label: '59%CE' }, { value: '212', label: '62%CE' }, { value: '213', label: '65%CE' }, { value: '214', label: '68%CE' },, { value: '215', label: '71%CE' },
             { value: '216', label: '74%CE' }, { value: '217', label: '77%CE' }, { value: '218', label: '80%CE' }, { value: '219', label: '83%CE' },, { value: '220', label: '86%CE' },
             { value: '221', label: '90%CE' }, { value: '222', label: '95%CE' }, { value: '223', label: '100%CE' }
         ]
+    },
+    {
+        name: 'PPM_MIN_THROTTLE', type: 'enum', label: 'escSyncEscFFBrake',
+        options: [
+            { value: '37', label: 'OFF' }, { value: '20', label: 'Low/Normal-Brake(25%)' }, { value: '21', label: 'Low/Normal-Brake(50%)' }, { value: '22', label: 'Low/Normal-Brake(75%)' },
+            { value: '23', label: 'Low/Normal-Brake(100%)' }, { value: '24', label: 'Low/Double-Brake(25%)' }, { value: '25', label: 'Low/Double-Brake(50%)' }, { value: '26', label: 'Low/Double-Brake(75%)' },
+            { value: '27', label: 'Low/Double-Brake(100%)' }, { value: '30', label: 'Medium/Normal-Brake(25%)' }, { value: '31', label: 'Medium/Normal-Brake(50%)' }, { value: '32', label: 'Medium/Normal-Brake(75%)' },
+            { value: '33', label: 'Medium/Normal-Brake(100%)' }, { value: '34', label: 'Medium/Double-Brake(50%)' }, { value: '35', label: 'Medium/Double-Brake(75%)' }, { value: '36', label: 'Medium/Double-Brake(100%)' },
+            { value: '40', label: 'Medium-High/Normal-Brake(25%)' }, { value: '41', label: 'Medium-High/Normal-Brake(50%)' }, { value: '42', label: 'Medium-High/Normal-Brake(75%)' }, { value: '43', label: 'Medium-High/Normal-Brake(100%)' },
+            { value: '44', label: 'Medium-High/Double-Brake(25%)' }, { value: '45', label: 'Medium-High/Double-Brake(50%)' }, { value: '46', label: 'Medium-High/Double-Brake(75%)' }, { value: '47', label: 'Medium-High/Double-Brake(100%)' },
+            { value: '50', label: 'High/Normal-Brake(25%)' }, { value: '51', label: 'High/Normal-Brake(50%)' }, { value: '52', label: 'High/Normal-Brake(75%)' }, { value: '53', label: 'High/Normal-Brake(100%)' },
+            { value: '54', label: 'High/Double-Brake(25%)' }, { value: '55', label: 'High/Double-Brake(50%)' }, { value: '56', label: 'High/Double-Brake(75%)' }, { value: '57', label: 'High/Double-Brake(100%)' }
+        ]
     }
 ];
 

diff --git a/jsx/base_components.jsx b/jsx/base_components.jsx
@@ -31,7 +31,6 @@ var Select = React.createClass({
                         value={this.props.notInSync ? -1 : this.props.value}
                         onChange={this.handleChange}
                     >
-                        <option className="hidden" disabled selected value="-1" />
                         {
                             this.props.options.map(option => <option value={option.value}>{option.label}</option>)
                         }

diff --git a/jsx/blheli_configurator.jsx b/jsx/blheli_configurator.jsx
@@ -362,8 +362,8 @@ var Configurator = React.createClass({
             var allSettings = self.state.escSettings.slice();
             allSettings[escIndex] = newSettings;
             self.onUserInput(allSettings);
-			this.resetPWMFrecuency(escIndex);
 
+            this.resetPWMFrecuency(escIndex);
             GUI.log(chrome.i18n.getMessage('writeSetupStarted'));
 
             try {