Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement rx1 / rx2 switch #71

Merged
merged 14 commits into from
Aug 19, 2016
Merged

Implement rx1 / rx2 switch #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c03f36c
Add rx window option + rx2 data-rate fields.
brocaar Aug 19, 2016
e281730
Use Go 1.7
brocaar Aug 19, 2016
52e989b
Fix naming error.
brocaar Aug 19, 2016
2f0b922
Use type instead of uint8.
brocaar Aug 19, 2016
189eb37
Implement rx1 / rx2 switch.
brocaar Aug 19, 2016
86303fc
Fix Go version (1.7.0 > 1.7)
brocaar Aug 19, 2016
bb805e8
Update CreateNode / UpdateNode queries.
brocaar Aug 19, 2016
16855e9
Update api definition (Node and NodeSession proto).
brocaar Aug 19, 2016
8297e83
Implement RXWindow and RX2DR params in api.
brocaar Aug 19, 2016
3332935
Set RXWindow and RX2DR on join to node-session.
brocaar Aug 19, 2016
5523ecf
Update documentation.
brocaar Aug 19, 2016
3fc5f12
Update grpc-gateway (fix enum issue).
brocaar Aug 19, 2016
1e6ca04
Always emit default values.
brocaar Aug 19, 2016
b65c25a
Add rxWindow and rx2DR fields to templates.
brocaar Aug 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: go
sudo: required
go:
- 1.6.3
- 1.7
before_install:
- sudo apt-get -qq update

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.6.3
FROM golang:1.7

ENV PROJECT_PATH=/go/src/github.com/brocaar/loraserver
ENV PATH=$PATH:$PROJECT_PATH/build
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Currently implemented:
- activation by personalization (ABP)
- over-the-air activation (OTAA)
- sending / receiving of MAC commands
- RX1 and RX2 receive window support (configurable)
- web-interface
- gRPC and RESTful JSON api (see [API](https://docs.loraserver.io/loraserver/api/))
- ISM bands
Expand Down
55 changes: 28 additions & 27 deletions api/application.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 29 additions & 28 deletions api/channel.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 28 additions & 28 deletions api/channelList.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 50 additions & 0 deletions api/common.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions api/common.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
syntax = "proto3";

package api;

enum RXWindow {
RX1 = 0;
RX2 = 1;
}
4 changes: 2 additions & 2 deletions api/gen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/usr/bin/env bash

# generate the gRPC code
protoc -I. -I$GOPATH/src -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis --go_out=Mgoogle/api/annotations.proto=github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api,plugins=grpc:. application.proto node.proto channel.proto channelList.proto nodeSession.proto
protoc -I. -I$GOPATH/src -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis --go_out=Mgoogle/api/annotations.proto=github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api,plugins=grpc:. application.proto node.proto channel.proto channelList.proto nodeSession.proto common.proto
# generate the JSON interface code
protoc -I/usr/local/include -I. -I$GOPATH/src -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis --grpc-gateway_out=logtostderr=true:. application.proto node.proto channel.proto channelList.proto nodeSession.proto
# generate the swagger definitions
protoc -I/usr/local/include -I. -I$GOPATH/src -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis --swagger_out=logtostderr=true:./swagger application.proto node.proto channel.proto channelList.proto nodeSession.proto
protoc -I/usr/local/include -I. -I$GOPATH/src -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis --swagger_out=logtostderr=true:./swagger application.proto node.proto channel.proto channelList.proto nodeSession.proto common.proto
# merge the swagger code into one file
go run swagger/main.go swagger > ../static/swagger/api.swagger.json
Loading