Commit 13e2da27 authored by Greg Williams's avatar Greg Williams
Browse files

Merged in develop

parents b3044d06 5b9d209f

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ LIB_OBJS = \ 
	$(OUT_DIR)/kinetic_controller.o \

	$(OUT_DIR)/kinetic_device_info.o \

	$(OUT_DIR)/kinetic_serial_allocator.o \

	$(OUT_DIR)/kinetic_connection.o \

	$(OUT_DIR)/kinetic_session.o \

	$(OUT_DIR)/kinetic_types_internal.o \

	$(OUT_DIR)/kinetic_types.o \

	$(OUT_DIR)/byte_array.o \
@@ -83,7 +83,7 @@ makedirs: 
all: default test system_tests test_internals run examples



clean: makedirs update_git_submodules

	rm -rf ./bin/**/*

	rm -rf ./bin/**

	rm -f $(OUT_DIR)/*.o $(OUT_DIR)/*.a *.core *.log

	bundle exec rake clobber

	-./vendor/kinetic-simulator/stopSimulator.sh &> /dev/null;

src/lib/kinetic_client.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include "kinetic_types_internal.h"

#include "kinetic_client.h"

#include "kinetic_connection.h"

#include "kinetic_session.h"

#include "kinetic_controller.h"

#include "kinetic_operation.h"

#include "kinetic_logger.h"

src/lib/kinetic_controller.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
*/



#include "kinetic_controller.h"

#include "kinetic_connection.h"

#include "kinetic_session.h"

#include "kinetic_operation.h"

#include "kinetic_pdu.h"

#include "kinetic_socket.h"

src/lib/kinetic_operation.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
*/



#include "kinetic_operation.h"

#include "kinetic_connection.h"

#include "kinetic_session.h"

#include "kinetic_message.h"

#include "kinetic_pdu.h"

#include "kinetic_nbo.h"

src/lib/kinetic_pdu.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include "kinetic_pdu.h"

#include "kinetic_nbo.h"

#include "kinetic_connection.h"

#include "kinetic_session.h"

#include "kinetic_socket.h"

#include "kinetic_hmac.h"

#include "kinetic_logger.h"