diff options
Diffstat (limited to 'low-can-binding/binding')
| -rw-r--r-- | low-can-binding/binding/application.hpp | 1 | ||||
| -rw-r--r-- | low-can-binding/binding/low-can-apidef.json | 392 | ||||
| -rw-r--r-- | low-can-binding/binding/low-can-cb.cpp | 34 |
3 files changed, 213 insertions, 214 deletions
diff --git a/low-can-binding/binding/application.hpp b/low-can-binding/binding/application.hpp index a5d2285c..5045ddab 100644 --- a/low-can-binding/binding/application.hpp +++ b/low-can-binding/binding/application.hpp @@ -117,4 +117,3 @@ class application_t bool isBusActive(can_bus_dev_t* bus); */ }; - diff --git a/low-can-binding/binding/low-can-apidef.json b/low-can-binding/binding/low-can-apidef.json index e647bd24..5f528377 100644 --- a/low-can-binding/binding/low-can-apidef.json +++ b/low-can-binding/binding/low-can-apidef.json @@ -1,183 +1,183 @@ { - "openapi": "3.0.0", - "$schema": "http:iot.bzh/download/openapi/schema-3.0/default-schema.json", - "info": { - "description": "", - "title": "low-can", - "version": "4.0", - "x-binding-c-generator": { - "api": "low-can", - "version": 2, - "prefix": "", - "postfix": "", - "start": null , - "onevent": null, - "init": "init_binding", - "scope": "", - "private": false - } - }, - "servers": [ - { - "url": "ws://{host}:{port}/api/monitor", - "description": "Low level CAN API.", - "variables": { - "host": { - "default": "localhost" - }, - "port": { - "default": "1234" - } - }, - "x-afb-events": [ - { - "$ref": "#/components/schemas/afb-event" - } - ] - } - ], - "components": { - "schemas": { - "afb-reply": { - "$ref": "#/components/schemas/afb-reply-v2" - }, - "afb-event": { - "$ref": "#/components/schemas/afb-event-v2" - }, - "afb-reply-v2": { - "title": "Generic response.", - "type": "object", - "required": [ "jtype", "request" ], - "properties": { - "jtype": { - "type": "string", - "const": "afb-reply" - }, - "request": { - "type": "object", - "required": [ "status" ], - "properties": { - "status": { "type": "string" }, - "info": { "type": "string" }, - "token": { "type": "string" }, - "uuid": { "type": "string" }, - "reqid": { "type": "string" } - } - }, - "response": { "type": "object" } - } - }, - "afb-event-v2": { - "type": "object", - "required": [ "jtype", "event" ], - "properties": { - "jtype": { - "type": "string", - "const": "afb-event" - }, - "event": { "type": "string" }, - "data": { "type": "object" } - } - } - }, - "x-permissions": { - "monitor": { - "permission": "urn:AGL:permission:low-can:public:monitor" - }, - "write": { - "permission": "urn:AGL:permission::platform:can:write " - } - }, - "responses": { - "200": { - "description": "A complex object array response", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/afb-reply" - } - } - } - } - } - }, - "paths": { - "/subscribe": { - "description": "Subscribe to CAN signals events", - "parameters": [ - { - "in": "query", - "name": "event", - "required": false, - "schema": { "type": "string" } - } - ], - "responses": { - "200": {"$ref": "#/components/responses/200"} - } - }, - "/unsubscribe": { - "description": "Unsubscribe previously subscribed signals.", - "parameters": [ - { - "in": "query", - "name": "event", - "required": false, - "schema": { "type": "string" } - } - ], - "responses": { - "200": {"$ref": "#/components/responses/200"} - } - }, - "/get": { - "description": "get a current value of CAN message", - "parameters": [ - { - "in": "query", - "name": "event", - "required": false, - "schema": { "type": "string" } - } - ], - "responses": { - "200": {"$ref": "#/components/responses/200"} - } - }, - "/list": { - "description": "get a supported CAN message list", - "responses": { - "200": {"$ref": "#/components/responses/200"} - } - }, - "/auth": { - "description": "Authenticate session to be raise Level Of Assurance.", - "get": { - "x-permissions": { - "$ref": "#/components/x-permissions/write" - }, - "responses": { - "200": {"$ref": "#/components/responses/200"} - } - } - }, - "/write": { - "description": "Write a CAN messages to the CAN bus.", - "get": { - "x-permissions": { - "LOA": 1 - }, - "parameters": [ - { - "in": "query", - "name": "bus_name", - "required": false, - "schema": { "type": "string" } - }, - { - "in": "query", - "name": "frame", - "required": false, + "openapi": "3.0.0", + "$schema": "http:iot.bzh/download/openapi/schema-3.0/default-schema.json", + "info": { + "description": "", + "title": "low-can", + "version": "4.0", + "x-binding-c-generator": { + "api": "low-can", + "version": 2, + "prefix": "", + "postfix": "", + "start": null , + "onevent": null, + "init": "init_binding", + "scope": "", + "private": false + } + }, + "servers": [ + { + "url": "ws://{host}:{port}/api/monitor", + "description": "Low level CAN API.", + "variables": { + "host": { + "default": "localhost" + }, + "port": { + "default": "1234" + } + }, + "x-afb-events": [ + { + "$ref": "#/components/schemas/afb-event" + } + ] + } + ], + "components": { + "schemas": { + "afb-reply": { + "$ref": "#/components/schemas/afb-reply-v2" + }, + "afb-event": { + "$ref": "#/components/schemas/afb-event-v2" + }, + "afb-reply-v2": { + "title": "Generic response.", + "type": "object", + "required": [ "jtype", "request" ], + "properties": { + "jtype": { + "type": "string", + "const": "afb-reply" + }, + "request": { + "type": "object", + "required": [ "status" ], + "properties": { + "status": { "type": "string" }, + "info": { "type": "string" }, + "token": { "type": "string" }, + "uuid": { "type": "string" }, + "reqid": { "type": "string" } + } + }, + "response": { "type": "object" } + } + }, + "afb-event-v2": { + "type": "object", + "required": [ "jtype", "event" ], + "properties": { + "jtype": { + "type": "string", + "const": "afb-event" + }, + "event": { "type": "string" }, + "data": { "type": "object" } + } + } + }, + "x-permissions": { + "monitor": { + "permission": "urn:AGL:permission:low-can:public:monitor" + }, + "write": { + "permission": "urn:AGL:permission::platform:can:write " + } + }, + "responses": { + "200": { + "description": "A complex object array response", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/afb-reply" + } + } + } + } + } + }, + "paths": { + "/subscribe": { + "description": "Subscribe to CAN signals events", + "parameters": [ + { + "in": "query", + "name": "event", + "required": false, + "schema": { "type": "string" } + } + ], + "responses": { + "200": {"$ref": "#/components/responses/200"} + } + }, + "/unsubscribe": { + "description": "Unsubscribe previously subscribed signals.", + "parameters": [ + { + "in": "query", + "name": "event", + "required": false, + "schema": { "type": "string" } + } + ], + "responses": { + "200": {"$ref": "#/components/responses/200"} + } + }, + "/get": { + "description": "get a current value of CAN message", + "parameters": [ + { + "in": "query", + "name": "event", + "required": false, + "schema": { "type": "string" } + } + ], + "responses": { + "200": {"$ref": "#/components/responses/200"} + } + }, + "/list": { + "description": "get a supported CAN message list", + "responses": { + "200": {"$ref": "#/components/responses/200"} + } + }, + "/auth": { + "description": "Authenticate session to be raise Level Of Assurance.", + "get": { + "x-permissions": { + "$ref": "#/components/x-permissions/write" + }, + "responses": { + "200": {"$ref": "#/components/responses/200"} + } + } + }, + "/write": { + "description": "Write a CAN messages to the CAN bus.", + "get": { + "x-permissions": { + "LOA": 1 + }, + "parameters": [ + { + "in": "query", + "name": "bus_name", + "required": false, + "schema": { "type": "string" } + }, + { + "in": "query", + "name": "frame", + "required": false, "schema": { "type": "array" }, "parameters": [ { @@ -199,24 +199,24 @@ "schema": { "type": "string" } } ] - }, + }, { - "in": "query", - "name": "signal_name", - "required": false, - "schema": { "type": "string" } + "in": "query", + "name": "signal_name", + "required": false, + "schema": { "type": "string" } }, { - "in": "query", - "name": "signal_value", - "required": false, - "schema": { "type": "integer" } - } - ], - "responses": { - "200": {"$ref": "#/components/responses/200"} - } - } - } - } + "in": "query", + "name": "signal_value", + "required": false, + "schema": { "type": "integer" } + } + ], + "responses": { + "200": {"$ref": "#/components/responses/200"} + } + } + } + } } diff --git a/low-can-binding/binding/low-can-cb.cpp b/low-can-binding/binding/low-can-cb.cpp index 2b630845..ad9543d9 100644 --- a/low-can-binding/binding/low-can-cb.cpp +++ b/low-can-binding/binding/low-can-cb.cpp @@ -192,11 +192,11 @@ static int add_to_event_loop(std::shared_ptr<low_can_subscription_t>& can_subscr } static int subscribe_unsubscribe_diagnostic_messages(afb_req_t request, - bool subscribe, - std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_messages, - struct event_filter_t& event_filter, - std::map<int, std::shared_ptr<low_can_subscription_t> >& s, - bool perm_rec_diag_req) + bool subscribe, + std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_messages, + struct event_filter_t& event_filter, + std::map<int, std::shared_ptr<low_can_subscription_t> >& s, + bool perm_rec_diag_req) { int rets = 0; application_t& app = application_t::instance(); @@ -257,10 +257,10 @@ static int subscribe_unsubscribe_diagnostic_messages(afb_req_t request, } static int subscribe_unsubscribe_signals(afb_req_t request, - bool subscribe, - std::vector<std::shared_ptr<signal_t> > signals, - struct event_filter_t& event_filter, - std::map<int, std::shared_ptr<low_can_subscription_t> >& s) + bool subscribe, + std::vector<std::shared_ptr<signal_t> > signals, + struct event_filter_t& event_filter, + std::map<int, std::shared_ptr<low_can_subscription_t> >& s) { int rets = 0; for(const auto& sig: signals) @@ -602,18 +602,18 @@ static void write_frame(afb_req_t request, const std::string& bus_name, json_obj AFB_DEBUG("JSON content %s",json_object_get_string(json_value)); if(!wrap_json_unpack(json_value, "{si, si, so !}", - "can_id", &id, - "can_dlc", &length, - "can_data", &can_data)) + "can_id", &id, + "can_dlc", &length, + "can_data", &can_data)) { message = new can_message_t(CANFD_MAX_DLEN,(uint32_t)id,(uint32_t)length,message_format_t::STANDARD,false,0,data,0); write_raw_frame(request,bus_name,message,can_data,socket_type::BCM); } #ifdef USE_FEATURE_J1939 else if(!wrap_json_unpack(json_value, "{si, si, so !}", - "pgn", &id, - "length", &length, - "data", &can_data)) + "pgn", &id, + "length", &length, + "data", &can_data)) { message = new j1939_message_t(J1939_MAX_DLEN,(uint32_t)length,message_format_t::J1939,data,0,J1939_NO_NAME,(pgn_t)id,J1939_NO_ADDR); write_raw_frame(request,bus_name,message,can_data,socket_type::J1939); @@ -701,8 +701,8 @@ void write(afb_req_t request) // Process about Raw CAN message on CAN bus directly if (args != NULL && ! wrap_json_unpack(args, "{ss, so !}", - "bus_name", &name, - "frame", &json_value)) + "bus_name", &name, + "frame", &json_value)) write_frame(request, name, json_value); // Search signal then encode value. |