Merge pull request #1 from alejandro-colomar/master

Update fork

10 files changed, 29 insertions, 19 deletions

diff --git a/cam/Dockerfile b/cam/Dockerfile
index 80ab6c6..bd998bb 100644
--- a/cam/Dockerfile
+++ b/cam/Dockerfile
@@ -1,5 +1,6 @@
 ###############################################################################
 #        Copyright (C) 2020        Sebastian Francisco Colomar Bauza          #
+#        Copyright (C) 2020        Alejandro Colomar Andrés                   #
 #        SPDX-License-Identifier:  GPL-2.0-only                               #
 ###############################################################################
 
@@ -7,8 +8,8 @@ FROM	debian:testing	AS build
 RUN	apt-get update							&& \
 	apt-get upgrade -V --yes					&& \
 	apt-get install -V \
-			gcc \
-			g++ \
+			gcc-10 \
+			g++-10 \
 			make \
 			git \
 			pkg-config \
diff --git a/cam/Makefile b/cam/Makefile
index 12b2859..1ba91a5 100644
--- a/cam/Makefile
+++ b/cam/Makefile
@@ -6,7 +6,7 @@ CFLAGS		= $(CFLAGS_W) $(CFLAGS_O)
 all: cam
 
 cam: cam.c
-	gcc $(CFLAGS)							\
+	gcc-10 $(CFLAGS)							\
 			`pkg-config --cflags libalx-base libalx-cv`	\
 			$< -o $@					\
 			`pkg-config --libs libalx-cv libalx-base`
diff --git a/docker-compose.yml b/docker/docker-compose.yaml
index 062177a..effba4d 100644
--- a/docker-compose.yml
+++ b/docker/docker-compose.yaml
@@ -1,5 +1,6 @@
 ###############################################################################
 #        Copyright (C) 2020        Sebastian Francisco Colomar Bauza          #
+#        Copyright (C) 2020        Alejandro Colomar Andrés                   #
 #        SPDX-License-Identifier:  GPL-2.0-only                               #
 ###############################################################################
 
@@ -17,7 +18,7 @@ services:
         -   ROB_ADDR=rob
         -   ROB_PORT=13100
         depends_on:
-            - rob
+        -   rob
         restart: always
 
     rob:
@@ -29,7 +30,6 @@ services:
         -   ROB_PORT=13100
         -   ROBOT_ADDR=robot
         -   ROBOT_PASSWD=
-        -   ROBOT_PORT=30002
         -   ROBOT_STATUS_FNAME=status.log
 #        -   ROBOT_TYPE=kwr
         -   ROBOT_TYPE=ur
diff --git a/kubernetes/cam.conf b/kubernetes/cam.conf
new file mode 100644
index 0000000..65bc87b
--- /dev/null
+++ b/kubernetes/cam.conf
@@ -0,0 +1,4 @@
+CAMERA_IDX="0"
+DELAY_US="10000"
+ROB_ADDR="rob"
+ROB_PORT="13100"
diff --git a/kube-compose.yml b/kubernetes/kube-compose.yaml
index 99396cb..e951c47 100644
--- a/kube-compose.yml
+++ b/kubernetes/kube-compose.yaml
@@ -56,8 +56,6 @@ spec:
                     value: "robot"
                 -   name: ROBOT_PASSWD
                     value: ""
-                -   name: ROBOT_PORT
-                    value: "30002"
                 -   name: ROBOT_STATUS_FNAME
                     value: "status.log"
 #                -   name: ROBOT_TYPE
@@ -150,6 +148,6 @@ spec:
 #kubectl apply -f https://docs.projectcalico.org/v3.8/manifests/calico.yaml    ;
 #echo "source <(kubectl completion bash)" >> ~/.bashrc                         ;
 #kubectl taint node ideapad node-role.kubernetes.io/master:NoSchedule-         ;
-#kubectl apply  --filename kube-compose.yml                                    ;
-#kubectl delete --filename kube-compose.yml                                    ;
+#kubectl apply  --filename kube-compose.yaml                                   ;
+#kubectl delete --filename kube-compose.yaml                                   ;
 ################################################################################
diff --git a/kubernetes/rob.conf b/kubernetes/rob.conf
new file mode 100644
index 0000000..95e11bb
--- /dev/null
+++ b/kubernetes/rob.conf
@@ -0,0 +1,10 @@
+DELAY_LOGIN="1000000"
+DELAY_US="100000"
+ROB_CAMS_MAX="1"
+ROB_PORT="13100"
+ROBOT_ADDR="robot"
+ROBOT_PASSWD=""
+ROBOT_STATUS_FNAME="status.log"
+#ROBOT_TYPE="kwr"
+ROBOT_TYPE="ur"
+ROBOT_USER=""
diff --git a/rob/Dockerfile b/rob/Dockerfile
index a1b1840..cadd164 100644
--- a/rob/Dockerfile
+++ b/rob/Dockerfile
@@ -1,13 +1,14 @@
 ###############################################################################
 #        Copyright (C) 2020        Sebastian Francisco Colomar Bauza          #
+#        Copyright (C) 2020        Alejandro Colomar Andrés                   #
 #        SPDX-License-Identifier:  GPL-2.0-only                               #
 ###############################################################################
 
-FROM	debian:stable-slim	AS build
+FROM	debian:testing-slim	AS build
 RUN	apt-get update							&& \
 	apt-get upgrade -V --yes					&& \
 	apt-get install -V \
-			gcc \
+			gcc-10 \
 			make \
 			git \
 			pkg-config \
diff --git a/rob/Makefile b/rob/Makefile
index 81ebb5e..6935b4b 100644
--- a/rob/Makefile
+++ b/rob/Makefile
@@ -7,7 +7,7 @@ CFLAGS		= $(CFLAGS_W) $(CFLAGS_O)
 all: rob
 
 rob: rob.c
-	gcc $(CFLAGS) 							\
+	gcc-10 $(CFLAGS) 							\
 			`pkg-config --static --cflags libalx-base`	\
 			`pkg-config --static --cflags libalx-telnet-tcp`\
 			`pkg-config --static --cflags libalx-robot`	\
diff --git a/rob/rob.c b/rob/rob.c
index 636ec11..614dee3 100644
--- a/rob/rob.c
+++ b/rob/rob.c
@@ -33,7 +33,6 @@
  ******************************************************************************/
 #define ENV_ROBOT_TYPE		"ROBOT_TYPE"
 #define ENV_ROBOT_ADDR		"ROBOT_ADDR"
-#define ENV_ROBOT_PORT		"ROBOT_PORT"
 #define ENV_ROBOT_USER		"ROBOT_USER"
 #define ENV_ROBOT_PASSWD	"ROBOT_PASSWD"
 #define ENV_ROBOT_STATUS_FNAME	"ROBOT_STATUS_FNAME"
@@ -76,7 +75,6 @@ struct	Robot_Status {
  ******************************************************************************/
 /* environment variables */
 static	char			robot_addr[_POSIX_ARG_MAX];
-static	char			robot_port[_POSIX_ARG_MAX];
 static	char			robot_user[_POSIX_ARG_MAX];
 static	char			robot_passwd[_POSIX_ARG_MAX];
 static	char			robot_status_fname[FILENAME_MAX];
@@ -251,9 +249,6 @@ int	env_init		(void)
 	if (getenv_s(robot_addr, ARRAY_SIZE(robot_addr), ENV_ROBOT_ADDR))
 		goto err;
 	status--;
-	if (getenv_s(robot_port, ARRAY_SIZE(robot_port), ENV_ROBOT_PORT))
-		goto err;
-	status--;
 	if (getenv_s(robot_user, ARRAY_SIZE(robot_user), ENV_ROBOT_USER))
 		goto err;
 	status--;
@@ -295,7 +290,7 @@ int	robot_init		(void)
 	if (telnet_login(robot, robot_user, robot_passwd, delay_login))
 		goto err;
 #else
-	if (ur_init(&robot, robot_addr, robot_port, delay_login))
+	if (ur_init(&robot, robot_addr))
 		goto err0;
 #endif
 	status--;
@@ -504,7 +499,7 @@ int	robot_step_info		(char *str)
 #if 0
 	return	telnet_send(robot, str);
 #else
-	return	ur_puts(robot, str, delay_us, stdout);
+	return	ur_puts(robot, str);
 #endif
 }
 
diff --git a/rob/robot/ur/Dockerfile b/rob/robot/ur/Dockerfile
index 36ccb4d..f4367a1 100644
--- a/rob/robot/ur/Dockerfile
+++ b/rob/robot/ur/Dockerfile
@@ -1,5 +1,6 @@
 ###############################################################################
 #        Copyright (C) 2020        Sebastian Francisco Colomar Bauza          #
+#        Copyright (C) 2020        Alejandro Colomar Andrés                   #
 #        SPDX-License-Identifier:  GPL-2.0-only                               #
 ###############################################################################