Skip to content

Fix txId in TxProfile as optional parameter (addresses #346) #348

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

Merged
merged 3 commits into from
Oct 8, 2024
Merged

Fix txId in TxProfile as optional parameter (addresses #346) #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80b7bb0
make txId in TxProfile optional (addresses #346)
matth-x Aug 2, 2024
8ca8691
fix TxProfile txId check condition (addresses #346)
matth-x Aug 2, 2024
2ceb028
update changelog
matth-x Oct 8, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
- Change arduinoWebSockets URL param to path ([#278](https://github.com/matth-x/MicroOcpp/issues/278))
- Avoid creating conf when operation fails ([#290](https://github.com/matth-x/MicroOcpp/pull/290))
- Fix whitespaces in MeterValues ([#301](https://github.com/matth-x/MicroOcpp/pull/301))
- Make SmartChargingProfile txId field optional ([#348](https://github.com/matth-x/MicroOcpp/pull/348))

## [1.0.3] - 2024-04-06

Expand Down
2 changes: 1 addition & 1 deletion src/MicroOcpp/Operations/SetChargingProfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void SetChargingProfile::processReq(JsonObject payload) {
return;
}

if (chargingProfile->getTransactionId() < 0 ||
if (chargingProfile->getTransactionId() >= 0 &&
chargingProfile->getTransactionId() != transaction->getTransactionId()) {
//transactionId undefined / mismatch
accepted = false;
Expand Down