Skip to content

Commit 2a5b045

Browse files
matth-xmatth-x
committed
replace ulong and uint with full type name
1 parent 9efdad2 commit 2a5b045

20 files changed

Lines changed: 80 additions & 82 deletions

‎src/ArduinoOcpp.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ void authorize(const char *idTag, OnReceiveConfListener onConf, OnAbortListener
233233
ocppEngine->initiateOperation(std::move(authorize));
234234
}
235235

236-
bool beginTransaction(const char *idTag, uint connectorId) {
236+
bool beginTransaction(const char *idTag, unsigned int connectorId) {
237237
if (!ocppEngine) {
238238
AO_DBG_ERR("OCPP uninitialized"); //please call OCPP_initialize before
239239
return false;
@@ -251,7 +251,7 @@ bool beginTransaction(const char *idTag, uint connectorId) {
251251
return true;
252252
}
253253

254-
bool endTransaction(const char *reason, uint connectorId) {
254+
bool endTransaction(const char *reason, unsigned int connectorId) {
255255
if (!ocppEngine) {
256256
AO_DBG_ERR("OCPP uninitialized"); //please call OCPP_initialize before
257257
return false;
@@ -266,7 +266,7 @@ bool endTransaction(const char *reason, uint connectorId) {
266266
return res;
267267
}
268268

269-
bool isTransactionRunning(uint connectorId) {
269+
bool isTransactionRunning(unsigned int connectorId) {
270270
if (!ocppEngine) {
271271
AO_DBG_ERR("OCPP uninitialized"); //please call OCPP_initialize before
272272
return false;
@@ -279,7 +279,7 @@ bool isTransactionRunning(uint connectorId) {
279279
return connector->isTransactionRunning();
280280
}
281281

282-
bool ocppPermitsCharge(uint connectorId) {
282+
bool ocppPermitsCharge(unsigned int connectorId) {
283283
if (!ocppEngine) {
284284
AO_DBG_WARN("Please call OCPP_initialize before");
285285
return false;
@@ -292,7 +292,7 @@ bool ocppPermitsCharge(uint connectorId) {
292292
return connector->ocppPermitsCharge();
293293
}
294294

295-
void setConnectorPluggedInput(std::function<bool()> pluggedInput, uint connectorId) {
295+
void setConnectorPluggedInput(std::function<bool()> pluggedInput, unsigned int connectorId) {
296296
if (!ocppEngine) {
297297
AO_DBG_ERR("OCPP uninitialized"); //please call OCPP_initialize before
298298
return;
@@ -311,7 +311,7 @@ void setConnectorPluggedInput(std::function<bool()> pluggedInput, uint connector
311311
}
312312
}
313313

314-
void setEnergyMeterInput(std::function<float()> energyInput, uint connectorId) {
314+
void setEnergyMeterInput(std::function<float()> energyInput, unsigned int connectorId) {
315315
if (!ocppEngine) {
316316
AO_DBG_ERR("OCPP uninitialized"); //please call OCPP_initialize before
317317
return;
@@ -333,7 +333,7 @@ void setEnergyMeterInput(std::function<float()> energyInput, uint connectorId) {
333333
model.getMeteringService()->setEnergySampler(connectorId, energyInput);
334334
}
335335

336-
void setPowerMeterInput(std::function<float()> powerInput, uint connectorId) {
336+
void setPowerMeterInput(std::function<float()> powerInput, unsigned int connectorId) {
337337
if (!ocppEngine) {
338338
AO_DBG_ERR("OCPP uninitialized"); //please call OCPP_initialize before
339339
return;
@@ -356,7 +356,7 @@ void setPowerMeterInput(std::function<float()> powerInput, uint connectorId) {
356356
model.getMeteringService()->setPowerSampler(connectorId, powerInput);
357357
}
358358

359-
void setSmartChargingOutput(std::function<void(float)> chargingLimitOutput, uint connectorId) {
359+
void setSmartChargingOutput(std::function<void(float)> chargingLimitOutput, unsigned int connectorId) {
360360
if (!ocppEngine) {
361361
AO_DBG_ERR("OCPP uninitialized"); //please call OCPP_initialize before
362362
return;
@@ -373,7 +373,7 @@ void setSmartChargingOutput(std::function<void(float)> chargingLimitOutput, uint
373373
model.getSmartChargingService()->setOnLimitChange(chargingLimitOutput);
374374
}
375375

376-
void setEvReadyInput(std::function<bool()> evReadyInput, uint connectorId) {
376+
void setEvReadyInput(std::function<bool()> evReadyInput, unsigned int connectorId) {
377377
if (!ocppEngine) {
378378
AO_DBG_ERR("OCPP uninitialized"); //please call OCPP_initialize before
379379
return;
@@ -386,7 +386,7 @@ void setEvReadyInput(std::function<bool()> evReadyInput, uint connectorId) {
386386
connector->setEvRequestsEnergySampler(evReadyInput);
387387
}
388388

389-
void setEvseReadyInput(std::function<bool()> evseReadyInput, uint connectorId) {
389+
void setEvseReadyInput(std::function<bool()> evseReadyInput, unsigned int connectorId) {
390390
if (!ocppEngine) {
391391
AO_DBG_ERR("OCPP uninitialized"); //please call OCPP_initialize before
392392
return;
@@ -399,7 +399,7 @@ void setEvseReadyInput(std::function<bool()> evseReadyInput, uint connectorId) {
399399
connector->setConnectorEnergizedSampler(evseReadyInput);
400400
}
401401

402-
void addErrorCodeInput(std::function<const char *()> errorCodeInput, uint connectorId) {
402+
void addErrorCodeInput(std::function<const char *()> errorCodeInput, unsigned int connectorId) {
403403
if (!ocppEngine) {
404404
AO_DBG_ERR("OCPP uninitialized"); //please call OCPP_initialize before
405405
return;
@@ -412,7 +412,7 @@ void addErrorCodeInput(std::function<const char *()> errorCodeInput, uint connec
412412
connector->addConnectorErrorCodeSampler(errorCodeInput);
413413
}
414414

415-
void addMeterValueInput(std::function<int32_t ()> valueInput, const char *measurand, const char *unit, const char *location, const char *phase, uint connectorId) {
415+
void addMeterValueInput(std::function<int32_t ()> valueInput, const char *measurand, const char *unit, const char *location, const char *phase, unsigned int connectorId) {
416416
if (!ocppEngine) {
417417
AO_DBG_ERR("OCPP uninitialized"); //please call OCPP_initialize before
418418
return;
@@ -445,7 +445,7 @@ void addMeterValueInput(std::function<int32_t ()> valueInput, const char *measur
445445
addMeterValueInput(std::move(valueSampler), connectorId);
446446
}
447447

448-
void addMeterValueInput(std::unique_ptr<SampledValueSampler> valueInput, uint connectorId) {
448+
void addMeterValueInput(std::unique_ptr<SampledValueSampler> valueInput, unsigned int connectorId) {
449449
if (!ocppEngine) {
450450
AO_DBG_ERR("OCPP uninitialized"); //please call OCPP_initialize before
451451
return;
@@ -480,7 +480,7 @@ void setOnResetExecute(std::function<void(bool)> onResetExecute) {
480480
}
481481
}
482482

483-
void setOnUnlockConnectorInOut(std::function<PollResult<bool>()> onUnlockConnectorInOut, uint connectorId) {
483+
void setOnUnlockConnectorInOut(std::function<PollResult<bool>()> onUnlockConnectorInOut, unsigned int connectorId) {
484484
if (!ocppEngine) {
485485
AO_DBG_ERR("OCPP uninitialized"); //please call OCPP_initialize before
486486
return;
@@ -493,7 +493,7 @@ void setOnUnlockConnectorInOut(std::function<PollResult<bool>()> onUnlockConnect
493493
connector->setOnUnlockConnector(onUnlockConnectorInOut);
494494
}
495495

496-
void setConnectorLockInOut(std::function<ArduinoOcpp::TxEnableState(ArduinoOcpp::TxTrigger)> lockConnectorInOut, uint connectorId) {
496+
void setConnectorLockInOut(std::function<ArduinoOcpp::TxEnableState(ArduinoOcpp::TxTrigger)> lockConnectorInOut, unsigned int connectorId) {
497497
if (!ocppEngine) {
498498
AO_DBG_ERR("OCPP uninitialized"); //please call OCPP_initialize before
499499
return;
@@ -506,7 +506,7 @@ void setConnectorLockInOut(std::function<ArduinoOcpp::TxEnableState(ArduinoOcpp:
506506
connector->setConnectorLock(lockConnectorInOut);
507507
}
508508

509-
void setTxBasedMeterInOut(std::function<ArduinoOcpp::TxEnableState(ArduinoOcpp::TxTrigger)> txMeterInOut, uint connectorId) {
509+
void setTxBasedMeterInOut(std::function<ArduinoOcpp::TxEnableState(ArduinoOcpp::TxTrigger)> txMeterInOut, unsigned int connectorId) {
510510
if (!ocppEngine) {
511511
AO_DBG_ERR("OCPP uninitialized"); //please call OCPP_initialize before
512512
return;
@@ -519,7 +519,7 @@ void setTxBasedMeterInOut(std::function<ArduinoOcpp::TxEnableState(ArduinoOcpp::
519519
connector->setTxBasedMeterUpdate(txMeterInOut);
520520
}
521521

522-
bool isOperative(uint connectorId) {
522+
bool isOperative(unsigned int connectorId) {
523523
if (!ocppEngine) {
524524
AO_DBG_WARN("Please call OCPP_initialize before");
525525
return true; //assume "true" as default state
@@ -535,7 +535,7 @@ bool isOperative(uint connectorId) {
535535
&& (connector->getAvailability() != AVAILABILITY_INOPERATIVE);
536536
}
537537

538-
int getTransactionId(uint connectorId) {
538+
int getTransactionId(unsigned int connectorId) {
539539
if (!ocppEngine) {
540540
AO_DBG_WARN("Please call OCPP_initialize before");
541541
return -1;
@@ -548,7 +548,7 @@ int getTransactionId(uint connectorId) {
548548
return connector->getTransactionId();
549549
}
550550

551-
const char *getTransactionIdTag(uint connectorId) {
551+
const char *getTransactionIdTag(unsigned int connectorId) {
552552
if (!ocppEngine) {
553553
AO_DBG_WARN("Please call OCPP_initialize before");
554554
return nullptr;

‎src/ArduinoOcpp.h‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ void authorize(
137137
* Returns true if it was possible to create a transaction. If it returned false, either another
138138
* transaction is still running or you need to try it again later.
139139
*/
140-
bool beginTransaction(const char *idTag, uint connectorId = 1);
140+
bool beginTransaction(const char *idTag, unsigned int connectorId = 1);
141141

142142
/*
143143
* End the transaction process by terminating the transaction and setting a reason for its termination.
@@ -150,21 +150,21 @@ bool beginTransaction(const char *idTag, uint connectorId = 1);
150150
*
151151
* Returns true if this action actually ended a transaction. False otherwise
152152
*/
153-
bool endTransaction(const char *reason = nullptr, uint connectorId = 1);
153+
bool endTransaction(const char *reason = nullptr, unsigned int connectorId = 1);
154154

155155
/*
156156
* Returns if the library has started the transaction by sending a StartTransaction and if it hasn't
157157
* been stopped already by sending a StopTransaction.
158158
*/
159-
bool isTransactionRunning(uint connectorId = 1);
159+
bool isTransactionRunning(unsigned int connectorId = 1);
160160

161161
/*
162162
* Returns if the OCPP library allows the EVSE to charge at the moment.
163163
*
164164
* If you integrate it into a J1772 charger, true means that the Control Pilot can send the PWM signal
165165
* and false means that the Control Pilot must be at a DC voltage.
166166
*/
167-
bool ocppPermitsCharge(uint connectorId = 1);
167+
bool ocppPermitsCharge(unsigned int connectorId = 1);
168168

169169
/*
170170
* Define the Inputs and Outputs of this library.
@@ -186,29 +186,29 @@ bool ocppPermitsCharge(uint connectorId = 1);
186186
* Configure the library with Inputs and Outputs once in the setup() function.
187187
*/
188188

189-
void setConnectorPluggedInput(std::function<bool()> pluggedInput, uint connectorId = 1); //Input about if an EV is plugged to this EVSE
189+
void setConnectorPluggedInput(std::function<bool()> pluggedInput, unsigned int connectorId = 1); //Input about if an EV is plugged to this EVSE
190190

191-
void setEnergyMeterInput(std::function<float()> energyInput, uint connectorId = 1); //Input of the electricity meter register
191+
void setEnergyMeterInput(std::function<float()> energyInput, unsigned int connectorId = 1); //Input of the electricity meter register
192192

193-
void setPowerMeterInput(std::function<float()> powerInput, uint connectorId = 1); //Input of the power meter reading
193+
void setPowerMeterInput(std::function<float()> powerInput, unsigned int connectorId = 1); //Input of the power meter reading
194194

195-
void setSmartChargingOutput(std::function<void(float)> chargingLimitOutput, uint connectorId = 1); //Output for the Smart Charging limit
195+
void setSmartChargingOutput(std::function<void(float)> chargingLimitOutput, unsigned int connectorId = 1); //Output for the Smart Charging limit
196196

197197
/*
198198
* Define the Inputs and Outputs of this library. (Advanced)
199199
*
200200
* These Inputs and Outputs are optional depending on the use case of your charger.
201201
*/
202202

203-
void setEvReadyInput(std::function<bool()> evReadyInput, uint connectorId = 1); //Input if EV is ready to charge (= J1772 State C)
203+
void setEvReadyInput(std::function<bool()> evReadyInput, unsigned int connectorId = 1); //Input if EV is ready to charge (= J1772 State C)
204204

205-
void setEvseReadyInput(std::function<bool()> evseReadyInput, uint connectorId = 1); //Input if EVSE allows charge (= PWM signal on)
205+
void setEvseReadyInput(std::function<bool()> evseReadyInput, unsigned int connectorId = 1); //Input if EVSE allows charge (= PWM signal on)
206206

207-
void addErrorCodeInput(std::function<const char *()> errorCodeInput, uint connectorId = 1); //Input for Error codes (please refer to OCPP 1.6, Edit2, p. 71 and 72 for valid error codes)
207+
void addErrorCodeInput(std::function<const char *()> errorCodeInput, unsigned int connectorId = 1); //Input for Error codes (please refer to OCPP 1.6, Edit2, p. 71 and 72 for valid error codes)
208208

209-
void addMeterValueInput(std::function<int32_t ()> valueInput, const char *measurand = nullptr, const char *unit = nullptr, const char *location = nullptr, const char *phase = nullptr, uint connectorId = 1); //integrate further metering Inputs
209+
void addMeterValueInput(std::function<int32_t ()> valueInput, const char *measurand = nullptr, const char *unit = nullptr, const char *location = nullptr, const char *phase = nullptr, unsigned int connectorId = 1); //integrate further metering Inputs
210210

211-
void addMeterValueInput(std::unique_ptr<ArduinoOcpp::SampledValueSampler> valueInput, uint connectorId = 1); //integrate further metering Inputs (more extensive alternative)
211+
void addMeterValueInput(std::unique_ptr<ArduinoOcpp::SampledValueSampler> valueInput, unsigned int connectorId = 1); //integrate further metering Inputs (more extensive alternative)
212212

213213
void setOnResetNotify(std::function<bool(bool)> onResetNotify); //call onResetNotify(isHard) before Reset. If you return false, Reset will be aborted. Optional
214214

@@ -220,7 +220,7 @@ void setOnResetExecute(std::function<void(bool)> onResetExecute); //reset handle
220220
* Return values: true on success, false on failure, PollResult::Await if not known yet
221221
* Continues to call the Cb as long as it returns PollResult::Await
222222
*/
223-
void setOnUnlockConnectorInOut(std::function<ArduinoOcpp::PollResult<bool>()> onUnlockConnectorInOut, uint connectorId = 1);
223+
void setOnUnlockConnectorInOut(std::function<ArduinoOcpp::PollResult<bool>()> onUnlockConnectorInOut, unsigned int connectorId = 1);
224224

225225
/*
226226
* Set an Input/Output for setting the state of the connector lock. Called in the course of normal
@@ -233,7 +233,7 @@ void setOnUnlockConnectorInOut(std::function<ArduinoOcpp::PollResult<bool>()> on
233233
* - TxEnableState::Inactive if connector lock is released
234234
* - TxEnableState::Pending otherwise, e.g. if transitioning between the states
235235
*/
236-
void setConnectorLockInOut(std::function<ArduinoOcpp::TxEnableState(ArduinoOcpp::TxTrigger)> lockConnectorInOut, uint connectorId = 1);
236+
void setConnectorLockInOut(std::function<ArduinoOcpp::TxEnableState(ArduinoOcpp::TxTrigger)> lockConnectorInOut, unsigned int connectorId = 1);
237237

238238
/*
239239
* Set an Input/Output to interact with a transaction-based energy meter. When this OCPP library is
@@ -249,17 +249,17 @@ void setConnectorLockInOut(std::function<ArduinoOcpp::TxEnableState(ArduinoOcpp:
249249
* - TxEnableState::Inactive if the tx-based meter has transitioned into a non-transaction-mode
250250
* - TxEnableState::Pending otherwise, e.g. if transitioning between the states
251251
*/
252-
void setTxBasedMeterInOut(std::function<ArduinoOcpp::TxEnableState(ArduinoOcpp::TxTrigger)> txMeterInOut, uint connectorId = 1);
252+
void setTxBasedMeterInOut(std::function<ArduinoOcpp::TxEnableState(ArduinoOcpp::TxTrigger)> txMeterInOut, unsigned int connectorId = 1);
253253

254254
/*
255255
* Access further information about the internal state of the library
256256
*/
257257

258-
bool isOperative(uint connectorId = 1); //if the charge point is operative or inoperative (see OCPP1.6 Edit2, p. 45)
258+
bool isOperative(unsigned int connectorId = 1); //if the charge point is operative or inoperative (see OCPP1.6 Edit2, p. 45)
259259

260-
int getTransactionId(uint connectorId = 1); //returns the txId if known, -1 if no transaction is running and 0 if txId not assigned yet
260+
int getTransactionId(unsigned int connectorId = 1); //returns the txId if known, -1 if no transaction is running and 0 if txId not assigned yet
261261

262-
const char *getTransactionIdTag(uint connectorId = 1); //returns the authorization token if applicable, or nullptr otherwise
262+
const char *getTransactionIdTag(unsigned int connectorId = 1); //returns the authorization token if applicable, or nullptr otherwise
263263

264264
void setOnResetRequest(OnReceiveReqListener onReceiveReq);
265265

‎src/ArduinoOcpp/Core/OcppOperation.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ class OcppOperation {
3636

3737
std::unique_ptr<Timeout> timeout{new OfflineSensitiveTimeout(40000)};
3838

39-
const ulong RETRY_INTERVAL = 3000; //in ms; first retry after ... ms; second retry after 2 * ... ms; third after 4 ...
40-
const ulong RETRY_INTERVAL_MAX = 20000; //in ms;
41-
ulong retry_start = 0;
42-
ulong retry_interval_mult = 1; // RETRY_INTERVAL * retry_interval_mult gives longer periods with each iteration
39+
const unsigned long RETRY_INTERVAL = 3000; //in ms; first retry after ... ms; second retry after 2 * ... ms; third after 4 ...
40+
const unsigned long RETRY_INTERVAL_MAX = 20000; //in ms;
41+
unsigned long retry_start = 0;
42+
unsigned long retry_interval_mult = 1; // RETRY_INTERVAL * retry_interval_mult gives longer periods with each iteration
4343

4444
uint16_t printReqCounter = 0;
4545

‎src/ArduinoOcpp/Core/OcppOperationTimeout.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ bool Timeout::isExceeded() {
3838
return exceeded;
3939
}
4040

41-
FixedTimeout::FixedTimeout(ulong TIMEOUT_DURATION) : TIMEOUT_DURATION(TIMEOUT_DURATION) {
41+
FixedTimeout::FixedTimeout(unsigned long TIMEOUT_DURATION) : TIMEOUT_DURATION(TIMEOUT_DURATION) {
4242
timeout_active = false;
4343
}
4444

@@ -57,12 +57,12 @@ bool FixedTimeout::timerIsExceeded() {
5757
}
5858

5959

60-
OfflineSensitiveTimeout::OfflineSensitiveTimeout(ulong TIMEOUT_DURATION) : TIMEOUT_DURATION(TIMEOUT_DURATION) {
60+
OfflineSensitiveTimeout::OfflineSensitiveTimeout(unsigned long TIMEOUT_DURATION) : TIMEOUT_DURATION(TIMEOUT_DURATION) {
6161
timeout_active = false;
6262
}
6363

6464
void OfflineSensitiveTimeout::timerTick(bool sendingSuccessful) {
65-
ulong t = ao_tick_ms();
65+
unsigned long t = ao_tick_ms();
6666

6767
if (!timeout_active) {
6868
timeout_active = true;
@@ -77,7 +77,7 @@ void OfflineSensitiveTimeout::timerTick(bool sendingSuccessful) {
7777
last_tick = t;
7878
}
7979
void OfflineSensitiveTimeout::timerRestart() {
80-
ulong t = ao_tick_ms();
80+
unsigned long t = ao_tick_ms();
8181
timeout_start = t;
8282
last_tick = t;
8383
timeout_active = false;

‎src/ArduinoOcpp/Core/OcppOperationTimeout.h‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
#include <functional>
99

10-
#include <sys/types.h>
11-
1210
namespace ArduinoOcpp {
1311

1412
using OnTimeoutListener = std::function<void()>;
@@ -36,24 +34,24 @@ class Timeout {
3634

3735
class FixedTimeout : public Timeout {
3836
private:
39-
ulong TIMEOUT_DURATION;
40-
ulong timeout_start;
37+
unsigned long TIMEOUT_DURATION;
38+
unsigned long timeout_start;
4139
bool timeout_active;
4240
public:
43-
FixedTimeout(ulong TIMEOUT_EXPIRE);
41+
FixedTimeout(unsigned long TIMEOUT_EXPIRE);
4442
void timerTick(bool sendingSuccessful);
4543
void timerRestart();
4644
bool timerIsExceeded();
4745
};
4846

4947
class OfflineSensitiveTimeout : public Timeout {
5048
private:
51-
ulong TIMEOUT_DURATION;
52-
ulong timeout_start;
53-
ulong last_tick;
49+
unsigned long TIMEOUT_DURATION;
50+
unsigned long timeout_start;
51+
unsigned long last_tick;
5452
bool timeout_active;
5553
public:
56-
OfflineSensitiveTimeout(ulong TIMEOUT_EXPIRE);
54+
OfflineSensitiveTimeout(unsigned long TIMEOUT_EXPIRE);
5755
void timerTick(bool sendingSuccessful);
5856
void timerRestart();
5957
bool timerIsExceeded();

‎src/ArduinoOcpp/MessagesV16/GetDiagnostics.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class GetDiagnostics : public OcppMessage {
1515
private:
1616
std::string location {};
1717
int retries = 1;
18-
ulong retryInterval = 180;
18+
unsigned long retryInterval = 180;
1919
OcppTimestamp startTime = OcppTimestamp();
2020
OcppTimestamp stopTime = OcppTimestamp();
2121

‎src/ArduinoOcpp/MessagesV16/UpdateFirmware.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class UpdateFirmware : public OcppMessage {
1616
std::string location {};
1717
OcppTimestamp retreiveDate = OcppTimestamp();
1818
int retries = 1;
19-
ulong retryInterval = 180;
19+
unsigned long retryInterval = 180;
2020
bool formatError = false;
2121
public:
2222
UpdateFirmware();

0 commit comments

Comments
 (0)