rename UID to prevent mix ups

stif · Aug 30, 2021 · 6035cd3 · 6035cd3
1 parent 65ed69a
commit 6035cd3
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 29 deletions.
diff --git a/include/tf_hat_zero.h b/include/tf_hat_zero.h
@@ -5,7 +5,7 @@
 #include "brick_hat_zero.h"
 #include "errors.h"
 
-#define UID "V7o" // Change XXYYZZ to the UID of your HAT Zero Brick
+#define UID_ZERO "V7o" // Change XXYYZZ to the UID of your HAT Zero Brick
 
 extern void check(int rc, const char* msg);
 

diff --git a/include/tf_ind_analog_in_v2.h b/include/tf_ind_analog_in_v2.h
@@ -8,7 +8,7 @@
 #include "hal_common.h"
 #include "bricklet_industrial_dual_analog_in_v2.h"
 
-#define UID "Sfw" // Change XYZ to the UID of your Industrial Dual Analog In Bricklet 2.0
+#define UID_ANALOG_IN "Sfw" // Change XYZ to the UID of your Industrial Dual Analog In Bricklet 2.0
 
 extern void check(int rc, const char* msg);
 /*

diff --git a/include/tf_ind_analog_out_v2.h b/include/tf_ind_analog_out_v2.h
@@ -8,7 +8,7 @@
 #include "hal_common.h"
 #include "bricklet_industrial_analog_out_v2.h"
 
-#define UID "XYZ" // Change XYZ to the UID of your Industrial Analog Out Bricklet 2.0
+#define UID_ANALOG_OUT "XYZ" // Change XYZ to the UID of your Industrial Analog Out Bricklet 2.0
 
 extern void check(int rc, const char* msg);
 

diff --git a/include/tf_ind_ptc.h b/include/tf_ind_ptc.h
@@ -8,7 +8,7 @@
 #include "hal_common.h"
 #include "bricklet_industrial_ptc.h"
 
-#define UID "TMC" // Change XYZ to the UID of your PTC Bricklet 2.0
+#define UID_PTC "TMC" // Change XYZ to the UID of your PTC Bricklet 2.0
 
 extern void check(int rc, const char* msg);
 /*

diff --git a/include/tf_thermocouple.h b/include/tf_thermocouple.h
@@ -8,7 +8,7 @@
 #include "hal_common.h"
 #include "bricklet_thermocouple_v2.h"
 
-#define UID "RJH" // Change XYZ to the UID of your Thermocouple Bricklet 2.0
+#define UID_THERMOCOUPLE "RJH" // Change XYZ to the UID of your Thermocouple Bricklet 2.0
 
 extern void check(int rc, const char* msg);
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -14,11 +14,9 @@
 TF_HalContext hal;
 
 void check(int e_code, const char *c) {
-  if (e_code == TF_E_OK) {
-      return;
+  if (e_code != TF_E_OK) {
+    tf_hal_printf("Failed to %s: %s (error code %d)\n", c, tf_hal_strerror(e_code), e_code);
   }
-
-  tf_hal_printf("Failed to %s: %s (error code %d)\n", c, tf_hal_strerror(e_code), e_code);
 }
 /*
 // Callback function for temperature callback
@@ -33,19 +31,11 @@ void temperature_handler(TF_ThermocoupleV2 *device, int32_t temperature,
 // TODO: Why i cannot forward declare these functions in tf_hat_zero.h / tf_thermocouple.h ?
 
 extern "C" void hat_zero_setup(TF_HalContext *hal);
-extern "C" void hat_zero_loop(TF_HalContext *hal);
-
 extern "C" void thermocouple_setup(TF_HalContext *hal);
-extern "C" void thermocouple_loop(TF_HalContext *hal);
-
 extern "C" void ptc_setup(TF_HalContext *hal);
-extern "C" void ptc_loop(TF_HalContext *hal);
-
 extern "C" void analog_in_setup(TF_HalContext *hal);
-extern "C" void analog_in_loop(TF_HalContext *hal);
-
 extern "C" void analog_out_setup(TF_HalContext *hal);
-extern "C" void analog_out_loop(TF_HalContext *hal);
+
 
 void setup() {
   // put your setup code here, to run once:
@@ -64,15 +54,10 @@ void setup() {
 
 void loop() {
   // put your main code here, to run repeatedly:
-  hat_zero_loop(&hal);
-  thermocouple_loop(&hal);
-  ptc_loop(&hal);
-  analog_in_loop(&hal);
-  //analog_out_loop(&hal); //bricklet not shipped until now..
 
   //getDeviceInfo();
   //createTraffic();
 
   // Poll for callbacks
-	//tf_hal_callback_tick(&hal, 0);
+	tf_hal_callback_tick(&hal, 0);
 }
diff --git a/src/tf_hat_zero.c b/src/tf_hat_zero.c
@@ -17,7 +17,7 @@ void check(int e_code, const char *c) {
 
 void hat_zero_setup(TF_HalContext *hal) {
 	// Create device object
-	check(tf_hat_zero_create(&hz, UID, hal), "create device object");
+	check(tf_hat_zero_create(&hz, UID_ZERO, hal), "create device object");
 
 	// Get current voltage
 	uint16_t voltage;

diff --git a/src/tf_ind_analog_in_v2.c b/src/tf_ind_analog_in_v2.c
@@ -14,7 +14,7 @@ static TF_IndustrialDualAnalogInV2 idai;
 
 void analog_in_setup(TF_HalContext *hal) {
 	// Create device object
-	check(tf_industrial_dual_analog_in_v2_create(&idai, UID, hal), "create device object");
+	check(tf_industrial_dual_analog_in_v2_create(&idai, UID_ANALOG_IN, hal), "create device object");
 
 	// Register voltage callback to function voltage_handler
 	tf_industrial_dual_analog_in_v2_register_voltage_callback(&idai,

diff --git a/src/tf_ind_analog_out_v2.c b/src/tf_ind_analog_out_v2.c
@@ -4,7 +4,7 @@ static TF_IndustrialAnalogOutV2 iao;
 
 void analog_out_setup(TF_HalContext *hal) {
 	// Create device object
-	check(tf_industrial_analog_out_v2_create(&iao, UID, hal), "create device object");
+	check(tf_industrial_analog_out_v2_create(&iao, UID_ANALOG_OUT, hal), "create device object");
 
 	// Set output current to 4.5mA
 	check(tf_industrial_analog_out_v2_set_current(&iao, 4500), "call set_current");

diff --git a/src/tf_ind_ptc.c b/src/tf_ind_ptc.c
@@ -12,7 +12,7 @@ static TF_IndustrialPTC ptc;
 
 void ptc_setup(TF_HalContext *hal) {
 	// Create device object
-	check(tf_industrial_ptc_create(&ptc, UID, hal), "create device object");
+	check(tf_industrial_ptc_create(&ptc, UID_PTC, hal), "create device object");
 
 	// Register temperature callback to function temperature_handler
 	tf_industrial_ptc_register_temperature_callback(&ptc,

diff --git a/src/tf_thermocouple.c b/src/tf_thermocouple.c
@@ -12,7 +12,7 @@ static TF_ThermocoupleV2 t;
 
 void thermocouple_setup(TF_HalContext *hal) {
 	// Create device object
-	check(tf_thermocouple_v2_create(&t, UID, hal), "create device object");
+	check(tf_thermocouple_v2_create(&t, UID_THERMOCOUPLE, hal), "create device object");
 
 	// Register temperature callback to function temperature_handler
 	tf_thermocouple_v2_register_temperature_callback(&t,