From 1dde1786f680458a82364fceb175b8241fa2bb22 Mon Sep 17 00:00:00 2001 From: Cyrille Nofficial Date: Mon, 30 May 2022 15:01:00 +0200 Subject: [PATCH] fix: bad throttle pwm parameters --- .../files/robocar/car/configmap.yaml | 10 +++++---- .../files/robocar/car/deployments.yaml | 21 ++++++++++++++++--- .../files/robocar/car/kustomization.yaml | 2 +- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/ansible/roles/microservices/files/robocar/car/configmap.yaml b/ansible/roles/microservices/files/robocar/car/configmap.yaml index 848f5e7..929157c 100644 --- a/ansible/roles/microservices/files/robocar/car/configmap.yaml +++ b/ansible/roles/microservices/files/robocar/car/configmap.yaml @@ -7,11 +7,13 @@ data: ################ # STEERING PWM # ################ - #STEERING_LEFT_PWM: "1092" - #STEERING_RIGHT_PWM: "1986" - #STEERING_CENTER_PWM: "1583" - STEERING_LEFT_PWM: "1092" STEERING_RIGHT_PWM: "1986" STEERING_CENTER_PWM: "1583" + ################ + # THROTTLE PWM # + ################ + THROTTLE_MIN_PWM: "1092" + THROTTLE_MAX_PWM: "1986" + THROTTLE_ZERO_PWM: "1583" diff --git a/ansible/roles/microservices/files/robocar/car/deployments.yaml b/ansible/roles/microservices/files/robocar/car/deployments.yaml index a4ec01a..549e659 100644 --- a/ansible/roles/microservices/files/robocar/car/deployments.yaml +++ b/ansible/roles/microservices/files/robocar/car/deployments.yaml @@ -189,9 +189,9 @@ spec: - "--mqtt-retain=false" - "--throttle-channel=1" - "--steering-channel=0" - - "--throttle-zero-pwm=378" - - "--throttle-min-pwm=250" - - "--throttle-max-pwm=500" + - "--throttle-zero-pwm=$(THROTTLE_ZERO_PWM)" + - "--throttle-min-pwm=$(THROTTLE_MIN_PWM)" + - "--throttle-max-pwm=$(THROTTLE_MAX_PWM)" - "--steering-left-pwm=$(STEERING_LEFT_PWM)" - "--steering-right-pwm=$(STEERING_RIGHT_PWM)" - "--steering-center-pwm=$(STEERING_CENTER_PWM)" @@ -249,6 +249,21 @@ spec: configMapKeyRef: name: robocar-pca9685 key: STEERING_CENTER_PWM + - name: THROTTLE_MIN_PWM + valueFrom: + configMapKeyRef: + name: robocar-pca9685 + key: THROTTLE_MIN_PWM + - name: THROTTLE_MAX_PWM + valueFrom: + configMapKeyRef: + name: robocar-pca9685 + key: THROTTLE_MAX_PWM + - name: THROTTLE_ZERO_PWM + valueFrom: + configMapKeyRef: + name: robocar-pca9685 + key: THROTTLE_ZERO_PWM - name: TZ value: "Europe/Paris" volumes: diff --git a/ansible/roles/microservices/files/robocar/car/kustomization.yaml b/ansible/roles/microservices/files/robocar/car/kustomization.yaml index 78b04bc..0d0c082 100644 --- a/ansible/roles/microservices/files/robocar/car/kustomization.yaml +++ b/ansible/roles/microservices/files/robocar/car/kustomization.yaml @@ -14,7 +14,7 @@ images: newTag: v0.3.0 - name: docker.io/cyrilix/robocar-pca9685 - newTag: v0.5.0-15-g1cc8d07 + newTag: v0.5.0-18-gcf8965d - name: docker.io/cyrilix/robocar-oak-camera newTag: v0.1.0 \ No newline at end of file