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.

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

Sync fork #18

Merged
merged 47 commits into from
Mar 5, 2024
Merged

Sync fork #18

merged 47 commits into from
Mar 5, 2024

Conversation

hnicolaysen
Copy link

@hnicolaysen hnicolaysen commented Mar 4, 2024

Sync our master with upstream/master at the latest tag v0.17.0.

lorenzodonini and others added 30 commits November 16, 2022 21:48
…rlying websocket when the callback functions are blocking
fixes occurrences in:
- reservation.ReserveNow
- remotecontrol.RequestStartTransaction

Signed-off-by: Lorenzo <[email protected]>
Signed-off-by: Lorenzo <[email protected]>
@hnicolaysen hnicolaysen added the enhancement New feature or request label Mar 4, 2024
@hnicolaysen hnicolaysen requested a review from dammarco March 4, 2024 11:43
@hnicolaysen hnicolaysen self-assigned this Mar 4, 2024
@coveralls
Copy link

Pull Request Test Coverage Report for Build 8139558405

Details

  • 211 of 261 (80.84%) changed or added relevant lines in 18 files are covered.
  • 8 unchanged lines in 3 files lost coverage.
  • Overall coverage increased (+1.2%) to 89.114%

Changes Missing Coverage Covered Lines Changed/Added Lines %
ocppj/ocppj.go 24 27 88.89%
ocppj/client.go 47 52 90.38%
ocpp1.6/charge_point.go 14 20 70.0%
ocpp2.0.1/charging_station.go 15 22 68.18%
ocppj/server.go 37 45 82.22%
ocpp1.6/central_system.go 13 23 56.52%
ocpp2.0.1/csms.go 18 29 62.07%
Files with Coverage Reduction New Missed Lines %
ocpp1.6/charge_point.go 1 69.55%
ws/websocket.go 2 90.24%
ocpp1.6/central_system.go 5 70.19%
Totals Coverage Status
Change from base Build 3477609330: 1.2%
Covered Lines: 6500
Relevant Lines: 7294

💛 - Coveralls

@dammarco
Copy link

dammarco commented Mar 5, 2024

Sure, we can sync the master. But as discussed, syncing our branch where the BDL extension lies, is not that easy 🤔

@hnicolaysen
Copy link
Author

Let's still sync the master. Then we either rebase the gridx-extensions branch or we just cherry-pick as discussed :)

@hnicolaysen hnicolaysen merged commit 607bfeb into master Mar 5, 2024
2 checks passed
@hnicolaysen hnicolaysen deleted the sync-fork branch March 5, 2024 07:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants