V0.1.1

Fantety · Oct 29, 2024 · af756ca · af756ca
1 parent aaf5f71
commit af756ca
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/demo/bin/gdble.gdextension b/demo/bin/gdble.gdextension
@@ -1,6 +1,6 @@
 [configuration]
 entry_symbol = "gdble_library_init"
-compatibility_minimum = "4.1"
+compatibility_minimum = "4.4"
 
 [libraries]
 windows.debug.x86_64 = "res://bin/windows/libgdble.windows.template_debug.x86_64.dll"

diff --git a/src/gdble.cpp b/src/gdble.cpp
@@ -4,7 +4,7 @@
  * @Descripttion: 
  * @Date: 2024-08-28 09:20:10
  * @LastEditors: Fantety
- * @LastEditTime: 2024-10-28 10:14:38
+ * @LastEditTime: 2024-10-29 09:27:56
  */
 /* godot-cpp integration testing project.
  *
@@ -52,12 +52,8 @@ bool GodotBLE::set_adapter(int index){
         return false;
     adapter = adapters[index];
     current_adapter_index = index;
-    adapter.set_callback_on_scan_start([]()->String {
-        return "Device Scan started\n";
-    });
-    adapter.set_callback_on_scan_stop([]()->String {
-        return "Device Scan stopped\n";
-    });
+    adapter.set_callback_on_scan_start(std::bind(&GodotBLE::emit_scan_start,this));
+    adapter.set_callback_on_scan_stop(std::bind(&GodotBLE::emit_scan_stop,this));
     adapter.set_callback_on_scan_found(std::bind(&GodotBLE::emit_found_signal,this,std::placeholders::_1));
     adapter.set_callback_on_scan_updated(std::bind(&GodotBLE::emit_update_signal, this, std::placeholders::_1));
     return true;
@@ -206,14 +202,23 @@ int GodotBLE::write_data_to_service(int index, String data){
 
 void GodotBLE::emit_found_signal(SimpleBLE::Peripheral peripheral){
     devices.push_back(peripheral);
-    call_deferred("emit_signal", "on_device_found", peripheral.identifier().empty()?"Unknown":peripheral.identifier().c_str(), peripheral.address().c_str());
+    call_deferred("emit_signal", "device_found", peripheral.identifier().empty()?"Unknown":peripheral.identifier().c_str(), peripheral.address().c_str());
     //emit_signal("on_device_found", peripheral.identifier().c_str(), peripheral.address().c_str());
 }
 void GodotBLE::emit_update_signal(SimpleBLE::Peripheral peripheral){
-    call_deferred("emit_signal", "on_device_update", peripheral.identifier().empty()?"Unknown":peripheral.identifier().c_str(), peripheral.address().c_str());
+    call_deferred("emit_signal", "device_update", peripheral.identifier().empty()?"Unknown":peripheral.identifier().c_str(), peripheral.address().c_str());
     //emit_signal("on_device_update", peripheral.identifier().c_str(), peripheral.address().c_str());
 }
 
+void GodotBLE::emit_scan_stop(){
+    call_deferred("emit_signal", "scan_stop");
+    //emit_signal("scan_stop");
+}
+void GodotBLE::emit_scan_start(){
+    call_deferred("emit_signal", "scan_start");
+    //emit_signal("scan_start");
+}
+
 void GodotBLE::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("bluetooth_enabled"), &GodotBLE::bluetooth_enabled);
     ClassDB::bind_method(D_METHOD("init_adapter_list"), &GodotBLE::init_adapter_list);
@@ -229,8 +234,10 @@ void GodotBLE::_bind_methods() {
     ClassDB::bind_method(D_METHOD("show_all_services"), &GodotBLE::show_all_services);
     ClassDB::bind_method(D_METHOD("read_data_from_service","index"), &GodotBLE::read_data_from_service,DEFVAL(0));
     ClassDB::bind_method(D_METHOD("write_data_to_service","index","data"), &GodotBLE::write_data_to_service);
-    ADD_SIGNAL(MethodInfo("on_device_found", PropertyInfo(Variant::STRING, "identifier"), PropertyInfo(Variant::STRING, "address")));
-    ADD_SIGNAL(MethodInfo("on_device_update", PropertyInfo(Variant::STRING, "identifier"), PropertyInfo(Variant::STRING, "address")));
+    ADD_SIGNAL(MethodInfo("device_found", PropertyInfo(Variant::STRING, "identifier"), PropertyInfo(Variant::STRING, "address")));
+    ADD_SIGNAL(MethodInfo("device_update", PropertyInfo(Variant::STRING, "identifier"), PropertyInfo(Variant::STRING, "address")));
+    ADD_SIGNAL(MethodInfo("scan_start"));
+    ADD_SIGNAL(MethodInfo("scan_stop"));
 }   
 
 GodotBLE::GodotBLE() {

diff --git a/src/gdble.h b/src/gdble.h
@@ -56,6 +56,8 @@ class GodotBLE : public Node {
 
 	void emit_found_signal(SimpleBLE::Peripheral peripheral);
 	void emit_update_signal(SimpleBLE::Peripheral peripheral);
+	void emit_scan_stop();
+	void emit_scan_start();
 	std::string godot_string_to_cpp_string(String godot_string);
 
 public: