aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-12-13 00:54:35 +0100
committerDimitri Sokolyuk <demon@dim13.org>2017-12-13 00:54:35 +0100
commit156a9a2271d47934a97ff00f33b8a61c8a49f125 (patch)
tree2f6a7b132dee1ddaae00484a398064f6b0a6603f
parent49b9dbaba204e6a69465e422f76debac540e75b7 (diff)
rename back
-rw-r--r--elegoo.go8
-rw-r--r--elegoo/NOTES.md (renamed from firmware/NOTES.md)0
-rw-r--r--elegoo/config.h (renamed from firmware/config.h)0
-rw-r--r--elegoo/elegoo.ino (renamed from firmware/elegoo.ino)0
-rw-r--r--elegoo/elegoo.pb.c (renamed from firmware/elegoo.pb.c)0
-rw-r--r--elegoo/elegoo.pb.h (renamed from firmware/elegoo.pb.h)0
-rw-r--r--elegoo/libs/0.3.8.zip (renamed from firmware/libs/0.3.8.zip)bin345356 -> 345356 bytes
-rw-r--r--elegoo/libs/Timer-1.3.zip (renamed from firmware/libs/Timer-1.3.zip)bin8308 -> 8308 bytes
-rw-r--r--elegoo/pb/pb.h (renamed from firmware/pb/pb.h)0
-rw-r--r--elegoo/pb/pb_common.c (renamed from firmware/pb/pb_common.c)0
-rw-r--r--elegoo/pb/pb_common.h (renamed from firmware/pb/pb_common.h)0
-rw-r--r--elegoo/pb/pb_decode.c (renamed from firmware/pb/pb_decode.c)0
-rw-r--r--elegoo/pb/pb_decode.h (renamed from firmware/pb/pb_decode.h)0
-rw-r--r--elegoo/pb/pb_encode.c (renamed from firmware/pb/pb_encode.c)0
-rw-r--r--elegoo/pb/pb_encode.h (renamed from firmware/pb/pb_encode.h)0
-rw-r--r--elegoo/pb/pb_stream.cpp (renamed from firmware/pb/pb_stream.cpp)0
-rw-r--r--elegoo/pb/pb_stream.h (renamed from firmware/pb/pb_stream.h)0
-rw-r--r--fsm.go2
18 files changed, 9 insertions, 1 deletions
diff --git a/elegoo.go b/elegoo.go
index 50ed37f..c2d19c7 100644
--- a/elegoo.go
+++ b/elegoo.go
@@ -19,6 +19,14 @@ func Send(w io.Writer, pb proto.Message) error {
return err
}
+func RecvR(r io.Reader, pb proto.Message) error {
+ block, err := bufio.NewReader(r).ReadBytes(0)
+ if err != nil {
+ return err
+ }
+ return proto.NewBuffer(cobs.Decode(block)).DecodeMessage(pb)
+}
+
func Recv(buf *bufio.Reader, pb proto.Message) error {
block, err := buf.ReadBytes(0)
if err != nil {
diff --git a/firmware/NOTES.md b/elegoo/NOTES.md
index 99a8dd0..99a8dd0 100644
--- a/firmware/NOTES.md
+++ b/elegoo/NOTES.md
diff --git a/firmware/config.h b/elegoo/config.h
index af497b1..af497b1 100644
--- a/firmware/config.h
+++ b/elegoo/config.h
diff --git a/firmware/elegoo.ino b/elegoo/elegoo.ino
index 6d72cd7..6d72cd7 100644
--- a/firmware/elegoo.ino
+++ b/elegoo/elegoo.ino
diff --git a/firmware/elegoo.pb.c b/elegoo/elegoo.pb.c
index bee2e3d..bee2e3d 100644
--- a/firmware/elegoo.pb.c
+++ b/elegoo/elegoo.pb.c
diff --git a/firmware/elegoo.pb.h b/elegoo/elegoo.pb.h
index b53e1cc..b53e1cc 100644
--- a/firmware/elegoo.pb.h
+++ b/elegoo/elegoo.pb.h
diff --git a/firmware/libs/0.3.8.zip b/elegoo/libs/0.3.8.zip
index 30a188f..30a188f 100644
--- a/firmware/libs/0.3.8.zip
+++ b/elegoo/libs/0.3.8.zip
Binary files differ
diff --git a/firmware/libs/Timer-1.3.zip b/elegoo/libs/Timer-1.3.zip
index ec94bc1..ec94bc1 100644
--- a/firmware/libs/Timer-1.3.zip
+++ b/elegoo/libs/Timer-1.3.zip
Binary files differ
diff --git a/firmware/pb/pb.h b/elegoo/pb/pb.h
index c7e6bc6..c7e6bc6 100644
--- a/firmware/pb/pb.h
+++ b/elegoo/pb/pb.h
diff --git a/firmware/pb/pb_common.c b/elegoo/pb/pb_common.c
index 4fb7186..4fb7186 100644
--- a/firmware/pb/pb_common.c
+++ b/elegoo/pb/pb_common.c
diff --git a/firmware/pb/pb_common.h b/elegoo/pb/pb_common.h
index 60b3d37..60b3d37 100644
--- a/firmware/pb/pb_common.h
+++ b/elegoo/pb/pb_common.h
diff --git a/firmware/pb/pb_decode.c b/elegoo/pb/pb_decode.c
index dc344dc..dc344dc 100644
--- a/firmware/pb/pb_decode.c
+++ b/elegoo/pb/pb_decode.c
diff --git a/firmware/pb/pb_decode.h b/elegoo/pb/pb_decode.h
index 398b24a..398b24a 100644
--- a/firmware/pb/pb_decode.h
+++ b/elegoo/pb/pb_decode.h
diff --git a/firmware/pb/pb_encode.c b/elegoo/pb/pb_encode.c
index b67b79b..b67b79b 100644
--- a/firmware/pb/pb_encode.c
+++ b/elegoo/pb/pb_encode.c
diff --git a/firmware/pb/pb_encode.h b/elegoo/pb/pb_encode.h
index 8bf78dd..8bf78dd 100644
--- a/firmware/pb/pb_encode.h
+++ b/elegoo/pb/pb_encode.h
diff --git a/firmware/pb/pb_stream.cpp b/elegoo/pb/pb_stream.cpp
index 41100ed..41100ed 100644
--- a/firmware/pb/pb_stream.cpp
+++ b/elegoo/pb/pb_stream.cpp
diff --git a/firmware/pb/pb_stream.h b/elegoo/pb/pb_stream.h
index 00be77c..00be77c 100644
--- a/firmware/pb/pb_stream.h
+++ b/elegoo/pb/pb_stream.h
diff --git a/fsm.go b/fsm.go
index a2ec938..d061995 100644
--- a/fsm.go
+++ b/fsm.go
@@ -60,7 +60,7 @@ func (f *FSM) initalState() stateFn {
func (f *FSM) readDistance() stateFn {
ev := <-f.events
log.Println(ev)
- if ev.Head.Distance < 20 {
+ if ev.Head != nil && ev.Head.Distance < 20 {
return f.stop
}
return f.moveAhead