changed because of naming conflict

Fork of LinearBlend by Bradley Perry

Committer:
perr1940
Date:
Wed May 13 19:21:33 2015 +0000
Revision:
4:a25456624155
Parent:
2:8e81d72bf792
initial publish

Who changed what in which revision?

UserRevisionLine numberNew contents of line
perr1940 2:8e81d72bf792 1 #ifndef LINEARBLEND_H
perr1940 2:8e81d72bf792 2 #define LINEARBLEND_H
perr1940 2:8e81d72bf792 3
perr1940 2:8e81d72bf792 4 #include "mbed.h"
perr1940 2:8e81d72bf792 5
perr1940 2:8e81d72bf792 6 // Define a BaseClass called LinearBlend
perr1940 4:a25456624155 7 class LinearBlend1{
perr1940 2:8e81d72bf792 8 /***********************************************************
perr1940 2:8e81d72bf792 9 Constructor
perr1940 2:8e81d72bf792 10 ***********************************************************/
perr1940 2:8e81d72bf792 11
perr1940 2:8e81d72bf792 12
perr1940 2:8e81d72bf792 13 /***********************************************************
perr1940 2:8e81d72bf792 14 Functions
perr1940 2:8e81d72bf792 15 ***********************************************************/
perr1940 2:8e81d72bf792 16 public:
perr1940 4:a25456624155 17 LinearBlend1();
perr1940 2:8e81d72bf792 18 /*void init(float end, float start, int t_blend);
perr1940 2:8e81d72bf792 19 float* blend(float ref[]);*/
perr1940 2:8e81d72bf792 20 float* blend(float end, float s, int t_blend, float ref[]);
perr1940 2:8e81d72bf792 21
perr1940 2:8e81d72bf792 22 /***********************************************************
perr1940 2:8e81d72bf792 23 Initialize and Define Variables
perr1940 2:8e81d72bf792 24 ***********************************************************/
perr1940 2:8e81d72bf792 25 private:
perr1940 2:8e81d72bf792 26 float slope;
perr1940 2:8e81d72bf792 27 int t_blend;
perr1940 2:8e81d72bf792 28 float start;
perr1940 2:8e81d72bf792 29
perr1940 2:8e81d72bf792 30 };
perr1940 2:8e81d72bf792 31
perr1940 2:8e81d72bf792 32 #endif