diff options
author | zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2019-04-04 09:03:27 +0900 |
---|---|---|
committer | zheng_wenlong <wenlong_zheng@nexty-ele.com> | 2019-04-04 09:04:27 +0900 |
commit | c404f25dcaa4e622a0fe9179bc79393a468093d1 (patch) | |
tree | cb53edb66a21a4463cdea12082fbd5b77a057035 /conf | |
parent | 1fed2c5a38fed8bc91bb6b8a08982303eb9c2e82 (diff) |
Revert "Change steering to systemd service for ces2019"
This reverts commit 1fed2c5a38fed8bc91bb6b8a08982303eb9c2e82.
Change-Id: Id83b437eef556b8d3fcd95503b9ff5b4d94bc7a5
Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/files/etc/gear_shift_para.json | 32 | ||||
-rw-r--r-- | conf/files/etc/steering_wheel.json | 5 | ||||
-rw-r--r-- | conf/files/etc/steering_wheel_map.json | 84 | ||||
-rw-r--r-- | conf/files/etc/udev/rules.d/90-wheel.rules | 1 | ||||
-rw-r--r-- | conf/files/lib/systemd/system/usbcan0.service | 8 | ||||
-rw-r--r-- | conf/files/lib/systemd/system/usbcan1.service | 8 | ||||
-rw-r--r-- | conf/files/lib/systemd/system/wheel.service | 7 | ||||
-rwxr-xr-x | conf/files/usr/bin/candev.sh | 36 |
8 files changed, 0 insertions, 181 deletions
diff --git a/conf/files/etc/gear_shift_para.json b/conf/files/etc/gear_shift_para.json deleted file mode 100644 index 3b58da7..0000000 --- a/conf/files/etc/gear_shift_para.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "GEAR_PARA" : [ - { - "POS" : "First", - "VAL" : "4.12", - }, - { - "POS" : "Second", - "VAL" : "2.84", - }, - { - "POS" : "Third", - "VAL" : "2.28", - }, - { - "POS" : "Fourth", - "VAL" : "1.45", - }, - { - "POS" : "Fifth", - "VAL" : "1.0", - }, - { - "POS" : "Sixth", - "VAL" : "0.69", - }, - { - "POS" : "Reverse", - "VAL" : "3.21", - }, - ] -}
\ No newline at end of file diff --git a/conf/files/etc/steering_wheel.json b/conf/files/etc/steering_wheel.json deleted file mode 100644 index d470628..0000000 --- a/conf/files/etc/steering_wheel.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dev_name": "/dev/input/js0", - "wheel_map": "/etc/steering_wheel_map.json", - "gear_para": "/etc/gear_shift_para.json" -} diff --git a/conf/files/etc/steering_wheel_map.json b/conf/files/etc/steering_wheel_map.json deleted file mode 100644 index 86fbd7c..0000000 --- a/conf/files/etc/steering_wheel_map.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "PROPERTYS" : [ - { - "PROPERTY" : "VehicleSpeed", - "TYPE" : "uint16_t", - "CANID" : "3E9", - "BIT_POSITION" : "0", - "BIT_SIZE" : "15", - "DLC" : "8" - }, - { - "PROPERTY" : "EngineSpeed", - "TYPE" : "uint16_t", - "CANID" : "3D9", - "BIT_POSITION" : "16", - "BIT_SIZE" : "16", - "DLC" : "8" - }, - { - "PROPERTY" : "AcceleratorPedalPosition", - "TYPE" : "uint16_t", - "CANID" : "5D1", - "BIT_POSITION" : "16", - "BIT_SIZE" : "8", - "DLC" : "8" - }, - { - "PROPERTY" : "TransmissionGearInfo", - "TYPE" : "uint16_t", - "CANID" : "5D2", - "BIT_POSITION" : "20", - "BIT_SIZE" : "4", - "DLC" : "8" - }, - { - "PROPERTY" : "TransmissionMode", - "TYPE" : "uint16_t", - "CANID" : "5D2", - "BIT_POSITION" : "16", - "BIT_SIZE" : "4", - "DLC" : "8" - }, - { - "PROPERTY" : "SteeringWheelAngle", - "TYPE" : "uint16_t", - "CANID" : "5D1", - "BIT_POSITION" : "4", - "BIT_SIZE" : "12", - "DLC" : "8" - }, - { - "PROPERTY" : "TurnSignalStatus", - "TYPE" : "uint16_t", - "CANID" : "5D3", - "BIT_POSITION" : "26", - "BIT_SIZE" : "3", - "DLC" : "8" - }, - { - "PROPERTY" : "LightStatusBrake", - "TYPE" : "bool", - "CANID" : "5D3", - "BIT_POSITION" : "7", - "BIT_SIZE" : "1", - "DLC" : "8" - }, - { - "PROPERTY" : "ParkingStatusBrake", - "TYPE" : "bool", - "CANID" : "5D3", - "BIT_POSITION" : "8", - "BIT_SIZE" : "1", - "DLC" : "8" - }, - { - "PROPERTY" : "FuelLevel", - "TYPE" : "uint16_t", - "CANID" : "3D9", - "BIT_POSITION" : "8", - "BIT_SIZE" : "8", - "DLC" : "8" - } - ] -} diff --git a/conf/files/etc/udev/rules.d/90-wheel.rules b/conf/files/etc/udev/rules.d/90-wheel.rules deleted file mode 100644 index 09b9d46..0000000 --- a/conf/files/etc/udev/rules.d/90-wheel.rules +++ /dev/null @@ -1 +0,0 @@ -ACTION=="add", SUBSYSTEMS=="input", KERNELS=="input[0-9]*", ATTRS{name}=="Logitech G29 Driving Force Racing Wheel", RUN+="/bin/systemctl start wheel.service" diff --git a/conf/files/lib/systemd/system/usbcan0.service b/conf/files/lib/systemd/system/usbcan0.service deleted file mode 100644 index 12dc9e1..0000000 --- a/conf/files/lib/systemd/system/usbcan0.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=slcan0 starter -After=remote-fs.target -After=syslog.target - -[Service] -ExecStart=/usr/bin/slcand -F -o -s6 -t hw -S 3000000 /dev/ttyUSB0 -Restart=on-failure diff --git a/conf/files/lib/systemd/system/usbcan1.service b/conf/files/lib/systemd/system/usbcan1.service deleted file mode 100644 index a2b4d1a..0000000 --- a/conf/files/lib/systemd/system/usbcan1.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=slcan1 starter -After=remote-fs.target -After=syslog.target - -[Service] -ExecStart=/usr/bin/slcand -F -o -s6 -t hw -S 3000000 /dev/ttyUSB1 -Restart=on-failure diff --git a/conf/files/lib/systemd/system/wheel.service b/conf/files/lib/systemd/system/wheel.service deleted file mode 100644 index 85c881f..0000000 --- a/conf/files/lib/systemd/system/wheel.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=wheel-service starter -After=syslog.target - -[Service] -ExecStart=/usr/bin/wheel-service -Restart=on-failure diff --git a/conf/files/usr/bin/candev.sh b/conf/files/usr/bin/candev.sh deleted file mode 100755 index fc47cb6..0000000 --- a/conf/files/usr/bin/candev.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -function execProc(){ - dev=$1 - - if [ "canCK" == ${dev:0:3}"CK" ]; then - modprobe can - ip link set $dev up type can bitrate 500000 - elif [ "vcanCK" == ${dev:0:4}"CK" ]; then - modprobe vcan - ip link add $dev type vcan - ip link set $dev up - elif [ "slcanCK" == ${dev:0:5}"CK" ]; then - modprobe slcan - systemctl start usbcan${dev:5:1} - ip link set $dev up - ip link - ifconfig $dev txqueuelen 1000 - fi -} - -if [ -e /etc/dev-mapping.conf ]; then - hs=`cat /etc/dev-mapping.conf | grep hs | cut -d '"' -f 2` - ls=`cat /etc/dev-mapping.conf | grep ls | cut -d '"' -f 2` -else - echo -e "[CANbus-mapping]\nhs=\"vcan0\"\nls=\"vcan1\"\n" > /etc/dev-mapping.conf - hs=vcan0 - ls=vcan1 -fi - -echo "candev "$hs -execProc $hs -if [ $hs != $ls ]; then - echo "candev "$ls - execProc $ls -fi |