diff options
| author | Mike Fiore <mfiore@multitech.com> | 2016-10-12 14:44:56 -0500 |
|---|---|---|
| committer | Mike Fiore <mfiore@multitech.com> | 2016-10-12 14:44:56 -0500 |
| commit | 0431c3fde7376018a22c28f273ec223da9f53254 (patch) | |
| tree | 534ea532d0fa93ae63f5e8cd69afc637ac1e6fa3 | |
| parent | fe933b9a96ba8327758ba49f5081066842d19783 (diff) | |
| download | mtdot-box-evb-factory-firmware-0431c3fde7376018a22c28f273ec223da9f53254.tar.gz mtdot-box-evb-factory-firmware-0431c3fde7376018a22c28f273ec223da9f53254.tar.bz2 mtdot-box-evb-factory-firmware-0431c3fde7376018a22c28f273ec223da9f53254.zip | |
update version file name to avoid conflicts with mbed-os headers
| -rw-r--r-- | CommandTerminal/CmdDisplayConfig.cpp | 2 | ||||
| -rw-r--r-- | CommandTerminal/CmdIdentification.cpp | 2 | ||||
| -rw-r--r-- | Layout/LayoutStartup.cpp | 2 | ||||
| -rwxr-xr-x | version.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/CommandTerminal/CmdDisplayConfig.cpp b/CommandTerminal/CmdDisplayConfig.cpp index 58ba86d..73c0442 100644 --- a/CommandTerminal/CmdDisplayConfig.cpp +++ b/CommandTerminal/CmdDisplayConfig.cpp @@ -17,7 +17,7 @@ */ #include "CmdDisplayConfig.h" -#include "version.h" +#include "dotbox_version.h" #include "MTSLog.h" std::string version = MTDOT_BOX_VERSION; diff --git a/CommandTerminal/CmdIdentification.cpp b/CommandTerminal/CmdIdentification.cpp index 1c576db..e92dc36 100644 --- a/CommandTerminal/CmdIdentification.cpp +++ b/CommandTerminal/CmdIdentification.cpp @@ -17,7 +17,7 @@ */ #include "CmdIdentification.h" -#include "version.h" +#include "dotbox_version.h" CmdIdentification::CmdIdentification(mDot* dot, mts::MTSSerial& serial) : Command(dot, "Request Id", "ATI", "Request Identification"), _serial(serial) { diff --git a/Layout/LayoutStartup.cpp b/Layout/LayoutStartup.cpp index b722aea..4603308 100644 --- a/Layout/LayoutStartup.cpp +++ b/Layout/LayoutStartup.cpp @@ -18,7 +18,7 @@ #include "LayoutStartup.h" #include "MultiTech_Logo.h" -#include "version.h" +#include "dotbox_version.h" #include "MTSText.h" LayoutStartup::LayoutStartup(DOGS102* lcd, mDot* dot) @@ -7,4 +7,4 @@ if [[ $BRANCH != "master" ]] && [[ $BRANCH != "(no branch)" ]]; then VERSION="$VERSION-$BRANCH" fi -echo -e "#ifndef __VERSION_H__\r\n#define __VERSION_H__\r\n\r\n#define MTDOT_BOX_VERSION \"$VERSION\"\r\n\r\n#endif" > version.h +echo -e "#ifndef __VERSION_H__\r\n#define __VERSION_H__\r\n\r\n#define MTDOT_BOX_VERSION \"$VERSION\"\r\n\r\n#endif" > dotbox_version.h |