Convert battery icon to vue component #2726

chmelevskij · 2021-12-31T14:51:48Z

Convert battery icon logic to self contained vue component.

sonarcloud · 2021-12-31T14:53:23Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication

chmelevskij · 2022-01-03T06:38:48Z

Seems to be working, just need to fix one little issue where is shows it's empty battery when connected to usb (might be issue which was there before as well, but need to do some manual verification)

McGiverGim · 2022-02-03T11:05:26Z

src/components/quad-status/BatteryIcon.vue

+  </div>
+</template>
+<script>
+const NO_BATTERY_VOLTAGE_MAXIMUM = 1.8; // Maybe is better to add a call to MSP_BATTERY_STATE but is not available for all versions


Only as suggestion... now that you have refactored it... maybe we can get rid of this, now that the code is clean...

We need to call this MSP:

betaflight-configurator/src/js/msp/MSPHelper.js

Lines 307 to 318 in d0d3141

case MSPCodes.MSP_BATTERY_STATE:

FC.BATTERY_STATE.cellCount = data.readU8();

FC.BATTERY_STATE.capacity = data.readU16(); // mAh

FC.BATTERY_STATE.voltage = data.readU8() / 10.0; // V

FC.BATTERY_STATE.mAhDrawn = data.readU16(); // mAh

FC.BATTERY_STATE.amperage = data.readU16() / 100; // A

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

FC.BATTERY_STATE.batteryState = data.readU8();

FC.BATTERY_STATE.voltage = data.readU16() / 100;

}

break;

and pass the FC.BATTERY_STATE.batteryState to the component. The value will be:

https://github.com/betaflight/betaflight/blob/025ee87a7aca068e3659fd066b8a9afbed123361/src/main/sensors/battery.h#L84-L90

It can be null or undefined (I'm not too sure) if the firmware is old, in this case we need to use the same code than now.

Will grab a look at it 😉 thanks for suggestion

Configurator now only supports >= API_VERSION_1_42

sonarcloud · 2022-05-08T16:21:27Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication

src/components/quad-status/BatteryIcon.vue

chmelevskij · 2022-12-30T19:27:06Z

src/css/theme.css

+/**
+ * Main theme colors
+ * This file is left as css on purpose to make it easier to work without
+ * the need to compile the less files and still can be use in storybook
+ */
+:root {
+    --accent: #ffbb00;
+    --error: red;
+    --subtleAccent: silver;
+    --quietText: #ffffff;
+    --quietHeader: #828885;
+    --defaultText: #000000;
+    --subtleText: #c0c0c0;
+    --mutedText: #616161;
+    --linkText: #2e2ebb;
+    --boxBackground: #ffffff;
+    --alternativeBackground: #f9f9f9;
+    --sideBackground: #ffffff;
+    --ledAccent: #adadad;
+    --ledBackground: #e9e9e9;
+    --gimbalBackground: #eee;
+    --gimbalCrosshair: var(--subtleAccent);
+    --switcherysecond: #c4c4c4;
+    --pushedButton-background: #c4c4c4;
+    --pushedButton-fontColor: #000000;
+    --hoverButton-background: #ffcc3e;
+    --superSubtleAccent: #cccccc;
+    --accentBorder: #ffbb00;
+}


Moving out for better visibility and easier usage with no less.

blckmn · 2022-12-30T21:17:05Z

AUTOMERGE: (FAIL)

github identifies PR as mergeable -> FAIL
assigned to a milestone -> PASS
cooling off period lapsed -> PASS
commit count less or equal to three -> PASS
Don't merge label NOT found -> PASS
at least one RN: label found -> PASS
Tested label found -> PASS
assigned to an approver -> PASS
approver count at least three -> FAIL

haslinghuis · 2022-12-30T21:56:21Z

Testing now but Configurator does not start?

chmelevskij · 2022-12-31T07:41:35Z

@haslinghuis fixed now

src/components/quad-status/BatteryIcon.vue

sonarcloud · 2022-12-31T17:36:27Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
2 Code Smells

No Coverage information
0.0% Duplication

github-actions · 2022-12-31T17:42:40Z

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 changed the title ~~Feat/quad status vue~~ Convert battery icon to vue component Dec 31, 2021

chmelevskij marked this pull request as draft December 31, 2021 15:29

This comment has been minimized.

Sign in to view

github-actions bot added the Inactive label Feb 3, 2022

chmelevskij added Pinned and removed Inactive labels Feb 3, 2022

McGiverGim reviewed Feb 3, 2022

View reviewed changes

chmelevskij force-pushed the feat/quad-status-vue branch from 1938686 to b0ea89d Compare May 8, 2022 07:25

This comment has been minimized.

Sign in to view

chmelevskij force-pushed the feat/quad-status-vue branch from b0ea89d to c5811f8 Compare May 8, 2022 16:19

This comment has been minimized.

Sign in to view

haslinghuis assigned chmelevskij May 26, 2022

feat: use vue battery icon

277686c

chmelevskij force-pushed the feat/quad-status-vue branch from c5811f8 to 277686c Compare December 30, 2022 16:21

This comment has been minimized.

Sign in to view

Add battery icon stories

3dee924

This comment has been minimized.

Sign in to view

chmelevskij marked this pull request as ready for review December 30, 2022 19:25

chmelevskij commented Dec 30, 2022

View reviewed changes

src/components/quad-status/BatteryIcon.vue Show resolved Hide resolved

chmelevskij commented Dec 30, 2022

View reviewed changes

haslinghuis added this to the 10.9.0 milestone Dec 30, 2022

haslinghuis added RN: UI and removed Pinned labels Dec 30, 2022

This comment has been minimized.

Sign in to view

chmelevskij force-pushed the feat/quad-status-vue branch from 8b5c70f to c79676c Compare December 31, 2022 07:40

This comment has been minimized.

Sign in to view

haslinghuis reviewed Dec 31, 2022

View reviewed changes

src/components/quad-status/BatteryIcon.vue Outdated Show resolved Hide resolved

feat: use battery state if available

46e26da

chmelevskij force-pushed the feat/quad-status-vue branch from c79676c to 46e26da Compare December 31, 2022 17:33

haslinghuis approved these changes Dec 31, 2022

View reviewed changes

haslinghuis requested a review from klutvott123 January 5, 2023 02:00

haslinghuis added the Tested label Jan 5, 2023

haslinghuis requested a review from blckmn January 6, 2023 21:11

blckmn approved these changes Jan 6, 2023

View reviewed changes

blckmn merged commit e0209c6 into betaflight:master Jan 6, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Convert battery icon to vue component #2726

Convert battery icon to vue component #2726

chmelevskij commented Dec 31, 2021 •

edited

Loading

sonarcloud bot commented Dec 31, 2021

chmelevskij commented Jan 3, 2022

This comment has been minimized.

McGiverGim Feb 3, 2022

chmelevskij Feb 4, 2022

haslinghuis Dec 31, 2022

This comment has been minimized.

sonarcloud bot commented May 8, 2022

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

chmelevskij Dec 30, 2022

This comment has been minimized.

blckmn commented Dec 30, 2022 •

edited

Loading

haslinghuis commented Dec 30, 2022

chmelevskij commented Dec 31, 2022

This comment has been minimized.

sonarcloud bot commented Dec 31, 2022

github-actions bot commented Dec 31, 2022

	case MSPCodes.MSP_BATTERY_STATE:
	FC.BATTERY_STATE.cellCount = data.readU8();
	FC.BATTERY_STATE.capacity = data.readU16(); // mAh

	FC.BATTERY_STATE.voltage = data.readU8() / 10.0; // V
	FC.BATTERY_STATE.mAhDrawn = data.readU16(); // mAh
	FC.BATTERY_STATE.amperage = data.readU16() / 100; // A
	if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_41)) {
	FC.BATTERY_STATE.batteryState = data.readU8();
	FC.BATTERY_STATE.voltage = data.readU16() / 100;
	}
	break;

Convert battery icon to vue component #2726

Convert battery icon to vue component #2726

Conversation

chmelevskij commented Dec 31, 2021 • edited Loading

sonarcloud bot commented Dec 31, 2021

chmelevskij commented Jan 3, 2022

This comment has been minimized.

McGiverGim Feb 3, 2022

Choose a reason for hiding this comment

chmelevskij Feb 4, 2022

Choose a reason for hiding this comment

haslinghuis Dec 31, 2022

Choose a reason for hiding this comment

This comment has been minimized.

sonarcloud bot commented May 8, 2022

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

chmelevskij Dec 30, 2022

Choose a reason for hiding this comment

This comment has been minimized.

blckmn commented Dec 30, 2022 • edited Loading

haslinghuis commented Dec 30, 2022

chmelevskij commented Dec 31, 2022

This comment has been minimized.

sonarcloud bot commented Dec 31, 2022

github-actions bot commented Dec 31, 2022

chmelevskij commented Dec 31, 2021 •

edited

Loading

blckmn commented Dec 30, 2022 •

edited

Loading