Working on BT/BLE API

Author: mirkosertic

frontend/src/components/blockly/colors.js

@@ -5,7 +5,8 @@ export const colorText = 80;
 export const colorLists = 100;
 export const colorIO = 120;
 export const colorLego = 140;
-export const colorFastLED = 160;
-export const colorIMU = 180;
-export const colorUI = 200;
-export const colorDebug = 220;
+export const colorGamepad = 160;
+export const colorFastLED = 180;
+export const colorIMU = 200;
+export const colorUI = 220;
+export const colorDebug = 240;

frontend/src/components/blockly/component.js

@@ -31,6 +31,9 @@ import {definition as ui_show_value} from './ui_show_value.js'
 import {definition as mh_debug_free_heap} from './mh_debug_free_heap.js'
 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_buttonpressed} from './mh_gamepad_buttonpressed.js'
+import {definition as gamepad_value} from './mh_gamepad_value.js'
+import {definition as gamepad_connected} from './mh_gamepad_connected.js'
 
 import {colorLogic,
 	colorMath,
@@ -251,7 +254,13 @@ const customBlocks = {
 
 	"mh_digitalread": mh_digitalread,
 
-	"mh_set_motor_speed" : mh_set_motor_speed,
+	"mh_set_motor_speed": mh_set_motor_speed,
+	
+	"mh_gamepad_buttonpressed": gamepad_buttonpressed,
+
+	"mh_gamepad_value": gamepad_value,
+
+	"mh_gamepad_connected": gamepad_connected,
 
 	"lego_get_mode_dataset": lego_get_mode_dataset,
 

frontend/src/components/blockly/mh_gamepad_buttonpressed.js

@@ -0,0 +1,40 @@
+import {colorGamepad} from './colors.js'
+
+// clang-format off
+export const definition = {
+	category : 'Gamepad',
+	colour : colorGamepad,
+	blockdefinition : {
+		"type" : "mh_gamepad_buttonpressed",
+		"message0" : "Checks if %2 is pressed on %1",
+		"args0" : [
+			{
+				"type" : "field_dropdown",
+				"name" : "GAMEPAD",
+				"options" : [
+					[ "GAMEPAD1", "GAMEPAD1" ],
+				]
+			},
+			{
+				"type" : "field_dropdown",
+				"name" : "BUTTON",
+				"options" : [
+					[ "GAMEPAD_BUTTON_1", "GAMEPAD_BUTTON_1" ],
+				]
+			}
+		],
+		"output": null,
+		"colour" : colorGamepad,
+		"tooltip" : "Checks if a specific button is pressed on a connected gamepad",
+		"helpUrl" : ""
+	},
+	generator : (block, generator) => {
+		const gamepad = block.getFieldValue('GAMEPAD');
+		const button = block.getFieldValue('BUTTON');
+
+		const command = "gamepad.buttonpressed(" + gamepad + "," + button + ")";
+
+		return [ command, 0 ];
+	}
+};
+// clang-format on

frontend/src/components/blockly/mh_gamepad_connected.js

@@ -0,0 +1,32 @@
+import {colorGamepad} from './colors.js'
+
+// clang-format off
+export const definition = {
+	category : 'Gamepad',
+	colour : colorGamepad,
+	blockdefinition : {
+		"type" : "mh_gamepad_connected",
+		"message0" : "Test if %1 is connected",
+		"args0" : [
+			{
+				"type" : "field_dropdown",
+				"name" : "GAMEPAD",
+				"options" : [
+					[ "GAMEPAD1", "GAMEPAD1" ],
+				]
+			},
+		],
+		"output": null,
+		"colour" : colorGamepad,
+		"tooltip" : "Tests if the Gamepad is connected",
+		"helpUrl" : ""
+	},
+	generator : (block, generator) => {
+		const gamepad = block.getFieldValue('GAMEPAD');
+
+		const command = "gamepad.connected(" + gamepad + ")";
+
+		return [ command, 0 ];
+	}
+};
+// clang-format on

frontend/src/components/blockly/mh_gamepad_value.js

@@ -0,0 +1,43 @@
+import {colorGamepad} from './colors.js'
+
+// clang-format off
+export const definition = {
+	category : 'Gamepad',
+	colour : colorGamepad,
+	blockdefinition : {
+		"type" : "mh_gamepad_value",
+		"message0" : "Get %2 from %1",
+		"args0" : [
+			{
+				"type" : "field_dropdown",
+				"name" : "GAMEPAD",
+				"options" : [
+					[ "GAMEPAD1", "GAMEPAD1" ],
+				]
+			},
+			{
+				"type" : "field_dropdown",
+				"name" : "VALUE",
+				"options" : [
+					["GAMEPAD_LEFT_X", "GAMEPAD_LEFT_X"],
+					["GAMEPAD_LEFT_Y", "GAMEPAD_LEFT_Y"],
+					["GAMEPAD_RIGHT_X", "GAMEPAD_RIGHT_X"],
+					[ "GAMEPAD_RIGHT_Y", "GAMEPAD_RIGHT_Y" ],
+				]
+			}
+		],
+		"output": null,
+		"colour" : colorGamepad,
+		"tooltip" : "Gets a value from a connected Gamepad",
+		"helpUrl" : ""
+	},
+	generator : (block, generator) => {
+		const gamepad = block.getFieldValue('GAMEPAD');
+		const value = block.getFieldValue('VALUE');
+
+		const command = "gamepad.value(" + gamepad + "," + value + ")";
+
+		return [ command, 0 ];
+	}
+};
+// clang-format on

lib/btremote/include/btremote.h

@@ -10,6 +10,7 @@
 #include "esp_gatt_common_api.h"
 #include "esp_gatts_api.h"
 #include "esp_hidh_api.h"
+#include "inputdevices.h"
 #include "megahub.h"
 
 #include <ArduinoJson.h>
@@ -111,25 +112,6 @@ struct HIDDevice {
 	uint32_t handle;
 };
 
-// Gamepad State - Standard HID gamepad layout
-struct GamepadState {
-	esp_bd_addr_t address;
-	bool connected;
-	uint32_t timestamp;
-	uint16_t vendorId;
-	uint16_t productId;
-
-	uint16_t buttons;
-
-	uint8_t dpad;
-
-	// Analog sticks (16-bit signed, range: -32768 to 32767, center=0)
-	int16_t leftStickX;
-	int16_t leftStickY;
-	int16_t rightStickX;
-	int16_t rightStickY;
-};
-
 // HID Event Queue Item for async processing
 struct HIDEventItem {
 	esp_hidh_cb_event_t event;
@@ -143,6 +125,7 @@ class BTRemote {
 	uint16_t gatts_if_;
 	uint16_t app_id_;
 
+	InputDevices *inputDevices_;
 	SerialLoggingOutput *loggingOutput_;
 	Configuration *configuration_;
 	Megahub *hub_;
@@ -176,8 +159,6 @@ class BTRemote {
 	// HID Host
 	std::map<std::string, HIDDevice> hidDevices_;
 	SemaphoreHandle_t hidDevicesMutex_;
-	std::map<std::string, GamepadState> gamepadStates_;
-	SemaphoreHandle_t gamepadStatesMutex_;
 
 	// HID event processing queue and task
 	QueueHandle_t hidEventQueue_;
@@ -249,7 +230,7 @@ class BTRemote {
 	void stringToBdAddr(const std::string &str, esp_bd_addr_t address);
 
 public:
-	BTRemote(FS *fs, Megahub *hub, SerialLoggingOutput *loggingOutput, Configuration *configuragtion);
+	BTRemote(FS *fs, InputDevices *inputDevices, Megahub *hub, SerialLoggingOutput *loggingOutput, Configuration *configuragtion);
 
 	void begin(const char *deviceName);
 
@@ -283,10 +264,6 @@ class BTRemote {
 	bool hidConnect(const char *macAddress);
 	bool hidDisconnect(const char *macAddress);
 	std::vector<HIDDevice> getConnectedHIDDevices();
-
-	// Gamepad API
-	bool getGamepadState(const char *macAddress, GamepadState &state);
-	std::vector<GamepadState> getAllGamepadStates();
 };
 
 #endif // BTREMOTE_H