diff options
Diffstat (limited to 'scala/ace/src/main/scala/com/github/jodersky/ace')
-rw-r--r-- | scala/ace/src/main/scala/com/github/jodersky/ace/Arq.scala (renamed from scala/ace/src/main/scala/com/github/jodersky/ace/protocol/Arq.scala) | 2 | ||||
-rw-r--r-- | scala/ace/src/main/scala/com/github/jodersky/ace/Framer.scala (renamed from scala/ace/src/main/scala/com/github/jodersky/ace/protocol/Framer.scala) | 2 | ||||
-rw-r--r-- | scala/ace/src/main/scala/com/github/jodersky/ace/PhysicalLayer.scala | 5 | ||||
-rw-r--r-- | scala/ace/src/main/scala/com/github/jodersky/ace/ReactiveLayer.scala (renamed from scala/ace/src/main/scala/com/github/jodersky/ace/protocol/ReactiveLayer.scala) | 2 | ||||
-rw-r--r-- | scala/ace/src/main/scala/com/github/jodersky/ace/SimpleActionLayer.scala (renamed from scala/ace/src/main/scala/com/github/jodersky/ace/protocol/SimpleActionLayer.scala) | 2 | ||||
-rw-r--r-- | scala/ace/src/main/scala/com/github/jodersky/ace/serial/Serial.scala | 15 | ||||
-rw-r--r-- | scala/ace/src/main/scala/com/github/jodersky/ace/serial/SerialProvider.scala | 7 |
7 files changed, 9 insertions, 26 deletions
diff --git a/scala/ace/src/main/scala/com/github/jodersky/ace/protocol/Arq.scala b/scala/ace/src/main/scala/com/github/jodersky/ace/Arq.scala index 4a4ed8d..f7c4376 100644 --- a/scala/ace/src/main/scala/com/github/jodersky/ace/protocol/Arq.scala +++ b/scala/ace/src/main/scala/com/github/jodersky/ace/Arq.scala @@ -1,4 +1,4 @@ -package com.github.jodersky.ace.protocol +package com.github.jodersky.ace import scala.concurrent._ import scala.concurrent.ExecutionContext.Implicits.global diff --git a/scala/ace/src/main/scala/com/github/jodersky/ace/protocol/Framer.scala b/scala/ace/src/main/scala/com/github/jodersky/ace/Framer.scala index 5558db3..8546c48 100644 --- a/scala/ace/src/main/scala/com/github/jodersky/ace/protocol/Framer.scala +++ b/scala/ace/src/main/scala/com/github/jodersky/ace/Framer.scala @@ -1,4 +1,4 @@ -package com.github.jodersky.ace.protocol +package com.github.jodersky.ace import scala.collection.mutable.ArrayBuffer import scala.concurrent.Future diff --git a/scala/ace/src/main/scala/com/github/jodersky/ace/PhysicalLayer.scala b/scala/ace/src/main/scala/com/github/jodersky/ace/PhysicalLayer.scala new file mode 100644 index 0000000..61ebd88 --- /dev/null +++ b/scala/ace/src/main/scala/com/github/jodersky/ace/PhysicalLayer.scala @@ -0,0 +1,5 @@ +package com.github.jodersky.ace + +trait PhysicalLayer extends ReactiveLayer[Nothing, Seq[Int]] { + protected def receive(nothing: Nothing) = throw new UnsupportedOperationException("A receive function cannot be called on the lowest layer.") +}
\ No newline at end of file diff --git a/scala/ace/src/main/scala/com/github/jodersky/ace/protocol/ReactiveLayer.scala b/scala/ace/src/main/scala/com/github/jodersky/ace/ReactiveLayer.scala index c9531c0..9d426d3 100644 --- a/scala/ace/src/main/scala/com/github/jodersky/ace/protocol/ReactiveLayer.scala +++ b/scala/ace/src/main/scala/com/github/jodersky/ace/ReactiveLayer.scala @@ -1,4 +1,4 @@ -package com.github.jodersky.ace.protocol +package com.github.jodersky.ace import scala.concurrent.Future diff --git a/scala/ace/src/main/scala/com/github/jodersky/ace/protocol/SimpleActionLayer.scala b/scala/ace/src/main/scala/com/github/jodersky/ace/SimpleActionLayer.scala index 81e39cb..4026c08 100644 --- a/scala/ace/src/main/scala/com/github/jodersky/ace/protocol/SimpleActionLayer.scala +++ b/scala/ace/src/main/scala/com/github/jodersky/ace/SimpleActionLayer.scala @@ -1,4 +1,4 @@ -package com.github.jodersky.ace.protocol +package com.github.jodersky.ace class SimpleActionLayer[A](action: A => Unit) extends ReactiveLayer[A, A] { protected def receive(data: A) = action(data) diff --git a/scala/ace/src/main/scala/com/github/jodersky/ace/serial/Serial.scala b/scala/ace/src/main/scala/com/github/jodersky/ace/serial/Serial.scala deleted file mode 100644 index b688ec8..0000000 --- a/scala/ace/src/main/scala/com/github/jodersky/ace/serial/Serial.scala +++ /dev/null @@ -1,15 +0,0 @@ -package com.github.jodersky.ace.serial - -import com.github.jodersky.ace.protocol.ReactiveLayer - -trait Serial extends ReactiveLayer[Nothing, Seq[Int]] { - protected def receive(nothing: Nothing) = throw new UnsupportedOperationException("A receive function cannot be called on the lowest layer.") - - def begin(): Unit - def close(): Unit - -} - -object Serial { - def open(port: String, baudRate: Int)(implicit provider: SerialProvider) = provider.open(port, baudRate) -}
\ No newline at end of file diff --git a/scala/ace/src/main/scala/com/github/jodersky/ace/serial/SerialProvider.scala b/scala/ace/src/main/scala/com/github/jodersky/ace/serial/SerialProvider.scala deleted file mode 100644 index 9c7b95c..0000000 --- a/scala/ace/src/main/scala/com/github/jodersky/ace/serial/SerialProvider.scala +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.jodersky.ace.serial - -trait SerialProvider { - - def open(port: String, baudRate: Int): Serial - -}
\ No newline at end of file |