Bug fixing / UI improvements

Author: mirkosertic

frontend/src/components/blockly/component.js

@@ -30,6 +30,7 @@ import {definition as lego_get_mode_dataset} from './lego_get_mode_dataset.js'
 import {definition as lego_select_mode} from './lego_select_mode.js'
 import {definition as gamepad_gamepad} from './mh_gamepad_gamepad.js'
 import {definition as gamepad_buttonpressed} from './mh_gamepad_buttonpressed.js'
+import {definition as gamepad_buttonsraw} from './mh_gamepad_buttonsraw.js'
 import {definition as gamepad_value} from './mh_gamepad_value.js'
 import {definition as gamepad_connected} from './mh_gamepad_connected.js'
 import {definition as mh_debug_millis} from './mh_debug_millis.js'
@@ -257,6 +258,8 @@ const customBlocks = {
 
 	"mh_gamepad_buttonpressed": gamepad_buttonpressed,
 
+	"mh_gamepad_buttonsraw": gamepad_buttonsraw,
+
 	"mh_gamepad_value": gamepad_value,
 
 	"mh_gamepad_connected": gamepad_connected,

frontend/src/components/blockly/mh_gamepad_buttonpressed.js

@@ -27,6 +27,21 @@ export const definition = {
 				"name" : "BUTTON",
 				"options" : [
 					[ "GAMEPAD_BUTTON_1", "GAMEPAD_BUTTON_1" ],
+					[ "GAMEPAD_BUTTON_1", "GAMEPAD_BUTTON_2" ],
+					[ "GAMEPAD_BUTTON_2", "GAMEPAD_BUTTON_3" ],
+					[ "GAMEPAD_BUTTON_4", "GAMEPAD_BUTTON_4" ],
+					[ "GAMEPAD_BUTTON_5", "GAMEPAD_BUTTON_5" ],
+					[ "GAMEPAD_BUTTON_6", "GAMEPAD_BUTTON_6" ],
+					[ "GAMEPAD_BUTTON_7", "GAMEPAD_BUTTON_7" ],
+					[ "GAMEPAD_BUTTON_8", "GAMEPAD_BUTTON_8" ],
+					[ "GAMEPAD_BUTTON_9", "GAMEPAD_BUTTON_9" ],
+					[ "GAMEPAD_BUTTON_10", "GAMEPAD_BUTTON_10" ],
+					[ "GAMEPAD_BUTTON_11", "GAMEPAD_BUTTON_11" ],
+					[ "GAMEPAD_BUTTON_12", "GAMEPAD_BUTTON_12" ],
+					[ "GAMEPAD_BUTTON_13", "GAMEPAD_BUTTON_13" ],
+					[ "GAMEPAD_BUTTON_14", "GAMEPAD_BUTTON_14" ],
+					[ "GAMEPAD_BUTTON_15", "GAMEPAD_BUTTON_15" ],
+					[ "GAMEPAD_BUTTON_16", "GAMEPAD_BUTTON_16" ],																																																																											
 				]
 			}
 		],

frontend/src/components/blockly/mh_gamepad_buttonsraw.js

@@ -0,0 +1,39 @@
+import {colorGamepad} from './colors.js'
+
+// clang-format off
+export const definition = {
+	category : 'Gamepad',
+	colour : colorGamepad,
+	inputsForToolbox: {
+		"GAMEPAD": {
+          "shadow": {
+            "type": "mh_gamepad_gamepad",
+            "fields": {
+              "GAMEPAD": "GAMEPAD1"
+            }
+          }
+		}
+	},
+	blockdefinition : {
+		"type" : "mh_gamepad_buttonsraw",
+		"message0" : "Gets the raw button values of %1",
+		"args0" : [
+			{
+				"type" : "input_value",
+				"name" : "GAMEPAD",
+			},
+		],
+		"output": null,
+		"colour" : colorGamepad,
+		"tooltip" : "Gets the raw button values of a Gamepad in as a 32bit integer",
+		"helpUrl" : ""
+	},
+	generator : (block, generator) => {
+		const gamepad = generator.valueToCode(block, 'GAMEPAD', 0);
+
+		const command = "gamepad.buttonsraw(" + gamepad + ")";
+
+		return [ command, 0 ];
+	}
+};
+// clang-format on

frontend/src/components/blockly/mh_gamepad_value.js

@@ -30,6 +30,7 @@ export const definition = {
 					["GAMEPAD_LEFT_Y", "GAMEPAD_LEFT_Y"],
 					["GAMEPAD_RIGHT_X", "GAMEPAD_RIGHT_X"],
 					["GAMEPAD_RIGHT_Y", "GAMEPAD_RIGHT_Y"],
+					["GAMEPAD_DPAD", "GAMEPAD_DPAD"],
 				]
 			}
 		],

frontend/src/components/files/component.html

@@ -23,8 +23,9 @@
             <div class="section-title">Create New Project</div>
             <div class="input-group">
                 <input type="text" id="newProjectName" placeholder="Enter project name...">
-                <button class="btn btn-primary" id="createbutton">Create</button>
+                <button class="btn btn-primary" id="createbutton" disabled>Create</button>
             </div>
+            <div class="validation-hint" id="validationHint"></div>
         </div>
 
         <div class="section">

frontend/src/components/files/component.js

@@ -7,6 +7,50 @@ class FilesHTMLElement extends HTMLElement {
 	selectedProject = undefined;
 	autostartProject = undefined;
 
+	/**
+	 * Validates project name and returns error message or empty string if valid.
+	 * Rules: not empty, no leading/trailing spaces, only alphanumeric and spaces allowed.
+	 */
+	validateProjectName(name) {
+		if (!name || name.length === 0) {
+			return 'Project name cannot be empty';
+		}
+		if (name.startsWith(' ')) {
+			return 'Project name cannot start with a space';
+		}
+		if (name.endsWith(' ')) {
+			return 'Project name cannot end with a space';
+		}
+		if (!/^[a-zA-Z0-9 ]+$/.test(name)) {
+			return 'Only letters, numbers, and spaces are allowed';
+		}
+		return '';
+	}
+
+	/**
+	 * Updates the validation UI based on input value.
+	 */
+	updateValidationUI() {
+		const input = this.shadowRoot.getElementById('newProjectName');
+		const hint = this.shadowRoot.getElementById('validationHint');
+		const createBtn = this.shadowRoot.getElementById('createbutton');
+		const value = input.value;
+
+		const error = this.validateProjectName(value);
+
+		if (error) {
+			input.classList.add('invalid');
+			hint.textContent = error;
+			hint.classList.add('visible');
+			createBtn.setAttribute('disabled', '');
+		} else {
+			input.classList.remove('invalid');
+			hint.textContent = '';
+			hint.classList.remove('visible');
+			createBtn.removeAttribute('disabled');
+		}
+	}
+
 	connectedCallback() {
 		const shadow = this.attachShadow({mode : 'open'})
 
@@ -77,9 +121,16 @@ class FilesHTMLElement extends HTMLElement {
 			this.openProject(this.selectedProject.name);
 		});
 
+		const newProjectInput = this.shadowRoot.getElementById("newProjectName");
+		newProjectInput.addEventListener("input", () => {
+			this.updateValidationUI();
+		});
+
 		this.shadowRoot.getElementById("createbutton").addEventListener("click", (event) => {
-			var project = this.shadowRoot.getElementById("newProjectName").value;
-			this.createProject(project);
+			var project = newProjectInput.value;
+			if (!this.validateProjectName(project)) {
+				this.createProject(project);
+			}
 		});
 
 		this.setAutoStartProject(this.autostartProject);

frontend/src/components/files/style.css

@@ -177,6 +177,29 @@ input[type="text"]:focus {
   border-color: var(--vscode-accent-blue);
 }
 
+input[type="text"].invalid {
+  border-color: var(--color-error);
+}
+
+input[type="text"].invalid:focus {
+  border-color: var(--color-error);
+}
+
+/* Validation Hint */
+.validation-hint {
+  font-size: var(--font-fixed-11);
+  color: var(--color-error);
+  min-height: 1.2em;
+  margin-top: calc(-1 * var(--spacing-sm));
+  padding-left: var(--spacing-xs);
+  opacity: 0;
+  transition: opacity var(--transition-fast);
+}
+
+.validation-hint.visible {
+  opacity: 1;
+}
+
 input[type="text"]::placeholder {
   color: var(--vscode-text-tertiary);
 }

frontend/src/index.js

@@ -602,8 +602,8 @@ async function initBLEConnection() {
 		btdevicelist.initialize();
 
 		bleClient.addEventListener(APP_EVENT_TYPE_LOG, (data) => {
-			const logEvent = JSON.parse(new TextDecoder().decode(data));
-			logger.addToLog(logEvent.message);
+			const message = new TextDecoder().decode(data);
+			logger.addToLog(message);
 		});
 
 		bleClient.addEventListener(APP_EVENT_TYPE_PORTSTATUS, (data) => {

lib/btremote/src/btremote.cpp

@@ -1079,11 +1079,7 @@ void BTRemote::publishLogMessages() {
 	String logMessage = loggingOutput_->waitForLogMessage(0);
 	while (logMessage.length() > 0) {
 		if (deviceConnected_ && readyForEvents_) {
-			std::vector<uint8_t> response;
-			createJsonResponse(response, [logMessage](JsonDocument &responseDoc) {
-				responseDoc["message"] = logMessage;
-			});
-
+			std::vector<uint8_t> response(logMessage.begin(), logMessage.end());
 			sendEvent(APP_EVENT_TYPE_LOG, response);
 		}
 

lib/megahub/include/megahub.h

@@ -34,12 +34,28 @@
 #define PINMODE_INPUT_PULLDOWN 3002
 #define PINMODE_OUTPUT		   3003
 
-#define GAMEPAD1		 4000
-#define GAMEPAD_BUTTON_1 5000
-#define GAMEPAD_LEFT_X	 6000
-#define GAMEPAD_LEFT_Y	 6001
-#define GAMEPAD_RIGHT_X	 6002
-#define GAMEPAD_RIGHT_Y	 6003
+#define GAMEPAD1		  4000
+#define GAMEPAD_BUTTON_1  5000
+#define GAMEPAD_BUTTON_2  5001
+#define GAMEPAD_BUTTON_3  5002
+#define GAMEPAD_BUTTON_4  5003
+#define GAMEPAD_BUTTON_5  5004
+#define GAMEPAD_BUTTON_6  5005
+#define GAMEPAD_BUTTON_7  5006
+#define GAMEPAD_BUTTON_8  5007
+#define GAMEPAD_BUTTON_9  5008
+#define GAMEPAD_BUTTON_10 5009
+#define GAMEPAD_BUTTON_11 5010
+#define GAMEPAD_BUTTON_12 5011
+#define GAMEPAD_BUTTON_13 5012
+#define GAMEPAD_BUTTON_14 5013
+#define GAMEPAD_BUTTON_15 5014
+#define GAMEPAD_BUTTON_16 5015
+#define GAMEPAD_LEFT_X	  6000
+#define GAMEPAD_LEFT_Y	  6001
+#define GAMEPAD_RIGHT_X	  6002
+#define GAMEPAD_RIGHT_Y	  6003
+#define GAMEPAD_DPAD	  6004
 
 #define YAW			   7000
 #define PITCH		   7001
@@ -82,7 +98,7 @@ class Megahub {
 	void registerThread(TaskHandle_t handle);
 	void stopRunningThreads();
 	void stopThread(TaskHandle_t handle);
-	
+
 private:
 	std::unique_ptr<InputDevices> inputdevices_;
 	std::unique_ptr<LegoDevice> device1_;