Skip to content

Commit c47bb0d

Browse files
mirkoserticmirkosertic
committed
UI Optimizations / Unified IMU interactions
1 parent 2692642 commit c47bb0d

27 files changed

Lines changed: 1238 additions & 348 deletions

‎frontend/index.html‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,18 @@
2020
</div>
2121
<custom-blockly id="blockly" class="layout-content dynamicvisibility visible-editor"></custom-blockly>
2222
<div class="layout-sidebar">
23-
<button class="btn btn-success reset dynamicvisibility visible-editor" id="reset">Reset
24-
workspace</button>
25-
<button class="btn btn-success btn syntaxcheck dynamicvisibility visible-editor" id="syntaxcheck">Syntax
26-
check</button>
27-
<button class="btn btn-primary execute dynamicvisibility visible-editor" id="execute">Execute!</button>
28-
<button class="btn btn-success stop dynamicvisibility visible-editor" id="stop">Stop!</button>
29-
<custom-lua-preview id="luapreview" class="dynamicvisibility visible-editor"></custom-lua-preview>
30-
<custom-portstatus id="portstatus"
31-
class="dynamicvisibility visible-management visible-editor"></custom-portstatus>
32-
<custom-btdevicelist id="btdevicelist" class="dynamicvisibility visible-management visible-editor"></custom-btdevicelist>
33-
<custom-ui id="uicomponents" class="dynamicvisibility visible-editor visible-management"></custom-ui>
23+
<div class="sidebar-buttons dynamicvisibility visible-editor">
24+
<button class="btn btn-success reset" id="reset">Reset workspace</button>
25+
<button class="btn btn-success btn syntaxcheck" id="syntaxcheck">Syntax check</button>
26+
<button class="btn btn-primary execute" id="execute">Execute!</button>
27+
<button class="btn btn-success stop" id="stop">Stop!</button>
28+
</div>
29+
<div class="sidebar-accordion" id="sidebarAccordion">
30+
<custom-lua-preview id="luapreview" class="dynamicvisibility visible-editor" data-accordion-panel></custom-lua-preview>
31+
<custom-portstatus id="portstatus" class="dynamicvisibility visible-management visible-editor" data-accordion-panel></custom-portstatus>
32+
<custom-ui id="uicomponents" class="dynamicvisibility visible-editor visible-management" data-accordion-panel></custom-ui>
33+
<custom-btdevicelist id="btdevicelist" class="dynamicvisibility visible-management visible-editor" data-accordion-panel></custom-btdevicelist>
34+
</div>
3435
</div>
3536
<custom-logger id="logger" class="layout-footer"></custom-logger>
3637
</div>

‎frontend/src/components/blockly/component.js‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@ import {definition as mh_fastled_addleds} from './mh_fastled_addleds.js'
2121
import {definition as mh_fastled_show} from './mh_fastled_show.js'
2222
import {definition as mh_fastled_clear} from './mh_fastled_clear.js'
2323
import {definition as mh_fastled_set} from './mh_fastled_set.js'
24-
import {definition as mh_imu_yaw} from './mh_imu_yaw.js'
25-
import {definition as mh_imu_pitch} from './mh_imu_pitch.js'
26-
import {definition as mh_imu_roll} from './mh_imu_roll.js'
27-
import {definition as mh_imu_acceleration_x} from './mh_imu_acceleration_x.js'
28-
import {definition as mh_imu_acceleration_y} from './mh_imu_acceleration_y.js'
29-
import {definition as mh_imu_acceleration_z} from './mh_imu_acceleration_z.js'
24+
import {definition as mh_imu_value} from './mh_imu_value.js'
3025
import {definition as ui_show_value} from './ui_show_value.js'
3126
import {definition as mh_debug_free_heap} from './mh_debug_free_heap.js'
3227
import {definition as lego_get_mode_dataset} from './lego_get_mode_dataset.js'
@@ -274,18 +269,8 @@ const customBlocks = {
274269

275270
"mh_fastled_set" : mh_fastled_set,
276271

277-
"mh_imu_yaw": mh_imu_yaw,
272+
"mh_imu_value": mh_imu_value,
278273

279-
"mh_imu_pitch": mh_imu_pitch,
280-
281-
"mh_imu_roll": mh_imu_roll,
282-
283-
"mh_imu_acceleration_x": mh_imu_acceleration_x,
284-
285-
"mh_imu_acceleration_y": mh_imu_acceleration_y,
286-
287-
"mh_imu_acceleration_z" : mh_imu_acceleration_z,
288-
289274
"ui_show_value" : ui_show_value,
290275

291276
"mh_debug_free_heap": mh_debug_free_heap,

‎frontend/src/components/blockly/mh_gamepad_value.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export const definition = {
2222
["GAMEPAD_LEFT_X", "GAMEPAD_LEFT_X"],
2323
["GAMEPAD_LEFT_Y", "GAMEPAD_LEFT_Y"],
2424
["GAMEPAD_RIGHT_X", "GAMEPAD_RIGHT_X"],
25-
[ "GAMEPAD_RIGHT_Y", "GAMEPAD_RIGHT_Y" ],
25+
["GAMEPAD_RIGHT_Y", "GAMEPAD_RIGHT_Y"],
2626
]
2727
}
2828
],

‎frontend/src/components/blockly/mh_imu_acceleration_x.js‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎frontend/src/components/blockly/mh_imu_acceleration_y.js‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎frontend/src/components/blockly/mh_imu_acceleration_z.js‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎frontend/src/components/blockly/mh_imu_pitch.js‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎frontend/src/components/blockly/mh_imu_roll.js‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎frontend/src/components/blockly/mh_imu_value.js‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
import {colorIMU} from './colors.js'
2+
3+
// clang-format off
4+
export const definition = {
5+
category : 'IMU',
6+
colour : colorIMU,
7+
blockdefinition : {
8+
"type" : "mh_imu_value",
9+
"message0" : "Get %1 from IMU",
10+
"args0" : [
11+
{
12+
"type" : "field_dropdown",
13+
"name" : "VALUE",
14+
"options" : [
15+
["YAW", "YAW"],
16+
["PITCH", "PITCH"],
17+
["ROLL", "ROLL"],
18+
["ACCELERATION_X", "ACCELERATION_X" ],
19+
["ACCELERATION_Y", "ACCELERATION_Y"],
20+
["ACCELERATION_Z", "ACCELERATION_Z" ],
21+
]
22+
}
23+
],
24+
"output" : null,
25+
"colour" : colorIMU,
26+
"tooltip" : "Gets a value from the IMU",
27+
"helpUrl" : ""
28+
},
29+
generator : (block, generator) => {
30+
const value = block.getFieldValue('VALUE');
31+
const command = "imu.value(" + value + ")";
32+
return [ command, 0 ];
33+
}
34+
};
35+
// clang-format on

‎frontend/src/components/btdevicelist/component.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<div class="bt-devices-container">
2-
<div class="bt-devices-header" id="headerToggle">
3-
<h3 class="bt-devices-title">Bluetooth Devices</h3>
1+
<div class="bt-devices-container collapsed">
2+
<div class="collapsible-header" id="headerToggle">
3+
<h3 class="collapsible-header-title">Bluetooth Devices</h3>
44
<div class="header-right">
55
<button id="startdiscovery" class="discovery-btn" title="Start Bluetooth Discovery">
66
<svg width="14" height="14" viewBox="0 0 16 16" fill="currentColor">
@@ -12,12 +12,12 @@ <h3 class="bt-devices-title">Bluetooth Devices</h3>
1212
<span class="discovery-indicator" id="discoveryIndicator"></span>
1313
<span class="discovery-text" id="discoveryText">Scanning...</span>
1414
</div>
15-
<button class="collapse-toggle" id="collapseToggle" aria-label="Toggle device list">
16-
<span class="collapse-icon">▼</span>
15+
<button class="collapsible-toggle" id="collapseToggle" aria-label="Toggle device list">
16+
<span class="collapsible-icon">▼</span>
1717
</button>
1818
</div>
1919
</div>
20-
<div class="bt-devices-content" id="devicesContent">
20+
<div class="collapsible-content" id="devicesContent">
2121
<div class="bt-devices-list" id="devicesList"></div>
2222
<div class="no-devices" id="noDevices">No devices discovered yet.</div>
2323
</div>

0 commit comments

Comments
 (0)