Skip to content

Commit

Permalink
Rename ocpp2.0 folder to ocpp2.0.1, fix warnings
Browse files Browse the repository at this point in the history
Signed-off-by: Lorenzo Donini <[email protected]>
  • Loading branch information
lorenzodonini committed Jun 27, 2021
1 parent ec88e19 commit e3a0890
Show file tree
Hide file tree
Showing 157 changed files with 573 additions and 489 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: |
go test ./ws ./ocppj -v -covermode=count -coverprofile=coverage.out
go test -v -covermode=count -coverprofile=ocpp16.out -coverpkg=github.com/lorenzodonini/ocpp-go/ocpp1.6/... github.com/lorenzodonini/ocpp-go/ocpp1.6_test
go test -v -covermode=count -coverprofile=ocpp20.out -coverpkg=github.com/lorenzodonini/ocpp-go/ocpp2.0/... github.com/lorenzodonini/ocpp-go/ocpp2.0_test
go test -v -covermode=count -coverprofile=ocpp20.out -coverpkg=github.com/lorenzodonini/ocpp-go/ocpp2.0.1/... github.com/lorenzodonini/ocpp-go/ocpp2.0.1_test
sed '1d;$d' ocpp16.out >> coverage.out
sed '1d;$d' ocpp20.out >> coverage.out
- name: Publish coverage
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@

# Project-specific
certs/

central_system_sim
charge_point_sim
Binary file removed central_system_sim
Binary file not shown.
Binary file removed charge_point_sim
Binary file not shown.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"gopkg.in/go-playground/validator.v9"

"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
)

// -------------------- Authorize (CS -> CSMS) --------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"gopkg.in/go-playground/validator.v9"

"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
)

// -------------------- Clear Cache (CSMS -> CS) --------------------
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"gopkg.in/go-playground/validator.v9"

"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
)

// -------------------- Change Availability (CSMS -> CS) --------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package availability

import (
"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"gopkg.in/go-playground/validator.v9"
"reflect"

"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
"gopkg.in/go-playground/validator.v9"
)

// -------------------- Heartbeat (CS -> CSMS) --------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package availability
import (
"reflect"

"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
"gopkg.in/go-playground/validator.v9"
)

Expand Down
34 changes: 17 additions & 17 deletions ocpp2.0/charging_station.go → ocpp2.0.1/charging_station.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ import (

"github.com/lorenzodonini/ocpp-go/internal/callbackqueue"
"github.com/lorenzodonini/ocpp-go/ocpp"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/authorization"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/availability"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/data"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/diagnostics"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/display"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/firmware"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/iso15118"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/localauth"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/meter"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/provisioning"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/remotecontrol"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/reservation"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/security"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/smartcharging"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/tariffcost"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/transactions"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/authorization"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/availability"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/data"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/diagnostics"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/display"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/firmware"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/iso15118"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/localauth"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/meter"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/provisioning"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/remotecontrol"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/reservation"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/security"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/smartcharging"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/tariffcost"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/transactions"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
"github.com/lorenzodonini/ocpp-go/ocppj"
)

Expand Down
34 changes: 17 additions & 17 deletions ocpp2.0/csms.go → ocpp2.0.1/csms.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ import (

"github.com/lorenzodonini/ocpp-go/internal/callbackqueue"
"github.com/lorenzodonini/ocpp-go/ocpp"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/authorization"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/availability"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/data"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/diagnostics"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/display"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/firmware"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/iso15118"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/localauth"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/meter"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/provisioning"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/remotecontrol"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/reservation"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/security"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/smartcharging"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/tariffcost"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/transactions"
"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/authorization"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/availability"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/data"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/diagnostics"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/display"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/firmware"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/iso15118"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/localauth"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/meter"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/provisioning"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/remotecontrol"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/reservation"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/security"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/smartcharging"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/tariffcost"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/transactions"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
"github.com/lorenzodonini/ocpp-go/ocppj"
"github.com/lorenzodonini/ocpp-go/ws"
)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"gopkg.in/go-playground/validator.v9"

"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
)

// -------------------- Data Transfer (CS -> CSMS / CSMS -> CS) --------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package diagnostics

import (
"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"gopkg.in/go-playground/validator.v9"
"reflect"

"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
"gopkg.in/go-playground/validator.v9"
)

// -------------------- Clear Variable Monitoring (CSMS -> CS) --------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"gopkg.in/go-playground/validator.v9"

"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
)

// -------------------- Customer Information (CSMS -> CS) --------------------
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package diagnostics

import (
"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"gopkg.in/go-playground/validator.v9"
"reflect"

"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
"gopkg.in/go-playground/validator.v9"
)

// -------------------- Get Log (CSMS -> CS) --------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package diagnostics

import (
"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"gopkg.in/go-playground/validator.v9"
"reflect"

"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
"gopkg.in/go-playground/validator.v9"
)

// -------------------- Get Monitoring Report (CSMS -> CS) --------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package diagnostics

import (
"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"gopkg.in/go-playground/validator.v9"
"reflect"

"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
"gopkg.in/go-playground/validator.v9"
)

// -------------------- Log Status Notification (CS -> CSMS) --------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package diagnostics

import (
"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"reflect"

"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
)

// -------------------- Notify Customer Information (CS -> CSMS) --------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package diagnostics

import (
"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"gopkg.in/go-playground/validator.v9"
"reflect"

"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
"gopkg.in/go-playground/validator.v9"
)

// -------------------- Notify Event (CS -> CSMS) --------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package diagnostics

import (
"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"reflect"

"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
)

// -------------------- Notify Monitoring Report (CS -> CSMS) --------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package diagnostics
import (
"reflect"

"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
"gopkg.in/go-playground/validator.v9"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package diagnostics
import (
"reflect"

"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
)

// -------------------- Set Monitoring Level (CSMS -> CS) --------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package diagnostics
import (
"reflect"

"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
"gopkg.in/go-playground/validator.v9"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package diagnostics

import (
"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
"gopkg.in/go-playground/validator.v9"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"gopkg.in/go-playground/validator.v9"

"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
)

// -------------------- Clear Display Message (CSMS -> CS) --------------------
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package display
import (
"reflect"

"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
"gopkg.in/go-playground/validator.v9"
)

Expand Down
2 changes: 1 addition & 1 deletion ocpp2.0/display/types.go → ocpp2.0.1/display/types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package display

import (
"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
"gopkg.in/go-playground/validator.v9"
)

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"gopkg.in/go-playground/validator.v9"

"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
)

// -------------------- Firmware Status Notification (CS -> CSMS) --------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package firmware

import (
"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"reflect"

"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
)

// -------------------- Publish Firmware (CSMS -> CS) --------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package firmware

import (
"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"gopkg.in/go-playground/validator.v9"
"reflect"

"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
"gopkg.in/go-playground/validator.v9"
)

// -------------------- Publish Firmware Status Notification (CS -> CSMS) --------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"gopkg.in/go-playground/validator.v9"

"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
)

// -------------------- Publish Firmware (CSMS -> CS) --------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"gopkg.in/go-playground/validator.v9"

"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
)

// -------------------- Publish Firmware (CSMS -> CS) --------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"gopkg.in/go-playground/validator.v9"

"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
)

// -------------------- Delete Certificate (CSMS -> CS) --------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"gopkg.in/go-playground/validator.v9"

"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
)

// -------------------- Get 15118EV Certificate (CS -> CSMS) --------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package iso15118
import (
"reflect"

"github.com/lorenzodonini/ocpp-go/ocpp2.0/types"
"github.com/lorenzodonini/ocpp-go/ocpp2.0.1/types"
)

// -------------------- Get Certificate Status (CS -> CSMS) --------------------
Expand Down
Loading

0 comments on commit e3a0890

Please sign in to comment.