Fix: Remove unecessary arguments/parameters to protocol init
diff --git a/examples/SpeedSensor/SpeedSensor.ino b/examples/SpeedSensor/SpeedSensor.ino
index dcb0af9..6da574b 100644
--- a/examples/SpeedSensor/SpeedSensor.ino
+++ b/examples/SpeedSensor/SpeedSensor.ino
@@ -39,7 +39,7 @@
{
Serial.begin(9600);
pinMode(LED, OUTPUT);
- thing.init(KNOT_THING_TTY, "Speed");
+ thing.init("Speed");
thing.registerIntData(SPEED_SENSOR_NAME, SPEED_SENSOR_ID, KNOT_TYPE_ID_SPEED, KNOT_UNIT_SPEED_MS, speed_read, speed_write);
}
diff --git a/src/KNoTThing.cpp b/src/KNoTThing.cpp
index a327ec5..886c568 100644
--- a/src/KNoTThing.cpp
+++ b/src/KNoTThing.cpp
@@ -21,9 +21,9 @@
knot_thing_exit();
}
-int KNoTThing::init(const int protocol, const char *thing_name)
+int KNoTThing::init(const char *thing_name)
{
- return knot_thing_init(protocol, thing_name);
+ return knot_thing_init(thing_name);
}
int KNoTThing::registerIntData(const char *name, uint8_t sensor_id, uint16_t type_id,
diff --git a/src/KNoTThing.h b/src/KNoTThing.h
index c9ad26d..a23b19b 100644
--- a/src/KNoTThing.h
+++ b/src/KNoTThing.h
@@ -13,8 +13,6 @@
#include "knot_types.h"
#include "knot_thing_main.h"
-#define KNOT_THING_TTY 0
-#define KNOT_THING_NRF24L01 1
class KNoTThing {
public:
@@ -24,9 +22,9 @@
/*
* This method initializes logging, radio, storage or other modules.
* Additionally it requests registration to the cloud (if necessary).
- * eg protocol: 'KNOT_THING_TTY', 'KNOT_THING_NRF24L01'
+ * eg protocol: 'TTY', 'NRF24L01'
*/
- int init(const int protocol, const char *thing_name);
+ int init(const char *thing_name);
int registerIntData(const char *name, uint8_t sensor_id, uint16_t type_id,
uint8_t unit, intDataFunction read, intDataFunction write);
diff --git a/src/knot_thing_main.c b/src/knot_thing_main.c
index 6ed4268..e68fcb9 100644
--- a/src/knot_thing_main.c
+++ b/src/knot_thing_main.c
@@ -83,7 +83,7 @@
return (!(data_items[sensor_id].config.event_flags & KNOT_EVT_FLAG_UNREGISTERED));
}
-int8_t knot_thing_init(const int protocol, const char *thing_name)
+int8_t knot_thing_init(const char *thing_name)
{
reset_data_items();
return 0;
diff --git a/src/knot_thing_main.h b/src/knot_thing_main.h
index c6afebe..709c611 100644
--- a/src/knot_thing_main.h
+++ b/src/knot_thing_main.h
@@ -49,7 +49,7 @@
} knot_data_functions;
/* KNOT Thing main initialization functions and polling */
-int8_t knot_thing_init(const int protocol, const char *thing_name);
+int8_t knot_thing_init(const char *thing_name);
void knot_thing_exit(void);
int8_t knot_thing_run(void);
diff --git a/src/knot_thing_protocol.c b/src/knot_thing_protocol.c
index 2f53615..edcf7aa 100644
--- a/src/knot_thing_protocol.c
+++ b/src/knot_thing_protocol.c
@@ -48,9 +48,8 @@
static data_function thing_write;
static config_function configf;
-int knot_thing_protocol_init(uint8_t protocol, const char *thing_name,
- data_function read, data_function write,
- schema_function schema, config_function config)
+int knot_thing_protocol_init(const char *thing_name, data_function read,
+ data_function write, schema_function schema, config_function config)
{
int len;
diff --git a/src/knot_thing_protocol.h b/src/knot_thing_protocol.h
index b146ee1..448b563 100644
--- a/src/knot_thing_protocol.h
+++ b/src/knot_thing_protocol.h
@@ -21,8 +21,7 @@
typedef int (*config_function)(uint8_t sensor_id, uint8_t event_flags,
knot_value_types *lower_limit, knot_value_types *upper_limit);
-int knot_thing_protocol_init(uint8_t protocol, const char *thing_name,
- data_function read, data_function write,
+int knot_thing_protocol_init(const char *thing_name, data_function read, data_function write,
schema_function schema, config_function config);
void knot_thing_protocol_exit(void);
int knot_thing_protocol_run(void);