aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-12-13 00:35:41 +0100
committerDimitri Sokolyuk <demon@dim13.org>2017-12-13 00:35:41 +0100
commit0a63ac38297b8b6dd343a0b66feda9533c2eb834 (patch)
treef489ac9f232d2eead0a74d642cfae20534966cbc
parent4f954f2daed0cb4f9c522002221a706e01c3e31e (diff)
...
-rw-r--r--elegoo.go4
-rw-r--r--firmware/NOTES.md (renamed from elegoo/NOTES.md)0
-rw-r--r--firmware/config.h (renamed from elegoo/config.h)0
-rw-r--r--firmware/elegoo.ino (renamed from elegoo/elegoo.ino)0
-rw-r--r--firmware/elegoo.pb.c (renamed from elegoo/elegoo.pb.c)2
-rw-r--r--firmware/elegoo.pb.h (renamed from elegoo/elegoo.pb.h)2
-rw-r--r--firmware/libs/0.3.8.zip (renamed from elegoo/libs/0.3.8.zip)bin345356 -> 345356 bytes
-rw-r--r--firmware/libs/Timer-1.3.zip (renamed from elegoo/libs/Timer-1.3.zip)bin8308 -> 8308 bytes
-rw-r--r--firmware/pb/pb.h (renamed from elegoo/pb/pb.h)0
-rw-r--r--firmware/pb/pb_common.c (renamed from elegoo/pb/pb_common.c)0
-rw-r--r--firmware/pb/pb_common.h (renamed from elegoo/pb/pb_common.h)0
-rw-r--r--firmware/pb/pb_decode.c (renamed from elegoo/pb/pb_decode.c)0
-rw-r--r--firmware/pb/pb_decode.h (renamed from elegoo/pb/pb_decode.h)0
-rw-r--r--firmware/pb/pb_encode.c (renamed from elegoo/pb/pb_encode.c)0
-rw-r--r--firmware/pb/pb_encode.h (renamed from elegoo/pb/pb_encode.h)0
-rw-r--r--firmware/pb/pb_stream.cpp (renamed from elegoo/pb/pb_stream.cpp)0
-rw-r--r--firmware/pb/pb_stream.h (renamed from elegoo/pb/pb_stream.h)0
17 files changed, 4 insertions, 4 deletions
diff --git a/elegoo.go b/elegoo.go
index a7ed182..50ed37f 100644
--- a/elegoo.go
+++ b/elegoo.go
@@ -5,10 +5,10 @@ import (
"io"
"github.com/dim13/cobs"
- proto "github.com/golang/protobuf/proto"
+ "github.com/golang/protobuf/proto"
)
-//go:generate sh -c "protoc --go_out=. --nanopb_out=elegoo/ *.proto"
+//go:generate sh -c "protoc --go_out=. --nanopb_out=firmware/ *.proto"
func Send(w io.Writer, pb proto.Message) error {
buf := new(proto.Buffer)
diff --git a/elegoo/NOTES.md b/firmware/NOTES.md
index 99a8dd0..99a8dd0 100644
--- a/elegoo/NOTES.md
+++ b/firmware/NOTES.md
diff --git a/elegoo/config.h b/firmware/config.h
index af497b1..af497b1 100644
--- a/elegoo/config.h
+++ b/firmware/config.h
diff --git a/elegoo/elegoo.ino b/firmware/elegoo.ino
index 6d72cd7..6d72cd7 100644
--- a/elegoo/elegoo.ino
+++ b/firmware/elegoo.ino
diff --git a/elegoo/elegoo.pb.c b/firmware/elegoo.pb.c
index f6e5c20..bee2e3d 100644
--- a/elegoo/elegoo.pb.c
+++ b/firmware/elegoo.pb.c
@@ -1,5 +1,5 @@
/* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.9 at Wed Dec 13 00:31:29 2017. */
+/* Generated by nanopb-0.3.9 at Wed Dec 13 00:35:27 2017. */
#include "elegoo.pb.h"
diff --git a/elegoo/elegoo.pb.h b/firmware/elegoo.pb.h
index e0a158b..b53e1cc 100644
--- a/elegoo/elegoo.pb.h
+++ b/firmware/elegoo.pb.h
@@ -1,5 +1,5 @@
/* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.9 at Wed Dec 13 00:31:29 2017. */
+/* Generated by nanopb-0.3.9 at Wed Dec 13 00:35:27 2017. */
#ifndef PB_ELEGOO_ELEGOO_PB_H_INCLUDED
#define PB_ELEGOO_ELEGOO_PB_H_INCLUDED
diff --git a/elegoo/libs/0.3.8.zip b/firmware/libs/0.3.8.zip
index 30a188f..30a188f 100644
--- a/elegoo/libs/0.3.8.zip
+++ b/firmware/libs/0.3.8.zip
Binary files differ
diff --git a/elegoo/libs/Timer-1.3.zip b/firmware/libs/Timer-1.3.zip
index ec94bc1..ec94bc1 100644
--- a/elegoo/libs/Timer-1.3.zip
+++ b/firmware/libs/Timer-1.3.zip
Binary files differ
diff --git a/elegoo/pb/pb.h b/firmware/pb/pb.h
index c7e6bc6..c7e6bc6 100644
--- a/elegoo/pb/pb.h
+++ b/firmware/pb/pb.h
diff --git a/elegoo/pb/pb_common.c b/firmware/pb/pb_common.c
index 4fb7186..4fb7186 100644
--- a/elegoo/pb/pb_common.c
+++ b/firmware/pb/pb_common.c
diff --git a/elegoo/pb/pb_common.h b/firmware/pb/pb_common.h
index 60b3d37..60b3d37 100644
--- a/elegoo/pb/pb_common.h
+++ b/firmware/pb/pb_common.h
diff --git a/elegoo/pb/pb_decode.c b/firmware/pb/pb_decode.c
index dc344dc..dc344dc 100644
--- a/elegoo/pb/pb_decode.c
+++ b/firmware/pb/pb_decode.c
diff --git a/elegoo/pb/pb_decode.h b/firmware/pb/pb_decode.h
index 398b24a..398b24a 100644
--- a/elegoo/pb/pb_decode.h
+++ b/firmware/pb/pb_decode.h
diff --git a/elegoo/pb/pb_encode.c b/firmware/pb/pb_encode.c
index b67b79b..b67b79b 100644
--- a/elegoo/pb/pb_encode.c
+++ b/firmware/pb/pb_encode.c
diff --git a/elegoo/pb/pb_encode.h b/firmware/pb/pb_encode.h
index 8bf78dd..8bf78dd 100644
--- a/elegoo/pb/pb_encode.h
+++ b/firmware/pb/pb_encode.h
diff --git a/elegoo/pb/pb_stream.cpp b/firmware/pb/pb_stream.cpp
index 41100ed..41100ed 100644
--- a/elegoo/pb/pb_stream.cpp
+++ b/firmware/pb/pb_stream.cpp
diff --git a/elegoo/pb/pb_stream.h b/firmware/pb/pb_stream.h
index 00be77c..00be77c 100644
--- a/elegoo/pb/pb_stream.h
+++ b/firmware/pb/pb_stream.h