ansible/roles/microservices/files/robocar/car/configmap.yaml

@@ -0,0 +1,13 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: robocar-pca9685
+data:
+  ################
+  # STEERING PWM #
+  ################
+  STEERING_LEFT_PWM: "1092"
+  STEERING_RIGHT_PWM: "1986"
+  STEERING_CENTER_PWM: "1583"
+

ansible/roles/microservices/files/robocar/car/deployments.yaml

@@ -187,15 +187,15 @@ spec:
           image: docker.io/cyrilix/robocar-pca9685
           args:
           - "--mqtt-retain=false"
-          - "--throttle-channel=15"
-          - "--steering-channel=14"
-          - "--throttle-zero-pwm=$(THROTTLE_ZERO_PWM)"
-          - "--throttle-min-pwm=$(THROTTLE_MIN_PWM)"
-          - "--throttle-max-pwm=$(THROTTLE_MAX_PWM)"
+          - "--throttle-channel=1"
+          - "--steering-channel=0"
+          - "--throttle-zero-pwm=378"
+          - "--throttle-min-pwm=250"
+          - "--throttle-max-pwm=500"
           - "--steering-left-pwm=$(STEERING_LEFT_PWM)"
           - "--steering-right-pwm=$(STEERING_RIGHT_PWM)"
           - "--steering-center-pwm=$(STEERING_CENTER_PWM)"
-          - "--update-pwm-frequency=25"
+          - "--update-pwm-frequency=10"
           - "--log=info"
           securityContext:
             runAsUser: 1234
@@ -237,33 +237,18 @@ spec:
             - name: STEERING_LEFT_PWM
               valueFrom:
                 configMapKeyRef:
-                  name: robocar-steering-pwm
+                  name: robocar-pca9685
                   key: STEERING_LEFT_PWM
             - name: STEERING_RIGHT_PWM
               valueFrom:
                 configMapKeyRef:
-                  name: robocar-steering-pwm
+                  name: robocar-pca9685
                   key: STEERING_RIGHT_PWM
             - name: STEERING_CENTER_PWM
               valueFrom:
                 configMapKeyRef:
-                  name: robocar-steering-pwm
+                  name: robocar-pca9685
                   key: STEERING_CENTER_PWM
-            - name: THROTTLE_MIN_PWM
-              valueFrom:
-                configMapKeyRef:
-                  name: robocar-throttle-pwm
-                  key: THROTTLE_MIN_PWM
-            - name: THROTTLE_MAX_PWM
-              valueFrom:
-                configMapKeyRef:
-                  name: robocar-throttle-pwm
-                  key: THROTTLE_MAX_PWM
-            - name: THROTTLE_ZERO_PWM
-              valueFrom:
-                configMapKeyRef:
-                  name: robocar-throttle-pwm
-                  key: THROTTLE_ZERO_PWM
             - name: TZ
               value: "Europe/Paris"
       volumes:

ansible/roles/microservices/files/robocar/car/kustomization.yaml

@@ -7,13 +7,14 @@ namespace: robocar
 resources:
   - ../common
   - deployments.yaml
+  - configmap.yaml
 
 images:
   - name: docker.io/cyrilix/robocar-camera
     newTag: v0.3.0
 
   - name: docker.io/cyrilix/robocar-pca9685
-    newTag: v0.6.0
+    newTag: v0.5.0
 
   - name: docker.io/cyrilix/robocar-oak-camera
     newTag: v0.1.0

ansible/roles/microservices/files/robocar/common/configmap.yaml

@@ -4,8 +4,6 @@ metadata:
   name: robocar
 data:
   # Broker configuration
-  #MQTT_BROKER_HOST: 192.168.217.19
-  #MQTT_BROKER: "tcp://192.168.217.19:1883"
   MQTT_BROKER_HOST: 192.168.2.221
   MQTT_BROKER: "tcp://192.168.2.221:1883"
   #MQTT_BROKER: "tcp://mqtt.robocar.svc.cluster.local:1883"
@@ -57,18 +55,7 @@ data:
   STEERING_LEFT_PWM: "1002"
   STEERING_RIGHT_PWM: "1985"
   STEERING_CENTER_PWM: "1491"
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: robocar-throttle-pwm
-data:
-  ################
-  # THROTTLE PWM #
-  ################
-  THROTTLE_MIN_PWM: "1092"
-  THROTTLE_MAX_PWM: "1986"
-  THROTTLE_ZERO_PWM: "1583"
+
 ---
 apiVersion: v1
 kind: ConfigMap

ansible/roles/microservices/files/robocar/common/deployments.yaml

@@ -30,7 +30,7 @@ spec:
             - "--steering-center-pwm=$(STEERING_CENTER_PWM)"
             - "-log=info"
           volumeMounts:
-            - mountPath: "/dev/ttyAMA0"
+            - mountPath: "/dev/ttyAMA1"
               name: serial
           securityContext:
             privileged: true
@@ -96,7 +96,7 @@ spec:
       volumes:
         - name: serial
           hostPath:
-            path: /dev/ttyAMA0
+            path: /dev/ttyAMA1
             type: CharDevice
 
 ---
@@ -525,7 +525,7 @@ spec:
         image: docker.io/cyrilix/robocar-record
         args:
         - "-mqtt-retain=true"
-        - "-debug=true"
+        - "-debug=false"
         securityContext:
           runAsUser: 1234
           runAsGroup: 1234

ansible/roles/microservices/files/robocar/common/kustomization.yaml

@@ -10,7 +10,7 @@ resources:
 
 images:
   - name: docker.io/cyrilix/robocar-arduino
-    newTag: v0.7.0
+    newTag: v0.6.0
 
   - name: docker.io/cyrilix/robocar-led
     newTag: v0.5.0
@@ -19,7 +19,7 @@ images:
     newTag: v0.4.0
 
   - name: docker.io/cyrilix/robocar-throttle
-    newTag: v0.4.1
+    newTag: v0.4.0
 
   - name: docker.io/cyrilix/robocar-record
     newTag: v0.5.0