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.

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

Jump to bottom

Bug/729 add remove variables and components from schema for device model #740

Merged
merged 15 commits into from
Aug 19, 2024
Merged

Bug/729 add remove variables and components from schema for device model #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
aa3f061
Change init device model db so you can update all components and not …
maaikez Aug 5, 2024
737b6d3
Change init device model db so that it does not need a config file an…
maaikez Aug 6, 2024
80b75ef
Just add another todo
maaikez Aug 6, 2024
22704c8
Set config values in component config files and remove unneeded files.
maaikez Aug 7, 2024
8a2ac17
Remove unused test. Add check integrity function to see if variables …
maaikez Aug 7, 2024
ef3ff78
Add integrity check if type is correct. Add extra tests for the integ…
maaikez Aug 7, 2024
06d9c80
Remove TODO's that taken care of. Add more 'auto' instead of specific…
maaikez Aug 8, 2024
dea04ff
Merge branch 'main' into bug/729-add-remove-variables-and-components-…
maaikez Aug 8, 2024
58a6f16
Formatting...
maaikez Aug 9, 2024
dffc836
Merge branch 'main' into bug/729-add-remove-variables-and-components-…
maaikez Aug 14, 2024
85cbc97
Fix build after merge
maaikez Aug 14, 2024
0513a4a
Fix failing tests
maaikez Aug 15, 2024
e470785
Review comments
maaikez Aug 19, 2024
c45d89b
Merge branch 'main' into bug/729-add-remove-variables-and-components-…
maaikez Aug 19, 2024
fa11168
Bump version to 0.16.0
maaikez Aug 19, 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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.14)

project(ocpp
VERSION 0.15.1
VERSION 0.16.0
DESCRIPTION "A C++ implementation of the Open Charge Point Protocol"
LANGUAGES CXX
)
Expand Down
14 changes: 4 additions & 10 deletions config/v201/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ set(MIGRATION_FILES_DEVICE_MODEL_SOURCE_DIR_V201 ${MIGRATION_FILES_DEVICE_MODEL_
option(LIBOCPP_INSTALL_DEVICE_MODEL_DATABASE "Install device model database for OCPP201" ON)

list(APPEND CONFIGS
config.json
../logging.ini
)

Expand All @@ -34,17 +33,12 @@ install(

if (LIBOCPP_INSTALL_DEVICE_MODEL_DATABASE)

if(NOT LIBOCPP_V201_CONFIG_FILE)
set(LIBOCPP_V201_CONFIG_FILE "${CMAKE_CURRENT_SOURCE_DIR}/config.json")
endif()

if (NOT LIBOCPP_COMPONENT_SCHEMAS_PATH)
set(LIBOCPP_COMPONENT_SCHEMAS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/component_schemas")
if (NOT LIBOCPP_COMPONENT_CONFIG_PATH)
set(LIBOCPP_COMPONENT_CONFIG_PATH "${CMAKE_CURRENT_SOURCE_DIR}/component_config")
endif()


message(STATUS "Using ocpp v201 config file path: ${LIBOCPP_V201_CONFIG_FILE}")
message(STATUS "Using ocpp v201 component config file path: ${LIBOCPP_COMPONENT_CONFIG_PATH}")

install(FILES ${LIBOCPP_V201_CONFIG_FILE} DESTINATION ${CMAKE_INSTALL_DATADIR}/everest/modules/OCPP201)
install(DIRECTORY ${LIBOCPP_COMPONENT_SCHEMAS_PATH} DESTINATION ${CMAKE_INSTALL_DATADIR}/everest/modules/OCPP201)
install(DIRECTORY ${LIBOCPP_COMPONENT_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_DATADIR}/everest/modules/OCPP201)
endif()
9 changes: 6 additions & 3 deletions ...mponent_schemas/custom/Connector_1_1.json → ...omponent_config/custom/Connector_1_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadOnly"
"mutability": "ReadOnly",
"value": true
}
],
"description": "Component exists",
Expand Down Expand Up @@ -60,7 +61,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadOnly"
"mutability": "ReadOnly",
"value": "sType2"
}
],
"description": "A value of ConnectorEnumType (See part 2) plus additionally: cGBT, cChaoJi, OppCharge. Specific type of connector, including sub-variant information. Note: Distinct and orthogonal to Charging Protocol, Power Type, Phases.",
Expand All @@ -76,7 +78,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadOnly"
"mutability": "ReadOnly",
"value": 3
}
],
"description": "Number of alternating current phases connected/available.",
Expand Down
9 changes: 6 additions & 3 deletions ...mponent_schemas/custom/Connector_2_1.json → ...omponent_config/custom/Connector_2_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadOnly"
"mutability": "ReadOnly",
"value": true
}
],
"description": "Component exists",
Expand Down Expand Up @@ -60,7 +61,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadOnly"
"mutability": "ReadOnly",
"value": "sType2"
}
],
"description": "A value of ConnectorEnumType (See part 2) plus additionally: cGBT, cChaoJi, OppCharge. Specific type of connector, including sub-variant information. Note: Distinct and orthogonal to Charging Protocol, Power Type, Phases.",
Expand All @@ -76,7 +78,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadOnly"
"mutability": "ReadOnly",
"value": 3
}
],
"description": "Number of alternating current phases connected/available.",
Expand Down
6 changes: 4 additions & 2 deletions ...rces/component_schemas/custom/EVSE_1.json → .../v201/component_config/custom/EVSE_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadOnly"
"mutability": "ReadOnly",
"value": true
}
],
"description": "Component exists",
Expand Down Expand Up @@ -98,7 +99,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadOnly"
"mutability": "ReadOnly",
"value": 3
}
],
"description": "Number of alternating current phases connected/available.",
Expand Down
6 changes: 4 additions & 2 deletions ...rces/component_schemas/custom/EVSE_2.json → .../v201/component_config/custom/EVSE_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadOnly"
"mutability": "ReadOnly",
"value": true
}
],
"description": "Component exists",
Expand Down Expand Up @@ -98,7 +99,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadOnly"
"mutability": "ReadOnly",
"value": 3
}
],
"description": "Number of alternating current phases connected/available.",
Expand Down
18 changes: 12 additions & 6 deletions ...chemas/standardized/AlignedDataCtrlr.json → ...config/standardized/AlignedDataCtrlr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": true
}
],
"default": true,
Expand Down Expand Up @@ -45,7 +46,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": 900
}
],
"description": "Size (in seconds) of the clock-aligned data interval, intended to be transmitted in the MeterValuesRequest message.",
Expand All @@ -62,7 +64,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": "Energy.Active.Import.Register,Voltage,Frequency"
}
],
"description": "Clock-aligned measurand(s) to be included in MeterValuesRequest, every AlignedDataInterval seconds.",
Expand All @@ -78,7 +81,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": false
}
],
"description": "If set to true, the Charging Station SHALL NOT send clock aligned meter values when a transaction is ongoing.",
Expand Down Expand Up @@ -110,7 +114,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": 60
}
],
"description": "Size (in seconds) of the clock-aligned data interval, intended to be transmitted in the TransactionEventRequest (eventType = Ended) message.",
Expand All @@ -127,7 +132,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": "Energy.Active.Import.Register,Voltage"
}
],
"description": "Clock-aligned measurands to be included in the meterValues element of TransactionEventRequest (eventType = Ended), every SampledDataTxEndedInterval seconds from the start of the transaction.",
Expand Down
6 changes: 4 additions & 2 deletions ..._schemas/standardized/AuthCacheCtrlr.json → ...t_config/standardized/AuthCacheCtrlr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadOnly"
"mutability": "ReadOnly",
"value": true
}
],
"description": "Authorization caching is available, but not necessarily enabled.",
Expand All @@ -29,7 +30,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": true
}
],
"description": "If set to true, Authorization caching is enabled.",
Expand Down
15 changes: 10 additions & 5 deletions ...onent_schemas/standardized/AuthCtrlr.json → ...ponent_config/standardized/AuthCtrlr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": true
}
],
"default": true,
Expand Down Expand Up @@ -43,7 +44,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": true
}
],
"description": "Whether a remote request to start a transaction in the form of RequestStartTransactionRequest message should be authorized beforehand like a local action to start a transaction.",
Expand All @@ -59,7 +61,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": true
}
],
"description": "Whether the Charging Station, when Offline, will start a transaction for locally-authorized identifiers,",
Expand All @@ -75,7 +78,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": true
}
],
"description": "Whether the Charging Station, when online, will start a transaction for locally-authorized identifiers without waiting for or requesting an AuthorizeResponse from the CSMS.",
Expand All @@ -91,7 +95,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": "123"
}
],
"description": "IdTokens that have this id as groupId belong to the Master Pass Group. Meaning they can stop any ongoing transaction, but cannot start transactions.",
Expand Down
12 changes: 8 additions & 4 deletions ...schemas/standardized/ChargingStation.json → ..._config/standardized/ChargingStation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": "RST"
}
],
"description": "This variable describes the phase rotation of a Component relative to its parent Component, using a three letter string consisting of the letters: R, S, T and x.",
Expand All @@ -61,7 +62,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadOnly"
"mutability": "ReadOnly",
"value": true
}
],
"description": "Component exists",
Expand Down Expand Up @@ -90,7 +92,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadOnly"
"mutability": "ReadOnly",
"value": 3
}
],
"description": "Number of alternating current phases connected/available.",
Expand Down Expand Up @@ -119,7 +122,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": false
}
],
"description": "Some problem/fault exists",
Expand Down
6 changes: 4 additions & 2 deletions ...standardized/ChargingStatusIndicator.json → ...standardized/ChargingStatusIndicator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": false
}
],
"description": "Lighted",
Expand All @@ -28,7 +29,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": "FFFF00"
}
],
"description": "Displayed color",
Expand Down
9 changes: 6 additions & 3 deletions ...nent_schemas/standardized/ClockCtrlr.json → ...onent_config/standardized/ClockCtrlr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": true
}
],
"type": "boolean"
Expand All @@ -27,7 +28,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadOnly"
"mutability": "ReadOnly",
"value": ""
}
],
"description": "Contains the current date and time,",
Expand Down Expand Up @@ -135,7 +137,8 @@
"attributes": [
{
"type": "Actual",
"mutability": "ReadWrite"
"mutability": "ReadWrite",
"value": "Heartbeat"
}
],
"description": "Via this variable, the Charging Station provides the CSMS with the option to configure multiple clock sources",
Expand Down
0 ...emas/standardized/CustomizationCtrlr.json → ...nfig/standardized/CustomizationCtrlr.json
View file
Open in desktop
File renamed without changes.
Loading
Loading