Updating makefile and source to be compatible with 1.3.9

Author: jimblom

Software/sparkx-sdk-addon/rule/makefile_build_acc_service_data_logger_rpi_sparkx.inc

@@ -0,0 +1,12 @@
+BUILD_ALL += utils/acc_service_data_logger_rpi_sparkx
+
+utils/acc_service_data_logger_rpi_sparkx : \
+					out/acc_service_data_logger.o \
+					libacconeer.a \
+					libacconeer_a111_r2c.a \
+					out/libcustomer.a \
+					libacc_service.a \
+					out/acc_board_rpi_sparkx.o
+	@echo "    Linking $(notdir $@)"
+	@mkdir -p utils
+	@$(LINK.o) -Wl,--start-group $^ -Wl,--end-group $(LOADLIBES) $(LDLIBS) -o $@

Software/sparkx-sdk-addon/rule/makefile_build_acc_streaming_server_rpi_sparkx.inc

@@ -0,0 +1,13 @@
+BUILD_ALL += utils/acc_streaming_server_rpi_sparkx
+
+utils/acc_streaming_server_rpi_sparkx : \
+					acc_streaming_server.o \
+					cJSON.o \
+					libacconeer.a \
+					libacconeer_a111_r2c.a \
+					out/libcustomer.a \
+					libacc_service.a \
+					out/acc_board_rpi_sparkx.o
+	@echo "    Linking $(notdir $@)"
+	@mkdir -p utils
+	@$(LINK.o) -Wl,--start-group $^ -Wl,--end-group $(LOADLIBES) $(LDLIBS) -o $@

Software/sparkx-sdk-addon/rule/makefile_build_example_service_envelope_rpi_sparkx.inc

@@ -4,11 +4,7 @@ out/sparkx_envelope_service_example : \
 					out/example_service_envelope.o \
 					libacconeer.a \
 					libacconeer_a111_r2c.a \
-					libacc_local_server.a \
-					libacc_message_driver_dummy.a \
 					out/libcustomer.a \
-					libacc_envelope.a \
-					libacc_power_bins.a \
 					libacc_service.a \
 					out/acc_board_rpi_sparkx.o
 	@echo "    Linking $(notdir $@)"

Software/sparkx-sdk-addon/rule/makefile_build_example_service_iq_rpi_sparkx.inc

@@ -4,11 +4,7 @@ out/sparkx_envelope_iq_example : \
 					out/example_service_iq.o \
 					libacconeer.a \
 					libacconeer_a111_r2c.a \
-					libacc_local_server.a \
-					libacc_message_driver_dummy.a \
 					out/libcustomer.a \
-					libacc_envelope.a \
-					libacc_power_bins.a \
 					libacc_service.a \
 					out/acc_board_rpi_sparkx.o
 	@echo "    Linking $(notdir $@)"

Software/sparkx-sdk-addon/rule/makefile_build_example_service_power_bins_rpi_sparkx.inc

@@ -4,11 +4,7 @@ out/sparkx_power_bins_example : \
 					out/example_service_power_bins.o \
 					libacconeer.a \
 					libacconeer_a111_r2c.a \
-					libacc_local_server.a \
-					libacc_message_driver_dummy.a \
 					out/libcustomer.a \
-					libacc_envelope.a \
-					libacc_power_bins.a \
 					libacc_service.a \
 					out/acc_board_rpi_sparkx.o
 	@echo "    Linking $(notdir $@)"

Software/sparkx-sdk-addon/rule/makefile_build_sparkx_detector_distance.inc

@@ -4,11 +4,7 @@ out/sparkx_detector_distance : \
 					out/sparkx_detector_distance.o \
 					libacconeer.a \
 					libacconeer_a111_r2c.a \
-					libacc_local_server.a \
-					libacc_message_driver_dummy.a \
 					out/libcustomer.a \
-					libacc_envelope.a \
-					libacc_power_bins.a \
 					libacc_service.a \
 					libacc_detector_distance_peak.a \
 					out/acc_board_rpi_sparkx.o

Software/sparkx-sdk-addon/source/acc_board_rpi_sparkx.c

@@ -10,9 +10,9 @@
 #include "acc_driver_gpio_linux_sysfs.h"
 #include "acc_driver_spi_linux_spidev.h"
 #include "acc_log.h"
-#include "acc_os.h"
-#include "acc_os_linux.h"
-
+#include "acc_device_os.h"
+#include "acc_device_spi.h"
+#include "acc_driver_os_linux.h"
 
 /**
  * @brief The module name
@@ -87,6 +87,10 @@ static const uint_fast8_t sensor_interrupt_pins[SENSOR_COUNT] = {
 	GPIO0_PIN
 };
 
+static acc_board_isr_t master_isr;
+
+static void isr_sensor1(void)  { if (master_isr) master_isr(1); }
+
 
 /**
  * @brief Get the combined status of all sensors
@@ -347,6 +351,33 @@ bool acc_board_is_sensor_interrupt_active(acc_sensor_t sensor)
 }
 
 
+acc_status_t acc_board_register_isr(acc_board_isr_t isr)
+{
+	acc_status_t status;
+
+	if (isr != NULL)
+	{
+		if (
+			(status = acc_device_gpio_register_isr(GPIO0_PIN, ACC_DEVICE_GPIO_EDGE_RISING, &isr_sensor1))
+		) {
+			return status;
+		}
+	}
+	else
+	{
+		if (
+			(status = acc_device_gpio_register_isr(GPIO0_PIN, ACC_DEVICE_GPIO_EDGE_NONE, NULL))
+		) {
+			return status;
+		}
+	}
+
+	master_isr = isr;
+
+	return ACC_STATUS_SUCCESS;
+}
+
+
 float acc_board_get_ref_freq(void)
 {
 	return ACC_BOARD_REF_FREQ;
@@ -366,4 +397,4 @@ acc_status_t acc_board_set_ref_freq(float ref_freq)
 	ACC_UNUSED(ref_freq);
 
 	return ACC_STATUS_UNSUPPORTED;
-}
+}