From 3682b8b484749a12b19665546b610017c50787f5 Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Mon, 27 Feb 2023 13:20:35 +0100 Subject: [PATCH 1/3] Added: Fabpel --- bffh.dhall | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/bffh.dhall b/bffh.dhall index f96cbc9..dce6595 100644 --- a/bffh.dhall +++ b/bffh.dhall @@ -424,11 +424,26 @@ cmd = "python", args = "tfom23-demo/actors/fabreader/main.py --host localhost --fabreader 00004" }}, + fabpel_0 = { module = "Process", params = + { + cmd = "python", + args = "tfom23-demo/actors/fabpel/main.py --host localhost --fabpel 00000" + }}, fabpel_1 = { module = "Process", params = { cmd = "python", args = "tfom23-demo/actors/fabpel/main.py --host localhost --fabpel 00001" }}, + fabpel_2 = { module = "Process", params = + { + cmd = "python", + args = "tfom23-demo/actors/fabpel/main.py --host localhost --fabpel 00002" + }}, + fabpel_3 = { module = "Process", params = + { + cmd = "python", + args = "tfom23-demo/actors/fabpel/main.py --host localhost --fabpel 00003" + }}, }, -- Linkng up machines to actors @@ -459,7 +474,10 @@ { machine = "Lasercutter_0", actor = "fabreader_3" }, { machine = "CNC_0", actor = "fabreader_4" }, - { machine = "Printer_0", actor = "fabpel_1" }, + { machine = "Printer_0", actor = "fabpel_0" }, + { machine = "Printer_1", actor = "fabpel_1" }, + { machine = "Lasercutter_0", actor = "fabpel_2" }, + { machine = "CNC_0", actor = "fabpel_3" }, ], -- Initiators are configured almost the same way as Actors, refer to actor documentation for more details From fe964f49fce09339bc0c809423e5ebd0a09822c2 Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Mon, 27 Feb 2023 14:53:10 +0100 Subject: [PATCH 2/3] Updated Actors --- actors/fabpel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actors/fabpel b/actors/fabpel index 2ba4d09..35fc427 160000 --- a/actors/fabpel +++ b/actors/fabpel @@ -1 +1 @@ -Subproject commit 2ba4d09e5ef219d3480d333c1da774fa5ed278ef +Subproject commit 35fc4270e1a03e0fd47787866535f2c2a0d5b1e6 From aa653722fde4a8f32d2a89a69c3dfa0fda315448 Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Mon, 27 Feb 2023 21:10:58 +0100 Subject: [PATCH 3/3] Fixed: Permissions --- bffh.dhall | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/bffh.dhall b/bffh.dhall index dce6595..d6e9270 100644 --- a/bffh.dhall +++ b/bffh.dhall @@ -146,7 +146,7 @@ description = Some "LBoxx with 1,75mm PLA", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.lboxx.use", + write = "tfom23.lboxx.write", manage = "tfom23.manage", category = "LBoxx", prodable = True, @@ -157,7 +157,7 @@ description = Some "LBoxx with Tools of the FabLock Project", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.lboxx.use", + write = "tfom23.lboxx.write", manage = "tfom23.manage", category = "LBoxx", prodable = True, @@ -168,7 +168,7 @@ description = Some "LBoxx with Tools of the FabReader Project", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.lboxx.use", + write = "tfom23.lboxx.write", manage = "tfom23.manage", category = "LBoxx", prodable = True, @@ -179,7 +179,7 @@ description = Some "LBoxx with FabAccess Sticker and NTAGs", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.lboxx.use", + write = "tfom23.lboxx.write", manage = "tfom23.manage", category = "LBoxx", prodable = True, @@ -190,7 +190,7 @@ description = Some "LBoxx with Parts for the TFOM23 Demo", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.lboxx.use", + write = "tfom23.lboxx.write", manage = "tfom23.manage", category = "LBoxx", prodable = True, @@ -203,7 +203,7 @@ description = Some "EuroBox with Haribo", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.eurobox.use", + write = "tfom23.eurobox.write", manage = "tfom23.manage", category = "EuroBox", prodable = True, @@ -214,7 +214,7 @@ description = Some "EuroBox with Rittersport Goldschatz", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.eurobox.use", + write = "tfom23.eurobox.write", manage = "tfom23.manage", category = "EuroBox", prodable = True, @@ -227,7 +227,7 @@ description = Some "Kallax Drawer", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.locker.use", + write = "tfom23.locker.write", manage = "tfom23.manage", category = "Locker", prodable = True, @@ -238,7 +238,7 @@ description = Some "Kallax Drawer", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.locker.use", + write = "tfom23.locker.write", manage = "tfom23.manage", category = "Locker", prodable = True, @@ -249,7 +249,7 @@ description = Some "Kallax Drawer", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.locker.use", + write = "tfom23.locker.write", manage = "tfom23.manage", category = "Locker", prodable = True, @@ -260,7 +260,7 @@ description = Some "Kallax Drawer", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.locker.use", + write = "tfom23.locker.write", manage = "tfom23.manage", category = "Locker", prodable = True, @@ -271,7 +271,7 @@ description = Some "Kallax Door", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.locker.use", + write = "tfom23.locker.write", manage = "tfom23.manage", category = "Locker", prodable = True, @@ -284,7 +284,7 @@ description = Some "FabAccess Prusa MK3", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.printer.use", + write = "tfom23.printer.write", manage = "tfom23.manage", category = "Printers" }, @@ -294,7 +294,7 @@ description = Some "TFOM23 Printer", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.printer.use", + write = "tfom23.printer.write", manage = "tfom23.manage", category = "Printers" }, @@ -304,7 +304,7 @@ description = Some "TFOM23 Lasercutter", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.lasercutter.use", + write = "tfom23.lasercutter.write", manage = "tfom23.manage", category = "Lasercutter" }, @@ -314,7 +314,7 @@ description = Some "TFOM23 CNC", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.cnc.use", + write = "tfom23.cnc.write", manage = "tfom23.manage", category = "CNC" },