From bee2c5b3a703080f4552946bb2f1ab737e1f53fe Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 11 Dec 2017 22:34:32 +0100 Subject: ... --- elegoo.pb.go | 50 +++++++++++++++++++++++++------------------------- elegoo.proto | 2 +- elegoo/elegoo.ino | 4 ++-- elegoo/elegoo.pb.c | 6 +++--- elegoo/elegoo.pb.h | 6 +++--- fsm.go | 2 +- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/elegoo.pb.go b/elegoo.pb.go index 9e41ff7..9450be6 100644 --- a/elegoo.pb.go +++ b/elegoo.pb.go @@ -59,7 +59,7 @@ func (m *Speed) GetR() int32 { type Command struct { Speed *Speed `protobuf:"bytes,1,opt,name=Speed" json:"Speed,omitempty"` Stop bool `protobuf:"varint,3,opt,name=Stop" json:"Stop,omitempty"` - Direction uint32 `protobuf:"varint,4,opt,name=Direction" json:"Direction,omitempty"` + Look uint32 `protobuf:"varint,4,opt,name=Look" json:"Look,omitempty"` StopAfter uint32 `protobuf:"varint,5,opt,name=StopAfter" json:"StopAfter,omitempty"` } @@ -82,9 +82,9 @@ func (m *Command) GetStop() bool { return false } -func (m *Command) GetDirection() uint32 { +func (m *Command) GetLook() uint32 { if m != nil { - return m.Direction + return m.Look } return 0 } @@ -220,26 +220,26 @@ func init() { func init() { proto.RegisterFile("elegoo.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 322 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x52, 0x4f, 0x4b, 0xc3, 0x30, - 0x1c, 0x25, 0xae, 0xab, 0xf5, 0xb7, 0x15, 0x66, 0x40, 0x28, 0xe2, 0x61, 0x56, 0x90, 0x5e, 0xdc, - 0x61, 0xfa, 0x05, 0xb4, 0x53, 0x14, 0x77, 0xfa, 0x55, 0x2f, 0xde, 0xe2, 0xf6, 0x9b, 0x14, 0xd6, - 0xa4, 0x64, 0x41, 0xf0, 0xe2, 0xc7, 0xf1, 0x73, 0x4a, 0x92, 0x66, 0x65, 0xb7, 0xbc, 0x3f, 0xcd, - 0x7b, 0x7d, 0x04, 0xc6, 0xb4, 0xa5, 0x2f, 0xa5, 0x66, 0xad, 0x56, 0x46, 0xf1, 0xd8, 0xa3, 0xfc, - 0x0a, 0x86, 0x55, 0x4b, 0xb4, 0xe6, 0x63, 0x60, 0xcb, 0x8c, 0x4d, 0x59, 0x71, 0x8a, 0x6c, 0x69, - 0x11, 0x66, 0x47, 0x1e, 0x61, 0xfe, 0x0b, 0xc7, 0xa5, 0x6a, 0x1a, 0x21, 0xd7, 0x3c, 0xf8, 0x9d, - 0x75, 0x34, 0x4f, 0x67, 0xdd, 0xad, 0x8e, 0xc4, 0xee, 0x2e, 0x0e, 0x51, 0x65, 0x54, 0x9b, 0x0d, - 0xa6, 0xac, 0x48, 0xd0, 0x9d, 0xf9, 0x05, 0x9c, 0x2c, 0x6a, 0x4d, 0x2b, 0x53, 0x2b, 0x99, 0x45, - 0x53, 0x56, 0xa4, 0xd8, 0x13, 0x56, 0xb5, 0xae, 0xfb, 0x8d, 0x21, 0x9d, 0x0d, 0xbd, 0xba, 0x27, - 0xf2, 0x27, 0x80, 0xf7, 0xad, 0xd1, 0xa2, 0x52, 0xb2, 0x5e, 0xf1, 0x73, 0x48, 0x16, 0xf5, 0xce, - 0x08, 0xb9, 0x22, 0xd7, 0x22, 0xc5, 0x3d, 0x3e, 0x4c, 0xf1, 0xfd, 0x7b, 0x22, 0xbf, 0x83, 0xe4, - 0x45, 0x6e, 0xb4, 0x40, 0xff, 0xbf, 0xe8, 0x3e, 0x4f, 0x90, 0xa1, 0x45, 0xa5, 0xf3, 0x27, 0xc8, - 0x4a, 0xbf, 0x85, 0x2f, 0xcf, 0x96, 0xf9, 0x25, 0xa4, 0x48, 0x8d, 0x32, 0x54, 0x2a, 0x69, 0xb4, - 0xda, 0xf2, 0x09, 0x0c, 0x5e, 0xe9, 0xa7, 0xcb, 0xb6, 0xc7, 0xfc, 0x8f, 0xc1, 0xf0, 0xf1, 0x9b, - 0xa4, 0xe1, 0xd7, 0x10, 0x3d, 0x93, 0x08, 0xf3, 0xf0, 0x30, 0x4f, 0x5f, 0x1f, 0x9d, 0xce, 0x0b, - 0x88, 0x2b, 0x92, 0x3b, 0xa5, 0x5d, 0xea, 0x68, 0x3e, 0x09, 0xce, 0x50, 0x10, 0x3b, 0x9d, 0xdf, - 0x40, 0xec, 0xe3, 0x5d, 0xa3, 0xd1, 0xfc, 0x2c, 0x38, 0x0f, 0x4a, 0x61, 0x67, 0xb2, 0x0b, 0xbc, - 0xd5, 0x0d, 0x55, 0x46, 0x34, 0x6d, 0xd8, 0x79, 0x4f, 0x3c, 0xc4, 0x1f, 0x51, 0x23, 0x6a, 0xf9, - 0x19, 0xbb, 0x57, 0x70, 0xfb, 0x1f, 0x00, 0x00, 0xff, 0xff, 0xc2, 0x8f, 0xab, 0x39, 0x15, 0x02, - 0x00, 0x00, + // 323 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x51, 0xc1, 0x4a, 0xc3, 0x40, + 0x10, 0x65, 0x6d, 0x1a, 0xe3, 0xb4, 0x81, 0xba, 0x20, 0x04, 0xf1, 0x50, 0x23, 0x48, 0x2e, 0xf6, + 0x50, 0xfd, 0x01, 0x4d, 0x15, 0xc5, 0x9c, 0x26, 0x7a, 0xf1, 0x16, 0xdb, 0xa9, 0x04, 0x9b, 0x9d, + 0xb0, 0x5d, 0x04, 0x7f, 0xc8, 0xef, 0x94, 0xdd, 0x6c, 0x0c, 0xde, 0xe6, 0xbd, 0x79, 0x99, 0xf7, + 0xf2, 0x16, 0xa6, 0xb4, 0xa3, 0x0f, 0xe6, 0x45, 0xab, 0xd9, 0xb0, 0x0c, 0x3b, 0x94, 0x5e, 0xc0, + 0xb8, 0x6c, 0x89, 0x36, 0x72, 0x0a, 0xa2, 0x48, 0xc4, 0x5c, 0x64, 0xc7, 0x28, 0x0a, 0x8b, 0x30, + 0x39, 0xe8, 0x10, 0xa6, 0x06, 0x0e, 0x73, 0x6e, 0x9a, 0x4a, 0x6d, 0x64, 0xaf, 0x77, 0xd2, 0xc9, + 0x32, 0x5e, 0xf8, 0xab, 0x8e, 0x44, 0x7f, 0x4b, 0x42, 0x50, 0x1a, 0x6e, 0x93, 0xd1, 0x5c, 0x64, + 0x11, 0xba, 0xd9, 0x72, 0x05, 0xf3, 0x67, 0x12, 0xcc, 0x45, 0x16, 0xa3, 0x9b, 0xe5, 0x19, 0x1c, + 0xd9, 0xdd, 0xed, 0xd6, 0x90, 0x4e, 0xc6, 0x6e, 0x31, 0x10, 0xe9, 0x03, 0xc0, 0xeb, 0xce, 0xe8, + 0xaa, 0x64, 0x55, 0xaf, 0xe5, 0x29, 0x44, 0xab, 0x7a, 0x6f, 0x2a, 0xb5, 0x26, 0xe7, 0x1d, 0xe3, + 0x1f, 0xb6, 0x77, 0x56, 0xb5, 0xa6, 0xb5, 0xa9, 0x59, 0xf9, 0xd4, 0x03, 0x91, 0xde, 0x40, 0xf4, + 0xa4, 0xb6, 0xba, 0xc2, 0xee, 0x2f, 0xd1, 0x7d, 0x1e, 0xa1, 0x40, 0x8b, 0x72, 0xa7, 0x8f, 0x50, + 0xe4, 0x5d, 0x03, 0x5d, 0x64, 0x51, 0xa4, 0xe7, 0x10, 0x23, 0x35, 0x6c, 0x28, 0x67, 0x65, 0x34, + 0xef, 0xe4, 0x0c, 0x46, 0xcf, 0xf4, 0xed, 0xbd, 0xed, 0x98, 0xfe, 0x08, 0x18, 0xdf, 0x7f, 0x91, + 0x32, 0xf2, 0x12, 0x82, 0x47, 0xaa, 0xfa, 0x52, 0x64, 0x5f, 0xca, 0x10, 0x1f, 0xdd, 0x5e, 0x66, + 0x10, 0x96, 0xa4, 0xf6, 0xac, 0x9d, 0xeb, 0x64, 0x39, 0xeb, 0x95, 0x7d, 0x40, 0xf4, 0x7b, 0x79, + 0x05, 0x61, 0x67, 0xef, 0x12, 0x4d, 0x96, 0x27, 0xbd, 0xf2, 0x5f, 0x28, 0xf4, 0x22, 0xdb, 0xc0, + 0x4b, 0xdd, 0x50, 0x69, 0xaa, 0xa6, 0xf5, 0x15, 0x0f, 0xc4, 0x5d, 0xf8, 0x16, 0x34, 0x55, 0xad, + 0xde, 0x43, 0xf7, 0xf6, 0xd7, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x01, 0x9b, 0xf8, 0x59, 0x0b, + 0x02, 0x00, 0x00, } diff --git a/elegoo.proto b/elegoo.proto index 51a550c..ab54a1b 100644 --- a/elegoo.proto +++ b/elegoo.proto @@ -12,7 +12,7 @@ message Speed { message Command { Speed Speed = 1; bool Stop = 3; - uint32 Direction = 4; // deg: 0 right .. 180 left + uint32 Look = 4; // deg: 0 right .. 180 left uint32 StopAfter = 5; // milliseconds } diff --git a/elegoo/elegoo.ino b/elegoo/elegoo.ino index 0911979..7b866e2 100644 --- a/elegoo/elegoo.ino +++ b/elegoo/elegoo.ino @@ -65,8 +65,8 @@ void onPacket(const uint8_t* buf, size_t size) { if (cmd.Stop) { stop(); } - if (cmd.Direction > 0) { - servo.write(cmd.Direction); + if (cmd.Look > 0) { + servo.write(cmd.Look); } if (cmd.StopAfter > 0) { timer.after(cmd.StopAfter, stop); diff --git a/elegoo/elegoo.pb.c b/elegoo/elegoo.pb.c index 93fd007..d25b96a 100644 --- a/elegoo/elegoo.pb.c +++ b/elegoo/elegoo.pb.c @@ -1,5 +1,5 @@ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.3.9 at Mon Dec 11 22:16:39 2017. */ +/* Generated by nanopb-0.3.9 at Mon Dec 11 22:33:35 2017. */ #include "elegoo.pb.h" @@ -19,8 +19,8 @@ const pb_field_t elegoo_Speed_fields[3] = { const pb_field_t elegoo_Command_fields[5] = { PB_FIELD( 1, MESSAGE , SINGULAR, STATIC , FIRST, elegoo_Command, Speed, Speed, &elegoo_Speed_fields), PB_FIELD( 3, BOOL , SINGULAR, STATIC , OTHER, elegoo_Command, Stop, Speed, 0), - PB_FIELD( 4, UINT32 , SINGULAR, STATIC , OTHER, elegoo_Command, Direction, Stop, 0), - PB_FIELD( 5, UINT32 , SINGULAR, STATIC , OTHER, elegoo_Command, StopAfter, Direction, 0), + PB_FIELD( 4, UINT32 , SINGULAR, STATIC , OTHER, elegoo_Command, Look, Stop, 0), + PB_FIELD( 5, UINT32 , SINGULAR, STATIC , OTHER, elegoo_Command, StopAfter, Look, 0), PB_LAST_FIELD }; diff --git a/elegoo/elegoo.pb.h b/elegoo/elegoo.pb.h index 9160145..7581dcd 100644 --- a/elegoo/elegoo.pb.h +++ b/elegoo/elegoo.pb.h @@ -1,5 +1,5 @@ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.3.9 at Mon Dec 11 22:16:39 2017. */ +/* Generated by nanopb-0.3.9 at Mon Dec 11 22:33:35 2017. */ #ifndef PB_ELEGOO_ELEGOO_PB_H_INCLUDED #define PB_ELEGOO_ELEGOO_PB_H_INCLUDED @@ -42,7 +42,7 @@ typedef struct _elegoo_UltraSonic { typedef struct _elegoo_Command { elegoo_Speed Speed; bool Stop; - uint32_t Direction; + uint32_t Look; uint32_t StopAfter; /* @@protoc_insertion_point(struct:elegoo_Command) */ } elegoo_Command; @@ -82,7 +82,7 @@ typedef struct _elegoo_Event { #define elegoo_UltraSonic_Direction_tag 2 #define elegoo_Command_Speed_tag 1 #define elegoo_Command_Stop_tag 3 -#define elegoo_Command_Direction_tag 4 +#define elegoo_Command_Look_tag 4 #define elegoo_Command_StopAfter_tag 5 #define elegoo_Event_Head_tag 1 #define elegoo_Event_Sensor_tag 2 diff --git a/fsm.go b/fsm.go index d9433f1..dfe04a5 100644 --- a/fsm.go +++ b/fsm.go @@ -53,7 +53,7 @@ func (f *FSM) Start() { } func (f *FSM) initalState() stateFn { - f.commands <- &Command{Direction: 90} + f.commands <- &Command{Look: 90} return f.readDistance } -- cgit v1.2.3