Compare commits

...

5 Commits

9 changed files with 37 additions and 10 deletions

View File

@ -103,11 +103,12 @@ spec:
spec: spec:
containers: containers:
- name: camera - name: camera
image: docker.io/cyrilix/robocar-oak-camera image: git.cyrilix.bzh/robocars/robocar-oak-camera
args: args:
- "--image-width=$(CAMERA_WIDTH)" - "--image-width=$(CAMERA_WIDTH)"
- "--image-height=$(CAMERA_HEIGHT)" - "--image-height=$(CAMERA_HEIGHT)"
- "--objects-threshold=$(THRESHOLD_OBJECTS)" - "--objects-threshold=$(THRESHOLD_OBJECTS)"
- "--log=info"
securityContext: securityContext:
runAsUser: 1234 runAsUser: 1234
privileged: true privileged: true
@ -146,7 +147,7 @@ spec:
- name: THRESHOLD_OBJECTS - name: THRESHOLD_OBJECTS
valueFrom: valueFrom:
configMapKeyRef: configMapKeyRef:
key: THRESHOLD key: OBJECTS_THRESHOLD
name: robocar-objects name: robocar-objects
- name: CAMERA_WIDTH - name: CAMERA_WIDTH
valueFrom: valueFrom:

View File

@ -16,5 +16,5 @@ images:
- name: docker.io/cyrilix/robocar-pca9685 - name: docker.io/cyrilix/robocar-pca9685
newTag: v0.6.4 newTag: v0.6.4
- name: docker.io/cyrilix/robocar-oak-camera - name: git.cyrilix.bzh/robocars/robocar-oak-camera
newTag: v0.2.0 newTag: v0.2.0-28-g7ebd909

View File

@ -46,8 +46,21 @@ data:
############ ############
# Throttle # # Throttle #
############ ############
THROTTLE_MIN: "0.2"
THROTTLE_MAX: "0.3" ## For manual driving
#####################
# THROTTLE_MIN: "0.10"
# THROTTLE_MAX: "0.12"
## Secure auto-pilot
####################
THROTTLE_MIN: "0.10"
THROTTLE_MAX: "0.12"
## Speed auto-pilot
###################
# THROTTLE_MIN: "0.11"
# THROTTLE_MAX: "0.13"
--- ---
@ -128,7 +141,6 @@ data:
MODEL_IMAGE_WIDTH: "160" MODEL_IMAGE_WIDTH: "160"
MODEL_IMAGE_HEIGHT: "120" MODEL_IMAGE_HEIGHT: "120"
HORIZON: "20" HORIZON: "20"
--- ---
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
@ -173,8 +185,11 @@ data:
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: android name: robocar-objects
data: data:
OBJECTS_THRESHOLD: "0.2"
# To delete?
thresholds.json: | thresholds.json: |
{ {
"threshold_steps": [ 0.07, 0.08, 0.09, 0.1, 0.125, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0 ], "threshold_steps": [ 0.07, 0.08, 0.09, 0.1, 0.125, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0 ],

View File

@ -107,7 +107,7 @@ spec:
type: CharDevice type: CharDevice
- name: robocar - name: robocar
configMap: configMap:
name: android name: robocar-objects
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
@ -321,7 +321,7 @@ spec:
- "-mqtt-retain=false" - "-mqtt-retain=false"
- "--image-width=$(IMAGE_WIDTH)" - "--image-width=$(IMAGE_WIDTH)"
- "--image-height=$(IMAGE_HEIGHT)" - "--image-height=$(IMAGE_HEIGHT)"
- "--enable-objects-correction=true" - "--enable-objects-correction=false"
- "--enable-objects-correction-user=false" - "--enable-objects-correction-user=false"
- "--grid-map-config=/etc/robocar/grid.json" - "--grid-map-config=/etc/robocar/grid.json"
- "--objects-move-factors-config=/etc/robocar/omf.json" - "--objects-move-factors-config=/etc/robocar/omf.json"

View File

@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- namespace.yaml
- deployments.yaml - deployments.yaml
- services.yaml - services.yaml
- configmap.yaml - configmap.yaml

View File

@ -0,0 +1,4 @@
apiVersion: v1
kind: Namespace
metadata:
name: robocar

View File

@ -3,6 +3,7 @@ apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: mqtt-credentials name: mqtt-credentials
namespace: robocar
stringData: stringData:
MQTT_USERNAME: satanas MQTT_USERNAME: satanas
MQTT_PASSWORD: satanas MQTT_PASSWORD: satanas

View File

@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization kind: Kustomization
resources: resources:
- namespace.yaml
- https://github.com/stakater/Reloader/deployments/kubernetes - https://github.com/stakater/Reloader/deployments/kubernetes
namespace: reloader namespace: reloader

View File

@ -0,0 +1,4 @@
apiVersion: v1
kind: Namespace
metadata:
name: reloader