From 6bd82931ea6484568661c977cea1bfd0adbdafeb Mon Sep 17 00:00:00 2001 From: James Date: Tue, 8 Jan 2019 22:10:06 -0800 Subject: [PATCH] add version and model changes, TODO: real model name in future --- CHANGELOG | 5 ++++- library/Makefile | 2 +- library/include/rc/model.h | 6 ++++-- library/include/rc/version.h | 6 +++--- library/src/model.c | 8 ++++++++ 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2ee23a6c..58bbdefb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +1.1.0 + * add support for hamster + 1.0.4 * fix missing stddef.h include in i2c.h * add kmartin36's PRU encoder robustness improvement @@ -187,4 +190,4 @@ 0.1.0 * installs on Blue as well and Black -// indentation is with spaces to allow copy/paste into debian/changelog \ No newline at end of file +// indentation is with spaces to allow copy/paste into debian/changelog diff --git a/library/Makefile b/library/Makefile index df460f2d..81075290 100644 --- a/library/Makefile +++ b/library/Makefile @@ -5,7 +5,7 @@ BUILDDIR := build INCLUDEDIR := include SHORTNAME := librobotcontrol.so SONAME := librobotcontrol.so.1 -FULLNAME := librobotcontrol.so.1.0.4 +FULLNAME := librobotcontrol.so.1.1.0 TARGET := $(LIBDIR)/$(FULLNAME) RC_VAR_DIR := var/lib/robotcontrol diff --git a/library/include/rc/model.h b/library/include/rc/model.h index f64b1b07..dbf0b301 100644 --- a/library/include/rc/model.h +++ b/library/include/rc/model.h @@ -50,7 +50,9 @@ typedef enum rc_model_t{ MODEL_RPI0_W, MODEL_RPI_CM, MODEL_RPI_CM3, - MODEL_PC + MODEL_PC, + MODEL_BB_AM57, + MODEL_BB_AM57_RC, } rc_model_t; @@ -101,4 +103,4 @@ void rc_model_category_print(void); #endif // RC_MODEL_H -/** @} end group Model*/ \ No newline at end of file +/** @} end group Model*/ diff --git a/library/include/rc/version.h b/library/include/rc/version.h index 020a7981..5040af53 100644 --- a/library/include/rc/version.h +++ b/library/include/rc/version.h @@ -19,8 +19,8 @@ extern "C" { #define RC_LIB_VERSION_MAJOR 1 -#define RC_LIB_VERSION_MINOR 0 -#define RC_LIB_VERSION_PATCH 4 +#define RC_LIB_VERSION_MINOR 1 +#define RC_LIB_VERSION_PATCH 0 #define RC_LIB_VERSION_HEX ((RC_LIB_VERSION_MAJOR << 16) | \ (RC_LIB_VERSION_MINOR << 8) | \ (RC_LIB_VERSION_PATCH)) @@ -58,4 +58,4 @@ void rc_version_print(void); #endif //RC_VERSION_H -/** @} end group version*/ \ No newline at end of file +/** @} end group version*/ diff --git a/library/src/model.c b/library/src/model.c index 0ddcd55d..92c1efdd 100644 --- a/library/src/model.c +++ b/library/src/model.c @@ -91,6 +91,14 @@ static void __check_model(void) current_model = MODEL_BB_BLUE; return; } + if(strcmp(c, "TI AM57xx BeagleBone")==0){ + current_model = MODEL_BB_AM57; + return; + } + if(strcmp(c, "TI AM57xx BeagleBone RoboticsCape")==0){ + current_model = MODEL_BB_AM57_RC; + return; + } return; }