diff --git a/.gitignore b/.gitignore index 01f0e8b..70e2305 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ *.py *.idea *.iml +*.pb.go diff --git a/async.proto b/async.proto index 8c8d88b..46cc963 100644 --- a/async.proto +++ b/async.proto @@ -1,4 +1,5 @@ option java_package = "com.hello.haneda.api"; +option go_package = "haneda"; message Ack { diff --git a/audio_control.proto b/audio_control.proto index e10ca1a..7fd2cb6 100644 --- a/audio_control.proto +++ b/audio_control.proto @@ -2,6 +2,7 @@ option java_package = "com.hello.suripu.api.audio"; option java_outer_classname = "AudioControlProtos"; +option go_package = "api"; message AudioClassifierMessage { enum ClassifierType { diff --git a/file_manifest.proto b/file_manifest.proto index 53e9934..a580790 100644 --- a/file_manifest.proto +++ b/file_manifest.proto @@ -1,5 +1,6 @@ option java_package = "com.hello.suripu.api.input"; option java_outer_classname = "FileSync"; +option go_package = "api"; message FileManifest { diff --git a/filetransfer.proto b/filetransfer.proto index 13d3911..6c55392 100644 --- a/filetransfer.proto +++ b/filetransfer.proto @@ -1,5 +1,6 @@ option java_package = "com.hello.suripu.api.audio"; option java_outer_classname = "FileTransfer"; +option go_package = "api"; message FileMessage { optional string device_id = 1; //device mac address (really device ID) diff --git a/generate_haneda.sh b/generate_haneda.sh new file mode 100755 index 0000000..1a17c82 --- /dev/null +++ b/generate_haneda.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env sh + +HANEDA_DIR=_go/haneda +API_DIR=_go/api +MESSEJI_DIR=_go/messeji + +mkdir -p $HANEDA_DIR +mkdir -p $API_DIR +mkdir -p $MESSEJI_DIR + +# HANEDA +protoc --go_out=_go/haneda/ async.proto streaming.proto + +# API +protoc --go_out=_go/api log.proto periodic.server.proto morpheus_ble.proto sync_response.proto audio_control.proto file_manifest.proto filetransfer.proto state.proto + +protoc --go_out=_go/messeji --proto_path=messeji messeji/*.proto + +ROOT="$GOPATH/src/github.com/hello/haneda" +HANEDA="$ROOT/haneda/" +API="$ROOT/api/" +MESSEJI="$ROOT/messeji" + +echo $HANEDA +echo $API +echo $MESSEJI + +cp $HANEDA_DIR/*.pb.go $HANEDA +cp $API_DIR/*.pb.go $API +cp $MESSEJI_DIR/*.pb.go $MESSEJI + +rm -rf _go/ + diff --git a/log.proto b/log.proto index 22cda3d..066b216 100644 --- a/log.proto +++ b/log.proto @@ -1,7 +1,8 @@ -//package hello; +package hello; option java_package = "com.hello.suripu.api.logging"; option java_outer_classname = "LogProtos"; +option go_package = "api"; //Logging protobuf to send to server enum LogType { diff --git a/messeji/audio_commands.proto b/messeji/audio_commands.proto index 6271a91..cb0ae30 100644 --- a/messeji/audio_commands.proto +++ b/messeji/audio_commands.proto @@ -1,4 +1,5 @@ option java_package = "com.hello.messeji.api"; +option go_package = "messeji"; message StopAudio { required uint32 fade_out_duration_seconds = 1; diff --git a/messeji/logging.proto b/messeji/logging.proto index cee8d6f..1ac33a3 100644 --- a/messeji/logging.proto +++ b/messeji/logging.proto @@ -1,4 +1,5 @@ option java_package = "com.hello.messeji.api"; +option go_package = "messeji"; import "messeji.proto"; diff --git a/messeji/messeji.proto b/messeji/messeji.proto index a8fb876..9bf5aba 100644 --- a/messeji/messeji.proto +++ b/messeji/messeji.proto @@ -1,4 +1,5 @@ option java_package = "com.hello.messeji.api"; +option go_package = "messeji"; import "audio_commands.proto"; diff --git a/periodic.proto b/periodic.proto index 2675b33..0fae912 100644 --- a/periodic.proto +++ b/periodic.proto @@ -2,6 +2,7 @@ option java_package = "com.hello.suripu.api.input"; option java_outer_classname = "DataInputProtos"; +option go_package = "api"; message periodic_data { diff --git a/periodic.server.proto b/periodic.server.proto index f63973d..45b74fa 100644 --- a/periodic.server.proto +++ b/periodic.server.proto @@ -2,6 +2,7 @@ option java_package = "com.hello.suripu.api.input"; option java_outer_classname = "DataInputProtos"; +option go_package = "api"; message periodic_data { optional int32 unix_time=1; diff --git a/state.proto b/state.proto index 4cfe127..07a8931 100644 --- a/state.proto +++ b/state.proto @@ -1,4 +1,5 @@ option java_package = "com.hello.suripu.api.input"; +option go_package = "api"; message AudioState { required bool playing_audio = 1; diff --git a/streaming.proto b/streaming.proto index 54ee4c5..6dcfb48 100644 --- a/streaming.proto +++ b/streaming.proto @@ -1,5 +1,5 @@ option java_package = "com.hello.haneda.api"; - +option go_package = "haneda"; message Preamble { enum pb_type { ACK = 0; @@ -8,6 +8,10 @@ message Preamble { SYNC_RESPONSE = 3; MATRIX_CLIENT_MESSAGE = 4; MESSEJI = 5; + FILE_MANIFEST = 6; + SENSE_STATE = 7; + MORPHEUS_COMMAND = 8; + BATCHED_PILL_DATA = 9; } enum auth_type { NO_AUTH = 0; //no authentication, reserved 0 bytes diff --git a/sync_response.proto b/sync_response.proto index 1e12d66..a28e60b 100644 --- a/sync_response.proto +++ b/sync_response.proto @@ -2,6 +2,7 @@ option java_package = "com.hello.suripu.api.output"; option java_outer_classname = "OutputProtos"; +option go_package = "api"; import "audio_control.proto";