Skip to content

Commit

Permalink
add version and model changes, TODO: real model name in future
Browse files Browse the repository at this point in the history
  • Loading branch information
James committed Jan 9, 2019
1 parent 2c83c78 commit 6bd8293
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 7 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
1.1.0
* add support for hamster

This comment has been minimized.

Copy link
@jadonk

jadonk Jun 2, 2020

Member

Let's put the new name in here. :-)


1.0.4
* fix missing stddef.h include in i2c.h
* add kmartin36's PRU encoder robustness improvement
Expand Down Expand Up @@ -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
// indentation is with spaces to allow copy/paste into debian/changelog
2 changes: 1 addition & 1 deletion library/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 4 additions & 2 deletions library/include/rc/model.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,

This comment has been minimized.

Copy link
@jadonk

jadonk Jun 2, 2020

Member

Probably should use BB_AI.

MODEL_BB_AM57_RC,
} rc_model_t;


Expand Down Expand Up @@ -101,4 +103,4 @@ void rc_model_category_print(void);

#endif // RC_MODEL_H

/** @} end group Model*/
/** @} end group Model*/
6 changes: 3 additions & 3 deletions library/include/rc/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -58,4 +58,4 @@ void rc_version_print(void);

#endif //RC_VERSION_H

/** @} end group version*/
/** @} end group version*/
8 changes: 8 additions & 0 deletions library/src/model.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,14 @@ static void __check_model(void)
current_model = MODEL_BB_BLUE;
return;
}
if(strcmp(c, "TI AM57xx BeagleBone")==0){

This comment has been minimized.

Copy link
@jadonk

jadonk Jun 2, 2020

Member

Probably doesn't match the actual string.

"BeagleBoard.org BeagleBone AI"

jadonk@144daed

current_model = MODEL_BB_AM57;
return;
}
if(strcmp(c, "TI AM57xx BeagleBone RoboticsCape")==0){
current_model = MODEL_BB_AM57_RC;
return;
}
return;
}

Expand Down

0 comments on commit 6bd8293

Please sign in to comment.