summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2021-01-12Restore /etc/dev-mapping.conf supportjellyfish_10.0.3jellyfish_10.0.2jellyfish/10.0.3jellyfish/10.0.210.0.310.0.2jellyfishScott Murray10-14/+393
Add back the ini-config and config-parser code that existed previously, and use it in binding init to over-ride the device mapping from the controller JSON if /etc/dev-mapping.conf exists. This restores the documented behavior, and is needed for the existing AGL demo platform support and soon CI. Additionally: - Add code to validate the active_message_set, diagnostic_bus, and bus device mapping configuration values. - The above required moving plugin loading before the configuration callback in the controller configuration, but this change seems rational in that everything required by the generated plugin code is already initialized before then, and it makes validating the configuration possible without adding an extra callback. - Add logging of the used CAN bus to device mappings at info level to ease debugging any future issues. - Tweak the log level of the missing configuration file message to info from error, since it is a legitimate mode of operation if relying on the default bus values in the controller JSON. Bug-AGL: SPEC-3755 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I440f5e0fc85be41f7c4c1f47d824a403525a18f9 (cherry picked from commit 9e23caa4c56259044604c38f107f7c637001b846)
2020-09-29Update agl-vcar to match test expectationsjellyfish_10.0.1jellyfish/10.0.110.0.1Scott Murray6-1669/+2424
The regeneration of the agl-vcar and default plugin signals code broke some expectations of the afb-test and pyagl tests, changes to get things back to a good state: - Add the missing J1939 messages that were in default-signals.cpp before it was regenerated to the agl-vcar signals.json, and then regenerate the affected cpp files; this fixes the J1939 test expectations. An alternative approach would be using the ability to load a different set of signals by configuring a different plugin, but that has been deemed not workable for AGL CI. - Remove the old application-generated.cpp file from the agl-vcar examples directory to avoid confusion. - Update the testFilter01pass.canreplay CAN data file used for the Filter_Test_01/Step_2 test to use the non-FD version of the 0x3D9 CAN message that matches the agl-vcar definition. A new 0x3DA message that is a FD copy of 0x3D9 has been added to the agl-vcar signals.json to allow testing CAN FD messaging, and a new testFilter01pass-FD.canreplay data file has been added that can potentially be used for doing so. Bug-AGL: SPEC-3603 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I24c960ca33aaf122ac83a2583cb2df0cd6dbd9e3
2020-09-25Update default signals to match agl-vcar definitionScott Murray4-1282/+582
Changes: - Updated the generated examples/agl-vcar/agl-vcar-signals.cpp and plugins/default-signals.cpp files with versions generated from examples/agl-vcar/signals.json with an updated version of low-level-can-generator. - Removed plugins/agl-vcar-signals.cpp to avoid confusion, as it is not used. - Removed unnecessary execute permission on plugins/CMakeLists.txt. Bug-AGL: SPEC-3603 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I33ccecf7b1316e8735a7f362c965cb927ed147b4 (cherry picked from commit 45514381c51ec65b1a2d05264a30a4d468348748)
2020-09-15Add gitreview file for jellyfish branchjellyfish_10.0.0jellyfish/10.0.010.0.0Jan-Simon Möller1-1/+1
Update the .gitreview file. Change-Id: If07354818f9e084cac0268b8c0b276b779ca2c56 Bug-AGL: SPEC-3581 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2020-08-19Rework J1939 and ISO TP feature enablingjellyfish_9.99.4jellyfish_9.99.3jellyfish/9.99.4jellyfish/9.99.39.99.49.99.3Scott Murray3-10/+39
Rework the J1939 and ISO TP feature enabling logic in config.cmake to: - define WITH_FEATURE_J1939 and WITH_FEATURE_ISOTP to default to off, thus requiring explicit enabling. This is safer than making assumptions based solely on the presence of the headers at build time. - honor WITH_FEATURE_* definitions given on the cmake command-line; the checks for header presence only over-ride an "ON" value if the required header is not present. Bug-AGL: SPEC-3538 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: Ie2b84ac50bbed0bbb775cae49f7f4fbe14f2f8ae
2020-06-09Update autobuild scriptsjellyfish_9.99.2jellyfish_9.99.1jellyfish/9.99.2jellyfish/9.99.19.99.29.99.1Scott Murray2-204/+154
Update autobuild scripts with reworked version that fixes building outside of the source tree. Bug-AGL: SPEC-2049, SPEC-3300 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I67abac8382ccf7a1961e6a8219b41f55df81fe47
2020-02-28config: Fix build failure missing header fileRomain Forlot1-2/+2
This commit add a sysroot variable in front of the path to header file which the presence is tested. Then we always point to the correct kernel headers path depending on the build environment Bug-AGL: SPEC-3204 Change-Id: Ifb59a897d36c74e6f84897d0bf3db3eb75609702 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-02-17Update autobuild script to create new targetsFrederic Marec2-26/+174
Update autobuild script to create multiple widget target debug, coverage and all Bug-AGL: SPEC-2049 Signed-off-by: Frederic Marec <frederic.marec@iot.bzh> Change-Id: I880f1aa629eaba9e320ed75b69eaa840c79887d8
2020-02-11Update .gitreview fileJan-Simon Möller1-1/+0
This updates the gitreview file in the project . Change-Id: I3cb34bd925688f411cc7c24a947d26709c63fa32 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2020-01-23low-can: fix aborting on can_data not being an json_type_arrayicefish_8.99.5icefish/8.99.58.99.5Matt Ranostay1-1/+3
Bug-AGL: SPEC-3129 Change-Id: I41928c5f4c467edb176ad6234c9b775e70035319 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
2020-01-23low-can: fix returned event_t from generate_filter() uninitializedMatt Ranostay1-1/+1
Bug-AGL: SPEC-3129 Change-Id: I003a98863b78b49e85638bbb7e9b0d0fbde5a2b7 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
2020-01-22low-can-apidef: Fix typo in permissionJose Bollo1-1/+1
The space at the end is not expected! Bug-AGL: SPEC-3115 Change-Id: I8c87e4827dc697d0605131a4f9e7f4720bf7cec4 Signed-off-by: Jose Bollo <jose.bollo@iot.bzh>
2020-01-20docs: update script paths in README.mdMatt Ranostay1-2/+2
Bug-AGL: SPEC-2984 Change-Id: I4b160319b4eb4cb27a4d3e18d9c1cab42eef76a0 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
2020-01-09get verb: add option idClément Bénier1-0/+61
can be called with json value: - a string matching can id - an array matching can ids Change-Id: Ia38728e065348e265613643fc934eb985564b722 Signed-off-by: Clément Bénier <clement.benier@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09openxc-utils : No send string but send array_object for signalsArthur Guyader1-1/+1
Change-Id: Iee28c1216ad5a3a4cdc76bd3edef4f7b5ccf0866 Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09message: move bit position flag and actionRomain Forlot7-70/+68
Separate some define to be in a dedicated header file that will be installed on the system. Then the low-can-generator could use it instead of having to copy those defines in the generator code. Change-Id: I1716c8b20f0811ca4ac1e8f13609f05ad7d24d1f Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09converter : Add "0x" for hex dataArthur Guyader1-0/+1
Change-Id: I9a46b0b87d56a73fb75fafafb0509ca66bb68dd3 Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09message: Fix copying all bytes but the last oneRomain Forlot3-64/+18
Change-Id: I8c2fce0f8080f213fda26a054f691ba3ed457bda Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09plugins: Remove J1939 condition in CMakeLists fileFrederic Marec1-28/+0
Remove condition to fix library link problem. This makes the build not happens at all if you don't have the J1939 CAN Kernel module isn't installed. Change-Id: I52f7bf2d6806e33505450c809a5ce7c463d91ab9 Signed-off-by: Frederic Marec <frederic.marec@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09can-bus: process signal rework to subscribe messageArthur Guyader2-13/+45
This commits allows to subscribe message and have all signals in one frame. Change-Id: I95de0e46b30be09a47a04754266cb55650eeec31 Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09can_decoder : Move frame swap to only do it one timeArthur Guyader2-11/+15
This commit allows to swap only one time a data message. Change-Id: I566c6ad72e266cd59a4397ab1a5ef423d752cf75 Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09openxc-utils : Add json value for DynamicFieldArthur Guyader3-12/+35
Change-Id: I93d31768804d4e30994897487e9fd312a56c547b Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09low_can_subscription: Add msg_def and create_rx for messageArthur Guyader2-1/+43
This commit adds message_definition variable to subscribe to message and not signals. And the function that init rx_filter for message. Also patch the error message Change-Id: I98b0b4dc8fec6ccef6e103fcb8aae136f708aa16 Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09Cleanup examples, tests, configuration and pluginsRomain Forlot27-6322/+6847
This commit updates all files external to the code. Change-Id: I910bc300c53b7669573bba414db7d7ad74313697 Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09signal_t : Remove attribute is_big_endianArthur Guyader4-69/+0
It is not used in the actual context. Change-Id: I6334ff9a037cec4f61deea56048b3109ad1362ab Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09Update flag FRAME_LAYOUT_IS_BIGENDIAN to BYTE_FRAME_IS_BIG_ENDIANArthur Guyader3-3/+3
Change-Id: I13a3392aecd8d57fac6f94346c4cf209595775b4 Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09format: remove uneeded brackets.Romain Forlot5-77/+8
Change-Id: I0689d62e32b9b60059adc2d4be78fa3b2581441c Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09converter: Improve the continental bit calculRomain Forlot1-1/+1
This is an improvment of the bit_position computing. This now operate only on full bytes to get the position. Change-Id: Idb4993a3c9922d50d02379139e7cbbe5a2cb501b Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09examples: Update examples j1939Arthur Guyader3-465/+238
Change-Id: I060994c4b553c6ae52becd52f8b0bfa795230743 Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09decoder: Add new decoders: ascii, date, timeArthur Guyader4-2/+82
Change-Id: I392bff2c1f4062aee186875335786fcda9cc0649 Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09can_bus: Add unit in the json that low-can emitsArthur Guyader3-6/+10
This commit allow if the unit is defined to display it in the json emmits by low-can. Change-Id: Ia09d4d9614eba6de93292ffab351fa1f4e612b73 Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09tests: Test the value of signals decodedArthur Guyader8-2/+263
This commit adds test to check if the value of signals is well decoded. Change-Id: I64f489d6428bf593dfda08dc6aacbdacd9d18d73 Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09test: Add tests filterArthur Guyader1-2/+2
This commit patch an error in the test low-can_FikterTest01.lua. This test crash other tests if not patch. Change-Id: I2163811853ddc1ab7b84616b006c302d9e1b27fc Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09j1939: Follow updates of the kernelArthur GUYADER7-25/+45
This commit patch j1939 feature after the update of the kernel from linux-can-next to mainline. Now promisc option removes filter of the bind. The option is now a parameter in the event_filter. The feature recv_own isn't available, you can't receive on the same socket an emit frame from you. Not a big problem because receive and send method use two different sockets in the implementation. Change-Id: I5ac410177c1512090827870300b8aa1679477b84 Signed-off-by: Arthur GUYADER <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09socket-j1939: Function add_filter return int to check errorArthur GUYADER2-3/+5
Change-Id: Ia79320108e8293d2b7a5beba4f49036999d5ebbb Signed-off-by: Arthur GUYADER <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09msg_def: returns pgn if j1939 usedArthur GUYADER1-1/+2
This commit patch function get_id. It was only capable to return id and id extended. Now it returns also pgn. Change-Id: If5feb7e2ee3bc5ca33b16620d1b998c95414dda8 Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09diag_mngr: No diagnostic msg if no diagnostic_busRomain Forlot2-4/+7
Change-Id: I840fc6cc7e9cfd171b03cac508fedb8ece4b976d Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09low-can-cb: Little optiRomain Forlot1-4/+2
Change-Id: I6f3e84700563fc60e643d770365c98342214bedd Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09message: Rework message flagsRomain Forlot3-19/+23
Adding bit_position and frame manipulation flags Change-Id: Ibd727a54a33a78b49f2c319b4b70dcda21ea87cb Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09encoder: use contructor to initialize the vectorRomain Forlot1-5/+3
Instead of initilizing using a for loop... Also fixes a wrong watched bit using a bcm socket Change-Id: Ib65a3da06dbd249c97b8ec11823247120505d545 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09converter: Improve bit_position computationRomain Forlot3-33/+27
- Fix wrong bit_position swap computed: Need to multiply then lenght in bytes by 8 to get it for bits. - Add a continental bit_position function: This allow to get the correct bit_position using the weird Continental. bit numbering method where the Frame is read using little endianness and bit count using a big endianness - Use define CHAR_BIT instead of hardcoded 8 value Change-Id: I8d458ab457f80e5fa116af942acfceaaef51b763 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09decoder: reformat function to parse the bitfieldRomain Forlot1-8/+10
Change-Id: Ia024b9d87d219f69aac0613d6e14b623e37300a6 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09message: Default frame layout as little endian.Romain Forlot4-5/+5
Change the flags to be enable if frame use big endian rather than little Change-Id: I09ae9c54f1d807da4e740457cf04a001723edb0e Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09diag-mngr: Fix sending and change initRomain Forlot3-17/+24
This commit fix the wrong bcm ival1 value set because the struct hasn't been initialized so it use a wrong value that can not be handled by the socket. Initialize diagnotstic manager depending on JSON configuration file This avoid to request engine_speed signal when there isn't any diagnostic_bus configured in the JSON file. Change-Id: I98145a6e20c29a644c856d818f104c6bd8069f9f Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09socket-bcm: Format, simplification of open socketRomain Forlot1-12/+10
Change-Id: I8a012285a8d06f3c5778c82e543c944d8fa20e3c Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09decoder: rework how to swap frame layout.Romain Forlot7-31/+35
This also change the bit_position to retrieve the bit word starting from the left or the right of the frame depending on the endianness of the frame layout. Change-Id: I28658e9d46bd35d8ecabeece317331832229384a Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09message: optimize getting subpart of a vectorRomain Forlot1-19/+7
Change-Id: Ifdaea3bf0969f15eb70629a92c0293ddeee33491 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09msg_definition: integrate frame layout as a flagRomain Forlot5-21/+14
Integrate frame layout as a flag instead of a separate boolean Change-Id: I0fe32fd8a80238006ef89152af25001ecdf018c9 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09misc: Some cleanup and fixes about signatures.Romain Forlot6-10/+14
Change-Id: Ib3e1df0d3741274336c8806ae82082e33d4d3a92 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2020-01-09ini-config: remove ini-config libRomain Forlot5-202/+0
No need to use ini-config now that the config is hold by the controller JSON configuration file. Bug-AGL: SPEC-2988 Change-Id: If82d22266fb2d592c140b81cda783ee63f1f13be Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>