From 4ae462c9e0469dc4572a54e8271ae24404a69db7 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 11 Dec 2017 22:18:31 +0100 Subject: ... --- elegoo/elegoo.ino | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'elegoo/elegoo.ino') diff --git a/elegoo/elegoo.ino b/elegoo/elegoo.ino index b3d1ced..0911979 100644 --- a/elegoo/elegoo.ino +++ b/elegoo/elegoo.ino @@ -76,23 +76,24 @@ void onPacket(const uint8_t* buf, size_t size) { void events() { uint8_t buf[64]; - elegoo_Events evt = elegoo_Events_init_zero; + elegoo_Event evt = elegoo_Event_init_zero; + + evt.Head.Distance = readDistance(); + evt.Head.Direction = servo.read(); - evt.Distance = readDistance(); evt.Sensor.R = digitalRead(SR); evt.Sensor.C = digitalRead(SC); evt.Sensor.L = digitalRead(SL); if (irrecv.decode(&ir)) { - evt.KeyPress = ir.value; + evt.Remote.Key = ir.value; irrecv.resume(); } - evt.Direction = servo.read(); - evt.Time = millis(); + evt.TimeStamp = millis(); pb_ostream_t ostream = pb_ostream_from_buffer(buf, sizeof(buf)); - pb_encode_delimited(&ostream, elegoo_Events_fields, &evt); + pb_encode_delimited(&ostream, elegoo_Event_fields, &evt); serial.send(buf, ostream.bytes_written); } -- cgit v1.2.3