Bradley Perry / LinearBlend1

changed because of naming conflict

Fork of LinearBlend by Bradley Perry

Files at this revision

API Documentation at this revision

Revision 4:a25456624155, committed 2015-05-13

Comitter:
perr1940
Date:
Wed May 13 19:21:33 2015 +0000
Parent:
3:3503662f78fb
Commit message:
initial publish

Changed in this revision

LinearBlend.cpp Show annotated file Show diff for this revision Revisions of this file
LinearBlend.h Show annotated file Show diff for this revision Revisions of this file 
--- a/LinearBlend.cpp	Mon Nov 24 03:33:14 2014 +0000
+++ b/LinearBlend.cpp	Wed May 13 19:21:33 2015 +0000
@@ -4,7 +4,7 @@
 /***********************************************************
 Constructor
 ***********************************************************/
-LinearBlend::LinearBlend():start(0),slope(0)
+LinearBlend1::LinearBlend1():start(0),slope(0)
 {
 }
 
@@ -34,7 +34,7 @@
     return ref;
 }*/
 
-float* LinearBlend::blend(float end, float s, int t_blend, float ref[])
+float* LinearBlend1::blend(float end, float s, int t_blend, float ref[])
 {
     slope=(end-s)/t_blend;
     //Pointer to the variable to store the trajectory point for the left side

--- a/LinearBlend.h	Mon Nov 24 03:33:14 2014 +0000
+++ b/LinearBlend.h	Wed May 13 19:21:33 2015 +0000
@@ -4,7 +4,7 @@
 #include "mbed.h"
 
 // Define a BaseClass called LinearBlend
-class LinearBlend{
+class LinearBlend1{
     /***********************************************************
     Constructor
     ***********************************************************/
@@ -14,7 +14,7 @@
     Functions
     ***********************************************************/
     public:
-    LinearBlend(); 
+    LinearBlend1(); 
     /*void init(float end, float start, int t_blend);
     float* blend(float ref[]);*/
     float* blend(float end, float s, int t_blend, float ref[]);