greg@linux-0rpb:~/greg/ovms/Open-Vehicle-Monitoring-System-3-master/Open-Vehicle-Monitoring-System-3> sh fetch.sh remote: Counting objects: 14, done. remote: Compressing objects: 100% (7/7), done. remote: Total 14 (delta 8), reused 11 (delta 5), pack-reused 0 Unpacking objects: 100% (14/14), done. >From https://github.com/openvehicles/Open-Vehicle-Monitoring-System-3 678e1c0..2dfc3f6 master -> upstream/master Already on 'master' Your branch is up to date with 'origin/master'. Merge made by the 'recursive' strategy. vehicle/OVMS.V3/components/mcp2515/mcp2515.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) Pass a valid window to KWallet::Wallet::openWallet(). Pass a valid window to KWallet::Wallet::openWallet(). Counting objects: 19, done. Delta compression using up to 4 threads. Compressing objects: 100% (16/16), done. Writing objects: 100% (19/19), 1.80 KiB | 1.80 MiB/s, done. Total 19 (delta 11), reused 0 (delta 0) remote: Resolving deltas: 100% (11/11), completed with 4 local objects. To https://github.com/bitsofgreg/Open-Vehicle-Monitoring-System-3.git 86f2937..8af5c8b master -> master greg@linux-0rpb:~/greg/ovms/Open-Vehicle-Monitoring-System-3-master/Open-Vehicle-Monitoring-System-3> sh fetch.sh remote: Counting objects: 312, done. remote: Compressing objects: 100% (47/47), done. remote: Total 312 (delta 199), reused 256 (delta 196), pack-reused 51 Receiving objects: 100% (312/312), 62.38 KiB | 100.00 KiB/s, done. Resolving deltas: 100% (200/200), completed with 44 local objects. >From https://github.com/openvehicles/Open-Vehicle-Monitoring-System-3 2dfc3f6..52d378f master -> upstream/master Already on 'master' Your branch is up to date with 'origin/master'. Merge made by the 'recursive' strategy. vehicle/OVMS.V3/components/can/can.cpp | 49 +++++++-- vehicle/OVMS.V3/components/can/can.h | 4 + vehicle/OVMS.V3/components/canopen/doc/Howto-detect-CANopen-nodes.txt | 199 +++++++++++++++++++++++++++++++++++++ vehicle/OVMS.V3/components/canopen/doc/Test-Frames.txt | 2 + vehicle/OVMS.V3/components/canopen/doc/Test-Session-1.txt | 2 +- vehicle/OVMS.V3/components/canopen/src/canopen.cpp | 603 +++++++++++++++++++++++++++++--------------------------------------------------------------------------------- vehicle/OVMS.V3/components/canopen/src/canopen.h | 178 ++++++++++++++++++++++++--------- vehicle/OVMS.V3/components/canopen/src/canopen_client.cpp | 355 ++++++++++++++++++++++++++++++++++++++++++++++------------------- vehicle/OVMS.V3/components/canopen/src/canopen_shell.cpp | 462 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ vehicle/OVMS.V3/components/canopen/src/canopen_worker.cpp | 136 ++++++++++++++++--------- vehicle/OVMS.V3/components/console_ssh/src/console_ssh.cpp | 4 +- vehicle/OVMS.V3/components/crypto/crypt_base64.cpp | 80 +++++++++++++++ vehicle/OVMS.V3/components/crypto/crypt_base64.h | 3 + vehicle/OVMS.V3/components/esp32can/esp32can.cpp | 40 ++++++-- vehicle/OVMS.V3/components/mcp2515/mcp2515.cpp | 39 ++++---- vehicle/OVMS.V3/components/vehicle/vehicle.cpp | 2 +- vehicle/OVMS.V3/components/vehicle_kiasoulev/src/ks_can_poll.cpp | 329 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ vehicle/OVMS.V3/components/vehicle_kiasoulev/src/ks_can_send.cpp | 151 ++++++++++++++++++++++++++++ vehicle/OVMS.V3/components/vehicle_kiasoulev/src/ks_commands.cpp | 387 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ vehicle/OVMS.V3/components/vehicle_kiasoulev/src/ks_incoming_c_can.cpp | 202 +++++++++++++++++++++++++++++++++++++ vehicle/OVMS.V3/components/vehicle_kiasoulev/src/ks_incoming_m_can.cpp | 106 ++++++++++++++++++++ vehicle/OVMS.V3/components/vehicle_kiasoulev/src/vehicle_kiasoulev.cpp | 1013 ++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------- vehicle/OVMS.V3/components/vehicle_kiasoulev/src/vehicle_kiasoulev.h | 27 ++++- vehicle/OVMS.V3/components/vehicle_renaulttwizy/doc/CAN-Test-Frames.txt | 59 ++++++++++- vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/rt_battmon.cpp | 2 +- vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/rt_can.cpp | 29 +----- vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/rt_charge.cpp | 2 +- vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/rt_notify.cpp | 12 ++- vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/rt_pwrmon.cpp | 9 +- vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/rt_sevcon.cpp | 561 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/rt_sevcon.h | 203 +++++++++++++++++++++++++++++++++++++ vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/rt_sevcon_faults.cpp | 346 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/rt_ticker.cpp | 88 ++-------------- vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/rt_types.h | 15 +-- vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/rt_utils.cpp | 2 +- vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/vehicle_renaulttwizy.cpp | 27 ++++- vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/vehicle_renaulttwizy.h | 10 +- vehicle/OVMS.V3/main/console_async.cpp | 25 ++++- vehicle/OVMS.V3/main/metrics_standard.cpp | 8 +- vehicle/OVMS.V3/main/metrics_standard.h | 11 ++ vehicle/OVMS.V3/main/ovms_buffer.cpp | 1 + vehicle/OVMS.V3/main/ovms_command.cpp | 5 - vehicle/OVMS.V3/main/ovms_command.h | 3 - vehicle/OVMS.V3/main/ovms_config.cpp | 66 +++++++----- vehicle/OVMS.V3/main/ovms_config.h | 10 +- vehicle/OVMS.V3/main/ovms_console.cpp | 18 +++- vehicle/OVMS.V3/main/ovms_console.h | 2 + vehicle/OVMS.V3/todo.txt | 2 +- 48 files changed, 4134 insertions(+), 1755 deletions(-) create mode 100644 vehicle/OVMS.V3/components/canopen/doc/Howto-detect-CANopen-nodes.txt create mode 100644 vehicle/OVMS.V3/components/canopen/src/canopen_shell.cpp create mode 100644 vehicle/OVMS.V3/components/vehicle_kiasoulev/src/ks_can_poll.cpp create mode 100644 vehicle/OVMS.V3/components/vehicle_kiasoulev/src/ks_can_send.cpp create mode 100644 vehicle/OVMS.V3/components/vehicle_kiasoulev/src/ks_commands.cpp create mode 100644 vehicle/OVMS.V3/components/vehicle_kiasoulev/src/ks_incoming_c_can.cpp create mode 100644 vehicle/OVMS.V3/components/vehicle_kiasoulev/src/ks_incoming_m_can.cpp create mode 100644 vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/rt_sevcon.cpp create mode 100644 vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/rt_sevcon.h create mode 100644 vehicle/OVMS.V3/components/vehicle_renaulttwizy/src/rt_sevcon_faults.cpp