Diff: fll.h

Revision:

29:2f3d6d09eaac

Parent:

6:d0348b7a2f05

diff -r d0348b7a2f05 -r 2f3d6d09eaac fll.h
--- a/fll.h	Sat Feb 14 08:02:21 2015 +0000
+++ b/fll.h	Sat Feb 14 08:14:07 2015 +0000
@@ -1,10 +1,12 @@
 // Frame Level Language
 // header
 
+#ifndef __FLL_H__
+#define __FLL_H__
+
 #include "mbed.h"
 #include "rtos.h"
 #include <stdint.h>
-#include <vector>
 
 #define R1 0x0001
 #define B_TRIANGLE 0x0002
@@ -32,28 +34,6 @@
     virtual button_t await() = 0;
 };
 
-// 0 input
-class RepeaterSource : public Producer {
-private:
-    int i;
-    button_t* button_seq;
-    int size;
-public:
-    RepeaterSource(button_t *bs, int s);
-    virtual button_t await();
-};
-
-// N inputs
-class FoldFlow : public Producer {
-private:
-    Producer** sources;
-    int sources_size;
-public:
-    FoldFlow(Producer **srcs, int srcs_size);
-    virtual button_t fold(button_t *bs, int bs_size) = 0;
-    virtual button_t await();
-};
-
 // ストリームの終端になっていて、キー入力をするスレッドに向けてキーを送る
 class Sink
 {
@@ -78,3 +58,5 @@
 };
 
 void press(button_t btn);
+
+#endif