changed to be compatible with struct
Fork of dataComm by
Diff: dataComm.cpp
- Revision:
- 7:26d706d285c1
- Parent:
- 6:502959ea39e4
- Child:
- 8:78435e587de1
- Child:
- 9:7486fb079085
--- a/dataComm.cpp Mon May 11 21:46:44 2015 +0000 +++ b/dataComm.cpp Wed May 13 19:21:55 2015 +0000 @@ -66,15 +66,15 @@ } else if (var.compare("WalkAngle")==0) { return (short)((fsm.get_backbias()-MIN_WALK)/(MAX_WALK-MIN_WALK)*100); } else if (var.compare("StepTime")==0) { - return (short) ((MMgait.time_steps-MIN_STEPTIME)/(MAX_STEPTIME-MIN_STEPTIME)*100); + return (short) ((mm_gait_params.time_steps-MIN_STEPTIME)/(MAX_STEPTIME-MIN_STEPTIME)*100); } else if (var.compare("PhaseShift") == 0) { - return (short) ((MMgait.peak_time-MIN_PHASESHIFT)/(MAX_PHASESHIFT-MIN_PHASESHIFT)*100); + return (short) ((mm_gait_params.peak_time-MIN_PHASESHIFT)/(MAX_PHASESHIFT-MIN_PHASESHIFT)*100); } else if (var.compare("WalkAngle") == 0) { - return (short) ((MMgait.walking_angle-MIN_WALK)/(MAX_WALK-MIN_WALK)*100); + return (short) ((mm_gait_params.walking_angle-MIN_WALK)/(MAX_WALK-MIN_WALK)*100); } else if (var.compare("StepLength") == 0) { - return (short) ((MMgait.end_angle-MIN_STEPLEN)/(MAX_STEPLEN-MIN_STEPLEN)*100); + return (short) ((mm_gait_params.end_angle-MIN_STEPLEN)/(MAX_STEPLEN-MIN_STEPLEN)*100); } else if (var.compare("HipFlex") == 0) { - return (short) ((MMgait.max_angle-MIN_HIPFLEX)/(MAX_HIPFLEX-MIN_HIPFLEX)*100); + return (short) ((mm_gait_params.max_angle-MIN_HIPFLEX)/(MAX_HIPFLEX-MIN_HIPFLEX)*100); } return 0; @@ -108,7 +108,7 @@ tSittingDown = MIN_SDTIME + (float)newval/100*(MAX_SDTIME-MIN_SDTIME); // pc.printf("%d\r\n", (short)tSittingDown); } else if (var.compare("StandingAngle")==0) { - pc.printf("LED\r\n"); + //pc.printf("LED\r\n"); motorLED = 1; stand_adjust = MIN_STAND + float(newval)/100*(MAX_STAND-MIN_STAND); encoder_L.init(zero_ang_L+stand_adjust); @@ -118,15 +118,15 @@ fsm.set_backbias(MIN_WALK+(float)newval/100*(MAX_WALK-MIN_WALK)); // pc.printf("%d\r\n", (short)fsm.get_backbias()); } else if (var.compare("StepTime")==0) { - MMgait.time_steps = (float)newval/100*(MAX_STEPTIME-MIN_STEPTIME); + mm_gait_params.time_steps = (float)newval/100*(MAX_STEPTIME-MIN_STEPTIME); } else if (var.compare("PhaseShift") == 0) { - MMgait.peak_time = (float)newval/100*(MAX_PHASESHIFT-MIN_PHASESHIFT); + mm_gait_params.peak_time = (float)newval/100*(MAX_PHASESHIFT-MIN_PHASESHIFT); } else if (var.compare("WalkAngle") == 0) { - MMgait.walking_angle = (float)newval/100*(MAX_WALK-MIN_WALK); + mm_gait_params.walking_angle = (float)newval/100*(MAX_WALK-MIN_WALK); } else if (var.compare("StepLength") == 0) { - MMgait.end_angle = (float)newval/100*(MAX_STEPLEN-MIN_STEPLEN); + mm_gait_params.end_angle = (float)newval/100*(MAX_STEPLEN-MIN_STEPLEN); } else if (var.compare("HipFlex") == 0) { - MMgait.max_angle = (float)newval/100*(MAX_HIPFLEX-MIN_HIPFLEX); + mm_gait_params.max_angle = (float)newval/100*(MAX_HIPFLEX-MIN_HIPFLEX); } //MORE else blocks for gait params