CP: API: Fix callback signature in cpp header

Initializing _ctx in common is enough, Needed args for set command in places where you need to pass class object
goToMain · Nov 30, 2023 · cdfdfa8 · cdfdfa8
1 parent 0a01dda
commit cdfdfa8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/include/osdp.hpp b/include/osdp.hpp
@@ -17,7 +17,7 @@ namespace OSDP {
 
 class Common {
 public:
-	Common() {}
+	Common() : _ctx(nullptr) {}
 
 	void logger_init(const char *name, int log_level,
 			 osdp_log_puts_fn_t puts_fn)
@@ -63,7 +63,6 @@ class ControlPanel : public Common {
 public:
 	ControlPanel()
 	{
-		_ctx = nullptr;
 	}
 
 	~ControlPanel()
@@ -110,7 +109,6 @@ class PeripheralDevice : public Common {
 public:
 	PeripheralDevice()
 	{
-		_ctx = nullptr;
 	}
 
 	~PeripheralDevice()
@@ -131,9 +129,9 @@ class PeripheralDevice : public Common {
 		osdp_pd_refresh(_ctx);
 	}
 
-	void set_command_callback(pd_command_callback_t cb)
+	void set_command_callback(pd_command_callback_t cb, void* args)
 	{
-		osdp_pd_set_command_callback(_ctx, cb, _ctx);
+		osdp_pd_set_command_callback(_ctx, cb, args);
 	}
 
 	int notify_event(struct osdp_event *event)

diff --git a/samples/cpp/pd_app.cpp b/samples/cpp/pd_app.cpp
@@ -80,7 +80,7 @@ int main()
 
 	pd.setup(&info_pd);
 
-	pd.set_command_callback(pd_command_handler);
+	pd.set_command_callback(pd_command_handler, nullptr);
 
 	while (1) {
 		pd.refresh();