diff --git a/.devcontainer/nodered/flows.json b/.devcontainer/nodered/flows.json index 707477f..e3eb3a9 100644 --- a/.devcontainer/nodered/flows.json +++ b/.devcontainer/nodered/flows.json @@ -1,6 +1,6 @@ [ { - "id": "41526b8c80d5a5f7", + "id": "86a34ee77bf6db10", "type": "tab", "label": "Flux 1", "disabled": false, @@ -8,9 +8,9 @@ "env": [] }, { - "id": "dc9d3b99eadb9b34", + "id": "699fb0d470d36c5f", "type": "ui-button", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "5fe915fcd26e78ae", "name": "", "label": "B0", @@ -42,14 +42,14 @@ "y": 680, "wires": [ [ - "40cd3b8ab614429e" + "31f0ac2326dee161" ] ] }, { - "id": "9dcd1bf2a25f7371", + "id": "9f4dc1907c1e00dd", "type": "ui-button", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "5fe915fcd26e78ae", "name": "", "label": "B1", @@ -81,14 +81,14 @@ "y": 720, "wires": [ [ - "4ee747c8012c58a1" + "c15d4bd7caa2d2fb" ] ] }, { - "id": "143358afb510246e", + "id": "79b179ce4b2341de", "type": "ui-button", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "5fe915fcd26e78ae", "name": "", "label": "B2", @@ -120,14 +120,14 @@ "y": 760, "wires": [ [ - "d966ba0d813b7cb7" + "0c9ba205249939bf" ] ] }, { - "id": "e863fe498c528076", + "id": "66e9e7d8aa02074d", "type": "ui-button", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "5fe915fcd26e78ae", "name": "", "label": "B3", @@ -159,14 +159,14 @@ "y": 800, "wires": [ [ - "501355b0c82cae08" + "8ec37a1598f36eab" ] ] }, { - "id": "04e097a5c78127cb", + "id": "e9cc79327d44b9fb", "type": "mqtt out", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "topic": "geii/in", "qos": "", @@ -182,9 +182,9 @@ "wires": [] }, { - "id": "d12767fc3e33bb20", + "id": "76dc26d0b466145c", "type": "ui-button", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "02fab8cbf37e2bb7", "name": "", "label": "MARCHE", @@ -216,14 +216,14 @@ "y": 560, "wires": [ [ - "3e0c75aae8971dca" + "dec1e73483e26a7d" ] ] }, { - "id": "a49263451d77f972", + "id": "fbe076215c8d2a12", "type": "inject", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "props": [ { @@ -241,15 +241,15 @@ "y": 40, "wires": [ [ - "869aedf62de05359", - "e52bad35a9e3303a" + "66094b9e85ac4d5b", + "f6a658f341548fb3" ] ] }, { - "id": "3e0c75aae8971dca", + "id": "dec1e73483e26a7d", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "set marche", "func": "msg.payload = {\n \"marche\": 1\n};\n\nreturn msg;", "outputs": 1, @@ -262,14 +262,14 @@ "y": 560, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "4ee747c8012c58a1", + "id": "c15d4bd7caa2d2fb", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "send b1", "func": "msg.payload = {\n \"b1\": 1\n};\n\nreturn msg;", "outputs": 1, @@ -282,14 +282,14 @@ "y": 720, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "d966ba0d813b7cb7", + "id": "0c9ba205249939bf", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "send b2", "func": "msg.payload = {\n \"b2\": 1\n};\n\nreturn msg;", "outputs": 1, @@ -302,14 +302,14 @@ "y": 760, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "501355b0c82cae08", + "id": "8ec37a1598f36eab", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "set b3", "func": "msg.payload = {\n \"b3\": 1\n};\n\nreturn msg;", "outputs": 1, @@ -322,14 +322,14 @@ "y": 800, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "1dfea06c14d2732c", + "id": "a04804d73c302cd9", "type": "mqtt in", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "topic": "geii/out", "qos": "2", @@ -343,14 +343,14 @@ "y": 1480, "wires": [ [ - "9ef1bb67f51b254c" + "586e5d5f736036fc" ] ] }, { - "id": "309cae1a9bcc718b", + "id": "9a23c6f558ea0378", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "c3dd11d0778f9e67", "order": 1, "width": 0, @@ -372,9 +372,9 @@ "wires": [] }, { - "id": "6bd900b695c3a793", + "id": "a80fa1a313f076c8", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "c3dd11d0778f9e67", "order": 2, "width": 0, @@ -396,9 +396,9 @@ "wires": [] }, { - "id": "cdc7f0e7741ad210", + "id": "10e55237847991c9", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "c3dd11d0778f9e67", "order": 3, "width": 0, @@ -420,9 +420,9 @@ "wires": [] }, { - "id": "9ef1bb67f51b254c", + "id": "586e5d5f736036fc", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "function 1", "func": "flow.set(\"s0\", Number(msg.payload.s0));\nflow.set(\"s1\", Number(msg.payload.s1));\nflow.set(\"s2\", Number(msg.payload.s2));\nflow.set(\"s3\", Number(msg.payload.s3));\nflow.set(\"s4\", Number(msg.payload.s4));\nflow.set(\"s5\", Number(msg.payload.s5));\nflow.set(\"s6\", Number(msg.payload.s6));\nflow.set(\"s7\", Number(msg.payload.s7));\n\nreturn msg;", "outputs": 1, @@ -435,40 +435,32 @@ "y": 1480, "wires": [ [ - "9dad44eccec1d282", - "fc568b731fec8026", - "6179e102d7866a82", - "ccecf6f984daae7c", - "51bb134ec07cdcef", - "ae4e0b8f232fbdfc", - "f98062374cdfd8d1", - "9dfe2d239a268225", - "be011ad2f6f6421d", - "99ccef7cde8a92e9", - "782e8b8cc5e195e4", - "9f7680a2a2de021a", - "2559321f70cd5908", - "12ee9490cfd0c2cb", - "a016dc35c575f406", - "e94f13f0f1acc44c", - "92b7b19f3a84b610", - "cd6ccfdf8cc29b04", - "e694653f29c5c6c3", - "b25a525c97f6ca68", - "f88ed6b89e2793cf", - "41f6c23afe13dda4", - "ca27afe33c09b23a", - "227354827c5b2a9e", - "79e82ef03466071e", - "f55fa882f44af78e", - "02cfaae4ac4028fa" + "b10ff790c2c745e2", + "3243dba201971bd7", + "051388bb768084d7", + "c793fceafb6fb3f0", + "65723f43ca71069b", + "3ceeaa9da55ccbb8", + "53e82b867be45c4a", + "4fe669c3987dcfe4", + "87bd077b61c6e623", + "17f45fa5a72be929", + "96a15b4c506aa11a", + "10a21959cbd3cc1e", + "1cd3d290f7f7d539", + "88310a9e40d564fc", + "b543660f60319f21", + "cefd0feeeaf4227c", + "0ddd646c0134e82c", + "3331b1d0398a3348", + "696cf5af60cf4b64" ] ] }, { - "id": "9dad44eccec1d282", + "id": "b10ff790c2c745e2", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "s0", "func": "msg.payload = Number(msg.payload.s0) ? \"🟩\" : \"🟥\";\n\nreturn msg;", "outputs": 1, @@ -481,14 +473,14 @@ "y": 1080, "wires": [ [ - "309cae1a9bcc718b" + "9a23c6f558ea0378" ] ] }, { - "id": "fc568b731fec8026", + "id": "3243dba201971bd7", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "s1", "func": "msg.payload = Number(msg.payload.s1) ? \"🟩\" : \"🟥\";\n\nreturn msg;", "outputs": 1, @@ -501,14 +493,14 @@ "y": 1120, "wires": [ [ - "6bd900b695c3a793" + "a80fa1a313f076c8" ] ] }, { - "id": "6179e102d7866a82", + "id": "051388bb768084d7", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "s2", "func": "msg.payload = Number(msg.payload.s2) ? \"🟩\" : \"🟥\";\n\nreturn msg;", "outputs": 1, @@ -521,14 +513,14 @@ "y": 1160, "wires": [ [ - "cdc7f0e7741ad210" + "10e55237847991c9" ] ] }, { - "id": "6172598e36ec2754", + "id": "38d83b28a85004c7", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "c3dd11d0778f9e67", "order": 4, "width": 0, @@ -550,9 +542,9 @@ "wires": [] }, { - "id": "7b808775687a1e80", + "id": "d8918e528c0bab75", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "c3dd11d0778f9e67", "order": 5, "width": 0, @@ -574,9 +566,9 @@ "wires": [] }, { - "id": "5e969524f2d7ac83", + "id": "d82070a29ee7072c", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "c3dd11d0778f9e67", "order": 6, "width": 0, @@ -598,9 +590,9 @@ "wires": [] }, { - "id": "f832017038053787", + "id": "04f3fd26b7f05cd2", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "c3dd11d0778f9e67", "order": 7, "width": 0, @@ -622,9 +614,9 @@ "wires": [] }, { - "id": "a85963dd6d125a42", + "id": "b2154eb18bb4e996", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "c3dd11d0778f9e67", "order": 8, "width": 0, @@ -646,9 +638,9 @@ "wires": [] }, { - "id": "ccecf6f984daae7c", + "id": "c793fceafb6fb3f0", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "s3", "func": "msg.payload = Number(msg.payload.s3) ? \"🟩\" : \"🟥\";\n\nreturn msg;", "outputs": 1, @@ -661,14 +653,14 @@ "y": 1200, "wires": [ [ - "6172598e36ec2754" + "38d83b28a85004c7" ] ] }, { - "id": "51bb134ec07cdcef", + "id": "65723f43ca71069b", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "s4", "func": "msg.payload = Number(msg.payload.s4) ? \"🟩\" : \"🟥\";\n\nreturn msg;", "outputs": 1, @@ -681,14 +673,14 @@ "y": 1240, "wires": [ [ - "7b808775687a1e80" + "d8918e528c0bab75" ] ] }, { - "id": "ae4e0b8f232fbdfc", + "id": "3ceeaa9da55ccbb8", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "s5", "func": "msg.payload = Number(msg.payload.s5) ? \"🟩\" : \"🟥\";\n\nreturn msg;", "outputs": 1, @@ -701,14 +693,14 @@ "y": 1280, "wires": [ [ - "5e969524f2d7ac83" + "d82070a29ee7072c" ] ] }, { - "id": "f98062374cdfd8d1", + "id": "53e82b867be45c4a", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "s6", "func": "msg.payload = Number(msg.payload.s6) ? \"🟩\" : \"🟥\";\n\nreturn msg;", "outputs": 1, @@ -721,14 +713,14 @@ "y": 1320, "wires": [ [ - "f832017038053787" + "04f3fd26b7f05cd2" ] ] }, { - "id": "9dfe2d239a268225", + "id": "4fe669c3987dcfe4", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "s7", "func": "msg.payload = Number(msg.payload.s7) ? \"🟩\" : \"🟥\";\n\nreturn msg;", "outputs": 1, @@ -741,14 +733,14 @@ "y": 1360, "wires": [ [ - "a85963dd6d125a42" + "b2154eb18bb4e996" ] ] }, { - "id": "869aedf62de05359", + "id": "66094b9e85ac4d5b", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "reset", "func": "flow.set(\"i0\", 0);\nflow.set(\"i1\", 0);\nflow.set(\"i2\", 0);\nflow.set(\"i3\", 0);\nflow.set(\"i4\", 0);\nflow.set(\"i5\", 0);\nflow.set(\"i6\", 0);\nflow.set(\"i7\", 0);\n\nflow.set(\"a0\", 0);\nflow.set(\"a1\", 0);\nflow.set(\"a2\", 0);\nflow.set(\"a3\", 0);\nflow.set(\"a4\", 0);\nflow.set(\"a5\", 0);\nflow.set(\"a6\", 0);\nflow.set(\"a7\", 0);\n\nflow.set(\"m0\", 0);\nflow.set(\"m1\", 0);\nflow.set(\"m2\", 0);\nflow.set(\"m3\", 0);\n\nflow.set(\"p0\", 0);\nflow.set(\"v0\", 0);\n\nflow.set(\"c0\", 1);\nflow.set(\"c1\", 0);\nflow.set(\"c2\", 0);\nflow.set(\"c3\", 0);\nflow.set(\"c4\", 0);\nflow.set(\"c5\", 0);\nflow.set(\"c6\", 0);\nflow.set(\"c7\", 0);\n\nflow.set(\"flag0\", 0);\n\nreturn msg;", "outputs": 1, @@ -757,18 +749,18 @@ "initialize": "", "finalize": "", "libs": [], - "x": 850, + "x": 870, "y": 40, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "e13f6855fb2ae6e5", + "id": "94418b813e53bf2c", "type": "ui-button", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "5fe915fcd26e78ae", "name": "", "label": "B4", @@ -800,14 +792,14 @@ "y": 840, "wires": [ [ - "6b074a32f2f70f5f" + "b5a2e6d66f70685c" ] ] }, { - "id": "23c475d0fb3faedb", + "id": "b674f39795cf1427", "type": "ui-button", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "5fe915fcd26e78ae", "name": "", "label": "B5", @@ -839,14 +831,14 @@ "y": 880, "wires": [ [ - "13525a762ac7e327" + "925464e2aac8a2e6" ] ] }, { - "id": "e9da3426111867c2", + "id": "adb70bf2d6204ecf", "type": "ui-button", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "5fe915fcd26e78ae", "name": "", "label": "B6", @@ -878,14 +870,14 @@ "y": 920, "wires": [ [ - "501a187ca9d5dc4e" + "3d73b77fe116a743" ] ] }, { - "id": "887889076242a450", + "id": "b84a284e2e61c6ac", "type": "ui-button", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "5fe915fcd26e78ae", "name": "", "label": "B7", @@ -917,14 +909,14 @@ "y": 960, "wires": [ [ - "9d0587a99be6ccac" + "2ad23092aec0c7c0" ] ] }, { - "id": "6b074a32f2f70f5f", + "id": "b5a2e6d66f70685c", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "set b4", "func": "msg.payload = {\n \"b4\": 1\n};\n\nreturn msg;", "outputs": 1, @@ -937,14 +929,14 @@ "y": 840, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "13525a762ac7e327", + "id": "925464e2aac8a2e6", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "set b5", "func": "msg.payload = {\n \"b5\": 1\n};\n\nreturn msg;", "outputs": 1, @@ -957,14 +949,14 @@ "y": 880, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "501a187ca9d5dc4e", + "id": "3d73b77fe116a743", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "set b6", "func": "msg.payload = {\n \"b6\": 1\n};\n\nreturn msg;", "outputs": 1, @@ -977,14 +969,14 @@ "y": 920, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "f1c934fc513b2bc7", + "id": "696586fa25378166", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "set i0", "func": "flow.set(\"i0\", msg.payload);\nmsg.payload = {};\nreturn msg;", "outputs": 1, @@ -997,14 +989,14 @@ "y": 140, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "ac96af9d69f69372", + "id": "ef83bfa989b6d72a", "type": "ui-switch", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "label": "I0", "group": "00ea85a0e0b38df3", @@ -1031,14 +1023,14 @@ "y": 140, "wires": [ [ - "f1c934fc513b2bc7" + "696586fa25378166" ] ] }, { - "id": "d64b5ceb51e6356d", + "id": "51bd327a4f697cbc", "type": "ui-button", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "02fab8cbf37e2bb7", "name": "", "label": "ARRET", @@ -1070,14 +1062,14 @@ "y": 600, "wires": [ [ - "6144c03f7e61ad75" + "be228653fc2bdb0f" ] ] }, { - "id": "40cd3b8ab614429e", + "id": "31f0ac2326dee161", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "send b0", "func": "msg.payload = {\n \"b0\": 1\n};\n\nreturn msg;", "outputs": 1, @@ -1090,14 +1082,14 @@ "y": 680, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "bf55b8bf4a7aaf10", + "id": "37bdef06b07499f2", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "format mqtt", "func": "let i0 = Number(flow.get(\"i0\")) || 0;\nlet i1 = Number(flow.get(\"i1\")) || 0;\nlet i2 = Number(flow.get(\"i2\")) || 0;\nlet i3 = Number(flow.get(\"i3\")) || 0;\nlet i4 = Number(flow.get(\"i4\")) || 0;\nlet i5 = Number(flow.get(\"i5\")) || 0;\nlet i6 = Number(flow.get(\"i6\")) || 0;\nlet i7 = Number(flow.get(\"i7\")) || 0;\n\nlet v0 = Number(flow.get(\"v0\")) || 0;\n\nif (typeof msg.payload[\"arret\"] === 'undefined') msg.payload[\"arret\"] = 1;\nif (typeof msg.payload[\"marche\"] === 'undefined') msg.payload[\"marche\"] = 0;\n\nif (typeof msg.payload[\"b0\"] === 'undefined') msg.payload[\"b0\"] = 0;\nif (typeof msg.payload[\"b1\"] === 'undefined') msg.payload[\"b1\"] = 0;\nif (typeof msg.payload[\"b2\"] === 'undefined') msg.payload[\"b2\"] = 0;\nif (typeof msg.payload[\"b3\"] === 'undefined') msg.payload[\"b3\"] = 0;\nif (typeof msg.payload[\"b4\"] === 'undefined') msg.payload[\"b4\"] = 0;\nif (typeof msg.payload[\"b5\"] === 'undefined') msg.payload[\"b5\"] = 0;\nif (typeof msg.payload[\"b6\"] === 'undefined') msg.payload[\"b6\"] = 0;\nif (typeof msg.payload[\"b7\"] === 'undefined') msg.payload[\"b7\"] = 0;\n\nmsg.payload[\"i0\"] = i0;\nmsg.payload[\"i1\"] = i1;\nmsg.payload[\"i2\"] = i2;\nmsg.payload[\"i3\"] = i3;\nmsg.payload[\"i4\"] = i4;\nmsg.payload[\"i5\"] = i5;\nmsg.payload[\"i6\"] = i6;\nmsg.payload[\"i7\"] = i7;\n\nlet c0 = Number(flow.get(\"c0\")) || 0;\nlet c1 = Number(flow.get(\"c1\")) || 0;\nlet c2 = Number(flow.get(\"c2\")) || 0;\nlet c3 = Number(flow.get(\"c3\")) || 0;\nlet c4 = Number(flow.get(\"c4\")) || 0;\nlet c5 = Number(flow.get(\"c5\")) || 0;\nlet c6 = Number(flow.get(\"c6\")) || 0;\nlet c7 = Number(flow.get(\"c7\")) || 0;\n\nmsg.payload[\"c0\"] = c0;\nmsg.payload[\"c1\"] = c1;\nmsg.payload[\"c2\"] = c2;\nmsg.payload[\"c3\"] = c3;\nmsg.payload[\"c4\"] = c4;\nmsg.payload[\"c5\"] = c5;\nmsg.payload[\"c6\"] = c6;\nmsg.payload[\"c7\"] = c7;\n\nmsg.payload[\"v0\"] = v0;\n\nreturn msg;", "outputs": 1, @@ -1110,15 +1102,15 @@ "y": 500, "wires": [ [ - "04e097a5c78127cb", - "2eb8008f157e3905" + "e9cc79327d44b9fb", + "99e68919914f2326" ] ] }, { - "id": "9d0587a99be6ccac", + "id": "2ad23092aec0c7c0", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "set b7", "func": "msg.payload = {\n \"b7\": 1\n};\n\nreturn msg;", "outputs": 1, @@ -1131,14 +1123,14 @@ "y": 960, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "057f5330eb0243b5", + "id": "452fe6ac6695e64e", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "set i1", "func": "flow.set(\"i1\", msg.payload);\nmsg.payload = {};\nreturn msg;", "outputs": 1, @@ -1151,14 +1143,14 @@ "y": 180, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "a2dd41c333e61095", + "id": "7bfba44b320a1826", "type": "ui-switch", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "label": "I1", "group": "00ea85a0e0b38df3", @@ -1185,14 +1177,14 @@ "y": 180, "wires": [ [ - "057f5330eb0243b5" + "452fe6ac6695e64e" ] ] }, { - "id": "ed8a7b695f241e17", + "id": "9c5672db1c4760f9", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "set i2", "func": "flow.set(\"i2\", msg.payload);\nmsg.payload = {};\nreturn msg;", "outputs": 1, @@ -1205,14 +1197,14 @@ "y": 220, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "7fa06bb9fc6290c2", + "id": "929ad4eb2a0bbb68", "type": "ui-switch", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "label": "I2", "group": "00ea85a0e0b38df3", @@ -1239,14 +1231,14 @@ "y": 220, "wires": [ [ - "ed8a7b695f241e17" + "9c5672db1c4760f9" ] ] }, { - "id": "f7196bb1c9ad7882", + "id": "893f151655f108a7", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "set i3", "func": "flow.set(\"i3\", msg.payload);\nmsg.payload = {};\nreturn msg;", "outputs": 1, @@ -1259,14 +1251,14 @@ "y": 260, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "787b142395f2812c", + "id": "1805fe84b15e252a", "type": "ui-switch", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "label": "I3", "group": "00ea85a0e0b38df3", @@ -1293,14 +1285,14 @@ "y": 260, "wires": [ [ - "f7196bb1c9ad7882" + "893f151655f108a7" ] ] }, { - "id": "a14b6f743fc24f5a", + "id": "e353d2804060adea", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "set i4", "func": "flow.set(\"i4\", msg.payload);\nmsg.payload = {};\nreturn msg;", "outputs": 1, @@ -1313,14 +1305,14 @@ "y": 300, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "5e24007ebaf43929", + "id": "5a52593d8e054e97", "type": "ui-switch", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "label": "I4", "group": "00ea85a0e0b38df3", @@ -1347,14 +1339,14 @@ "y": 300, "wires": [ [ - "a14b6f743fc24f5a" + "e353d2804060adea" ] ] }, { - "id": "3a78dbb26cfb4ced", + "id": "447d6f906eddfbec", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "set i5", "func": "flow.set(\"i5\", msg.payload);\nmsg.payload = {};\nreturn msg;", "outputs": 1, @@ -1367,14 +1359,14 @@ "y": 340, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "3a440beb763d86fb", + "id": "b677272b111f5855", "type": "ui-switch", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "label": "I5", "group": "00ea85a0e0b38df3", @@ -1401,14 +1393,14 @@ "y": 340, "wires": [ [ - "3a78dbb26cfb4ced" + "447d6f906eddfbec" ] ] }, { - "id": "0da4875391d23ba7", + "id": "f98b878cec139ee4", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "set i6", "func": "flow.set(\"i6\", msg.payload);\nmsg.payload = {};\nreturn msg;", "outputs": 1, @@ -1421,14 +1413,14 @@ "y": 380, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "9a6dbd2385a1e118", + "id": "961e284427aa8f71", "type": "ui-switch", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "label": "I6", "group": "00ea85a0e0b38df3", @@ -1455,14 +1447,14 @@ "y": 380, "wires": [ [ - "0da4875391d23ba7" + "f98b878cec139ee4" ] ] }, { - "id": "6343064ecf3d8a64", + "id": "42287fe19a5e1337", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "set i7", "func": "flow.set(\"i7\", msg.payload);\nmsg.payload = {};\nreturn msg;", "outputs": 1, @@ -1475,14 +1467,14 @@ "y": 420, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "a4bb8403a98d9690", + "id": "9cdcb36a20d2892f", "type": "ui-switch", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "label": "I7", "group": "00ea85a0e0b38df3", @@ -1509,14 +1501,14 @@ "y": 420, "wires": [ [ - "6343064ecf3d8a64" + "42287fe19a5e1337" ] ] }, { - "id": "2eb8008f157e3905", + "id": "99e68919914f2326", "type": "debug", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "debug 1", "active": false, "tosidebar": true, @@ -1531,9 +1523,9 @@ "wires": [] }, { - "id": "e52bad35a9e3303a", + "id": "f6a658f341548fb3", "type": "change", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "rules": [ { @@ -1553,22 +1545,22 @@ "y": 160, "wires": [ [ - "ac96af9d69f69372", - "a2dd41c333e61095", - "7fa06bb9fc6290c2", - "a4bb8403a98d9690", - "9a6dbd2385a1e118", - "3a440beb763d86fb", - "5e24007ebaf43929", - "787b142395f2812c", - "5281ea0425c23135" + "ef83bfa989b6d72a", + "7bfba44b320a1826", + "929ad4eb2a0bbb68", + "9cdcb36a20d2892f", + "961e284427aa8f71", + "b677272b111f5855", + "5a52593d8e054e97", + "1805fe84b15e252a", + "1f3e907130059c8c" ] ] }, { - "id": "6144c03f7e61ad75", + "id": "be228653fc2bdb0f", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "set arret", "func": "msg.payload = {\n \"arret\": 0\n};\n\nreturn msg;", "outputs": 1, @@ -1581,14 +1573,14 @@ "y": 600, "wires": [ [ - "bf55b8bf4a7aaf10" + "37bdef06b07499f2" ] ] }, { - "id": "deadd211f38d9561", + "id": "63046df5f8142320", "type": "inject", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "props": [ { @@ -1602,19 +1594,27 @@ "topic": "", "payload": "{\"t\":0}", "payloadType": "json", - "x": 1220, - "y": 240, + "x": 1230, + "y": 140, "wires": [ [ - "bf55b8bf4a7aaf10", - "2e6f0eeba0865594" + "37bdef06b07499f2", + "30d93ea6f5e8d0c1", + "f0a7071d5b71ee7d", + "74bf36dd658deecd", + "2cc563dff2f59f18", + "cd67d17ed708f8d2", + "4f19905f0d970ca1", + "c76542262137e660", + "3c5d996abc900e3d", + "6d425818a9a96be2" ] ] }, { - "id": "5281ea0425c23135", + "id": "1f3e907130059c8c", "type": "ui-slider", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "b1bde11bdd78b9f1", "name": "", "label": "Consigne", @@ -1642,14 +1642,14 @@ "y": 480, "wires": [ [ - "22dad6f80cc846bd" + "d193b7c9c0a6c51f" ] ] }, { - "id": "8c90e91ac1299743", + "id": "8a9cc277cf3f445b", "type": "ui-progress", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "b1bde11bdd78b9f1", "name": "", "label": "Progress", @@ -1658,14 +1658,14 @@ "height": 0, "color": "", "className": "", - "x": 1740, - "y": 240, + "x": 1720, + "y": 40, "wires": [] }, { - "id": "be011ad2f6f6421d", + "id": "87bd077b61c6e623", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "m0", "func": "flow.set(\"m0\", Number(msg.payload.m0));\nmsg.payload = msg.payload.m0 * 10;\nreturn msg;", "outputs": 1, @@ -1678,14 +1678,14 @@ "y": 1440, "wires": [ [ - "7ac9d8c8e18dc044" + "c7a24187c63a6f92" ] ] }, { - "id": "99ccef7cde8a92e9", + "id": "17f45fa5a72be929", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "m1", "func": "flow.set(\"m1\", Number(msg.payload.m1));\nmsg.payload = msg.payload.m1 * 10;\nreturn msg;", "outputs": 1, @@ -1698,14 +1698,14 @@ "y": 1480, "wires": [ [ - "84fa844178c49edf" + "fc11f649c39c46d2" ] ] }, { - "id": "782e8b8cc5e195e4", + "id": "96a15b4c506aa11a", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "m2", "func": "flow.set(\"m2\", Number(msg.payload.m2));\nmsg.payload = msg.payload.m2 * 10;\nreturn msg;", "outputs": 1, @@ -1718,14 +1718,14 @@ "y": 1520, "wires": [ [ - "47017a2a936e5072" + "8e5c745d23d5380c" ] ] }, { - "id": "9f7680a2a2de021a", + "id": "10a21959cbd3cc1e", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "m3", "func": "flow.set(\"m3\", Number(msg.payload.m3));\nmsg.payload = msg.payload.m3 * 10;\nreturn msg;", "outputs": 1, @@ -1738,14 +1738,14 @@ "y": 1560, "wires": [ [ - "5ce2b9a4e220b5ea" + "1f1e018651c474a0" ] ] }, { - "id": "2e6f0eeba0865594", + "id": "30d93ea6f5e8d0c1", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "function 2", "func": "let p0 = Number(flow.get(\"p0\")) || 0;\n\nif (flow.get(\"m0\")) {\n p0++;\n if (p0 > 100) p0 = 100;\n flow.set(\"p0\", p0);\n}\n\nif (flow.get(\"m1\")) {\n p0--;\n if (p0 < 0) p0 = 0;\n flow.set(\"p0\", p0);\n}\n\nmsg.payload = p0;\n\nreturn msg;", "outputs": 1, @@ -1754,18 +1754,18 @@ "initialize": "", "finalize": "", "libs": [], - "x": 1460, - "y": 240, + "x": 1480, + "y": 40, "wires": [ [ - "8c90e91ac1299743" + "8a9cc277cf3f445b" ] ] }, { - "id": "22dad6f80cc846bd", + "id": "d193b7c9c0a6c51f", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "v0", "func": "flow.set(\"v0\", Number(msg.payload));\nreturn msg;", "outputs": 1, @@ -1781,9 +1781,9 @@ ] }, { - "id": "7bd24ffe89bf6013", + "id": "aff33a1ec25cb285", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "02fab8cbf37e2bb7", "order": 5, "width": 0, @@ -1805,9 +1805,9 @@ "wires": [] }, { - "id": "6d94aa7b17d6bedd", + "id": "697cc7b491485ee5", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "02fab8cbf37e2bb7", "order": 4, "width": 0, @@ -1829,9 +1829,9 @@ "wires": [] }, { - "id": "309e25e7e1f603d5", + "id": "3b6fc91887629b43", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "02fab8cbf37e2bb7", "order": 3, "width": 0, @@ -1853,9 +1853,9 @@ "wires": [] }, { - "id": "2559321f70cd5908", + "id": "1cd3d290f7f7d539", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "l1", "func": "msg.payload = Number(msg.payload.light) == 1 ? \"🟢\" : \"⚪\";\n\nreturn msg;", "outputs": 1, @@ -1868,14 +1868,14 @@ "y": 1740, "wires": [ [ - "7bd24ffe89bf6013" + "aff33a1ec25cb285" ] ] }, { - "id": "12ee9490cfd0c2cb", + "id": "88310a9e40d564fc", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "l2", "func": "msg.payload = Number(msg.payload.light) == 2 ? \"🟠\" : \"⚪\";\n\nreturn msg;", "outputs": 1, @@ -1888,14 +1888,14 @@ "y": 1700, "wires": [ [ - "6d94aa7b17d6bedd" + "697cc7b491485ee5" ] ] }, { - "id": "a016dc35c575f406", + "id": "b543660f60319f21", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "l3", "func": "msg.payload = Number(msg.payload.light) == 3 ? \"🔴\" : \"⚪\";\n\nreturn msg;", "outputs": 1, @@ -1908,14 +1908,14 @@ "y": 1660, "wires": [ [ - "309e25e7e1f603d5" + "3b6fc91887629b43" ] ] }, { - "id": "7ac9d8c8e18dc044", + "id": "c7a24187c63a6f92", "type": "ui-gauge", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "group": "6b44d4b22cd7b3dc", "order": 1, @@ -1967,9 +1967,9 @@ ] }, { - "id": "84fa844178c49edf", + "id": "fc11f649c39c46d2", "type": "ui-gauge", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "group": "6b44d4b22cd7b3dc", "order": 2, @@ -2021,9 +2021,9 @@ ] }, { - "id": "47017a2a936e5072", + "id": "8e5c745d23d5380c", "type": "ui-gauge", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "group": "6b44d4b22cd7b3dc", "order": 3, @@ -2075,9 +2075,9 @@ ] }, { - "id": "5ce2b9a4e220b5ea", + "id": "1f1e018651c474a0", "type": "ui-gauge", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "group": "6b44d4b22cd7b3dc", "order": 4, @@ -2129,9 +2129,9 @@ ] }, { - "id": "e94f13f0f1acc44c", + "id": "cefd0feeeaf4227c", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "a0", "func": "flow.set(\"a0\", Number(msg.payload.a0));\nmsg.payload = msg.payload.a0;\nreturn msg;", "outputs": 1, @@ -2144,14 +2144,14 @@ "y": 1820, "wires": [ [ - "3f4307ae68dbfe24" + "faccd817ca7a8365" ] ] }, { - "id": "3f4307ae68dbfe24", + "id": "faccd817ca7a8365", "type": "rbe", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "func": "rbe", "gap": "", @@ -2160,18 +2160,18 @@ "septopics": false, "property": "payload", "topi": "topic", - "x": 850, + "x": 830, "y": 1820, "wires": [ [ - "4eb3133716e74df9" + "4986d82da7142a49" ] ] }, { - "id": "6e41db0b430f9a91", + "id": "f6f1221e4d6b3682", "type": "delay", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "sortie verrin", "pauseType": "delay", "timeout": "800", @@ -2189,14 +2189,14 @@ "y": 1900, "wires": [ [ - "9df81d32815e49cf" + "5aedb839421d6b67" ] ] }, { - "id": "9df81d32815e49cf", + "id": "5aedb839421d6b67", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c6 = 1", "func": "flow.set(\"c6\", 1);\nflow.set(\"flag0\", 1);\nreturn msg;", "outputs": 1, @@ -2212,9 +2212,9 @@ ] }, { - "id": "4eb3133716e74df9", + "id": "4986d82da7142a49", "type": "switch", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "property": "payload", "propertyType": "msg", @@ -2237,18 +2237,18 @@ "y": 1820, "wires": [ [ - "38a0783404eca7e6" + "a0c18759a1ad2b61" ], [ - "8dbfe82b3d93a51f", - "6e41db0b430f9a91" + "27bcdd18caf20c38", + "f6f1221e4d6b3682" ] ] }, { - "id": "8dbfe82b3d93a51f", + "id": "27bcdd18caf20c38", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c0 = 0", "func": "flow.set(\"c0\", 0);\nreturn msg;", "outputs": 1, @@ -2264,9 +2264,9 @@ ] }, { - "id": "38a0783404eca7e6", + "id": "a0c18759a1ad2b61", "type": "delay", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "retour verrin", "pauseType": "delay", "timeout": "1200", @@ -2284,14 +2284,14 @@ "y": 1800, "wires": [ [ - "bfedc09f6f707609" + "47209e9117e4de74" ] ] }, { - "id": "bfedc09f6f707609", + "id": "47209e9117e4de74", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c0 = 1", "func": "flow.set(\"c0\", 1);\nreturn msg;", "outputs": 1, @@ -2307,9 +2307,9 @@ ] }, { - "id": "92b7b19f3a84b610", + "id": "0ddd646c0134e82c", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "a1", "func": "flow.set(\"a1\", Number(msg.payload.a1));\nmsg.payload = msg.payload.a1;\nreturn msg;", "outputs": 1, @@ -2322,14 +2322,14 @@ "y": 2040, "wires": [ [ - "0b52465d023a6934" + "fed6f62ccc31d96a" ] ] }, { - "id": "0b52465d023a6934", + "id": "fed6f62ccc31d96a", "type": "rbe", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "func": "rbe", "gap": "", @@ -2338,18 +2338,18 @@ "septopics": true, "property": "payload", "topi": "topic", - "x": 850, + "x": 830, "y": 2040, "wires": [ [ - "e0b6603acc4ecf87" + "0168dbe453be398a" ] ] }, { - "id": "e0b6603acc4ecf87", + "id": "0168dbe453be398a", "type": "switch", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "property": "payload", "propertyType": "msg", @@ -2372,19 +2372,19 @@ "y": 2040, "wires": [ [ - "255aa585d23062e3", - "af93bf8a3513b407" + "e2d0c6d3f5b5c7c8", + "4aa7b6db9b990fa0" ], [ - "36306be30feaf7f0", - "0d6e71b58cc1cc38" + "57189f4df55ec290", + "6f8042f0cd1f9dd2" ] ] }, { - "id": "af93bf8a3513b407", + "id": "4aa7b6db9b990fa0", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c2 = 0", "func": "flow.set(\"c2\", 0);\nreturn msg;", "outputs": 1, @@ -2393,16 +2393,16 @@ "initialize": "", "finalize": "", "libs": [], - "x": 1170, + "x": 1210, "y": 1980, "wires": [ [] ] }, { - "id": "36306be30feaf7f0", + "id": "57189f4df55ec290", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c1 = 0", "func": "flow.set(\"c1\", 0);\nreturn msg;", "outputs": 1, @@ -2411,16 +2411,16 @@ "initialize": "", "finalize": "", "libs": [], - "x": 1170, - "y": 2100, + "x": 1210, + "y": 2080, "wires": [ [] ] }, { - "id": "0d6e71b58cc1cc38", + "id": "6f8042f0cd1f9dd2", "type": "delay", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "sortie verrin", "pauseType": "delay", "timeout": "800", @@ -2434,18 +2434,18 @@ "drop": false, "allowrate": false, "outputs": 1, - "x": 1190, - "y": 2140, + "x": 1230, + "y": 2120, "wires": [ [ - "3cc44c740230f02a" + "fb3f9295012fd03e" ] ] }, { - "id": "3cc44c740230f02a", + "id": "fb3f9295012fd03e", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c2 = 1", "func": "flow.set(\"c2\", 1);\nreturn msg;", "outputs": 1, @@ -2454,16 +2454,16 @@ "initialize": "", "finalize": "", "libs": [], - "x": 1370, - "y": 2140, + "x": 1390, + "y": 2120, "wires": [ [] ] }, { - "id": "255aa585d23062e3", + "id": "e2d0c6d3f5b5c7c8", "type": "delay", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "retour verrin", "pauseType": "delay", "timeout": "1200", @@ -2477,18 +2477,18 @@ "drop": false, "allowrate": false, "outputs": 1, - "x": 1190, + "x": 1230, "y": 2020, "wires": [ [ - "2f9031a86b4a023b" + "aa06273eb1db7d1a" ] ] }, { - "id": "2f9031a86b4a023b", + "id": "aa06273eb1db7d1a", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c1 = 1", "func": "flow.set(\"c1\", 1);\nreturn msg;", "outputs": 1, @@ -2497,24 +2497,24 @@ "initialize": "", "finalize": "", "libs": [], - "x": 1350, + "x": 1390, "y": 2020, "wires": [ [] ] }, { - "id": "7febe9e39b9c4b6d", + "id": "3a4fc72ec7ac5e24", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "6b44d4b22cd7b3dc", - "order": 5, - "width": "2", + "order": 6, + "width": "1", "height": "1", "name": "", "label": "c0", "format": "{{msg.payload}}", - "layout": "row-spread", + "layout": "row-left", "style": false, "font": "", "fontSize": 16, @@ -2523,22 +2523,22 @@ "className": "", "value": "payload", "valueType": "msg", - "x": 1230, - "y": 1120, + "x": 1650, + "y": 100, "wires": [] }, { - "id": "462e542c5786e330", + "id": "f9dc47909191e3c8", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "6b44d4b22cd7b3dc", - "order": 6, - "width": "2", + "order": 8, + "width": "1", "height": "1", "name": "", "label": "c1", "format": "{{msg.payload}}", - "layout": "row-spread", + "layout": "row-left", "style": false, "font": "", "fontSize": 16, @@ -2547,22 +2547,22 @@ "className": "", "value": "payload", "valueType": "msg", - "x": 1230, - "y": 1160, + "x": 1650, + "y": 140, "wires": [] }, { - "id": "c7e569b7027aa3ce", + "id": "010deed59c85eb88", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "6b44d4b22cd7b3dc", - "order": 7, - "width": "2", + "order": 9, + "width": "1", "height": "1", "name": "", "label": "c2", "format": "{{msg.payload}}", - "layout": "row-spread", + "layout": "row-right", "style": false, "font": "", "fontSize": 16, @@ -2571,82 +2571,82 @@ "className": "", "value": "payload", "valueType": "msg", - "x": 1230, - "y": 1200, + "x": 1650, + "y": 180, "wires": [] }, { - "id": "cd6ccfdf8cc29b04", + "id": "f0a7071d5b71ee7d", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c0", - "func": "msg.payload = Number(msg.payload.c0) ? \"🟩\" : \"🟥\";\n\nreturn msg;", + "func": "const value = flow.get(\"c0\");\nmsg.payload = value ? \"🟩\" : \"🟥\";\n\nreturn msg;", "outputs": 1, "timeout": 0, "noerr": 0, "initialize": "", "finalize": "", "libs": [], - "x": 1050, - "y": 1120, + "x": 1470, + "y": 100, "wires": [ [ - "7febe9e39b9c4b6d" + "3a4fc72ec7ac5e24" ] ] }, { - "id": "e694653f29c5c6c3", + "id": "74bf36dd658deecd", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c1", - "func": "msg.payload = Number(msg.payload.c1) ? \"🟩\" : \"🟥\";\n\nreturn msg;", + "func": "const value = flow.get(\"c1\");\nmsg.payload = value ? \"🟩\" : \"🟥\";\n\nreturn msg;", "outputs": 1, "timeout": 0, "noerr": 0, "initialize": "", "finalize": "", "libs": [], - "x": 1050, - "y": 1160, + "x": 1470, + "y": 140, "wires": [ [ - "462e542c5786e330" + "f9dc47909191e3c8" ] ] }, { - "id": "b25a525c97f6ca68", + "id": "2cc563dff2f59f18", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c2", - "func": "msg.payload = Number(msg.payload.c2) ? \"🟩\" : \"🟥\";\n\nreturn msg;", + "func": "const value = flow.get(\"c2\");\nmsg.payload = value ? \"🟩\" : \"🟥\";\n\nreturn msg;", "outputs": 1, "timeout": 0, "noerr": 0, "initialize": "", "finalize": "", "libs": [], - "x": 1050, - "y": 1200, + "x": 1470, + "y": 180, "wires": [ [ - "c7e569b7027aa3ce" + "010deed59c85eb88" ] ] }, { - "id": "36c7c76a5e1740ba", + "id": "ee9fdf6abaeac67b", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "6b44d4b22cd7b3dc", - "order": 8, - "width": "2", + "order": 12, + "width": "1", "height": "1", "name": "", "label": "c3", "format": "{{msg.payload}}", - "layout": "row-spread", + "layout": "row-right", "style": false, "font": "", "fontSize": 16, @@ -2655,16 +2655,16 @@ "className": "", "value": "payload", "valueType": "msg", - "x": 1230, - "y": 1240, + "x": 1650, + "y": 220, "wires": [] }, { - "id": "e3cc796a4ae84c36", + "id": "a6a2a869c90e9632", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "6b44d4b22cd7b3dc", - "order": 9, + "order": 16, "width": "2", "height": "1", "name": "", @@ -2679,22 +2679,22 @@ "className": "", "value": "payload", "valueType": "msg", - "x": 1230, - "y": 1280, + "x": 1650, + "y": 260, "wires": [] }, { - "id": "0f4fcd7d4ea77704", + "id": "67f154181e143217", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "6b44d4b22cd7b3dc", - "order": 10, - "width": "2", + "order": 15, + "width": "1", "height": "1", "name": "", "label": "c5", "format": "{{msg.payload}}", - "layout": "row-spread", + "layout": "row-right", "style": false, "font": "", "fontSize": 16, @@ -2703,22 +2703,22 @@ "className": "", "value": "payload", "valueType": "msg", - "x": 1230, - "y": 1320, + "x": 1650, + "y": 300, "wires": [] }, { - "id": "d19105b55c934446", + "id": "8f07f55780eaea54", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "6b44d4b22cd7b3dc", - "order": 11, - "width": "2", + "order": 13, + "width": "1", "height": "1", "name": "", "label": "c6", "format": "{{msg.payload}}", - "layout": "row-spread", + "layout": "row-left", "style": false, "font": "", "fontSize": 16, @@ -2727,16 +2727,16 @@ "className": "", "value": "payload", "valueType": "msg", - "x": 1230, - "y": 1360, + "x": 1650, + "y": 340, "wires": [] }, { - "id": "9f668e45418ca62a", + "id": "3e9c527b9179cc5a", "type": "ui-text", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "group": "6b44d4b22cd7b3dc", - "order": 12, + "order": 17, "width": "2", "height": "1", "name": "", @@ -2751,114 +2751,114 @@ "className": "", "value": "payload", "valueType": "msg", - "x": 1230, - "y": 1400, + "x": 1650, + "y": 380, "wires": [] }, { - "id": "f88ed6b89e2793cf", + "id": "cd67d17ed708f8d2", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c3", - "func": "msg.payload = Number(msg.payload.c3) ? \"🟩\" : \"🟥\";\n\nreturn msg;", + "func": "const value = flow.get(\"c3\");\nmsg.payload = value ? \"🟩\" : \"🟥\";\n\nreturn msg;", "outputs": 1, "timeout": 0, "noerr": 0, "initialize": "", "finalize": "", "libs": [], - "x": 1050, - "y": 1240, + "x": 1470, + "y": 220, "wires": [ [ - "36c7c76a5e1740ba" + "ee9fdf6abaeac67b" ] ] }, { - "id": "41f6c23afe13dda4", + "id": "4f19905f0d970ca1", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c4", - "func": "msg.payload = Number(msg.payload.c4) ? \"🟩\" : \"🟥\";\n\nreturn msg;", + "func": "const value = flow.get(\"c4\");\nmsg.payload = value ? \"🟩\" : \"🟥\";\n\nreturn msg;", "outputs": 1, "timeout": 0, "noerr": 0, "initialize": "", "finalize": "", "libs": [], - "x": 1050, - "y": 1280, + "x": 1470, + "y": 260, "wires": [ [ - "e3cc796a4ae84c36" + "a6a2a869c90e9632" ] ] }, { - "id": "ca27afe33c09b23a", + "id": "c76542262137e660", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c5", - "func": "msg.payload = Number(msg.payload.c5) ? \"🟩\" : \"🟥\";\n\nreturn msg;", + "func": "const value = flow.get(\"c5\");\nmsg.payload = value ? \"🟩\" : \"🟥\";\n\nreturn msg;", "outputs": 1, "timeout": 0, "noerr": 0, "initialize": "", "finalize": "", "libs": [], - "x": 1050, - "y": 1320, + "x": 1470, + "y": 300, "wires": [ [ - "0f4fcd7d4ea77704" + "67f154181e143217" ] ] }, { - "id": "227354827c5b2a9e", + "id": "3c5d996abc900e3d", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c6", - "func": "msg.payload = Number(msg.payload.c6) ? \"🟩\" : \"🟥\";\n\nreturn msg;", + "func": "const value = flow.get(\"c6\");\nmsg.payload = value ? \"🟩\" : \"🟥\";\n\nreturn msg;", "outputs": 1, "timeout": 0, "noerr": 0, "initialize": "", "finalize": "", "libs": [], - "x": 1050, - "y": 1360, + "x": 1470, + "y": 340, "wires": [ [ - "d19105b55c934446" + "8f07f55780eaea54" ] ] }, { - "id": "79e82ef03466071e", + "id": "6d425818a9a96be2", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c7", - "func": "msg.payload = Number(msg.payload.c7) ? \"🟩\" : \"🟥\";\n\nreturn msg;", + "func": "const value = flow.get(\"c7\");\nmsg.payload = value ? \"🟩\" : \"🟥\";\n\nreturn msg;", "outputs": 1, "timeout": 0, "noerr": 0, "initialize": "", "finalize": "", "libs": [], - "x": 1050, - "y": 1400, + "x": 1470, + "y": 380, "wires": [ [ - "9f668e45418ca62a" + "3e9c527b9179cc5a" ] ] }, { - "id": "f55fa882f44af78e", + "id": "3331b1d0398a3348", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "a2", "func": "flow.set(\"a2\", Number(msg.payload.a2));\nmsg.payload = msg.payload.a2;\nreturn msg;", "outputs": 1, @@ -2871,14 +2871,14 @@ "y": 2240, "wires": [ [ - "c2cdd0cec8c60f7b" + "52cc761676e02b0f" ] ] }, { - "id": "c2cdd0cec8c60f7b", + "id": "52cc761676e02b0f", "type": "rbe", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "func": "rbe", "gap": "", @@ -2887,18 +2887,18 @@ "septopics": true, "property": "payload", "topi": "topic", - "x": 834, - "y": 2229, + "x": 830, + "y": 2240, "wires": [ [ - "4f208fbc27e6ba22" + "3a0b09b9dc5fabce" ] ] }, { - "id": "4f208fbc27e6ba22", + "id": "3a0b09b9dc5fabce", "type": "switch", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "property": "payload", "propertyType": "msg", @@ -2921,17 +2921,17 @@ "y": 2240, "wires": [ [ - "66ea059b7d73dd94" + "70967b168ac9ceb6" ], [ - "119a37cc13969294" + "cd93246cd9e0f59b" ] ] }, { - "id": "119a37cc13969294", + "id": "cd93246cd9e0f59b", "type": "delay", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "sortie verrin", "pauseType": "delay", "timeout": "800", @@ -2945,18 +2945,18 @@ "drop": false, "allowrate": false, "outputs": 1, - "x": 1170, + "x": 1230, "y": 2280, "wires": [ [ - "f4829f8e643d0c3e" + "9b3a271ba664c506" ] ] }, { - "id": "f4829f8e643d0c3e", + "id": "9b3a271ba664c506", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c3 = 1", "func": "flow.set(\"c3\", 1);\nflow.set(\"c6\", 0);\n\nif (Number(flow.get(\"flag0\")) == 1) {\n flow.set(\"flag0\", 0);\n flow.set(\"c5\", 1);\n}\n\nreturn msg;", "outputs": 1, @@ -2965,16 +2965,16 @@ "initialize": "", "finalize": "", "libs": [], - "x": 1330, + "x": 1390, "y": 2280, "wires": [ [] ] }, { - "id": "66ea059b7d73dd94", + "id": "70967b168ac9ceb6", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c3 = 0", "func": "flow.set(\"c3\", 0);\nreturn msg;", "outputs": 1, @@ -2983,16 +2983,16 @@ "initialize": "", "finalize": "", "libs": [], - "x": 1170, - "y": 2220, + "x": 1210, + "y": 2200, "wires": [ [] ] }, { - "id": "02cfaae4ac4028fa", + "id": "696cf5af60cf4b64", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "a3", "func": "flow.set(\"a3\", Number(msg.payload.a3));\nmsg.payload = msg.payload.a3;\nreturn msg;", "outputs": 1, @@ -3005,14 +3005,14 @@ "y": 2360, "wires": [ [ - "0ae317ffe38bf575" + "d90023d094b7e43d" ] ] }, { - "id": "0ae317ffe38bf575", + "id": "d90023d094b7e43d", "type": "rbe", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "func": "rbe", "gap": "", @@ -3025,14 +3025,14 @@ "y": 2360, "wires": [ [ - "a50f4b5dfa9eade9" + "65b5c174d03f4048" ] ] }, { - "id": "a50f4b5dfa9eade9", + "id": "65b5c174d03f4048", "type": "switch", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "", "property": "payload", "propertyType": "msg", @@ -3051,19 +3051,19 @@ "checkall": "false", "repair": false, "outputs": 2, - "x": 980, + "x": 1000, "y": 2360, "wires": [ [], [ - "fc150d9fc55ebcc5" + "a4029ba85e639676" ] ] }, { - "id": "fc150d9fc55ebcc5", + "id": "13d74fea2023a497", "type": "function", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "c5 = 0", "func": "flow.set(\"c5\", 0);\nreturn msg;", "outputs": 1, @@ -3072,16 +3072,16 @@ "initialize": "", "finalize": "", "libs": [], - "x": 1150, - "y": 2380, + "x": 1390, + "y": 2420, "wires": [ [] ] }, { - "id": "97c3bdd3022c06a2", + "id": "d64c41e23b4c2c83", "type": "inject", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "sortie a0", "props": [ { @@ -3099,14 +3099,14 @@ "y": 1800, "wires": [ [ - "e94f13f0f1acc44c" + "cefd0feeeaf4227c" ] ] }, { - "id": "32a0178413458831", + "id": "182406188164351f", "type": "inject", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "retour a0", "props": [ { @@ -3124,14 +3124,14 @@ "y": 1840, "wires": [ [ - "e94f13f0f1acc44c" + "cefd0feeeaf4227c" ] ] }, { - "id": "55b870902eafb7d6", + "id": "d4d595cda525c169", "type": "inject", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "sortie a1", "props": [ { @@ -3145,18 +3145,18 @@ "topic": "", "payload": "{\"a1\":1}", "payloadType": "json", - "x": 420, + "x": 400, "y": 2020, "wires": [ [ - "92b7b19f3a84b610" + "0ddd646c0134e82c" ] ] }, { - "id": "9613b1d12607eb78", + "id": "a3108919b481a583", "type": "inject", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "retour a1", "props": [ { @@ -3170,18 +3170,18 @@ "topic": "", "payload": "{\"a1\":0}", "payloadType": "json", - "x": 420, + "x": 400, "y": 2060, "wires": [ [ - "92b7b19f3a84b610" + "0ddd646c0134e82c" ] ] }, { - "id": "e2ee6d24c361265a", + "id": "d21d6bdbad082c02", "type": "inject", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "retour a2", "props": [ { @@ -3195,18 +3195,18 @@ "topic": "", "payload": "{\"a2\":0}", "payloadType": "json", - "x": 420, + "x": 400, "y": 2240, "wires": [ [ - "f55fa882f44af78e" + "3331b1d0398a3348" ] ] }, { - "id": "3f3795eb65e0bc06", + "id": "240c384cfd37aa35", "type": "inject", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "retour a3", "props": [ { @@ -3220,18 +3220,18 @@ "topic": "", "payload": "{\"a3\":0}", "payloadType": "json", - "x": 440, + "x": 400, "y": 2380, "wires": [ [ - "02cfaae4ac4028fa" + "696cf5af60cf4b64" ] ] }, { - "id": "7806cff293d6b133", + "id": "cf5a2a9fba2009f1", "type": "inject", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "sortie a2", "props": [ { @@ -3245,18 +3245,18 @@ "topic": "", "payload": "{\"a2\":1}", "payloadType": "json", - "x": 420, + "x": 400, "y": 2200, "wires": [ [ - "f55fa882f44af78e" + "3331b1d0398a3348" ] ] }, { - "id": "b96e4ea91c42c3de", + "id": "746e5cf4ca1a8fa7", "type": "inject", - "z": "41526b8c80d5a5f7", + "z": "86a34ee77bf6db10", "name": "sortie a3", "props": [ { @@ -3270,11 +3270,132 @@ "topic": "", "payload": "{\"a3\":1}", "payloadType": "json", - "x": 440, + "x": 400, "y": 2340, "wires": [ [ - "02cfaae4ac4028fa" + "696cf5af60cf4b64" + ] + ] + }, + { + "id": "c219b897538f7dfd", + "type": "ui-text", + "z": "86a34ee77bf6db10", + "group": "6b44d4b22cd7b3dc", + "order": 5, + "width": "2", + "height": "1", + "name": "", + "label": "Actionneur 0", + "format": "{{msg.payload}}", + "layout": "row-spread", + "style": false, + "font": "", + "fontSize": 16, + "color": "#717171", + "wrapText": false, + "className": "", + "value": "payloads", + "valueType": "msg", + "x": 1850, + "y": 100, + "wires": [] + }, + { + "id": "74204db55792e5ad", + "type": "ui-text", + "z": "86a34ee77bf6db10", + "group": "6b44d4b22cd7b3dc", + "order": 7, + "width": "2", + "height": "1", + "name": "", + "label": "Actionneur 1", + "format": "{{msg.payload}}", + "layout": "row-spread", + "style": false, + "font": "", + "fontSize": 16, + "color": "#717171", + "wrapText": false, + "className": "", + "value": "payloads", + "valueType": "msg", + "x": 1850, + "y": 140, + "wires": [] + }, + { + "id": "8d5eb1827691bec4", + "type": "ui-text", + "z": "86a34ee77bf6db10", + "group": "6b44d4b22cd7b3dc", + "order": 10, + "width": "2", + "height": "1", + "name": "", + "label": "Actionneur 2", + "format": "{{msg.payload}}", + "layout": "row-spread", + "style": false, + "font": "", + "fontSize": 16, + "color": "#717171", + "wrapText": false, + "className": "", + "value": "payloads", + "valueType": "msg", + "x": 1850, + "y": 180, + "wires": [] + }, + { + "id": "072b58c153a7e6be", + "type": "ui-text", + "z": "86a34ee77bf6db10", + "group": "6b44d4b22cd7b3dc", + "order": 14, + "width": "2", + "height": "1", + "name": "", + "label": "Actionneur 3", + "format": "{{msg.payload}}", + "layout": "row-spread", + "style": false, + "font": "", + "fontSize": 16, + "color": "#717171", + "wrapText": false, + "className": "", + "value": "payloads", + "valueType": "msg", + "x": 1850, + "y": 220, + "wires": [] + }, + { + "id": "a4029ba85e639676", + "type": "delay", + "z": "86a34ee77bf6db10", + "name": "soufflage", + "pauseType": "delay", + "timeout": "500", + "timeoutUnits": "milliseconds", + "rate": "1", + "nbRateUnits": "1", + "rateUnits": "second", + "randomFirst": "1", + "randomLast": "5", + "randomUnits": "seconds", + "drop": false, + "allowrate": false, + "outputs": 1, + "x": 1220, + "y": 2420, + "wires": [ + [ + "13d74fea2023a497" ] ] }, @@ -3469,7 +3590,7 @@ } }, { - "id": "72fb79817cf41c66", + "id": "dfc5297535cb8f75", "type": "global-config", "env": [], "modules": { diff --git a/autom.cpp b/autom.cpp index bda73e9..fc0e600 100644 --- a/autom.cpp +++ b/autom.cpp @@ -50,6 +50,7 @@ unsigned long millis() int marche = 0; int arret = 1; +int light = 0; int b0, b1, b2, b3, b4, b5, b6, b7; int i0, i1, i2, i3, i4, i5, i6, i7; int s0, s1, s2, s3, s4, s5, s6, s7; @@ -123,21 +124,21 @@ public: if (j.contains("i6")) i6 = j["i6"].get(); if (j.contains("i7")) i7 = j["i7"].get(); - if (j.contains("c0")) + if (j.contains("c0") && j["c0"].is_number()) c0 = j["c0"].get(); - if (j.contains("c1")) + if (j.contains("c1") && j["c1"].is_number()) c1 = j["c1"].get(); - if (j.contains("c2")) + if (j.contains("c2") && j["c2"].is_number()) c2 = j["c2"].get(); - if (j.contains("c3")) + if (j.contains("c3") && j["c3"].is_number()) c3 = j["c3"].get(); - if (j.contains("c4")) + if (j.contains("c4") && j["c4"].is_number()) c4 = j["c4"].get(); - if (j.contains("c5")) + if (j.contains("c5") && j["c5"].is_number()) c5 = j["c5"].get(); - if (j.contains("c6")) + if (j.contains("c6") && j["c6"].is_number()) c6 = j["c6"].get(); - if (j.contains("c7")) + if (j.contains("c7") && j["c7"].is_number()) c7 = j["c7"].get(); if (j.contains("v0") && j["v0"].is_number()) v0 = j["v0"].get(); @@ -193,7 +194,7 @@ void mqtt_send(mqtt::async_client *client) {"a5", a5}, {"a6", a6}, {"a7", a7}, - {"light", 0}, + {"light", light}, }; std::string payload = obj.dump();