From 0573cd9a578eb55d1cedd79511dbdf34621434bc Mon Sep 17 00:00:00 2001 From: "j.foucher" Date: Wed, 18 Feb 2026 16:54:35 +0100 Subject: [PATCH] =?UTF-8?q?PS=5FWin=5FBLE=20:=20cat=C3=A9gories=20Blueprin?= =?UTF-8?q?t=20=E2=86=92=20ASTERION|Win=5FBLE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Toutes les entrées Blueprint (UFUNCTION, UPROPERTY, UCLASS, USTRUCT, UENUM) sont désormais rangées dans ASTERION|Win_BLE au lieu de "PS BLE". 64 occurrences mises à jour dans les 4 headers publics. Co-Authored-By: Claude Opus 4.6 --- .../Source/PS_Win_BLE/Public/PS_BLEDevice.h | 52 +++++++++---------- .../Source/PS_Win_BLE/Public/PS_BLELibrary.h | 12 ++--- .../Source/PS_Win_BLE/Public/PS_BLEManager.h | 28 +++++----- .../Source/PS_Win_BLE/Public/PS_BLETypes.h | 36 ++++++------- 4 files changed, 64 insertions(+), 64 deletions(-) diff --git a/Unreal/Plugins/PS_Win_BLE/Source/PS_Win_BLE/Public/PS_BLEDevice.h b/Unreal/Plugins/PS_Win_BLE/Source/PS_Win_BLE/Public/PS_BLEDevice.h index 225ee91..549d8ff 100644 --- a/Unreal/Plugins/PS_Win_BLE/Source/PS_Win_BLE/Public/PS_BLEDevice.h +++ b/Unreal/Plugins/PS_Win_BLE/Source/PS_Win_BLE/Public/PS_BLEDevice.h @@ -10,7 +10,7 @@ class UPS_BLE_Manager; class UPS_BLE_Module; -UCLASS(ClassGroup = (Custom), Category = "PS BLE", meta = (BlueprintSpawnableComponent)) +UCLASS(ClassGroup = (Custom), Category = "ASTERION|Win_BLE", meta = (BlueprintSpawnableComponent)) class PS_WIN_BLE_API UPS_BLE_Device : public UObject { GENERATED_BODY() @@ -23,68 +23,68 @@ public: virtual ~UPS_BLE_Device() override; // ─── Getters Blueprint ──────────────────────────────────────────────────── - UFUNCTION(BlueprintCallable, BlueprintPure, Category = "PS BLE", meta = (DisplayName = "Address as String", ReturnDisplayName = "Address")) + UFUNCTION(BlueprintCallable, BlueprintPure, Category = "ASTERION|Win_BLE", meta = (DisplayName = "Address as String", ReturnDisplayName = "Address")) FString DeviceAddressAsString(); - UFUNCTION(BlueprintCallable, BlueprintPure, Category = "PS BLE", meta = (DisplayName = "Address as Int64", ReturnDisplayName = "Int64")) + UFUNCTION(BlueprintCallable, BlueprintPure, Category = "ASTERION|Win_BLE", meta = (DisplayName = "Address as Int64", ReturnDisplayName = "Int64")) int64 DeviceAddressAsInt64(); - UFUNCTION(BlueprintCallable, BlueprintPure, Category = "PS BLE", meta = (DisplayName = "Address as MAC", ReturnDisplayName = "MAC")) + UFUNCTION(BlueprintCallable, BlueprintPure, Category = "ASTERION|Win_BLE", meta = (DisplayName = "Address as MAC", ReturnDisplayName = "MAC")) FPS_MACAddress DeviceAddressAsMAC(); // ─── Actions ────────────────────────────────────────────────────────────── - UFUNCTION(BlueprintCallable, Category = "PS BLE") + UFUNCTION(BlueprintCallable, Category = "ASTERION|Win_BLE") void Connect(); - UFUNCTION(BlueprintCallable, Category = "PS BLE") + UFUNCTION(BlueprintCallable, Category = "ASTERION|Win_BLE") void Disconnect(); - UFUNCTION(BlueprintCallable, Category = "PS BLE", meta = (DisplayName = "Is Connected", ReturnDisplayName = "Connected")) + UFUNCTION(BlueprintCallable, Category = "ASTERION|Win_BLE", meta = (DisplayName = "Is Connected", ReturnDisplayName = "Connected")) bool IsConnected(); - UFUNCTION(BlueprintCallable, Category = "PS BLE") + UFUNCTION(BlueprintCallable, Category = "ASTERION|Win_BLE") void DiscoverServices(); - UFUNCTION(BlueprintCallable, Category = "PS BLE") + UFUNCTION(BlueprintCallable, Category = "ASTERION|Win_BLE") void Read(const FString& ServiceUUID, const FString& CharacteristicUUID); - UFUNCTION(BlueprintCallable, Category = "PS BLE") + UFUNCTION(BlueprintCallable, Category = "ASTERION|Win_BLE") void Write(const FString& ServiceUUID, const FString& CharacteristicUUID, TArray Data); - UFUNCTION(BlueprintCallable, Category = "PS BLE") + UFUNCTION(BlueprintCallable, Category = "ASTERION|Win_BLE") void Subscribe(const FString& ServiceUUID, const FString& CharacteristicUUID); - UFUNCTION(BlueprintCallable, Category = "PS BLE") + UFUNCTION(BlueprintCallable, Category = "ASTERION|Win_BLE") void Unsubscribe(const FString& ServiceUUID, const FString& CharacteristicUUID); // ─── Properties ─────────────────────────────────────────────────────────── - UPROPERTY(BlueprintReadOnly, Category = "PS BLE") + UPROPERTY(BlueprintReadOnly, Category = "ASTERION|Win_BLE") FString DeviceName = ""; - UPROPERTY(BlueprintReadOnly, BlueprintGetter = "DeviceAddressAsString", Category = "PS BLE") + UPROPERTY(BlueprintReadOnly, BlueprintGetter = "DeviceAddressAsString", Category = "ASTERION|Win_BLE") FString AddressAsString; - UPROPERTY(BlueprintReadOnly, BlueprintGetter = "DeviceAddressAsInt64", Category = "PS BLE") + UPROPERTY(BlueprintReadOnly, BlueprintGetter = "DeviceAddressAsInt64", Category = "ASTERION|Win_BLE") int64 AddressAsInt64 = 0; - UPROPERTY(BlueprintReadOnly, BlueprintGetter = "DeviceAddressAsMAC", Category = "PS BLE") + UPROPERTY(BlueprintReadOnly, BlueprintGetter = "DeviceAddressAsMAC", Category = "ASTERION|Win_BLE") FPS_MACAddress AddressAsMAC; - UPROPERTY(BlueprintReadOnly, Category = "PS BLE") + UPROPERTY(BlueprintReadOnly, Category = "ASTERION|Win_BLE") int32 RSSI = 0; - UPROPERTY(BlueprintReadOnly, VisibleAnywhere, Category = "PS BLE") + UPROPERTY(BlueprintReadOnly, VisibleAnywhere, Category = "ASTERION|Win_BLE") TArray ActiveServices; // ─── Delegates ──────────────────────────────────────────────────────────── - UPROPERTY(BlueprintAssignable, Category = "PS BLE") FPS_OnConnect OnConnect; - UPROPERTY(BlueprintAssignable, Category = "PS BLE") FPS_OnDisconnect OnDisconnect; - UPROPERTY(BlueprintAssignable, Category = "PS BLE") FPS_OnServicesDiscovered OnServicesDiscovered; - UPROPERTY(BlueprintAssignable, Category = "PS BLE") FPS_OnRead OnRead; - UPROPERTY(BlueprintAssignable, Category = "PS BLE") FPS_OnNotify OnNotify; - UPROPERTY(BlueprintAssignable, Category = "PS BLE") FPS_OnWrite OnWrite; - UPROPERTY(BlueprintAssignable, Category = "PS BLE") FPS_OnSubscribe OnSubscribe; - UPROPERTY(BlueprintAssignable, Category = "PS BLE") FPS_OnUnsubscribe OnUnsubscribe; + UPROPERTY(BlueprintAssignable, Category = "ASTERION|Win_BLE") FPS_OnConnect OnConnect; + UPROPERTY(BlueprintAssignable, Category = "ASTERION|Win_BLE") FPS_OnDisconnect OnDisconnect; + UPROPERTY(BlueprintAssignable, Category = "ASTERION|Win_BLE") FPS_OnServicesDiscovered OnServicesDiscovered; + UPROPERTY(BlueprintAssignable, Category = "ASTERION|Win_BLE") FPS_OnRead OnRead; + UPROPERTY(BlueprintAssignable, Category = "ASTERION|Win_BLE") FPS_OnNotify OnNotify; + UPROPERTY(BlueprintAssignable, Category = "ASTERION|Win_BLE") FPS_OnWrite OnWrite; + UPROPERTY(BlueprintAssignable, Category = "ASTERION|Win_BLE") FPS_OnSubscribe OnSubscribe; + UPROPERTY(BlueprintAssignable, Category = "ASTERION|Win_BLE") FPS_OnUnsubscribe OnUnsubscribe; // ─── Internal state ─────────────────────────────────────────────────────── uint64 DeviceID = 0; diff --git a/Unreal/Plugins/PS_Win_BLE/Source/PS_Win_BLE/Public/PS_BLELibrary.h b/Unreal/Plugins/PS_Win_BLE/Source/PS_Win_BLE/Public/PS_BLELibrary.h index 1adbb99..a5002bd 100644 --- a/Unreal/Plugins/PS_Win_BLE/Source/PS_Win_BLE/Public/PS_BLELibrary.h +++ b/Unreal/Plugins/PS_Win_BLE/Source/PS_Win_BLE/Public/PS_BLELibrary.h @@ -16,18 +16,18 @@ class PS_WIN_BLE_API UPS_BLE_Library : public UBlueprintFunctionLibrary public: /** Return the BLE Manager singleton */ - UFUNCTION(BlueprintCallable, BlueprintPure, Category = "PS BLE", meta = ( + UFUNCTION(BlueprintCallable, BlueprintPure, Category = "ASTERION|Win_BLE", meta = ( DisplayName = "Get BLE Manager", ReturnDisplayName = "BLE Manager", Keywords = "Bluetooth LE BLE manager PS")) static UPS_BLE_Manager* GetBLEManager(bool& IsPluginLoaded, bool& BLEAdapterFound); /** Convert a hex nibble character to byte (0-15). Valid=false if invalid character. */ - UFUNCTION(BlueprintPure, Category = "PS BLE", meta = (DisplayName = "Nibble To Byte", ReturnDisplayName = "Byte")) + UFUNCTION(BlueprintPure, Category = "ASTERION|Win_BLE", meta = (DisplayName = "Nibble To Byte", ReturnDisplayName = "Byte")) static uint8 NibbleToByte(const FString& Nibble, bool& Valid); /** Decompose a characteristic descriptor byte into individual capability booleans */ - UFUNCTION(BlueprintPure, Category = "PS BLE", meta = (DisplayName = "Get Descriptor Bits")) + UFUNCTION(BlueprintPure, Category = "ASTERION|Win_BLE", meta = (DisplayName = "Get Descriptor Bits")) static void GetDescriptorBits( const EPS_CharacteristicDescriptor& Descriptor, bool& Broadcastable, bool& ExtendedProperties, @@ -36,7 +36,7 @@ public: bool& WriteNoResponse, bool& SignedWrite); /** Build a characteristic descriptor byte from individual capability booleans */ - UFUNCTION(BlueprintPure, Category = "PS BLE", meta = (DisplayName = "Make BLE Descriptor")) + UFUNCTION(BlueprintPure, Category = "ASTERION|Win_BLE", meta = (DisplayName = "Make BLE Descriptor")) static EPS_CharacteristicDescriptor MakeDescriptor( const bool Broadcastable, const bool ExtendedProperties, const bool Notifiable, const bool Indicable, @@ -44,10 +44,10 @@ public: const bool WriteNoResponse, const bool SignedWrite); /** Convert a descriptor byte to a human-readable string */ - UFUNCTION(BlueprintPure, Category = "PS BLE", meta = (DisplayName = "Descriptor To String", ReturnDisplayName = "Descriptor")) + UFUNCTION(BlueprintPure, Category = "ASTERION|Win_BLE", meta = (DisplayName = "Descriptor To String", ReturnDisplayName = "Descriptor")) static FString DescriptorToString(const uint8& Descriptor); /** True if running inside the Unreal Editor */ - UFUNCTION(BlueprintPure, Category = "PS BLE", meta = (DisplayName = "Is Editor Running", ReturnDisplayName = "EditorRunning")) + UFUNCTION(BlueprintPure, Category = "ASTERION|Win_BLE", meta = (DisplayName = "Is Editor Running", ReturnDisplayName = "EditorRunning")) static bool IsEditorRunning(); }; diff --git a/Unreal/Plugins/PS_Win_BLE/Source/PS_Win_BLE/Public/PS_BLEManager.h b/Unreal/Plugins/PS_Win_BLE/Source/PS_Win_BLE/Public/PS_BLEManager.h index 3984b8c..bdbf360 100644 --- a/Unreal/Plugins/PS_Win_BLE/Source/PS_Win_BLE/Public/PS_BLEManager.h +++ b/Unreal/Plugins/PS_Win_BLE/Source/PS_Win_BLE/Public/PS_BLEManager.h @@ -10,7 +10,7 @@ class UPS_BLE_Module; class UPS_BLE_Device; -UCLASS(ClassGroup = (Custom), Category = "PS BLE", meta = (BlueprintSpawnableComponent)) +UCLASS(ClassGroup = (Custom), Category = "ASTERION|Win_BLE", meta = (BlueprintSpawnableComponent)) class PS_WIN_BLE_API UPS_BLE_Manager : public UObject { GENERATED_BODY() @@ -24,7 +24,7 @@ public: void AttachModule(UPS_BLE_Module* Module); // ─── Discovery ──────────────────────────────────────────────────────────── - UFUNCTION(BlueprintCallable, Category = "PS BLE", meta = ( + UFUNCTION(BlueprintCallable, Category = "ASTERION|Win_BLE", meta = ( AutoCreateRefTerm = "OnNewDeviceDiscovered", ToolTip = "Live scan: fires OnNewDeviceDiscovered each time a device is found. Filter is comma-separated name substrings.")) void StartDiscoveryLive( @@ -33,7 +33,7 @@ public: const int64 DurationMs = 5000, const FString& NameFilter = ""); - UFUNCTION(BlueprintCallable, Category = "PS BLE", meta = ( + UFUNCTION(BlueprintCallable, Category = "ASTERION|Win_BLE", meta = ( AutoCreateRefTerm = "OnDiscoveryEnd", ToolTip = "Background scan: fires OnDiscoveryEnd once finished. Filter is comma-separated name substrings.")) void StartDiscoveryInBackground( @@ -41,34 +41,34 @@ public: const int64 DurationMs = 5000, const FString& NameFilter = ""); - UFUNCTION(BlueprintCallable, Category = "PS BLE") + UFUNCTION(BlueprintCallable, Category = "ASTERION|Win_BLE") void StopDiscovery(); - UFUNCTION(BlueprintCallable, Category = "PS BLE") + UFUNCTION(BlueprintCallable, Category = "ASTERION|Win_BLE") void DisconnectAll(); - UFUNCTION(BlueprintCallable, Category = "PS BLE", meta = (DisplayName = "Reset BLE Adapter", ReturnDisplayName = "Success")) + UFUNCTION(BlueprintCallable, Category = "ASTERION|Win_BLE", meta = (DisplayName = "Reset BLE Adapter", ReturnDisplayName = "Success")) bool ResetBLEAdapter(); // ─── MAC utils ──────────────────────────────────────────────────────────── - UFUNCTION(BlueprintPure, Category = "PS BLE", meta = (DisplayName = "MAC to String", ReturnDisplayName = "Address")) + UFUNCTION(BlueprintPure, Category = "ASTERION|Win_BLE", meta = (DisplayName = "MAC to String", ReturnDisplayName = "Address")) static FString MACToString(const FPS_MACAddress& Address); - UFUNCTION(BlueprintPure, Category = "PS BLE", meta = (DisplayName = "String to MAC", ReturnDisplayName = "MAC")) + UFUNCTION(BlueprintPure, Category = "ASTERION|Win_BLE", meta = (DisplayName = "String to MAC", ReturnDisplayName = "MAC")) static FPS_MACAddress StringToMAC(const FString& Address, bool& Valid); // ─── Properties ─────────────────────────────────────────────────────────── - UPROPERTY(BlueprintReadOnly, VisibleAnywhere, Category = "PS BLE") + UPROPERTY(BlueprintReadOnly, VisibleAnywhere, Category = "ASTERION|Win_BLE") TArray FoundDevices; - UPROPERTY(BlueprintReadOnly, Category = "PS BLE") + UPROPERTY(BlueprintReadOnly, Category = "ASTERION|Win_BLE") bool bIsScanInProgress = false; // ─── Delegates ──────────────────────────────────────────────────────────── - UPROPERTY(BlueprintAssignable, Category = "PS BLE") FPS_OnAnyBLEDeviceConnected OnAnyDeviceConnected; - UPROPERTY(BlueprintAssignable, Category = "PS BLE") FPS_OnAnyBLEDeviceDisconnected OnAnyDeviceDisconnected; - UPROPERTY(BlueprintAssignable, Category = "PS BLE") FPS_OnAnyServiceDiscovered OnAnyServiceDiscovered; - UPROPERTY(BlueprintAssignable, Category = "PS BLE") FPS_OnBLEError OnBLEError; + UPROPERTY(BlueprintAssignable, Category = "ASTERION|Win_BLE") FPS_OnAnyBLEDeviceConnected OnAnyDeviceConnected; + UPROPERTY(BlueprintAssignable, Category = "ASTERION|Win_BLE") FPS_OnAnyBLEDeviceDisconnected OnAnyDeviceDisconnected; + UPROPERTY(BlueprintAssignable, Category = "ASTERION|Win_BLE") FPS_OnAnyServiceDiscovered OnAnyServiceDiscovered; + UPROPERTY(BlueprintAssignable, Category = "ASTERION|Win_BLE") FPS_OnBLEError OnBLEError; // ─── Internal callbacks (called from UPS_BLE_Module dispatch) ───────────── void JustDiscoveredDevice(const FPS_DeviceRecord& Rec); diff --git a/Unreal/Plugins/PS_Win_BLE/Source/PS_Win_BLE/Public/PS_BLETypes.h b/Unreal/Plugins/PS_Win_BLE/Source/PS_Win_BLE/Public/PS_BLETypes.h index 9697909..e9a9106 100644 --- a/Unreal/Plugins/PS_Win_BLE/Source/PS_Win_BLE/Public/PS_BLETypes.h +++ b/Unreal/Plugins/PS_Win_BLE/Source/PS_Win_BLE/Public/PS_BLETypes.h @@ -7,7 +7,7 @@ // ─── ENUMS ─────────────────────────────────────────────────────────────────── -UENUM(BlueprintType, Category = "PS BLE") +UENUM(BlueprintType, Category = "ASTERION|Win_BLE") enum class EPS_GATTStatus : uint8 { Success = 0x00 UMETA(DisplayName = "Success"), @@ -21,7 +21,7 @@ enum class EPS_GATTStatus : uint8 Failure = 0xFF UMETA(DisplayName = "Failure") }; -UENUM(BlueprintType, Category = "PS BLE") +UENUM(BlueprintType, Category = "ASTERION|Win_BLE") enum class EPS_CharacteristicDescriptor : uint8 { Unknown = 0x00 UMETA(DisplayName = "Unknown"), @@ -35,7 +35,7 @@ enum class EPS_CharacteristicDescriptor : uint8 SignedWrite = 0x80 UMETA(DisplayName = "Signed Write") }; -UENUM(BlueprintType, Category = "PS BLE") +UENUM(BlueprintType, Category = "ASTERION|Win_BLE") enum class EPS_BLEError : uint8 { NoError = 0x00 UMETA(DisplayName = "Success"), @@ -61,40 +61,40 @@ enum class EPS_BLEError : uint8 // ─── STRUCTS ───────────────────────────────────────────────────────────────── -USTRUCT(BlueprintType, Atomic, Category = "PS BLE") +USTRUCT(BlueprintType, Atomic, Category = "ASTERION|Win_BLE") struct FPS_MACAddress { GENERATED_BODY() public: - UPROPERTY(BlueprintReadWrite, Category = "PS BLE") uint8 b0 = 0; - UPROPERTY(BlueprintReadWrite, Category = "PS BLE") uint8 b1 = 0; - UPROPERTY(BlueprintReadWrite, Category = "PS BLE") uint8 b2 = 0; - UPROPERTY(BlueprintReadWrite, Category = "PS BLE") uint8 b3 = 0; - UPROPERTY(BlueprintReadWrite, Category = "PS BLE") uint8 b4 = 0; - UPROPERTY(BlueprintReadWrite, Category = "PS BLE") uint8 b5 = 0; + UPROPERTY(BlueprintReadWrite, Category = "ASTERION|Win_BLE") uint8 b0 = 0; + UPROPERTY(BlueprintReadWrite, Category = "ASTERION|Win_BLE") uint8 b1 = 0; + UPROPERTY(BlueprintReadWrite, Category = "ASTERION|Win_BLE") uint8 b2 = 0; + UPROPERTY(BlueprintReadWrite, Category = "ASTERION|Win_BLE") uint8 b3 = 0; + UPROPERTY(BlueprintReadWrite, Category = "ASTERION|Win_BLE") uint8 b4 = 0; + UPROPERTY(BlueprintReadWrite, Category = "ASTERION|Win_BLE") uint8 b5 = 0; }; -USTRUCT(BlueprintType, Atomic, Category = "PS BLE") +USTRUCT(BlueprintType, Atomic, Category = "ASTERION|Win_BLE") struct FPS_CharacteristicItem { GENERATED_BODY() public: FGuid cUUID; bool subscribed = false; - UPROPERTY(BlueprintReadOnly, Category = "PS BLE") uint8 Descriptor = 0; - UPROPERTY(BlueprintReadOnly, Category = "PS BLE") FString CharacteristicName; - UPROPERTY(BlueprintReadOnly, Category = "PS BLE") FString CharacteristicUUID; + UPROPERTY(BlueprintReadOnly, Category = "ASTERION|Win_BLE") uint8 Descriptor = 0; + UPROPERTY(BlueprintReadOnly, Category = "ASTERION|Win_BLE") FString CharacteristicName; + UPROPERTY(BlueprintReadOnly, Category = "ASTERION|Win_BLE") FString CharacteristicUUID; }; -USTRUCT(BlueprintType, Atomic, Category = "PS BLE") +USTRUCT(BlueprintType, Atomic, Category = "ASTERION|Win_BLE") struct FPS_ServiceItem { GENERATED_BODY() public: FGuid sUUID; - UPROPERTY(BlueprintReadOnly, Category = "PS BLE") FString ServiceName; - UPROPERTY(BlueprintReadOnly, Category = "PS BLE") FString ServiceUUID; - UPROPERTY(BlueprintReadOnly, Category = "PS BLE") TArray Characteristics; + UPROPERTY(BlueprintReadOnly, Category = "ASTERION|Win_BLE") FString ServiceName; + UPROPERTY(BlueprintReadOnly, Category = "ASTERION|Win_BLE") FString ServiceUUID; + UPROPERTY(BlueprintReadOnly, Category = "ASTERION|Win_BLE") TArray Characteristics; }; // ─── INTERNAL DEVICE RECORD (forward-declared here so Manager can use it) ────