2 Commits

6 changed files with 90 additions and 51 deletions

View File

@ -11,9 +11,3 @@ data:
STEERING_RIGHT_PWM: "1986" STEERING_RIGHT_PWM: "1986"
STEERING_CENTER_PWM: "1583" STEERING_CENTER_PWM: "1583"
################
# THROTTLE PWM #
################
THROTTLE_MIN_PWM: "1092"
THROTTLE_MAX_PWM: "1986"
THROTTLE_ZERO_PWM: "1583"

View File

@ -166,7 +166,7 @@ spec:
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: pca9685 name: pca9685-steering
annotations: annotations:
reloader.stakater.com/auto: "true" reloader.stakater.com/auto: "true"
spec: spec:
@ -184,19 +184,15 @@ spec:
spec: spec:
containers: containers:
- name: pca9685 - name: pca9685
image: docker.io/cyrilix/robocar-pca9685 image: docker.io/cyrilix/robocar-pca9685-python
args: args:
- "--mqtt-retain=false" - "steering"
- "--throttle-channel=1" - "--i2c-bus=1"
- "--steering-channel=0" - "--i2c-address=40"
- "--throttle-zero-pwm=$(THROTTLE_ZERO_PWM)" - "--pca9685-channel=0"
- "--throttle-min-pwm=$(THROTTLE_MIN_PWM)" - "--left-pulse=$(STEERING_LEFT_PWM)"
- "--throttle-max-pwm=$(THROTTLE_MAX_PWM)" - "--right-pulse=$(STEERING_RIGHT_PWM)"
- "--steering-left-pwm=$(STEERING_LEFT_PWM)" - "--debug"
- "--steering-right-pwm=$(STEERING_RIGHT_PWM)"
- "--steering-center-pwm=$(STEERING_CENTER_PWM)"
- "--update-pwm-frequency=25"
- "--log=info"
securityContext: securityContext:
runAsUser: 1234 runAsUser: 1234
runAsGroup: 998 # Set 998/i2c group to access to i2c device runAsGroup: 998 # Set 998/i2c group to access to i2c device
@ -208,7 +204,7 @@ spec:
- name: MQTT_BROKER - name: MQTT_BROKER
valueFrom: valueFrom:
configMapKeyRef: configMapKeyRef:
key: MQTT_BROKER key: MQTT_BROKER_HOST
name: robocar name: robocar
- name: MQTT_USERNAME - name: MQTT_USERNAME
valueFrom: valueFrom:
@ -221,13 +217,8 @@ spec:
key: MQTT_PASSWORD key: MQTT_PASSWORD
name: mqtt-credentials name: mqtt-credentials
- name: MQTT_CLIENT_ID - name: MQTT_CLIENT_ID
value: rc-pca9685 value: rc-pca9685-steering
- name: MQTT_TOPIC_THROTTLE - name: MQTT_TOPIC
valueFrom:
configMapKeyRef:
key: MQTT_TOPIC_THROTTLE
name: robocar
- name: MQTT_TOPIC_STEERING
valueFrom: valueFrom:
configMapKeyRef: configMapKeyRef:
key: MQTT_TOPIC_STEERING key: MQTT_TOPIC_STEERING
@ -249,21 +240,77 @@ spec:
configMapKeyRef: configMapKeyRef:
name: robocar-pca9685 name: robocar-pca9685
key: STEERING_CENTER_PWM key: STEERING_CENTER_PWM
- name: THROTTLE_MIN_PWM - name: TZ
valueFrom: value: "Europe/Paris"
configMapKeyRef: volumes:
name: robocar-pca9685 - name: i2c
key: THROTTLE_MIN_PWM hostPath:
- name: THROTTLE_MAX_PWM path: /dev/i2c-1
valueFrom: type: CharDevice
configMapKeyRef: ---
name: robocar-pca9685 apiVersion: apps/v1
key: THROTTLE_MAX_PWM kind: Deployment
- name: THROTTLE_ZERO_PWM metadata:
valueFrom: name: pca9685-throttle
configMapKeyRef: annotations:
name: robocar-pca9685 reloader.stakater.com/auto: "true"
key: THROTTLE_ZERO_PWM spec:
revisionHistoryLimit: 0
replicas: 1
strategy:
type: Recreate
selector:
matchLabels:
component: pca9685
template:
metadata:
labels:
component: pca9685
spec:
containers:
- name: pca9685-throttle
image: docker.io/cyrilix/robocar-pca9685-python
args:
- "throttle"
- "--zero-pulse=378"
- "--min-pulse=250"
- "--max-pulse=500"
- "--i2c-bus=1"
- "--i2c-address=40"
- "--pca9685-channel=1"
- "--debug"
securityContext:
runAsUser: 1234
runAsGroup: 998 # Set 998/i2c group to access to i2c device
privileged: true
volumeMounts:
- mountPath: /dev/i2c-1
name: i2c
env:
- name: MQTT_BROKER
valueFrom:
configMapKeyRef:
key: MQTT_BROKER_HOST
name: robocar
- name: MQTT_USERNAME
valueFrom:
secretKeyRef:
key: MQTT_USERNAME
name: mqtt-credentials
- name: MQTT_PASSWORD
valueFrom:
secretKeyRef:
key: MQTT_PASSWORD
name: mqtt-credentials
- name: MQTT_CLIENT_ID
value: rc-pca9685-throttle
- name: MQTT_TOPIC
valueFrom:
configMapKeyRef:
key: MQTT_TOPIC_THROTTLE
name: robocar
- name: MQTT_QOS
value: "0"
- name: TZ - name: TZ
value: "Europe/Paris" value: "Europe/Paris"
volumes: volumes:

View File

@ -13,8 +13,8 @@ images:
- name: docker.io/cyrilix/robocar-camera - name: docker.io/cyrilix/robocar-camera
newTag: v0.3.0 newTag: v0.3.0
- name: docker.io/cyrilix/robocar-pca9685 - name: docker.io/cyrilix/robocar-pca9685-python
newTag: v0.6.0 newTag: v0.1.0-12-g2966f92
- name: docker.io/cyrilix/robocar-oak-camera - name: docker.io/cyrilix/robocar-oak-camera
newTag: v0.1.0 newTag: v0.1.0

View File

@ -4,8 +4,6 @@ metadata:
name: robocar name: robocar
data: data:
# Broker configuration # 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_HOST: 192.168.2.221
MQTT_BROKER: "tcp://192.168.2.221:1883" MQTT_BROKER: "tcp://192.168.2.221:1883"
#MQTT_BROKER: "tcp://mqtt.robocar.svc.cluster.local:1883" #MQTT_BROKER: "tcp://mqtt.robocar.svc.cluster.local:1883"

View File

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

View File

@ -10,7 +10,7 @@ resources:
images: images:
- name: docker.io/cyrilix/robocar-arduino - name: docker.io/cyrilix/robocar-arduino
newTag: v0.6.0-3-gd15a7b5 newTag: v0.6.0
- name: docker.io/cyrilix/robocar-led - name: docker.io/cyrilix/robocar-led
newTag: v0.5.0 newTag: v0.5.0