diff --git a/documentation/Robot.docx b/documentation/Robot.docx index ab88e44..2651022 100644 Binary files a/documentation/Robot.docx and b/documentation/Robot.docx differ diff --git a/documentation/SmartGardeningProjekt.mdj b/documentation/SmartGardeningProjekt.mdj index 8850ffa..9f48c84 100644 --- a/documentation/SmartGardeningProjekt.mdj +++ b/documentation/SmartGardeningProjekt.mdj @@ -61,9 +61,9 @@ "$ref": "AAAAAAGHA6OtsNB4UQo=" }, "font": "Arial;13;0", - "left": 38.55908203125, + "left": 40.72998046875, "top": 13, - "width": 52.9873046875, + "width": 58.07177734375, "height": 13, "text": "Messfahrt" }, @@ -76,7 +76,7 @@ "font": "Arial;13;1", "left": 21, "top": 13, - "width": 12.55908203125, + "width": 14.72998046875, "height": 13, "text": "sd" } @@ -6628,7 +6628,7 @@ "font": "Arial;13;1", "left": 805, "top": 455, - "width": 182, + "width": 191.8388671875, "height": 13, "text": "Roboter" }, @@ -6663,7 +6663,7 @@ "font": "Arial;13;0", "left": 800, "top": 448, - "width": 192, + "width": 201.8388671875, "height": 25, "stereotypeLabel": { "$ref": "AAAAAAGH3D4gT0frdC4=" @@ -6690,7 +6690,7 @@ "font": "Arial;13;0", "left": 800, "top": 473, - "width": 192, + "width": 201.8388671875, "height": 10 }, { @@ -6715,7 +6715,7 @@ "font": "Arial;13;0", "left": 805, "top": 488, - "width": 182, + "width": 191.8388671875, "height": 13, "text": "+plant_1.py()", "horizontalAlignment": 0 @@ -6732,7 +6732,7 @@ "font": "Arial;13;0", "left": 805, "top": 503, - "width": 182, + "width": 191.8388671875, "height": 13, "text": "+plant_2.py()", "horizontalAlignment": 0 @@ -6749,7 +6749,7 @@ "font": "Arial;13;0", "left": 805, "top": 518, - "width": 182, + "width": 191.8388671875, "height": 13, "text": "+plant_3.py()", "horizontalAlignment": 0 @@ -6766,7 +6766,7 @@ "font": "Arial;13;0", "left": 805, "top": 533, - "width": 182, + "width": 191.8388671875, "height": 13, "text": "+plant_4.py()", "horizontalAlignment": 0 @@ -6783,7 +6783,7 @@ "font": "Arial;13;0", "left": 805, "top": 548, - "width": 182, + "width": 191.8388671875, "height": 13, "text": "+plant_5.py()", "horizontalAlignment": 0 @@ -6800,7 +6800,7 @@ "font": "Arial;13;0", "left": 805, "top": 563, - "width": 182, + "width": 191.8388671875, "height": 13, "text": "+plant_6.py()", "horizontalAlignment": 0 @@ -6817,17 +6817,68 @@ "font": "Arial;13;0", "left": 805, "top": 578, - "width": 182, + "width": 191.8388671875, "height": 13, - "text": "+drive_back(plantNumber: int)", + "text": "+drive_back.py(plantNumber: int)", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGIca9MPEvDMsE=", + "_parent": { + "$ref": "AAAAAAGH3D4gT0fwZoY=" + }, + "model": { + "$ref": "AAAAAAGIcawCCjubWmE=" + }, + "font": "Arial;13;0", + "left": 805, + "top": 593, + "width": 191.8388671875, + "height": 13, + "text": "+drive_arm.py(plantNumber)", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGIca9MPUvGqL8=", + "_parent": { + "$ref": "AAAAAAGH3D4gT0fwZoY=" + }, + "model": { + "$ref": "AAAAAAGIcaycHD2RFTc=" + }, + "font": "Arial;13;0", + "left": 805, + "top": 608, + "width": 191.8388671875, + "height": 13, + "text": "+drive_back_straight.py()", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGIca9MPUvJO3M=", + "_parent": { + "$ref": "AAAAAAGH3D4gT0fwZoY=" + }, + "model": { + "$ref": "AAAAAAGIcaziEz6gmiQ=" + }, + "font": "Arial;13;0", + "left": 805, + "top": 623, + "width": 191.8388671875, + "height": 13, + "text": "+drive_plant.py(plantNumber)", "horizontalAlignment": 0 } ], "font": "Arial;13;0", "left": 800, "top": 483, - "width": 192, - "height": 113 + "width": 201.8388671875, + "height": 158 }, { "_type": "UMLReceptionCompartmentView", @@ -6866,7 +6917,7 @@ "containerChangeable": true, "left": 800, "top": 448, - "width": 192, + "width": 201.8388671875, "height": 264, "nameCompartment": { "$ref": "AAAAAAGH3D4gT0fq8KA=" @@ -6904,8 +6955,8 @@ "$ref": "AAAAAAGH3ECZX0hH3WI=" }, "font": "Arial;13;0", - "left": 902, - "top": 376, + "left": 904, + "top": 375, "width": 128.25439453125, "height": 13, "alpha": 1.5664535923283518, @@ -6927,7 +6978,7 @@ }, "visible": null, "font": "Arial;13;0", - "left": 921, + "left": 924, "top": 376, "height": 13, "alpha": 1.5707963267948966, @@ -6948,7 +6999,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 877, + "left": 880, "top": 377, "height": 13, "alpha": -1.5707963267948966, @@ -6969,7 +7020,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 907, + "left": 908, "top": 339, "height": 13, "alpha": 0.5235987755982988, @@ -6990,8 +7041,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 920, - "top": 342, + "left": 922, + "top": 341, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -7011,8 +7062,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 879, - "top": 335, + "left": 881, + "top": 336, "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -7032,7 +7083,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 907, + "left": 911, "top": 414, "height": 13, "alpha": -0.5235987755982988, @@ -7052,8 +7103,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 921, - "top": 412, + "left": 924, + "top": 411, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -7072,7 +7123,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 880, + "left": 883, "top": 419, "height": 13, "alpha": 0.5235987755982988, @@ -7118,7 +7169,7 @@ "$ref": "AAAAAAGH3D4F4Ee/GtY=" }, "lineStyle": 1, - "points": "892:320;893:447", + "points": "893:320;897:447", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGH3ECZYUhMvEs=" @@ -10428,7 +10479,7 @@ "top": 96, "width": 206, "height": 13, - "text": "+readSesnors(self): SensorData", + "text": "+readSesnors(sensorData)", "horizontalAlignment": 0 }, { @@ -10445,7 +10496,7 @@ "top": 111, "width": 206, "height": 13, - "text": "+takePicture(self): Picture", + "text": "+takePicture()", "horizontalAlignment": 0 }, { @@ -10462,7 +10513,7 @@ "top": 126, "width": 206, "height": 13, - "text": "+readPosition(self): Position", + "text": "+readPosition(): Position", "horizontalAlignment": 0 }, { @@ -10496,7 +10547,24 @@ "top": 156, "width": 206, "height": 13, - "text": "+readTSL2561(): float", + "text": "+readTSL2561(): int", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGIca9MREvwJgQ=", + "_parent": { + "$ref": "AAAAAAGH3FRA/Nh7pww=" + }, + "model": { + "$ref": "AAAAAAGIca3ek0K+EG8=" + }, + "font": "Arial;13;0", + "left": 1189, + "top": 171, + "width": 206, + "height": 13, + "text": "+readMCP3008(): float", "horizontalAlignment": 0 } ], @@ -10504,7 +10572,7 @@ "left": 1184, "top": 91, "width": 216, - "height": 83 + "height": 98 }, { "_type": "UMLReceptionCompartmentView", @@ -11592,7 +11660,7 @@ "_parent": { "$ref": "AAAAAAGH3D4gT0fn5xE=" }, - "name": "drive_back", + "name": "drive_back.py", "parameters": [ { "_type": "UMLParameter", @@ -11604,6 +11672,52 @@ "type": "int" } ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGIcawCCjubWmE=", + "_parent": { + "$ref": "AAAAAAGH3D4gT0fn5xE=" + }, + "name": "drive_arm.py", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGIcaxtEDwOwMs=", + "_parent": { + "$ref": "AAAAAAGIcawCCjubWmE=" + }, + "name": "plantNumber", + "type": "" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGIcaycHD2RFTc=", + "_parent": { + "$ref": "AAAAAAGH3D4gT0fn5xE=" + }, + "name": "drive_back_straight.py" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGIcaziEz6gmiQ=", + "_parent": { + "$ref": "AAAAAAGH3D4gT0fn5xE=" + }, + "name": "drive_plant.py", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGIca0f1D8T+mM=", + "_parent": { + "$ref": "AAAAAAGIcaziEz6gmiQ=" + }, + "name": "plantNumber", + "type": "" + } + ] } ] }, @@ -11622,6 +11736,26 @@ "$ref": "AAAAAAGH3D2ih0dk35I=" }, "name": "Raspy_Sensors", + "ownedElements": [ + { + "_type": "UMLActivity", + "_id": "AAAAAAGIcbt+/mld9Lg=", + "_parent": { + "$ref": "AAAAAAGH3FRA/NhynDA=" + }, + "name": "Activity1", + "ownedElements": [ + { + "_type": "UMLActivityDiagram", + "_id": "AAAAAAGIcbt+/2leiIQ=", + "_parent": { + "$ref": "AAAAAAGIcbt+/mld9Lg=" + }, + "name": "ActivityDiagram1" + } + ] + } + ], "operations": [ { "_type": "UMLOperation", @@ -11637,17 +11771,7 @@ "_parent": { "$ref": "AAAAAAGH3FSgmd+KRe4=" }, - "name": "self", - "type": "" - }, - { - "_type": "UMLParameter", - "_id": "AAAAAAGH3FT4FeDWQBc=", - "_parent": { - "$ref": "AAAAAAGH3FSgmd+KRe4=" - }, - "type": "SensorData", - "direction": "return" + "name": "sensorData" } ] }, @@ -11657,27 +11781,7 @@ "_parent": { "$ref": "AAAAAAGH3FRA/NhynDA=" }, - "name": "takePicture", - "parameters": [ - { - "_type": "UMLParameter", - "_id": "AAAAAAGH3FVtzeRAhQQ=", - "_parent": { - "$ref": "AAAAAAGH3FUGTeL1xTE=" - }, - "name": "self", - "type": "" - }, - { - "_type": "UMLParameter", - "_id": "AAAAAAGH3FVtzeRB6PM=", - "_parent": { - "$ref": "AAAAAAGH3FUGTeL1xTE=" - }, - "type": "Picture", - "direction": "return" - } - ] + "name": "takePicture" }, { "_type": "UMLOperation", @@ -11687,15 +11791,6 @@ }, "name": "readPosition", "parameters": [ - { - "_type": "UMLParameter", - "_id": "AAAAAAGH3FXRr+f0tAk=", - "_parent": { - "$ref": "AAAAAAGH3FWOReapIIQ=" - }, - "name": "self", - "type": "" - }, { "_type": "UMLParameter", "_id": "AAAAAAGH3FXRr+f18WA=", @@ -11740,6 +11835,25 @@ "_parent": { "$ref": "AAAAAAGH+qC2A2+bFng=" }, + "type": "int", + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGIca3ek0K+EG8=", + "_parent": { + "$ref": "AAAAAAGH3FRA/NhynDA=" + }, + "name": "readMCP3008", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGIca4IEUMxOHY=", + "_parent": { + "$ref": "AAAAAAGIca3ek0K+EG8=" + }, "type": "float", "direction": "return" } @@ -12197,7 +12311,7 @@ "top": 96, "width": 206, "height": 13, - "text": "+readSesnors(self): SensorData", + "text": "+readSesnors(sensorData)", "horizontalAlignment": 0 }, { @@ -12214,7 +12328,7 @@ "top": 111, "width": 206, "height": 13, - "text": "+takePicture(self): Picture", + "text": "+takePicture()", "horizontalAlignment": 0 }, { @@ -12231,7 +12345,7 @@ "top": 126, "width": 206, "height": 13, - "text": "+readPosition(self): Position", + "text": "+readPosition(): Position", "horizontalAlignment": 0 }, { @@ -12265,7 +12379,24 @@ "top": 156, "width": 206, "height": 13, - "text": "+readTSL2561(): float", + "text": "+readTSL2561(): int", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGIca3eq0LBh8A=", + "_parent": { + "$ref": "AAAAAAGH4UFHSSj1vbw=" + }, + "model": { + "$ref": "AAAAAAGIca3ek0K+EG8=" + }, + "font": "Arial;13;0", + "left": 1181, + "top": 171, + "width": 206, + "height": 13, + "text": "+readMCP3008(): float", "horizontalAlignment": 0 } ], @@ -12273,7 +12404,7 @@ "left": 1176, "top": 91, "width": 216, - "height": 83 + "height": 98 }, { "_type": "UMLReceptionCompartmentView", @@ -12369,7 +12500,7 @@ "font": "Arial;13;1", "left": 485, "top": 447, - "width": 182, + "width": 191.8388671875, "height": 13, "text": "Roboter" }, @@ -12404,7 +12535,7 @@ "font": "Arial;13;0", "left": 480, "top": 440, - "width": 192, + "width": 201.8388671875, "height": 25, "stereotypeLabel": { "$ref": "AAAAAAGH4UFt8isQbMY=" @@ -12431,7 +12562,7 @@ "font": "Arial;13;0", "left": 480, "top": 465, - "width": 192, + "width": 201.8388671875, "height": 10 }, { @@ -12456,7 +12587,7 @@ "font": "Arial;13;0", "left": 485, "top": 480, - "width": 182, + "width": 191.8388671875, "height": 13, "text": "+plant_1.py()", "horizontalAlignment": 0 @@ -12473,7 +12604,7 @@ "font": "Arial;13;0", "left": 485, "top": 495, - "width": 182, + "width": 191.8388671875, "height": 13, "text": "+plant_2.py()", "horizontalAlignment": 0 @@ -12490,7 +12621,7 @@ "font": "Arial;13;0", "left": 485, "top": 510, - "width": 182, + "width": 191.8388671875, "height": 13, "text": "+plant_3.py()", "horizontalAlignment": 0 @@ -12507,7 +12638,7 @@ "font": "Arial;13;0", "left": 485, "top": 525, - "width": 182, + "width": 191.8388671875, "height": 13, "text": "+plant_4.py()", "horizontalAlignment": 0 @@ -12524,7 +12655,7 @@ "font": "Arial;13;0", "left": 485, "top": 540, - "width": 182, + "width": 191.8388671875, "height": 13, "text": "+plant_5.py()", "horizontalAlignment": 0 @@ -12541,7 +12672,7 @@ "font": "Arial;13;0", "left": 485, "top": 555, - "width": 182, + "width": 191.8388671875, "height": 13, "text": "+plant_6.py()", "horizontalAlignment": 0 @@ -12558,17 +12689,68 @@ "font": "Arial;13;0", "left": 485, "top": 570, - "width": 182, + "width": 191.8388671875, "height": 13, - "text": "+drive_back(plantNumber: int)", + "text": "+drive_back.py(plantNumber: int)", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGIcawCJzuepG0=", + "_parent": { + "$ref": "AAAAAAGH4UFt8ysVXTY=" + }, + "model": { + "$ref": "AAAAAAGIcawCCjubWmE=" + }, + "font": "Arial;13;0", + "left": 485, + "top": 585, + "width": 191.8388671875, + "height": 13, + "text": "+drive_arm.py(plantNumber)", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGIcaycJz2Utow=", + "_parent": { + "$ref": "AAAAAAGH4UFt8ysVXTY=" + }, + "model": { + "$ref": "AAAAAAGIcaycHD2RFTc=" + }, + "font": "Arial;13;0", + "left": 485, + "top": 600, + "width": 191.8388671875, + "height": 13, + "text": "+drive_back_straight.py()", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGIcaziHz6j90o=", + "_parent": { + "$ref": "AAAAAAGH4UFt8ysVXTY=" + }, + "model": { + "$ref": "AAAAAAGIcaziEz6gmiQ=" + }, + "font": "Arial;13;0", + "left": 485, + "top": 615, + "width": 191.8388671875, + "height": 13, + "text": "+drive_plant.py(plantNumber)", "horizontalAlignment": 0 } ], "font": "Arial;13;0", "left": 480, "top": 475, - "width": 192, - "height": 113 + "width": 201.8388671875, + "height": 158 }, { "_type": "UMLReceptionCompartmentView", @@ -12607,7 +12789,7 @@ "containerChangeable": true, "left": 480, "top": 440, - "width": 192, + "width": 201.8388671875, "height": 264, "nameCompartment": { "$ref": "AAAAAAGH4UFt8isPshg=" @@ -12775,6 +12957,23 @@ "text": "+drive_plant_thread(plantID, actionID, client: mqtt.Client)", "horizontalAlignment": 0 }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGIcak5DjEy7GQ=", + "_parent": { + "$ref": "AAAAAAGH4UHyHitMuDo=" + }, + "model": { + "$ref": "AAAAAAGIcak45DEvXBY=" + }, + "font": "Arial;13;0", + "left": 669, + "top": 126, + "width": 348.638671875, + "height": 13, + "text": "+drive_plant_all_thread(plantIDs, actionID, client)", + "horizontalAlignment": 0 + }, { "_type": "UMLOperationView", "_id": "AAAAAAGH4UL+kyv55lA=", @@ -12786,12 +12985,29 @@ }, "font": "Arial;13;0", "left": 669, - "top": 126, + "top": 141, "width": 348.638671875, "height": 13, "text": "+drive_plant(clients: mqtt.Client, userdata, message)", "horizontalAlignment": 0 }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGIcaoT4zPK+6U=", + "_parent": { + "$ref": "AAAAAAGH4UHyHitMuDo=" + }, + "model": { + "$ref": "AAAAAAGIcaoT1zPHj/M=" + }, + "font": "Arial;13;0", + "left": 669, + "top": 156, + "width": 348.638671875, + "height": 13, + "text": "+drive_plant_all(client: mqtt.Cliient, userdata, message)", + "horizontalAlignment": 0 + }, { "_type": "UMLOperationView", "_id": "AAAAAAGH4UNklSwHEUE=", @@ -12803,7 +13019,7 @@ }, "font": "Arial;13;0", "left": 669, - "top": 141, + "top": 171, "width": 348.638671875, "height": 13, "text": "+get_position(clients: mqtt.Client, userdata, message)", @@ -12820,18 +13036,35 @@ }, "font": "Arial;13;0", "left": 669, - "top": 156, + "top": 186, "width": 348.638671875, "height": 13, "text": "+get_batteryStatus(clients: mqtt.Clients, userdata, message)", "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGIcash6zZVtR4=", + "_parent": { + "$ref": "AAAAAAGH4UHyHitMuDo=" + }, + "model": { + "$ref": "AAAAAAGIcash3zZSHnI=" + }, + "font": "Arial;13;0", + "left": 669, + "top": 201, + "width": 348.638671875, + "height": 13, + "text": "+sendPicture(client: mqtt.Client)", + "horizontalAlignment": 0 } ], "font": "Arial;13;0", "left": 664, "top": 91, "width": 358.638671875, - "height": 83 + "height": 128 }, { "_type": "UMLReceptionCompartmentView", @@ -13842,7 +14075,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 696, + "left": 706, "top": 579, "height": 13, "alpha": -0.5235987755982988, @@ -13862,7 +14095,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 699, + "left": 709, "top": 593, "height": 13, "alpha": -0.7853981633974483, @@ -13882,7 +14115,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 692, + "left": 702, "top": 552, "height": 13, "alpha": 0.5235987755982988, @@ -13927,7 +14160,7 @@ "tail": { "$ref": "AAAAAAGH4UHyHitFzP8=" }, - "points": "750:319;750:571;671:571", + "points": "750:319;750:571;681:571", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGH4UT84TJLLpY=" @@ -14104,6 +14337,43 @@ } ] }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGIcak45DEvXBY=", + "_parent": { + "$ref": "AAAAAAGH4UHyHStDgNY=" + }, + "name": "drive_plant_all_thread", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGIcanC4DJ9cZM=", + "_parent": { + "$ref": "AAAAAAGIcak45DEvXBY=" + }, + "name": "plantIDs", + "type": "" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGIcanC4TJ+SKE=", + "_parent": { + "$ref": "AAAAAAGIcak45DEvXBY=" + }, + "name": "actionID", + "type": "" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGIcanC4TJ/+r8=", + "_parent": { + "$ref": "AAAAAAGIcak45DEvXBY=" + }, + "name": "client", + "type": "" + } + ] + }, { "_type": "UMLOperation", "_id": "AAAAAAGH4UL+iiv2rNQ=", @@ -14141,6 +14411,43 @@ } ] }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGIcaoT1zPHj/M=", + "_parent": { + "$ref": "AAAAAAGH4UHyHStDgNY=" + }, + "name": "drive_plant_all", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGIcaqPFjQ6S3Y=", + "_parent": { + "$ref": "AAAAAAGIcaoT1zPHj/M=" + }, + "name": "client", + "type": "mqtt.Cliient" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGIcaqPGDQ7CtU=", + "_parent": { + "$ref": "AAAAAAGIcaoT1zPHj/M=" + }, + "name": "userdata", + "type": "" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGIcaqPGDQ8QXQ=", + "_parent": { + "$ref": "AAAAAAGIcaoT1zPHj/M=" + }, + "name": "message", + "type": "" + } + ] + }, { "_type": "UMLOperation", "_id": "AAAAAAGH4UNkjywE/3M=", @@ -14214,10 +14521,1584 @@ "type": "" } ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGIcash3zZSHnI=", + "_parent": { + "$ref": "AAAAAAGH4UHyHStDgNY=" + }, + "name": "sendPicture", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGIcatbAzbFuus=", + "_parent": { + "$ref": "AAAAAAGIcash3zZSHnI=" + }, + "name": "client", + "type": "mqtt.Client" + } + ] } ] } ] + }, + { + "_type": "UMLActivity", + "_id": "AAAAAAGIcbxCYW11vPQ=", + "_parent": { + "$ref": "AAAAAAFF+h6SjaM2Hec=" + }, + "name": "Activity1", + "ownedElements": [ + { + "_type": "UMLActivityDiagram", + "_id": "AAAAAAGIcbxCYW122B0=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW11vPQ=" + }, + "name": "ActivityDiagram1", + "ownedViews": [ + { + "_type": "UMLActionView", + "_id": "AAAAAAGIcbyI5227Gjg=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW122B0=" + }, + "model": { + "$ref": "AAAAAAGIcbyI5m25tz8=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAGIcbyI5228o+o=", + "_parent": { + "$ref": "AAAAAAGIcbyI5227Gjg=" + }, + "model": { + "$ref": "AAAAAAGIcbyI5m25tz8=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAGIcbyI6G29JRk=", + "_parent": { + "$ref": "AAAAAAGIcbyI5228o+o=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13 + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcbyI6G2+R18=", + "_parent": { + "$ref": "AAAAAAGIcbyI5228o+o=" + }, + "font": "Arial;13;1", + "left": 427, + "top": 63, + "width": 158.20263671875, + "height": 13, + "text": "save plantID and actionID" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcbyI6G2/m+s=", + "_parent": { + "$ref": "AAAAAAGIcbyI5228o+o=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 86.6708984375, + "height": 13, + "text": "(from Activity1)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcbyI6G3AICI=", + "_parent": { + "$ref": "AAAAAAGIcbyI5228o+o=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 422, + "top": 56, + "width": 168.20263671875, + "height": 25, + "stereotypeLabel": { + "$ref": "AAAAAAGIcbyI6G29JRk=" + }, + "nameLabel": { + "$ref": "AAAAAAGIcbyI6G2+R18=" + }, + "namespaceLabel": { + "$ref": "AAAAAAGIcbyI6G2/m+s=" + }, + "propertyLabel": { + "$ref": "AAAAAAGIcbyI6G3AICI=" + } + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 422, + "top": 56, + "width": 168.20263671875, + "height": 41, + "nameCompartment": { + "$ref": "AAAAAAGIcbyI5228o+o=" + } + }, + { + "_type": "UMLActionView", + "_id": "AAAAAAGIcbyyQG3VzSI=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW122B0=" + }, + "model": { + "$ref": "AAAAAAGIcbyyQG3T7FM=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAGIcbyyQG3WJ2k=", + "_parent": { + "$ref": "AAAAAAGIcbyyQG3VzSI=" + }, + "model": { + "$ref": "AAAAAAGIcbyyQG3T7FM=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAGIcbyyQG3XNwM=", + "_parent": { + "$ref": "AAAAAAGIcbyyQG3WJ2k=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13 + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcbyyQG3YQxU=", + "_parent": { + "$ref": "AAAAAAGIcbyyQG3WJ2k=" + }, + "font": "Arial;13;1", + "left": 415, + "top": 223, + "width": 181.3017578125, + "height": 13, + "text": "drive to Plant with color code" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcbyyQG3Z+DQ=", + "_parent": { + "$ref": "AAAAAAGIcbyyQG3WJ2k=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 86.6708984375, + "height": 13, + "text": "(from Activity1)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcbyyQG3asi0=", + "_parent": { + "$ref": "AAAAAAGIcbyyQG3WJ2k=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 410, + "top": 216, + "width": 191.3017578125, + "height": 25, + "stereotypeLabel": { + "$ref": "AAAAAAGIcbyyQG3XNwM=" + }, + "nameLabel": { + "$ref": "AAAAAAGIcbyyQG3YQxU=" + }, + "namespaceLabel": { + "$ref": "AAAAAAGIcbyyQG3Z+DQ=" + }, + "propertyLabel": { + "$ref": "AAAAAAGIcbyyQG3asi0=" + } + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 410, + "top": 216, + "width": 191.3017578125, + "height": 41, + "nameCompartment": { + "$ref": "AAAAAAGIcbyyQG3WJ2k=" + } + }, + { + "_type": "UMLActionView", + "_id": "AAAAAAGIcbzfqW3vuO4=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW122B0=" + }, + "model": { + "$ref": "AAAAAAGIcbzfqG3tcdY=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAGIcbzfqW3wf7w=", + "_parent": { + "$ref": "AAAAAAGIcbzfqW3vuO4=" + }, + "model": { + "$ref": "AAAAAAGIcbzfqG3tcdY=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAGIcbzfqW3xTvE=", + "_parent": { + "$ref": "AAAAAAGIcbzfqW3wf7w=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13 + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcbzfqW3yPws=", + "_parent": { + "$ref": "AAAAAAGIcbzfqW3wf7w=" + }, + "font": "Arial;13;1", + "left": 463, + "top": 314, + "width": 86.70263671875, + "height": 13, + "text": "Read Sensors" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcbzfqW3zj1U=", + "_parent": { + "$ref": "AAAAAAGIcbzfqW3wf7w=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 86.6708984375, + "height": 13, + "text": "(from Activity1)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcbzfqW30jHc=", + "_parent": { + "$ref": "AAAAAAGIcbzfqW3wf7w=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 458, + "top": 307, + "width": 96.70263671875, + "height": 25, + "stereotypeLabel": { + "$ref": "AAAAAAGIcbzfqW3xTvE=" + }, + "nameLabel": { + "$ref": "AAAAAAGIcbzfqW3yPws=" + }, + "namespaceLabel": { + "$ref": "AAAAAAGIcbzfqW3zj1U=" + }, + "propertyLabel": { + "$ref": "AAAAAAGIcbzfqW30jHc=" + } + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 458, + "top": 307, + "width": 96.70263671875, + "height": 41, + "nameCompartment": { + "$ref": "AAAAAAGIcbzfqW3wf7w=" + } + }, + { + "_type": "UMLActionView", + "_id": "AAAAAAGIcbz4SW4JwY4=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW122B0=" + }, + "model": { + "$ref": "AAAAAAGIcbz4SW4HACY=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAGIcbz4SW4K+G4=", + "_parent": { + "$ref": "AAAAAAGIcbz4SW4JwY4=" + }, + "model": { + "$ref": "AAAAAAGIcbz4SW4HACY=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAGIcbz4Sm4LRG0=", + "_parent": { + "$ref": "AAAAAAGIcbz4SW4K+G4=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13 + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcbz4Sm4MwX0=", + "_parent": { + "$ref": "AAAAAAGIcbz4SW4K+G4=" + }, + "font": "Arial;13;1", + "left": 448, + "top": 405, + "width": 116.76513671875, + "height": 13, + "text": "Turn arm to middle" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcbz4Sm4NX9Y=", + "_parent": { + "$ref": "AAAAAAGIcbz4SW4K+G4=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 86.6708984375, + "height": 13, + "text": "(from Activity1)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcbz4Sm4OHaU=", + "_parent": { + "$ref": "AAAAAAGIcbz4SW4K+G4=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 443, + "top": 398, + "width": 126.76513671875, + "height": 25, + "stereotypeLabel": { + "$ref": "AAAAAAGIcbz4Sm4LRG0=" + }, + "nameLabel": { + "$ref": "AAAAAAGIcbz4Sm4MwX0=" + }, + "namespaceLabel": { + "$ref": "AAAAAAGIcbz4Sm4NX9Y=" + }, + "propertyLabel": { + "$ref": "AAAAAAGIcbz4Sm4OHaU=" + } + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 443, + "top": 398, + "width": 126.76513671875, + "height": 41, + "nameCompartment": { + "$ref": "AAAAAAGIcbz4SW4K+G4=" + } + }, + { + "_type": "UMLActionView", + "_id": "AAAAAAGIcb0ZGW4jhhY=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW122B0=" + }, + "model": { + "$ref": "AAAAAAGIcb0ZGW4hY84=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAGIcb0ZGW4kHn8=", + "_parent": { + "$ref": "AAAAAAGIcb0ZGW4jhhY=" + }, + "model": { + "$ref": "AAAAAAGIcb0ZGW4hY84=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAGIcb0ZGW4lvqI=", + "_parent": { + "$ref": "AAAAAAGIcb0ZGW4kHn8=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13 + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcb0ZGW4meJw=", + "_parent": { + "$ref": "AAAAAAGIcb0ZGW4kHn8=" + }, + "font": "Arial;13;1", + "left": 474, + "top": 565, + "width": 63.57177734375, + "height": 13, + "text": "Send Data" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcb0ZGW4n2IM=", + "_parent": { + "$ref": "AAAAAAGIcb0ZGW4kHn8=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 86.6708984375, + "height": 13, + "text": "(from Activity1)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcb0ZGm4oI3w=", + "_parent": { + "$ref": "AAAAAAGIcb0ZGW4kHn8=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 469, + "top": 558, + "width": 73.57177734375, + "height": 25, + "stereotypeLabel": { + "$ref": "AAAAAAGIcb0ZGW4lvqI=" + }, + "nameLabel": { + "$ref": "AAAAAAGIcb0ZGW4meJw=" + }, + "namespaceLabel": { + "$ref": "AAAAAAGIcb0ZGW4n2IM=" + }, + "propertyLabel": { + "$ref": "AAAAAAGIcb0ZGm4oI3w=" + } + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 469, + "top": 558, + "width": 73.57177734375, + "height": 41, + "nameCompartment": { + "$ref": "AAAAAAGIcb0ZGW4kHn8=" + } + }, + { + "_type": "UMLActionView", + "_id": "AAAAAAGIcb08+W4+9io=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW122B0=" + }, + "model": { + "$ref": "AAAAAAGIcb08+W480Pk=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAGIcb08+W4/dXY=", + "_parent": { + "$ref": "AAAAAAGIcb08+W4+9io=" + }, + "model": { + "$ref": "AAAAAAGIcb08+W480Pk=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAGIcb08+W5AWuw=", + "_parent": { + "$ref": "AAAAAAGIcb08+W4/dXY=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13 + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcb08+W5BPoI=", + "_parent": { + "$ref": "AAAAAAGIcb08+W4/dXY=" + }, + "font": "Arial;13;1", + "left": 470, + "top": 656, + "width": 72.2490234375, + "height": 13, + "text": "Drive Home" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcb08+W5C33A=", + "_parent": { + "$ref": "AAAAAAGIcb08+W4/dXY=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 86.6708984375, + "height": 13, + "text": "(from Activity1)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAGIcb08+W5Dsmk=", + "_parent": { + "$ref": "AAAAAAGIcb08+W4/dXY=" + }, + "visible": false, + "font": "Arial;13;0", + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 465, + "top": 649, + "width": 82.2490234375, + "height": 25, + "stereotypeLabel": { + "$ref": "AAAAAAGIcb08+W5AWuw=" + }, + "nameLabel": { + "$ref": "AAAAAAGIcb08+W5BPoI=" + }, + "namespaceLabel": { + "$ref": "AAAAAAGIcb08+W5C33A=" + }, + "propertyLabel": { + "$ref": "AAAAAAGIcb08+W5Dsmk=" + } + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 465, + "top": 649, + "width": 82.2490234375, + "height": 41, + "nameCompartment": { + "$ref": "AAAAAAGIcb08+W4/dXY=" + } + }, + { + "_type": "UMLControlNodeView", + "_id": "AAAAAAGIcb17M25ZN8E=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW122B0=" + }, + "model": { + "$ref": "AAAAAAGIcb17M25X5S8=" + }, + "font": "Arial;13;0", + "containerChangeable": true, + "left": 494, + "top": 147, + "width": 23, + "height": 19 + }, + { + "_type": "UMLControlNodeView", + "_id": "AAAAAAGIcb2Q025el7c=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW122B0=" + }, + "model": { + "$ref": "AAAAAAGIcb2Q025csa0=" + }, + "font": "Arial;13;0", + "containerChangeable": true, + "left": 494, + "top": 489, + "width": 23, + "height": 19 + }, + { + "_type": "UMLControlFlowView", + "_id": "AAAAAAGIcb4GO25mF+s=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW122B0=" + }, + "model": { + "$ref": "AAAAAAGIcb4GO25lVUQ=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb4GPG5nIts=", + "_parent": { + "$ref": "AAAAAAGIcb4GO25mF+s=" + }, + "model": { + "$ref": "AAAAAAGIcb4GO25lVUQ=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 519, + "top": 114, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIcb4GO25mF+s=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb4GPG5oUWs=", + "_parent": { + "$ref": "AAAAAAGIcb4GO25mF+s=" + }, + "model": { + "$ref": "AAAAAAGIcb4GO25lVUQ=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 534, + "top": 114, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGIcb4GO25mF+s=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb4GPG5p3Ls=", + "_parent": { + "$ref": "AAAAAAGIcb4GO25mF+s=" + }, + "model": { + "$ref": "AAAAAAGIcb4GO25lVUQ=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 490, + "top": 115, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIcb4GO25mF+s=" + }, + "edgePosition": 1 + } + ], + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAGIcb17M25ZN8E=" + }, + "tail": { + "$ref": "AAAAAAGIcbyI5227Gjg=" + }, + "lineStyle": 1, + "points": "505:97;505:146", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGIcb4GPG5nIts=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGIcb4GPG5oUWs=" + }, + "propertyLabel": { + "$ref": "AAAAAAGIcb4GPG5p3Ls=" + } + }, + { + "_type": "UMLControlFlowView", + "_id": "AAAAAAGIcb4UM253C1Q=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW122B0=" + }, + "model": { + "$ref": "AAAAAAGIcb4UM252rg0=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb4UM254NL4=", + "_parent": { + "$ref": "AAAAAAGIcb4UM253C1Q=" + }, + "model": { + "$ref": "AAAAAAGIcb4UM252rg0=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 519, + "top": 274, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIcb4UM253C1Q=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb4UM255A+8=", + "_parent": { + "$ref": "AAAAAAGIcb4UM253C1Q=" + }, + "model": { + "$ref": "AAAAAAGIcb4UM252rg0=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 534, + "top": 274, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGIcb4UM253C1Q=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb4UM256eQs=", + "_parent": { + "$ref": "AAAAAAGIcb4UM253C1Q=" + }, + "model": { + "$ref": "AAAAAAGIcb4UM252rg0=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 490, + "top": 275, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIcb4UM253C1Q=" + }, + "edgePosition": 1 + } + ], + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAGIcbzfqW3vuO4=" + }, + "tail": { + "$ref": "AAAAAAGIcbyyQG3VzSI=" + }, + "lineStyle": 1, + "points": "505:257;505:306", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGIcb4UM254NL4=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGIcb4UM255A+8=" + }, + "propertyLabel": { + "$ref": "AAAAAAGIcb4UM256eQs=" + } + }, + { + "_type": "UMLControlFlowView", + "_id": "AAAAAAGIcb4fUm6Icng=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW122B0=" + }, + "model": { + "$ref": "AAAAAAGIcb4fUm6HOlo=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb4fUm6JBhc=", + "_parent": { + "$ref": "AAAAAAGIcb4fUm6Icng=" + }, + "model": { + "$ref": "AAAAAAGIcb4fUm6HOlo=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 519, + "top": 183, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIcb4fUm6Icng=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb4fUm6KT0o=", + "_parent": { + "$ref": "AAAAAAGIcb4fUm6Icng=" + }, + "model": { + "$ref": "AAAAAAGIcb4fUm6HOlo=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 534, + "top": 183, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGIcb4fUm6Icng=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb4fUm6LVxY=", + "_parent": { + "$ref": "AAAAAAGIcb4fUm6Icng=" + }, + "model": { + "$ref": "AAAAAAGIcb4fUm6HOlo=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 490, + "top": 184, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIcb4fUm6Icng=" + }, + "edgePosition": 1 + } + ], + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAGIcbyyQG3VzSI=" + }, + "tail": { + "$ref": "AAAAAAGIcb17M25ZN8E=" + }, + "lineStyle": 1, + "points": "505:166;505:215", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGIcb4fUm6JBhc=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGIcb4fUm6KT0o=" + }, + "propertyLabel": { + "$ref": "AAAAAAGIcb4fUm6LVxY=" + } + }, + { + "_type": "UMLControlFlowView", + "_id": "AAAAAAGIcb4qb26Z0lE=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW122B0=" + }, + "model": { + "$ref": "AAAAAAGIcb4qb26Yxo4=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb4qb26aSeU=", + "_parent": { + "$ref": "AAAAAAGIcb4qb26Z0lE=" + }, + "model": { + "$ref": "AAAAAAGIcb4qb26Yxo4=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 519, + "top": 365, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIcb4qb26Z0lE=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb4qb26bMtg=", + "_parent": { + "$ref": "AAAAAAGIcb4qb26Z0lE=" + }, + "model": { + "$ref": "AAAAAAGIcb4qb26Yxo4=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 534, + "top": 365, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGIcb4qb26Z0lE=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb4qb26cHoQ=", + "_parent": { + "$ref": "AAAAAAGIcb4qb26Z0lE=" + }, + "model": { + "$ref": "AAAAAAGIcb4qb26Yxo4=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 490, + "top": 366, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIcb4qb26Z0lE=" + }, + "edgePosition": 1 + } + ], + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAGIcbz4SW4JwY4=" + }, + "tail": { + "$ref": "AAAAAAGIcbzfqW3vuO4=" + }, + "lineStyle": 1, + "points": "505:348;505:397", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGIcb4qb26aSeU=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGIcb4qb26bMtg=" + }, + "propertyLabel": { + "$ref": "AAAAAAGIcb4qb26cHoQ=" + } + }, + { + "_type": "UMLControlFlowView", + "_id": "AAAAAAGIcb45Z26qcRI=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW122B0=" + }, + "model": { + "$ref": "AAAAAAGIcb45Z26p+PE=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb45Z26rGvg=", + "_parent": { + "$ref": "AAAAAAGIcb45Z26qcRI=" + }, + "model": { + "$ref": "AAAAAAGIcb45Z26p+PE=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 519, + "top": 456, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIcb45Z26qcRI=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb45Z26s/Tg=", + "_parent": { + "$ref": "AAAAAAGIcb45Z26qcRI=" + }, + "model": { + "$ref": "AAAAAAGIcb45Z26p+PE=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 534, + "top": 456, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGIcb45Z26qcRI=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb45Z26tAEg=", + "_parent": { + "$ref": "AAAAAAGIcb45Z26qcRI=" + }, + "model": { + "$ref": "AAAAAAGIcb45Z26p+PE=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 490, + "top": 457, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIcb45Z26qcRI=" + }, + "edgePosition": 1 + } + ], + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAGIcb2Q025el7c=" + }, + "tail": { + "$ref": "AAAAAAGIcbz4SW4JwY4=" + }, + "lineStyle": 1, + "points": "505:439;505:488", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGIcb45Z26rGvg=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGIcb45Z26s/Tg=" + }, + "propertyLabel": { + "$ref": "AAAAAAGIcb45Z26tAEg=" + } + }, + { + "_type": "UMLControlFlowView", + "_id": "AAAAAAGIcb5D/267ZhY=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW122B0=" + }, + "model": { + "$ref": "AAAAAAGIcb5D/266OmQ=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb5D/268ZPQ=", + "_parent": { + "$ref": "AAAAAAGIcb5D/267ZhY=" + }, + "model": { + "$ref": "AAAAAAGIcb5D/266OmQ=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 519, + "top": 616, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIcb5D/267ZhY=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb5D/269tTE=", + "_parent": { + "$ref": "AAAAAAGIcb5D/267ZhY=" + }, + "model": { + "$ref": "AAAAAAGIcb5D/266OmQ=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 534, + "top": 616, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGIcb5D/267ZhY=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb5D/26+lag=", + "_parent": { + "$ref": "AAAAAAGIcb5D/267ZhY=" + }, + "model": { + "$ref": "AAAAAAGIcb5D/266OmQ=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 490, + "top": 617, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIcb5D/267ZhY=" + }, + "edgePosition": 1 + } + ], + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAGIcb08+W4+9io=" + }, + "tail": { + "$ref": "AAAAAAGIcb0ZGW4jhhY=" + }, + "lineStyle": 1, + "points": "505:599;505:648", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGIcb5D/268ZPQ=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGIcb5D/269tTE=" + }, + "propertyLabel": { + "$ref": "AAAAAAGIcb5D/26+lag=" + } + }, + { + "_type": "UMLControlFlowView", + "_id": "AAAAAAGIcb5R527MQcE=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW122B0=" + }, + "model": { + "$ref": "AAAAAAGIcb5R527L8LI=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb5R527Nc0w=", + "_parent": { + "$ref": "AAAAAAGIcb5R527MQcE=" + }, + "model": { + "$ref": "AAAAAAGIcb5R527L8LI=" + }, + "font": "Arial;13;0", + "left": 512, + "top": 525, + "width": 89.5908203125, + "height": 13, + "alpha": 1.5904012538089045, + "distance": 51.0098029794274, + "hostEdge": { + "$ref": "AAAAAAGIcb5R527MQcE=" + }, + "edgePosition": 1, + "text": "No more Plants" + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb5R527O9yg=", + "_parent": { + "$ref": "AAAAAAGIcb5R527MQcE=" + }, + "model": { + "$ref": "AAAAAAGIcb5R527L8LI=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 534, + "top": 525, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGIcb5R527MQcE=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb5R527P6IE=", + "_parent": { + "$ref": "AAAAAAGIcb5R527MQcE=" + }, + "model": { + "$ref": "AAAAAAGIcb5R527L8LI=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 490, + "top": 526, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIcb5R527MQcE=" + }, + "edgePosition": 1 + } + ], + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAGIcb0ZGW4jhhY=" + }, + "tail": { + "$ref": "AAAAAAGIcb2Q025el7c=" + }, + "lineStyle": 1, + "points": "505:508;505:557", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGIcb5R527Nc0w=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGIcb5R527O9yg=" + }, + "propertyLabel": { + "$ref": "AAAAAAGIcb5R527P6IE=" + } + }, + { + "_type": "UMLControlFlowView", + "_id": "AAAAAAGIcb5g927dr0o=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW122B0=" + }, + "model": { + "$ref": "AAAAAAGIcb5g927cLV4=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb5g927ejlk=", + "_parent": { + "$ref": "AAAAAAGIcb5g927dr0o=" + }, + "model": { + "$ref": "AAAAAAGIcb5g927cLV4=" + }, + "font": "Arial;13;0", + "left": 214, + "top": 317, + "width": 130.05712890625, + "height": 13, + "alpha": -4.7262769201047625, + "distance": 72.00694410957877, + "hostEdge": { + "$ref": "AAAAAAGIcb5g927dr0o=" + }, + "edgePosition": 1, + "text": "More Plants to drive to" + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb5g927f3Sg=", + "_parent": { + "$ref": "AAAAAAGIcb5g927dr0o=" + }, + "model": { + "$ref": "AAAAAAGIcb5g927cLV4=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 322, + "top": 317, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGIcb5g927dr0o=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIcb5g927gpLU=", + "_parent": { + "$ref": "AAAAAAGIcb5g927dr0o=" + }, + "model": { + "$ref": "AAAAAAGIcb5g927cLV4=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 367, + "top": 318, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIcb5g927dr0o=" + }, + "edgePosition": 1 + } + ], + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAGIcb17M25ZN8E=" + }, + "tail": { + "$ref": "AAAAAAGIcb2Q025el7c=" + }, + "points": "494:496;352:496;352:152;494:152", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGIcb5g927ejlk=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGIcb5g927f3Sg=" + }, + "propertyLabel": { + "$ref": "AAAAAAGIcb5g927gpLU=" + } + } + ] + } + ], + "nodes": [ + { + "_type": "UMLAction", + "_id": "AAAAAAGIcbyI5m25tz8=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW11vPQ=" + }, + "name": "save plantID and actionID" + }, + { + "_type": "UMLAction", + "_id": "AAAAAAGIcbyyQG3T7FM=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW11vPQ=" + }, + "name": "drive to Plant with color code" + }, + { + "_type": "UMLAction", + "_id": "AAAAAAGIcbzfqG3tcdY=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW11vPQ=" + }, + "name": "Read Sensors" + }, + { + "_type": "UMLAction", + "_id": "AAAAAAGIcbz4SW4HACY=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW11vPQ=" + }, + "name": "Turn arm to middle" + }, + { + "_type": "UMLAction", + "_id": "AAAAAAGIcb0ZGW4hY84=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW11vPQ=" + }, + "name": "Send Data" + }, + { + "_type": "UMLAction", + "_id": "AAAAAAGIcb08+W480Pk=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW11vPQ=" + }, + "name": "Drive Home" + }, + { + "_type": "UMLMergeNode", + "_id": "AAAAAAGIcb17M25X5S8=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW11vPQ=" + }, + "name": "MergeNode1" + }, + { + "_type": "UMLDecisionNode", + "_id": "AAAAAAGIcb2Q025csa0=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW11vPQ=" + }, + "name": "DecisionNode1" + } + ], + "edges": [ + { + "_type": "UMLControlFlow", + "_id": "AAAAAAGIcb4GO25lVUQ=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW11vPQ=" + }, + "source": { + "$ref": "AAAAAAGIcbyI5m25tz8=" + }, + "target": { + "$ref": "AAAAAAGIcb17M25X5S8=" + } + }, + { + "_type": "UMLControlFlow", + "_id": "AAAAAAGIcb4UM252rg0=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW11vPQ=" + }, + "source": { + "$ref": "AAAAAAGIcbyyQG3T7FM=" + }, + "target": { + "$ref": "AAAAAAGIcbzfqG3tcdY=" + } + }, + { + "_type": "UMLControlFlow", + "_id": "AAAAAAGIcb4fUm6HOlo=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW11vPQ=" + }, + "source": { + "$ref": "AAAAAAGIcb17M25X5S8=" + }, + "target": { + "$ref": "AAAAAAGIcbyyQG3T7FM=" + } + }, + { + "_type": "UMLControlFlow", + "_id": "AAAAAAGIcb4qb26Yxo4=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW11vPQ=" + }, + "source": { + "$ref": "AAAAAAGIcbzfqG3tcdY=" + }, + "target": { + "$ref": "AAAAAAGIcbz4SW4HACY=" + } + }, + { + "_type": "UMLControlFlow", + "_id": "AAAAAAGIcb45Z26p+PE=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW11vPQ=" + }, + "source": { + "$ref": "AAAAAAGIcbz4SW4HACY=" + }, + "target": { + "$ref": "AAAAAAGIcb2Q025csa0=" + } + }, + { + "_type": "UMLControlFlow", + "_id": "AAAAAAGIcb5D/266OmQ=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW11vPQ=" + }, + "source": { + "$ref": "AAAAAAGIcb0ZGW4hY84=" + }, + "target": { + "$ref": "AAAAAAGIcb08+W480Pk=" + } + }, + { + "_type": "UMLControlFlow", + "_id": "AAAAAAGIcb5R527L8LI=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW11vPQ=" + }, + "name": "No more Plants", + "source": { + "$ref": "AAAAAAGIcb2Q025csa0=" + }, + "target": { + "$ref": "AAAAAAGIcb0ZGW4hY84=" + } + }, + { + "_type": "UMLControlFlow", + "_id": "AAAAAAGIcb5g927cLV4=", + "_parent": { + "$ref": "AAAAAAGIcbxCYW11vPQ=" + }, + "name": "More Plants to drive to", + "source": { + "$ref": "AAAAAAGIcb2Q025csa0=" + }, + "target": { + "$ref": "AAAAAAGIcb17M25X5S8=" + } + } + ] } ] } \ No newline at end of file diff --git a/software/roboter/raspy/functions.py b/software/roboter/raspy/functions.py index 482a02d..6b81cf4 100644 --- a/software/roboter/raspy/functions.py +++ b/software/roboter/raspy/functions.py @@ -216,7 +216,7 @@ def get_position(clients: mqtt.Client, userdata, message: mqtt.MQTTMessage): clients.publish(Topics["ROBOT_DATA_POSITION"], json.dumps(position, indent=4), qos=1) -def get_BatteryStatus(client: mqtt.Client, userdata, message: mqtt.MQTTMessage): +def get_batteryStatus(client: mqtt.Client, userdata, message: mqtt.MQTTMessage): """ Callback function for battery status request Function to read battery status from ev3 and send via MQTT in form of BATTERY diff --git a/software/roboter/raspy/mainProg.py b/software/roboter/raspy/mainProg.py index b6f3b53..36c0e39 100644 --- a/software/roboter/raspy/mainProg.py +++ b/software/roboter/raspy/mainProg.py @@ -30,7 +30,7 @@ def on_connect(client: mqtt.Client, userdata, flags, rc): #Add callbacks client.message_callback_add(Topics["ROBOT_ACTION_DRIVE"], functions.drive_plant) client.message_callback_add(Topics["ROBOT_ACTION_GETPOSITION"], functions.get_position) - client.message_callback_add(Topics["ROBOT_ACTION_GETBATTERY"], functions.get_BatteryStatus) + client.message_callback_add(Topics["ROBOT_ACTION_GETBATTERY"], functions.get_batteryStatus) client.message_callback_add(Topics["ROBOT_ACTION_DRIVEALL"], functions.drive_plant_all) #Subscribe to topics