Joseph Bradshaw / Axis_version2

Dependencies:   PID LS7366LIB MotCon2

Files at this revision

API Documentation at this revision

Comitter:
jebradshaw
Date:
Tue Nov 15 15:41:33 2016 +0000
Parent:
10:32faca5a2577
Child:
12:7a7fe3baf733
Commit message:
Latest Axis class library as of 20161115

Changed in this revision

Axis.cpp Show annotated file Show diff for this revision Revisions of this file
Axis.h Show annotated file Show diff for this revision Revisions of this file
MotCon.lib Show annotated file Show diff for this revision Revisions of this file
--- a/Axis.cpp	Wed Aug 31 21:46:27 2016 +0000
+++ b/Axis.cpp	Tue Nov 15 15:41:33 2016 +0000
@@ -255,7 +255,7 @@
 }
 
 float Axis::readCurrent(void){    
-    motCurrent = (this->_analog.read() * 3.3)/ .525;  //525mV per amp
+    motCurrent = (this->_analog.read() * 3.3) / .525;  //525mV per amp
     return motCurrent;
 }
 
--- a/Axis.h	Wed Aug 31 21:46:27 2016 +0000
+++ b/Axis.h	Tue Nov 15 15:41:33 2016 +0000
@@ -1,7 +1,7 @@
 
 
-#ifndef MBED_ROBOTARM_H
-#define MBED_ROBOTARM_H
+#ifndef MBED_AXIS_H
+#define MBED_AXIS_H
  
 #include "mbed.h"
 #include "PID.h"        //library for software routine PID controller
--- a/MotCon.lib	Wed Aug 31 21:46:27 2016 +0000
+++ b/MotCon.lib	Tue Nov 15 15:41:33 2016 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/users/jebradshaw/code/MotCon/#10187d108666
+https://developer.mbed.org/users/jebradshaw/code/MotCon/#709761ee0a14