Skad00sh / Mbed OS ES_CW2_Dev

Callum and Adel's changes on 12/02/19

Dependencies:   Crypto

Files at this revision

API Documentation at this revision

Revision 56:0e7f794d2676, committed 2019-05-07

Comitter:
adehadd
Date:
Tue May 07 13:34:58 2019 +0000
Parent:
55:e8b15b4b875f
Commit message:
fixed some errors that prevented compilation (!)

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file 
diff -r e8b15b4b875f -r 0e7f794d2676 main.cpp
--- a/main.cpp	Fri Mar 22 23:49:51 2019 +0000
+++ b/main.cpp	Tue May 07 13:34:58 2019 +0000
@@ -218,7 +218,7 @@
                     sscanf(_newCmd, "V%f", &_targetVel);                 // Find desired the target velocity
                     _modeBitField = 0x01;                               // Adjust bitfield pos 1
                     _motor_pos = 0; 
-                    if (&_targetVel < 0) {
+                    if (&_targetVel < (void *)0) {
                         _targetRot = -100;
                     } else {
                         _targetRot = 100;
@@ -413,7 +413,7 @@
                         encState;
 
         uint32_t        _mtrPeriod,                                      // Motor period
-                        _MAXPWM_PRD;
+                        _MAXPWM_PRD,
                         quadratureStates,
                         MINPWM_PRD,
                         maxEncCount,