Fix unit bug

theol0403 · Jan 23, 2020 · 2c513b0 · 2c513b0
1 parent ecb23c3
commit 2c513b0
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ USE_PACKAGE:=0
 IS_LIBRARY:=1
 # TODO: CHANGE THIS!
 LIBNAME:=odomDebug
-VERSION:=1.1.0
+VERSION:=1.1.1
 # EXCLUDE_SRC_FROM_LIB= $(SRCDIR)/unpublishedfile.c
 # this line excludes opcontrol.c and similar files
 EXCLUDE_SRC_FROM_LIB+=$(foreach file, $(SRCDIR)/opcontrol $(SRCDIR)/initialize $(SRCDIR)/autonomous,$(foreach cext,$(CEXTS),$(file).$(cext)) $(foreach cxxext,$(CXXEXTS),$(file).$(cxxext)))

diff --git a/README.md b/README.md
@@ -6,7 +6,8 @@ Display the robot on a VEX field using odometry and LVGL.
 # Installation in external project
 ### Use pre-built template
 Instead of building the project yourself you can use a pre-built template to apply to your external project.
-Download <a href="https://github.com/theol0403/odomDebug/raw/master/odomDebug%401.1.0.zip" target="_blank">`[email protected]`</a> from the repository and then fetch into PROS as described below.
+Download <a href="https://github.com/theol0403/odomDebug/raw/master/odomDebug%401.1.1.zip" target="_blank">`[email protected]`</a> from the repository and then fetch into PROS as described below.
+
 ### Building
 To build the template yourself, clone the repository and run `prosv5 make template`.
 ### Apply template to project 

diff --git a/bin/odomDebug.a b/bin/odomDebug.a
diff --git a/[email protected] b/[email protected]
diff --git a/[email protected] b/[email protected]
diff --git a/[email protected] b/[email protected]
diff --git a/src/odomDebug/odomDebug.cpp b/src/odomDebug/odomDebug.cpp
@@ -272,8 +272,8 @@ void OdomDebug::setData(state_t state, sensors_t sensors) {
   lv_obj_invalidate(line);
 
   std::string text =
-  "X_in: " + std::to_string(state.x.convert(foot)) + "\n" +
-  "Y_in: " + std::to_string(state.y.convert(foot)) + "\n" +
+  "X_in: " + std::to_string(state.x.convert(inch)) + "\n" +
+  "Y_in: " + std::to_string(state.y.convert(inch)) + "\n" +
   "Theta_deg: " + std::to_string(state.theta.convert(degree)) + "\n" +
   "Left: " + std::to_string(sensors.left) + "\n" +
   "Right: " + std::to_string(sensors.right);