diff options
author | Mike Fiore <mfiore@multitech.com> | 2015-12-01 15:15:47 -0600 |
---|---|---|
committer | Mike Fiore <mfiore@multitech.com> | 2015-12-01 15:15:47 -0600 |
commit | ab6c90739bc2efb5eaf94474be8916fe0f990707 (patch) | |
tree | 345177a64b8ef13d1a6c89b3d2aceb0e7c83e3df /main.cpp | |
parent | 4a7ab715f7115460892927b998b2c45828f275d6 (diff) | |
parent | 96fd7995d2d2ae16c2be7ed30b1e4aacc79d3a61 (diff) | |
download | mtdot-box-evb-factory-firmware-ab6c90739bc2efb5eaf94474be8916fe0f990707.tar.gz mtdot-box-evb-factory-firmware-ab6c90739bc2efb5eaf94474be8916fe0f990707.tar.bz2 mtdot-box-evb-factory-firmware-ab6c90739bc2efb5eaf94474be8916fe0f990707.zip |
Merge branch 'modeDemo'
Conflicts:
Mode/Mode.cpp
Diffstat (limited to 'main.cpp')
-rw-r--r-- | main.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -4,11 +4,6 @@ // MTS headers #include "mDot.h" #include "MTSLog.h" -// sensor headers -#include "ISL29011.h" -#include "MMA845x.h" -#include "MPL3115A2.h" -#include "GPSPARSER.h" // display headers #include "DOGS102.h" #include "NCP5623B.h" |