Add nanopb (https://github.com/metormote/nanopb) and generate example protocol buffer for beerduino (https://github.com/ilyevsky/beerduino)

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "protobuf"]
 	path = protobuf
 	url = https://github.com/google/protobuf.git
+[submodule "nanopb"]
+	path = nanopb
+	url = https://code.google.com/p/nanopb/

Makefile

@@ -1,12 +1,16 @@
 .PHONY = clean
 
 PROTO_DIR = proto
-GOOGLE_PROTOBUF_INCLUDES = protobuf\src
+GOOGLE_PROTOBUF_INCLUDES = protobuf/src
-PROTO_INCLUDES = -I$(PROTO_DIR) -I$(GOOGLE_PROTOBUF_INCLUDES)
+NANOPB_DIR = nanopb/generator/proto
+PROTO_INCLUDES = -I$(PROTO_DIR) -I$(GOOGLE_PROTOBUF_INCLUDES) -I$(NANOPB_DIR)
 
-all: addressbook_pb2.py
+all: nanopb_pb2.py beerduino_pb2.py
 
-%_pb2.py: $(PROTO_DIR)\%.proto
+nanopb_pb2.py: $(NANOPB_DIR)/nanopb.proto
+	protoc --python_out=. $(PROTO_INCLUDES) $<
+
+%_pb2.py: $(PROTO_DIR)/%.proto
 	protoc --python_out=. $(PROTO_INCLUDES) $<
 
 clean:

addressbook_pb2.py

@@ -1,204 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: addressbook.proto
-
-import sys
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor.FileDescriptor(
-  name='addressbook.proto',
-  package='tutorial',
-  serialized_pb=_b('\n\x11\x61\x64\x64ressbook.proto\x12\x08tutorial\"\xda\x01\n\x06Person\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\n\n\x02id\x18\x02 \x02(\x05\x12\r\n\x05\x65mail\x18\x03 \x01(\t\x12+\n\x05phone\x18\x04 \x03(\x0b\x32\x1c.tutorial.Person.PhoneNumber\x1aM\n\x0bPhoneNumber\x12\x0e\n\x06number\x18\x01 \x02(\t\x12.\n\x04type\x18\x02 \x01(\x0e\x32\x1a.tutorial.Person.PhoneType:\x04HOME\"+\n\tPhoneType\x12\n\n\x06MOBILE\x10\x00\x12\x08\n\x04HOME\x10\x01\x12\x08\n\x04WORK\x10\x02\"/\n\x0b\x41\x64\x64ressBook\x12 \n\x06person\x18\x01 \x03(\x0b\x32\x10.tutorial.PersonB)\n\x14\x63om.example.tutorialB\x11\x41\x64\x64ressBookProtos')
-)
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-
-
-
-_PERSON_PHONETYPE = _descriptor.EnumDescriptor(
-  name='PhoneType',
-  full_name='tutorial.Person.PhoneType',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    _descriptor.EnumValueDescriptor(
-      name='MOBILE', index=0, number=0,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='HOME', index=1, number=1,
-      options=None,
-      type=None),
-    _descriptor.EnumValueDescriptor(
-      name='WORK', index=2, number=2,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=207,
-  serialized_end=250,
-)
-_sym_db.RegisterEnumDescriptor(_PERSON_PHONETYPE)
-
-
-_PERSON_PHONENUMBER = _descriptor.Descriptor(
-  name='PhoneNumber',
-  full_name='tutorial.Person.PhoneNumber',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='number', full_name='tutorial.Person.PhoneNumber.number', index=0,
-      number=1, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='type', full_name='tutorial.Person.PhoneNumber.type', index=1,
-      number=2, type=14, cpp_type=8, label=1,
-      has_default_value=True, default_value=1,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=128,
-  serialized_end=205,
-)
-
-_PERSON = _descriptor.Descriptor(
-  name='Person',
-  full_name='tutorial.Person',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='name', full_name='tutorial.Person.name', index=0,
-      number=1, type=9, cpp_type=9, label=2,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='id', full_name='tutorial.Person.id', index=1,
-      number=2, type=5, cpp_type=1, label=2,
-      has_default_value=False, default_value=0,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='email', full_name='tutorial.Person.email', index=2,
-      number=3, type=9, cpp_type=9, label=1,
-      has_default_value=False, default_value=_b("").decode('utf-8'),
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-    _descriptor.FieldDescriptor(
-      name='phone', full_name='tutorial.Person.phone', index=3,
-      number=4, type=11, cpp_type=10, label=3,
-      has_default_value=False, default_value=[],
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[_PERSON_PHONENUMBER, ],
-  enum_types=[
-    _PERSON_PHONETYPE,
-  ],
-  options=None,
-  is_extendable=False,
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=32,
-  serialized_end=250,
-)
-
-
-_ADDRESSBOOK = _descriptor.Descriptor(
-  name='AddressBook',
-  full_name='tutorial.AddressBook',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    _descriptor.FieldDescriptor(
-      name='person', full_name='tutorial.AddressBook.person', index=0,
-      number=1, type=11, cpp_type=10, label=3,
-      has_default_value=False, default_value=[],
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  extension_ranges=[],
-  oneofs=[
-  ],
-  serialized_start=252,
-  serialized_end=299,
-)
-
-_PERSON_PHONENUMBER.fields_by_name['type'].enum_type = _PERSON_PHONETYPE
-_PERSON_PHONENUMBER.containing_type = _PERSON
-_PERSON.fields_by_name['phone'].message_type = _PERSON_PHONENUMBER
-_PERSON_PHONETYPE.containing_type = _PERSON
-_ADDRESSBOOK.fields_by_name['person'].message_type = _PERSON
-DESCRIPTOR.message_types_by_name['Person'] = _PERSON
-DESCRIPTOR.message_types_by_name['AddressBook'] = _ADDRESSBOOK
-
-Person = _reflection.GeneratedProtocolMessageType('Person', (_message.Message,), dict(
-
-  PhoneNumber = _reflection.GeneratedProtocolMessageType('PhoneNumber', (_message.Message,), dict(
-    DESCRIPTOR = _PERSON_PHONENUMBER,
-    __module__ = 'addressbook_pb2'
-    # @@protoc_insertion_point(class_scope:tutorial.Person.PhoneNumber)
-    ))
-  ,
-  DESCRIPTOR = _PERSON,
-  __module__ = 'addressbook_pb2'
-  # @@protoc_insertion_point(class_scope:tutorial.Person)
-  ))
-_sym_db.RegisterMessage(Person)
-_sym_db.RegisterMessage(Person.PhoneNumber)
-
-AddressBook = _reflection.GeneratedProtocolMessageType('AddressBook', (_message.Message,), dict(
-  DESCRIPTOR = _ADDRESSBOOK,
-  __module__ = 'addressbook_pb2'
-  # @@protoc_insertion_point(class_scope:tutorial.AddressBook)
-  ))
-_sym_db.RegisterMessage(AddressBook)
-
-
-DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\024com.example.tutorialB\021AddressBookProtos'))
-# @@protoc_insertion_point(module_scope)

proto/beerduino.proto

@@ -0,0 +1,13 @@
+import "nanopb.proto";
+
+package beerduino;
+
+message Ping {
+  required int32 id = 1;
+}
+
+message Echo {
+  required int32 id = 1;
+  optional string message = 2 [(nanopb).max_size = 40];
+}
+

server.py

@@ -0,0 +1,35 @@
+#!/usr/bin/python
+
+import serial
+import sys
+
+import beerduino_pb2
+
+def main(argv):
+  if len(argv) < 2:
+    print 'Usage: server.py /dev/serial'
+    return
+
+  ard_serial = serial.Serial(argv[1], 9600)
+  print ard_serial.readline()
+
+  ping_msg = beerduino_pb2.Ping()
+  ping_msg.id = 123
+
+  data = ping_msg.SerializeToString()
+  ard_serial.write('' + chr(len(data)))
+  print 'Writing %d bytes to serial.' % len(data)
+  ard_serial.write(data)
+
+  echo_msg = beerduino_pb2.Echo()
+  msg_len = ard_serial.read(size=1)
+  print 'Reading %d bytes from serial.' % ord(msg_len)
+  echo_msg.ParseFromString(ard_serial.read(ord(msg_len)))
+
+  str = 'Received Echo with id: %d.' % echo_msg.id
+  if echo_msg.HasField('message'):
+    print str + ' Message: %s' % echo_msg.message
+
+
+if __name__ == '__main__':
+  main(sys.argv)