Skip to content

Commit

Permalink
Merge pull request #4 from boschrexroth/feature/update22
Browse files Browse the repository at this point in the history
Feature/update22
  • Loading branch information
Johannes Albrecht committed Aug 25, 2023
2 parents c21d1a2 + ea85db6 commit 7088542
Show file tree
Hide file tree
Showing 672 changed files with 12,860 additions and 3,173 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
sudo apt-get update
sudo apt-get install -y libsystemd-dev libzmq3-dev
sudo apt install pkg-config
wget https://github.com/boschrexroth/ctrlx-automation-sdk/releases/download/1.20.0/ctrlx-datalayer-1.10.7.deb
sudo apt-get install -y -f ./ctrlx-datalayer-1.10.7.deb
wget https://github.com/boschrexroth/ctrlx-automation-sdk/releases/download/2.2.0/ctrlx-datalayer-2.2.7.deb
sudo apt-get install -y -f ./ctrlx-datalayer-2.2.7.deb
- name: Go
uses: actions/setup-go@v2
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ GOOS := $(shell go env GOOS)
GOARCH := $(shell go env GOARCH)
BUILD := build/public/$(GOOS)_$(GOARCH)

DATALAYER_DEB_VERSION := 1.20.0
DATALAYER_DEB_FILE_VERSION := 1.10.7
DATALAYER_DEB_VERSION := 2.2.0
DATALAYER_DEB_FILE_VERSION := 2.2.7

.PHONY: all go-dep apt-dep lint vet test test-coverage build clean

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ sudo apt-get install libsystemd-dev libsystemd-dev:arm64 libzmq3-dev libzmq3-dev
Check the current [ctrlx Data Layer](https://github.com/boschrexroth/ctrlx-automation-sdk/releases) debian package, download and install this, see example.

```bash
wget https://github.com/boschrexroth/ctrlx-automation-sdk/releases/download/1.20.0/ctrlx-datalayer-1.10.7.deb
sudo dpkg -i ctrlx-datalayer-1.10.7.deb
wget https://github.com/boschrexroth/ctrlx-automation-sdk/releases/download/2.2.0/ctrlx-datalayer-2.2.7.deb
sudo dpkg -i ctrlx-datalayer-2.2.7.deb
```

### Integrate in you project
Expand Down
11 changes: 9 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
module github.com/boschrexroth/ctrlx-datalayer-golang

go 1.13
go 1.20

require (
github.com/google/flatbuffers v1.12.0
github.com/google/flatbuffers v23.5.26+incompatible
github.com/loov/hrtime v1.0.3
github.com/loov/hrtime/hrplot v1.0.2
github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852
github.com/stretchr/testify v1.7.0
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/davecgh/go-spew v1.1.0 // indirect
github.com/loov/plot v0.0.0-20200413101321-e09a6f01d2f5 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/google/flatbuffers v1.12.0 h1:/PtAHvnBY4Kqnx/xCQ3OIV9uYcSFGScBsWI3Oogeh6w=
github.com/google/flatbuffers v1.12.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg=
github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
github.com/loov/hrtime v1.0.1/go.mod h1:yDY3Pwv2izeY4sq7YcPX/dtLwzg5NU1AxWuWxKwd0p0=
github.com/loov/hrtime v1.0.3 h1:LiWKU3B9skJwRPUf0Urs9+0+OE3TxdMuiRPOTwR0gcU=
github.com/loov/hrtime v1.0.3/go.mod h1:yDY3Pwv2izeY4sq7YcPX/dtLwzg5NU1AxWuWxKwd0p0=
Expand Down
4 changes: 2 additions & 2 deletions pkg/datalayer/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@ func (c *Client) PingSync() Result {

// CreateSync creates an object. This function is synchronous.
// Parameter address is an address of the node to create object in.
// Parameter variant is a data of the object.
// It returns the status of function call or a variant result of write or a tuple (Result, Variant).
// Parameter data is a data of the object, result of write.
// It returns the status of function call.
func (c *Client) CreateSync(address string, data *Variant) Result {
if data == nil {
return ResultMissingArgument
Expand Down
4 changes: 4 additions & 0 deletions pkg/datalayer/result.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,3 +179,7 @@ func (r Result) String() string {
}
return "Result_Unknown"
}

func (r Result) Error() string {
return r.String()
}
11 changes: 7 additions & 4 deletions pkg/fbs/comm/axisprofile/fbtypes/APRBootState.go

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

15 changes: 9 additions & 6 deletions pkg/fbs/comm/axisprofile/fbtypes/dummyFbs.go

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

69 changes: 54 additions & 15 deletions pkg/fbs/comm/axisprofile/fbtypes/mappingEntry.go

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

9 changes: 6 additions & 3 deletions pkg/fbs/comm/axisprofile/fbtypes/profile.go

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

31 changes: 20 additions & 11 deletions pkg/fbs/comm/axisprofile/fbtypes/profileConfig.go

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

38 changes: 25 additions & 13 deletions pkg/fbs/comm/axisprofile/fbtypes/profileConfigInfo.go

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

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

10 changes: 5 additions & 5 deletions pkg/fbs/comm/axisprofile/fbtypes/profileScalingCfg.go

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

2 changes: 1 addition & 1 deletion pkg/fbs/comm/axisprofile/fbtypes/profileScalingStrategy.go

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

Loading

0 comments on commit 7088542

Please sign in to comment.