From e4f9eee31924ca8a3e6f45665feb4de3509541c7 Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 8 Oct 2023 23:52:52 +0200 Subject: [PATCH] robot --- groupTasks/groups/rex-robots/index.json | 27 ++---------------- groupTasks/groups/rex-robots/test.py | 2 +- .../robots/__pycache__/rex.cpython-39.pyc | Bin 1038 -> 1179 bytes groupTasks/libs/robots/rex.py | 20 +++++++++---- main.go | 4 +-- modules/cache/socketclient.go | 2 +- socketserver/hub.go | 2 +- 7 files changed, 23 insertions(+), 34 deletions(-) diff --git a/groupTasks/groups/rex-robots/index.json b/groupTasks/groups/rex-robots/index.json index d665ffd..e13b8dc 100644 --- a/groupTasks/groups/rex-robots/index.json +++ b/groupTasks/groups/rex-robots/index.json @@ -1,35 +1,14 @@ { "category": "RexRobots", "name": "Produktionstask 1", - "globalInputs": [ - { - "parameterName": "kundenname", - "type": "text", - "displayName": "Name des Kunden" - } - ], + "globalInputs": [], "tasks": [ { "name": "Bild zu Label konvertieren", "onFinish": "pause", - "undoPossible": true, - "repeatPossible": true, - "scriptPath": "test1.py", - "parameters": [ - { - "parameterName": "labelformat", - "type": "text", - "displayName": "Format des Labels", - "global": false - } - ] - }, - { - "name": "Label drucken", - "onFinish": "next", "undoPossible": false, - "repeatPossible": false, - "scriptPath": "test2.py", + "repeatPossible": true, + "scriptPath": "test.py", "parameters": [] } ] diff --git a/groupTasks/groups/rex-robots/test.py b/groupTasks/groups/rex-robots/test.py index b061c7d..0115a54 100644 --- a/groupTasks/groups/rex-robots/test.py +++ b/groupTasks/groups/rex-robots/test.py @@ -6,6 +6,6 @@ sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '../..') from libs.robots import rex -rexRobot = rex.Rex("rexRobot") +rexRobot = rex.Rex("rexRobot", "Drucker leeren") rexRobot.move(1, 2, 3) \ No newline at end of file diff --git a/groupTasks/libs/robots/__pycache__/rex.cpython-39.pyc b/groupTasks/libs/robots/__pycache__/rex.cpython-39.pyc index 533eac1113cfaa7ef1dec9982e909d6287720fcf..419f63556363fca9f72cd93f406e959c5075f677 100644 GIT binary patch literal 1179 zcmZuw!A{&T5VezR5|)LwC#0StkSZd<22^oDRfSZkJ#`P1LzRo0jZHU8HePHmU823g zwSUkb=r85kQ-6U|XB-w5)QSA!@r-B2^XzP6qf0=F?Hv)jg#1BeRbY*rz|gM&IN`J; zDfvXW!`)lL-5V#RoPHs(_ZRGBkRz^&1Ih^uy$c`+c$3uOGx)hva>JKpVHo$@| z2qOyz5DEr_A^=^B9w(6087K;#ai<9&^dOsvCK$`1ozQthuNzv&ZsTcDo-0hCJb>Rs zt-~`kYhnh!MP8^w%{8~R$H)eu?5B+f9!1m zpIgLq7Gz9rC}{4zMy&?+8%l}s#{suK;0MhcJKX=}^5CaKNy}RO)-r*leU?`uG9%G4 z6d4(1Q6+vvQ>hD6$g1TGJ?r2Uk9!=|>(K;uadh6ToxSLe#`T+#G1KEDDP^9OBdN{t z(ZRvdQF3*dK;_~InuA)zz~ov3msi3>V}5E4jKxCkkbo7MSt!AI;{vwI27$zAei z_)FJPQ6f55e6wd;4r9&i%+BmQzB%WIhkXY6Gkva~3C4bru}cArw_x`e;saAm@jLLX z7%?S2u`DQXe~*x*dvOd!vk_NpBorS7N~qwDjY1Ww2xp{X)x#O91bOz_;9M`7lYR=i zn3OIprnz&e)pM(zu4k7nt&cChH_%~ z8zC$U+px-Ky5)oFi{bFhEpUfsWR-XqGGt&cW(8%evD~!^ET+PbrRON0m zHn~;*+o$8axYU&ze6{9kev!LNH<*@Vha_kphhCh`Z`wr4vMOsSBh+zJjPcn2nghUb zws99Bxzv^B^|Lkg3fL^tYB?%Z^3`dIa3i3iJO-m zRKowGxz=et(H+=nZGe5Hf24Ec%DOaF2R}uwdgnCItF+lqXLzM3_;@8w(iP8!S!}6M zOVimHqK)RZtZI*L8@SqLq3x0Lewc^76MOV3q}2P+I*39Kk!TWvh+GASZ$qTh_B=c< zpm-?Q8VZ6%Y@r}4*gydgqM@ZSjYyB}0Tg=(fgUNJeL!N{XvVwFX=yvH_N2sEQa-`8 z^WP_L_PbU3`(f6jtX4KV`^aClsU**%a2YHk!q_p(+v=2!<+E%(>)6&Gm h9-V}TK@ul@e>+5%@e{R3BY(fR-Y diff --git a/groupTasks/libs/robots/rex.py b/groupTasks/libs/robots/rex.py index 9d34a6c..4fa8ffe 100644 --- a/groupTasks/libs/robots/rex.py +++ b/groupTasks/libs/robots/rex.py @@ -1,9 +1,12 @@ +import requests + class Rex: """ This class represents a rex robot. """ - def __init__(self, name): - self.name = name + def __init__(self, rexName, jobName): + self.rexName = rexName + self.jobName = jobName self.x = 0 self.y = 0 self.z = 0 @@ -16,7 +19,14 @@ class Rex: self.y = y self.z = z - print("Robot: " + self.name + " moved to (" + str(self.x) + ", " + str(self.y) + ")") + print("Robot: " + self.rexName + " moved to (" + str(self.x) + ", " + str(self.y) + ")") - def __str__(self): - return "Robot: " + self.name + " (" + str(self.x) + ", " + str(self.y) + ")" \ No newline at end of file + requests.post("http://localhost:50055/v1/control/move", json={"x": self.x, "y": self.y, "z": self.z}) + + def finish(): + """ + Finish the robot. + """ + print("Robot finished") + + # TODO: request to the server to finish the robot and update the robot status to free \ No newline at end of file diff --git a/main.go b/main.go index cf93cdb..754cb5b 100644 --- a/main.go +++ b/main.go @@ -33,7 +33,7 @@ import ( "git.ex.umbach.dev/Alex/roese-utils/rslogger" "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/middleware/cors" - flogger "github.com/gofiber/fiber/v2/middleware/logger" + "github.com/gofiber/fiber/v2/middleware/logger" "github.com/gofiber/websocket/v2" "github.com/rs/zerolog/log" ) @@ -111,7 +111,7 @@ func main() { app.Use(cors.New()) if config.Cfg.Debug { - app.Use(flogger.New(flogger.Config{ + app.Use(logger.New(logger.Config{ Format: "${pid} ${locals:requestid} ${status} - ${latency} ${method} ${path}​\n", })) } diff --git a/modules/cache/socketclient.go b/modules/cache/socketclient.go index b5e888d..9e0304b 100644 --- a/modules/cache/socketclient.go +++ b/modules/cache/socketclient.go @@ -11,7 +11,7 @@ import ( var socketClients []*structs.SocketClient var mu sync.RWMutex -func AddSocketClient(sessionId string, socketClient *structs.SocketClient) { +func AddSocketClient(socketClient *structs.SocketClient) { mu.Lock() socketClients = append(socketClients, socketClient) mu.Unlock() diff --git a/socketserver/hub.go b/socketserver/hub.go index 53f5177..9c7b1b1 100644 --- a/socketserver/hub.go +++ b/socketserver/hub.go @@ -40,7 +40,7 @@ func RunHub() { newSocketClient.SessionId = sessionId newSocketClient.UserId = userId - cache.AddSocketClient(sessionId, newSocketClient) + cache.AddSocketClient(newSocketClient) // check that user session is not expired var userSession structs.UserSession