diff --git a/documentation/Robot.docx b/documentation/Robot.docx index 84cc016..45c7b27 100644 Binary files a/documentation/Robot.docx and b/documentation/Robot.docx differ diff --git a/documentation/SmartGardeningProjekt.mdj b/documentation/SmartGardeningProjekt.mdj index 9f48c84..557ecd6 100644 --- a/documentation/SmartGardeningProjekt.mdj +++ b/documentation/SmartGardeningProjekt.mdj @@ -4338,9 +4338,9 @@ "$ref": "AAAAAAGHlIPCoOgymiM=" }, "font": "Arial;13;0", - "left": 24.72998046875, + "left": 22.55908203125, "top": 5, - "width": 130.34619140625, + "width": 117.23828125, "height": 13, "text": "Raspy-ev3-nonThread" }, @@ -4353,7 +4353,7 @@ "font": "Arial;13;1", "left": 5, "top": 5, - "width": 14.72998046875, + "width": 12.55908203125, "height": 13, "text": "sd" } @@ -6318,7 +6318,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": -608, + "left": -592, "top": -256, "height": 13 }, @@ -6329,11 +6329,11 @@ "$ref": "AAAAAAGH3D4F4EfA0gE=" }, "font": "Arial;13;1", - "left": 717, + "left": 725, "top": 63, - "width": 348.638671875, + "width": 350.81591796875, "height": 13, - "text": "mainProg" + "text": "RaspberryPi" }, { "_type": "LabelView", @@ -6343,7 +6343,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": -608, + "left": -592, "top": -256, "width": 122.103515625, "height": 13, @@ -6357,16 +6357,16 @@ }, "visible": false, "font": "Arial;13;0", - "left": -608, + "left": -592, "top": -256, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", - "left": 712, + "left": 720, "top": 56, - "width": 358.638671875, + "width": 360.81591796875, "height": 25, "stereotypeLabel": { "$ref": "AAAAAAGH3D4F4EfBrX4=" @@ -6391,9 +6391,9 @@ "$ref": "AAAAAAGH3D4F30e9Sco=" }, "font": "Arial;13;0", - "left": 712, + "left": 720, "top": 81, - "width": 358.638671875, + "width": 360.81591796875, "height": 10 }, { @@ -6406,6 +6406,23 @@ "$ref": "AAAAAAGH3D4F30e9Sco=" }, "subViews": [ + { + "_type": "UMLOperationView", + "_id": "AAAAAAGH+p6r/k7PMs0=", + "_parent": { + "$ref": "AAAAAAGH3D4F4EfGEDY=" + }, + "model": { + "$ref": "AAAAAAGH4UPAXywhJ1c=" + }, + "font": "Arial;13;0", + "left": 725, + "top": 96, + "width": 350.81591796875, + "height": 13, + "text": "+main()", + "horizontalAlignment": 0 + }, { "_type": "UMLOperationView", "_id": "AAAAAAGH3EEdnklV1IQ=", @@ -6416,13 +6433,81 @@ "$ref": "AAAAAAGH3EEdiklS30M=" }, "font": "Arial;13;0", - "left": 717, - "top": 96, - "width": 348.638671875, + "left": 725, + "top": 111, + "width": 350.81591796875, "height": 13, "text": "+on_connect(client: mqtt.Client, userdata, flags, rc)", "horizontalAlignment": 0 }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGH3EMsP0qKNik=", + "_parent": { + "$ref": "AAAAAAGH3D4F4EfGEDY=" + }, + "model": { + "$ref": "AAAAAAGH3EMsNkqHBBI=" + }, + "font": "Arial;13;0", + "left": 725, + "top": 126, + "width": 350.81591796875, + "height": 13, + "text": "+drive_plant(client: mqtt.Client, userdata, message)", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGJAjEaaNNKq+I=", + "_parent": { + "$ref": "AAAAAAGH3D4F4EfGEDY=" + }, + "model": { + "$ref": "AAAAAAGJAjEaTtNHMvw=" + }, + "font": "Arial;13;0", + "left": 725, + "top": 141, + "width": 350.81591796875, + "height": 13, + "text": "+drive_plant_all(client: mqtt.Client, userdata, message)", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGH3EMxmEqrhPw=", + "_parent": { + "$ref": "AAAAAAGH3D4F4EfGEDY=" + }, + "model": { + "$ref": "AAAAAAGH3EMxj0qorZA=" + }, + "font": "Arial;13;0", + "left": 725, + "top": 156, + "width": 350.81591796875, + "height": 13, + "text": "+get_position(client: mqtt.Client, userdata, message)", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGH3EM1FErMeLs=", + "_parent": { + "$ref": "AAAAAAGH3D4F4EfGEDY=" + }, + "model": { + "$ref": "AAAAAAGH3EM1BkrJ200=" + }, + "font": "Arial;13;0", + "left": 725, + "top": 171, + "width": 350.81591796875, + "height": 13, + "text": "+get_batteryStatus(client: mqtt.Client, userdata, message)", + "horizontalAlignment": 0 + }, { "_type": "UMLOperationView", "_id": "AAAAAAGH3EHqDUmyKrk=", @@ -6433,9 +6518,9 @@ "$ref": "AAAAAAGH3EHqAkmvWqg=" }, "font": "Arial;13;0", - "left": 717, - "top": 111, - "width": 348.638671875, + "left": 725, + "top": 186, + "width": 350.81591796875, "height": 13, "text": "+measure_send_data(plantID, actionID, client: mqtt.Client)", "horizontalAlignment": 0 @@ -6450,87 +6535,36 @@ "$ref": "AAAAAAGH3EKFmkov2/Y=" }, "font": "Arial;13;0", - "left": 717, - "top": 126, - "width": 348.638671875, + "left": 725, + "top": 201, + "width": 350.81591796875, "height": 13, "text": "+drive_plant_thread(plantID, actionID, client: mqtt.Client)", "horizontalAlignment": 0 }, { "_type": "UMLOperationView", - "_id": "AAAAAAGH3EMsP0qKNik=", + "_id": "AAAAAAGJAjP+uxp0WeA=", "_parent": { "$ref": "AAAAAAGH3D4F4EfGEDY=" }, "model": { - "$ref": "AAAAAAGH3EMsNkqHBBI=" + "$ref": "AAAAAAGJAjP+sRpxSo8=" }, "font": "Arial;13;0", - "left": 717, - "top": 141, - "width": 348.638671875, + "left": 725, + "top": 216, + "width": 350.81591796875, "height": 13, - "text": "+drive_plant(clients: mqtt.Client, userdata, message)", - "horizontalAlignment": 0 - }, - { - "_type": "UMLOperationView", - "_id": "AAAAAAGH3EMxmEqrhPw=", - "_parent": { - "$ref": "AAAAAAGH3D4F4EfGEDY=" - }, - "model": { - "$ref": "AAAAAAGH3EMxj0qorZA=" - }, - "font": "Arial;13;0", - "left": 717, - "top": 156, - "width": 348.638671875, - "height": 13, - "text": "+get_position(clients: mqtt.Client, userdata, message)", - "horizontalAlignment": 0 - }, - { - "_type": "UMLOperationView", - "_id": "AAAAAAGH3EM1FErMeLs=", - "_parent": { - "$ref": "AAAAAAGH3D4F4EfGEDY=" - }, - "model": { - "$ref": "AAAAAAGH3EM1BkrJ200=" - }, - "font": "Arial;13;0", - "left": 717, - "top": 171, - "width": 348.638671875, - "height": 13, - "text": "+get_batteryStatus(clients: mqtt.Clients, userdata, message)", - "horizontalAlignment": 0 - }, - { - "_type": "UMLOperationView", - "_id": "AAAAAAGH+p6r/k7PMs0=", - "_parent": { - "$ref": "AAAAAAGH3D4F4EfGEDY=" - }, - "model": { - "$ref": "AAAAAAGH4UPAXywhJ1c=" - }, - "font": "Arial;13;0", - "left": 717, - "top": 186, - "width": 348.638671875, - "height": 13, - "text": "+main()", + "text": "+drive_plant_all_thread(plantIDs, actionID, client: mqtt.client)", "horizontalAlignment": 0 } ], "font": "Arial;13;0", - "left": 712, + "left": 720, "top": 91, - "width": 358.638671875, - "height": 113 + "width": 360.81591796875, + "height": 143 }, { "_type": "UMLReceptionCompartmentView", @@ -6543,7 +6577,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": -304, + "left": -296, "top": -128, "width": 10, "height": 10 @@ -6559,7 +6593,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": -304, + "left": -296, "top": -128, "width": 10, "height": 10 @@ -6567,9 +6601,9 @@ ], "font": "Arial;13;0", "containerChangeable": true, - "left": 712, + "left": 720, "top": 56, - "width": 358.638671875, + "width": 360.81591796875, "height": 264, "nameCompartment": { "$ref": "AAAAAAGH3D4F4EfA0gE=" @@ -6955,8 +6989,8 @@ "$ref": "AAAAAAGH3ECZX0hH3WI=" }, "font": "Arial;13;0", - "left": 904, - "top": 375, + "left": 909, + "top": 377, "width": 128.25439453125, "height": 13, "alpha": 1.5664535923283518, @@ -6978,7 +7012,7 @@ }, "visible": null, "font": "Arial;13;0", - "left": 924, + "left": 928, "top": 376, "height": 13, "alpha": 1.5707963267948966, @@ -6999,7 +7033,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 880, + "left": 884, "top": 377, "height": 13, "alpha": -1.5707963267948966, @@ -7020,8 +7054,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 908, - "top": 339, + "left": 914, + "top": 338, "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -7041,7 +7075,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 922, + "left": 927, "top": 341, "height": 13, "alpha": 0.7853981633974483, @@ -7062,8 +7096,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 881, - "top": 336, + "left": 886, + "top": 334, "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -7083,8 +7117,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 911, - "top": 414, + "left": 914, + "top": 416, "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -7103,8 +7137,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 924, - "top": 411, + "left": 927, + "top": 413, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -7123,8 +7157,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 883, - "top": 419, + "left": 886, + "top": 420, "height": 13, "alpha": 0.5235987755982988, "distance": 25, @@ -7168,8 +7202,7 @@ "tail": { "$ref": "AAAAAAGH3D4F4Ee/GtY=" }, - "lineStyle": 1, - "points": "893:320;897:447", + "points": "899:319;899:448", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGH3ECZYUhMvEs=" @@ -7226,7 +7259,7 @@ "$ref": "AAAAAAGH3EWJ9U0ew3A=" }, "font": "Arial;13;0", - "left": 596, + "left": 600, "top": 96, "width": 76.2099609375, "height": 13, @@ -7249,7 +7282,7 @@ }, "visible": null, "font": "Arial;13;0", - "left": 635, + "left": 639, "top": 52, "height": 13, "alpha": 1.5707963267948966, @@ -7270,7 +7303,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 635, + "left": 639, "top": 97, "height": 13, "alpha": -1.5707963267948966, @@ -7354,7 +7387,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 686, + "left": 694, "top": 67, "height": 13, "alpha": -0.5235987755982988, @@ -7374,7 +7407,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 683, + "left": 691, "top": 53, "height": 13, "alpha": -0.7853981633974483, @@ -7394,7 +7427,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 690, + "left": 698, "top": 94, "height": 13, "alpha": 0.5235987755982988, @@ -7439,7 +7472,7 @@ "tail": { "$ref": "AAAAAAGH3D3wxkeVQAs=" }, - "points": "559:88;712:88", + "points": "559:88;720:88", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGH3EWJ9k0jsD0=" @@ -7496,7 +7529,7 @@ "$ref": "AAAAAAGH3EYx3k99YDU=" }, "font": "Arial;13;0", - "left": 578, + "left": 582, "top": 193, "width": 112.3662109375, "height": 13, @@ -7519,7 +7552,7 @@ }, "visible": null, "font": "Arial;13;0", - "left": 634, + "left": 638, "top": 208, "height": 13, "alpha": 1.5707963267948966, @@ -7540,7 +7573,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 635, + "left": 639, "top": 163, "height": 13, "alpha": -1.5707963267948966, @@ -7561,7 +7594,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 686, + "left": 694, "top": 192, "height": 13, "alpha": 0.5235987755982988, @@ -7582,7 +7615,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 683, + "left": 691, "top": 206, "height": 13, "alpha": 0.7853981633974483, @@ -7603,7 +7636,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 690, + "left": 698, "top": 165, "height": 13, "alpha": -0.5235987755982988, @@ -7709,7 +7742,7 @@ "tail": { "$ref": "AAAAAAGH3D4F4Ee/GtY=" }, - "points": "712:184;559:184", + "points": "720:184;559:184", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGH3EYx30+CpXk=" @@ -7766,8 +7799,8 @@ "$ref": "AAAAAAGH3EatplK6g08=" }, "font": "Arial;13;0", - "left": 588, - "top": 257, + "left": 592, + "top": 225, "width": 92.12353515625, "height": 13, "alpha": 1.5707963267948966, @@ -7789,8 +7822,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 634, - "top": 272, + "left": 638, + "top": 240, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -7810,8 +7843,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 635, - "top": 227, + "left": 639, + "top": 195, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -7831,8 +7864,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 686, - "top": 256, + "left": 694, + "top": 224, "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -7852,8 +7885,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 683, - "top": 270, + "left": 691, + "top": 238, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -7873,8 +7906,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 690, - "top": 229, + "left": 698, + "top": 197, "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -7895,7 +7928,7 @@ "visible": false, "font": "Arial;13;0", "left": 584, - "top": 256, + "top": 224, "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -7915,7 +7948,7 @@ "visible": false, "font": "Arial;13;0", "left": 587, - "top": 270, + "top": 238, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -7935,7 +7968,7 @@ "visible": false, "font": "Arial;13;0", "left": 580, - "top": 229, + "top": 197, "height": 13, "alpha": 0.5235987755982988, "distance": 25, @@ -7979,7 +8012,7 @@ "tail": { "$ref": "AAAAAAGH3D4F4Ee/GtY=" }, - "points": "712:248;559:248", + "points": "720:216;559:216", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGH3Eatp1K/1Gk=" @@ -8036,8 +8069,8 @@ "$ref": "AAAAAAGH3Eb/CliGY9g=" }, "font": "Arial;13;0", - "left": 591, - "top": 289, + "left": 595, + "top": 257, "width": 87.05810546875, "height": 13, "alpha": 1.5707963267948966, @@ -8059,8 +8092,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 634, - "top": 304, + "left": 638, + "top": 272, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -8080,8 +8113,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 635, - "top": 259, + "left": 639, + "top": 227, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -8101,8 +8134,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 686, - "top": 288, + "left": 694, + "top": 256, "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -8122,8 +8155,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 683, - "top": 302, + "left": 691, + "top": 270, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -8143,8 +8176,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 690, - "top": 261, + "left": 698, + "top": 229, "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -8165,7 +8198,7 @@ "visible": false, "font": "Arial;13;0", "left": 584, - "top": 288, + "top": 256, "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -8185,7 +8218,7 @@ "visible": false, "font": "Arial;13;0", "left": 587, - "top": 302, + "top": 270, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -8205,7 +8238,7 @@ "visible": false, "font": "Arial;13;0", "left": 580, - "top": 261, + "top": 229, "height": 13, "alpha": 0.5235987755982988, "distance": 25, @@ -8249,7 +8282,7 @@ "tail": { "$ref": "AAAAAAGH3D4F4Ee/GtY=" }, - "points": "712:280;559:280", + "points": "720:248;559:248", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGH3Eb/CliL9oQ=" @@ -9926,7 +9959,7 @@ "$ref": "AAAAAAGH3EsB6JzZhr0=" }, "font": "Arial;13;0", - "left": 599, + "left": 603, "top": 127, "width": 74.03271484375, "height": 13, @@ -9949,7 +9982,7 @@ }, "visible": null, "font": "Arial;13;0", - "left": 635, + "left": 639, "top": 84, "height": 13, "alpha": 1.5707963267948966, @@ -9970,7 +10003,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 635, + "left": 639, "top": 129, "height": 13, "alpha": -1.5707963267948966, @@ -10054,7 +10087,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 686, + "left": 694, "top": 99, "height": 13, "alpha": -0.5235987755982988, @@ -10074,7 +10107,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 683, + "left": 691, "top": 85, "height": 13, "alpha": -0.7853981633974483, @@ -10094,7 +10127,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 690, + "left": 698, "top": 126, "height": 13, "alpha": 0.5235987755982988, @@ -10139,7 +10172,7 @@ "tail": { "$ref": "AAAAAAGH3D3wxkeVQAs=" }, - "points": "559:120;712:120", + "points": "559:120;720:120", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGH3EsB6JzesLE=" @@ -10465,57 +10498,6 @@ "$ref": "AAAAAAGH3FRA/NhynDA=" }, "subViews": [ - { - "_type": "UMLOperationView", - "_id": "AAAAAAGH3FSgo9+xxLw=", - "_parent": { - "$ref": "AAAAAAGH3FRA/Nh7pww=" - }, - "model": { - "$ref": "AAAAAAGH3FSgmd+KRe4=" - }, - "font": "Arial;13;0", - "left": 1189, - "top": 96, - "width": 206, - "height": 13, - "text": "+readSesnors(sensorData)", - "horizontalAlignment": 0 - }, - { - "_type": "UMLOperationView", - "_id": "AAAAAAGH3FUGVeMc98Q=", - "_parent": { - "$ref": "AAAAAAGH3FRA/Nh7pww=" - }, - "model": { - "$ref": "AAAAAAGH3FUGTeL1xTE=" - }, - "font": "Arial;13;0", - "left": 1189, - "top": 111, - "width": 206, - "height": 13, - "text": "+takePicture()", - "horizontalAlignment": 0 - }, - { - "_type": "UMLOperationView", - "_id": "AAAAAAGH3FWOTebQ3/4=", - "_parent": { - "$ref": "AAAAAAGH3FRA/Nh7pww=" - }, - "model": { - "$ref": "AAAAAAGH3FWOReapIIQ=" - }, - "font": "Arial;13;0", - "left": 1189, - "top": 126, - "width": 206, - "height": 13, - "text": "+readPosition(): Position", - "horizontalAlignment": 0 - }, { "_type": "UMLOperationView", "_id": "AAAAAAGH+qKUBnXhbaw=", @@ -10527,7 +10509,7 @@ }, "font": "Arial;13;0", "left": 1189, - "top": 141, + "top": 96, "width": 206, "height": 13, "text": "+readDHT22(): float; float", @@ -10544,7 +10526,7 @@ }, "font": "Arial;13;0", "left": 1189, - "top": 156, + "top": 111, "width": 206, "height": 13, "text": "+readTSL2561(): int", @@ -10561,11 +10543,62 @@ }, "font": "Arial;13;0", "left": 1189, - "top": 171, + "top": 126, "width": 206, "height": 13, "text": "+readMCP3008(): float", "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGH3FSgo9+xxLw=", + "_parent": { + "$ref": "AAAAAAGH3FRA/Nh7pww=" + }, + "model": { + "$ref": "AAAAAAGH3FSgmd+KRe4=" + }, + "font": "Arial;13;0", + "left": 1189, + "top": 141, + "width": 206, + "height": 13, + "text": "+readSesnors(sensorData)", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGH3FUGVeMc98Q=", + "_parent": { + "$ref": "AAAAAAGH3FRA/Nh7pww=" + }, + "model": { + "$ref": "AAAAAAGH3FUGTeL1xTE=" + }, + "font": "Arial;13;0", + "left": 1189, + "top": 156, + "width": 206, + "height": 13, + "text": "+takePicture()", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAGH3FWOTebQ3/4=", + "_parent": { + "$ref": "AAAAAAGH3FRA/Nh7pww=" + }, + "model": { + "$ref": "AAAAAAGH3FWOReapIIQ=" + }, + "font": "Arial;13;0", + "left": 1189, + "top": 171, + "width": 206, + "height": 13, + "text": "+readPosition(): Position", + "horizontalAlignment": 0 } ], "font": "Arial;13;0", @@ -10648,7 +10681,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1127, + "left": 1132, "top": 166, "height": 13, "alpha": 1.5707963267948966, @@ -10669,7 +10702,7 @@ }, "visible": null, "font": "Arial;13;0", - "left": 1127, + "left": 1132, "top": 151, "height": 13, "alpha": 1.5707963267948966, @@ -10690,7 +10723,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1127, + "left": 1132, "top": 196, "height": 13, "alpha": -1.5707963267948966, @@ -10711,7 +10744,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1095, + "left": 1105, "top": 166, "height": 13, "alpha": 0.5235987755982988, @@ -10732,7 +10765,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1098, + "left": 1108, "top": 152, "height": 13, "alpha": 0.7853981633974483, @@ -10753,7 +10786,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1091, + "left": 1101, "top": 193, "height": 13, "alpha": -0.5235987755982988, @@ -10859,7 +10892,7 @@ "tail": { "$ref": "AAAAAAGH3D4F4Ee/GtY=" }, - "points": "1070:187;1184:187", + "points": "1080:187;1184:187", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGH3FctbPiiqUo=" @@ -10895,6 +10928,276 @@ "headQualifiersCompartment": { "$ref": "AAAAAAGH3Fctbfis1gE=" } + }, + { + "_type": "UMLAssociationView", + "_id": "AAAAAAGJAjaSWjsAsQM=", + "_parent": { + "$ref": "AAAAAAGH3D2ih0dlqTY=" + }, + "model": { + "$ref": "AAAAAAGJAjaSWjr8YY4=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGJAjaSWjsBE54=", + "_parent": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + }, + "model": { + "$ref": "AAAAAAGJAjaSWjr8YY4=" + }, + "font": "Arial;13;0", + "left": 599, + "top": 289, + "width": 79.85986328125, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + }, + "edgePosition": 1, + "text": "+RobotReady" + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGJAjaSWjsCNhg=", + "_parent": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + }, + "model": { + "$ref": "AAAAAAGJAjaSWjr8YY4=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 638, + "top": 304, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGJAjaSWjsDTLA=", + "_parent": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + }, + "model": { + "$ref": "AAAAAAGJAjaSWjr8YY4=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 639, + "top": 259, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGJAjaSWjsELCE=", + "_parent": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + }, + "model": { + "$ref": "AAAAAAGJAjaSWjr9Ajc=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 694, + "top": 288, + "height": 13, + "alpha": 0.5235987755982988, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + }, + "edgePosition": 2 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGJAjaSWjsFcKg=", + "_parent": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + }, + "model": { + "$ref": "AAAAAAGJAjaSWjr9Ajc=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 691, + "top": 302, + "height": 13, + "alpha": 0.7853981633974483, + "distance": 40, + "hostEdge": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + }, + "edgePosition": 2 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGJAjaSWjsGSAE=", + "_parent": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + }, + "model": { + "$ref": "AAAAAAGJAjaSWjr9Ajc=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 698, + "top": 261, + "height": 13, + "alpha": -0.5235987755982988, + "distance": 25, + "hostEdge": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + }, + "edgePosition": 2 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGJAjaSWjsHdU0=", + "_parent": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + }, + "model": { + "$ref": "AAAAAAGJAjaSWjr+0f8=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 584, + "top": 288, + "height": 13, + "alpha": -0.5235987755982988, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + } + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGJAjaSWjsI0OA=", + "_parent": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + }, + "model": { + "$ref": "AAAAAAGJAjaSWjr+0f8=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 587, + "top": 302, + "height": 13, + "alpha": -0.7853981633974483, + "distance": 40, + "hostEdge": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + } + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGJAjaSWjsJxvo=", + "_parent": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + }, + "model": { + "$ref": "AAAAAAGJAjaSWjr+0f8=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 580, + "top": 261, + "height": 13, + "alpha": 0.5235987755982988, + "distance": 25, + "hostEdge": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + } + }, + { + "_type": "UMLQualifierCompartmentView", + "_id": "AAAAAAGJAjaSWjsK960=", + "_parent": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + }, + "model": { + "$ref": "AAAAAAGJAjaSWjr9Ajc=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 10, + "height": 10 + }, + { + "_type": "UMLQualifierCompartmentView", + "_id": "AAAAAAGJAjaSWjsLVBM=", + "_parent": { + "$ref": "AAAAAAGJAjaSWjsAsQM=" + }, + "model": { + "$ref": "AAAAAAGJAjaSWjr+0f8=" + }, + "visible": false, + "font": "Arial;13;0", + "width": 10, + "height": 10 + } + ], + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAGH3D3wxkeVQAs=" + }, + "tail": { + "$ref": "AAAAAAGH3D4F4Ee/GtY=" + }, + "points": "720:280;559:280", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGJAjaSWjsBE54=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGJAjaSWjsCNhg=" + }, + "propertyLabel": { + "$ref": "AAAAAAGJAjaSWjsDTLA=" + }, + "showEndOrder": "hide", + "tailRoleNameLabel": { + "$ref": "AAAAAAGJAjaSWjsELCE=" + }, + "tailPropertyLabel": { + "$ref": "AAAAAAGJAjaSWjsFcKg=" + }, + "tailMultiplicityLabel": { + "$ref": "AAAAAAGJAjaSWjsGSAE=" + }, + "headRoleNameLabel": { + "$ref": "AAAAAAGJAjaSWjsHdU0=" + }, + "headPropertyLabel": { + "$ref": "AAAAAAGJAjaSWjsI0OA=" + }, + "headMultiplicityLabel": { + "$ref": "AAAAAAGJAjaSWjsJxvo=" + }, + "tailQualifiersCompartment": { + "$ref": "AAAAAAGJAjaSWjsK960=" + }, + "headQualifiersCompartment": { + "$ref": "AAAAAAGJAjaSWjsLVBM=" + } } ] }, @@ -11156,7 +11459,7 @@ "_parent": { "$ref": "AAAAAAGH3D2ih0dk35I=" }, - "name": "mainProg", + "name": "RaspberryPi", "ownedElements": [ { "_type": "UMLAssociation", @@ -11354,9 +11657,46 @@ "$ref": "AAAAAAGH3D4gT0fn5xE=" } } + }, + { + "_type": "UMLAssociation", + "_id": "AAAAAAGJAjaSWjr8YY4=", + "_parent": { + "$ref": "AAAAAAGH3D4F30e9Sco=" + }, + "name": "RobotReady", + "end1": { + "_type": "UMLAssociationEnd", + "_id": "AAAAAAGJAjaSWjr9Ajc=", + "_parent": { + "$ref": "AAAAAAGJAjaSWjr8YY4=" + }, + "reference": { + "$ref": "AAAAAAGH3D4F30e9Sco=" + } + }, + "end2": { + "_type": "UMLAssociationEnd", + "_id": "AAAAAAGJAjaSWjr+0f8=", + "_parent": { + "$ref": "AAAAAAGJAjaSWjr8YY4=" + }, + "reference": { + "$ref": "AAAAAAGH3D3wxUeT3SY=" + }, + "navigable": "navigable" + } } ], "operations": [ + { + "_type": "UMLOperation", + "_id": "AAAAAAGH4UPAXywhJ1c=", + "_parent": { + "$ref": "AAAAAAGH3D4F30e9Sco=" + }, + "name": "main" + }, { "_type": "UMLOperation", "_id": "AAAAAAGH3EEdiklS30M=", @@ -11403,6 +11743,146 @@ } ] }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGH3EMsNkqHBBI=", + "_parent": { + "$ref": "AAAAAAGH3D4F30e9Sco=" + }, + "name": "drive_plant", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGH3EQYB0slB0A=", + "_parent": { + "$ref": "AAAAAAGH3EMsNkqHBBI=" + }, + "name": "client", + "type": "mqtt.Client" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGH3EQYB0smfc8=", + "_parent": { + "$ref": "AAAAAAGH3EMsNkqHBBI=" + }, + "name": "userdata" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGH3EQYB0snvXM=", + "_parent": { + "$ref": "AAAAAAGH3EMsNkqHBBI=" + }, + "name": "message" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGJAjEaTtNHMvw=", + "_parent": { + "$ref": "AAAAAAGH3D4F30e9Sco=" + }, + "name": "drive_plant_all", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGJAjMZdQyKPBc=", + "_parent": { + "$ref": "AAAAAAGJAjEaTtNHMvw=" + }, + "name": "client", + "type": "mqtt.Client" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGJAjMZdgyLcsA=", + "_parent": { + "$ref": "AAAAAAGJAjEaTtNHMvw=" + }, + "name": "userdata" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGJAjMZdgyMJVg=", + "_parent": { + "$ref": "AAAAAAGJAjEaTtNHMvw=" + }, + "name": "message" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGH3EMxj0qorZA=", + "_parent": { + "$ref": "AAAAAAGH3D4F30e9Sco=" + }, + "name": "get_position", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGH3ER1dEtcsG8=", + "_parent": { + "$ref": "AAAAAAGH3EMxj0qorZA=" + }, + "name": "client", + "type": "mqtt.Client" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGH3ER1dUtde8A=", + "_parent": { + "$ref": "AAAAAAGH3EMxj0qorZA=" + }, + "name": "userdata" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGH3ER1dUte0IY=", + "_parent": { + "$ref": "AAAAAAGH3EMxj0qorZA=" + }, + "name": "message" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGH3EM1BkrJ200=", + "_parent": { + "$ref": "AAAAAAGH3D4F30e9Sco=" + }, + "name": "get_batteryStatus", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGH3EUSq0uat1w=", + "_parent": { + "$ref": "AAAAAAGH3EM1BkrJ200=" + }, + "name": "client", + "type": "mqtt.Client" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGH3EUSq0ubRjk=", + "_parent": { + "$ref": "AAAAAAGH3EM1BkrJ200=" + }, + "name": "userdata" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGH3EUSq0ucxCM=", + "_parent": { + "$ref": "AAAAAAGH3EM1BkrJ200=" + }, + "name": "message" + } + ] + }, { "_type": "UMLOperation", "_id": "AAAAAAGH3EHqAkmvWqg=", @@ -11479,122 +11959,40 @@ }, { "_type": "UMLOperation", - "_id": "AAAAAAGH3EMsNkqHBBI=", + "_id": "AAAAAAGJAjP+sRpxSo8=", "_parent": { "$ref": "AAAAAAGH3D4F30e9Sco=" }, - "name": "drive_plant", + "name": "drive_plant_all_thread", "parameters": [ { "_type": "UMLParameter", - "_id": "AAAAAAGH3EQYB0slB0A=", + "_id": "AAAAAAGJAjSFPBvXncs=", "_parent": { - "$ref": "AAAAAAGH3EMsNkqHBBI=" + "$ref": "AAAAAAGJAjP+sRpxSo8=" }, - "name": "clients", - "type": "mqtt.Client" - }, - { - "_type": "UMLParameter", - "_id": "AAAAAAGH3EQYB0smfc8=", - "_parent": { - "$ref": "AAAAAAGH3EMsNkqHBBI=" - }, - "name": "userdata", + "name": "plantIDs", "type": "" }, { "_type": "UMLParameter", - "_id": "AAAAAAGH3EQYB0snvXM=", + "_id": "AAAAAAGJAjSFPBvYwX8=", "_parent": { - "$ref": "AAAAAAGH3EMsNkqHBBI=" + "$ref": "AAAAAAGJAjP+sRpxSo8=" }, - "name": "message", + "name": "actionID", "type": "" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGJAjSFPBvZ/QY=", + "_parent": { + "$ref": "AAAAAAGJAjP+sRpxSo8=" + }, + "name": "client", + "type": "mqtt.client" } ] - }, - { - "_type": "UMLOperation", - "_id": "AAAAAAGH3EMxj0qorZA=", - "_parent": { - "$ref": "AAAAAAGH3D4F30e9Sco=" - }, - "name": "get_position", - "parameters": [ - { - "_type": "UMLParameter", - "_id": "AAAAAAGH3ER1dEtcsG8=", - "_parent": { - "$ref": "AAAAAAGH3EMxj0qorZA=" - }, - "name": "clients", - "type": "mqtt.Client" - }, - { - "_type": "UMLParameter", - "_id": "AAAAAAGH3ER1dUtde8A=", - "_parent": { - "$ref": "AAAAAAGH3EMxj0qorZA=" - }, - "name": "userdata", - "type": "" - }, - { - "_type": "UMLParameter", - "_id": "AAAAAAGH3ER1dUte0IY=", - "_parent": { - "$ref": "AAAAAAGH3EMxj0qorZA=" - }, - "name": "message", - "type": "" - } - ] - }, - { - "_type": "UMLOperation", - "_id": "AAAAAAGH3EM1BkrJ200=", - "_parent": { - "$ref": "AAAAAAGH3D4F30e9Sco=" - }, - "name": "get_batteryStatus", - "parameters": [ - { - "_type": "UMLParameter", - "_id": "AAAAAAGH3EUSq0uat1w=", - "_parent": { - "$ref": "AAAAAAGH3EM1BkrJ200=" - }, - "name": "clients", - "type": "mqtt.Clients" - }, - { - "_type": "UMLParameter", - "_id": "AAAAAAGH3EUSq0ubRjk=", - "_parent": { - "$ref": "AAAAAAGH3EM1BkrJ200=" - }, - "name": "userdata", - "type": "" - }, - { - "_type": "UMLParameter", - "_id": "AAAAAAGH3EUSq0ucxCM=", - "_parent": { - "$ref": "AAAAAAGH3EM1BkrJ200=" - }, - "name": "message", - "type": "" - } - ] - }, - { - "_type": "UMLOperation", - "_id": "AAAAAAGH4UPAXywhJ1c=", - "_parent": { - "$ref": "AAAAAAGH3D4F30e9Sco=" - }, - "name": "main" } ] }, @@ -11757,51 +12155,6 @@ } ], "operations": [ - { - "_type": "UMLOperation", - "_id": "AAAAAAGH3FSgmd+KRe4=", - "_parent": { - "$ref": "AAAAAAGH3FRA/NhynDA=" - }, - "name": "readSesnors", - "parameters": [ - { - "_type": "UMLParameter", - "_id": "AAAAAAGH3FT4FeDVImY=", - "_parent": { - "$ref": "AAAAAAGH3FSgmd+KRe4=" - }, - "name": "sensorData" - } - ] - }, - { - "_type": "UMLOperation", - "_id": "AAAAAAGH3FUGTeL1xTE=", - "_parent": { - "$ref": "AAAAAAGH3FRA/NhynDA=" - }, - "name": "takePicture" - }, - { - "_type": "UMLOperation", - "_id": "AAAAAAGH3FWOReapIIQ=", - "_parent": { - "$ref": "AAAAAAGH3FRA/NhynDA=" - }, - "name": "readPosition", - "parameters": [ - { - "_type": "UMLParameter", - "_id": "AAAAAAGH3FXRr+f18WA=", - "_parent": { - "$ref": "AAAAAAGH3FWOReapIIQ=" - }, - "type": "Position", - "direction": "return" - } - ] - }, { "_type": "UMLOperation", "_id": "AAAAAAGH+qAzBm5mP44=", @@ -11858,6 +12211,52 @@ "direction": "return" } ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGH3FSgmd+KRe4=", + "_parent": { + "$ref": "AAAAAAGH3FRA/NhynDA=" + }, + "name": "readSesnors", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGH3FT4FeDVImY=", + "_parent": { + "$ref": "AAAAAAGH3FSgmd+KRe4=" + }, + "name": "sensorData", + "type": "" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGH3FUGTeL1xTE=", + "_parent": { + "$ref": "AAAAAAGH3FRA/NhynDA=" + }, + "name": "takePicture" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGH3FWOReapIIQ=", + "_parent": { + "$ref": "AAAAAAGH3FRA/NhynDA=" + }, + "name": "readPosition", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGH3FXRr+f18WA=", + "_parent": { + "$ref": "AAAAAAGH3FWOReapIIQ=" + }, + "type": "Position", + "direction": "return" + } + ] } ] } diff --git a/software/roboter/raspy/functions.py b/software/roboter/raspy/functions.py index b38806e..267abbb 100644 --- a/software/roboter/raspy/functions.py +++ b/software/roboter/raspy/functions.py @@ -249,7 +249,7 @@ def drive_plant_all(client: mqtt.Client, userdata, message: mqtt.MQTTMessage): thread.start() -def get_position(clients: mqtt.Client, userdata, message: mqtt.MQTTMessage): +def get_position(client: mqtt.Client, userdata, message: mqtt.MQTTMessage): """ Callback function for GPS position request Function to send actual GPS position via MQTT in form of POSITION @@ -267,7 +267,7 @@ def get_position(clients: mqtt.Client, userdata, message: mqtt.MQTTMessage): "Position": "" } - clients.publish(Topics["ROBOT_DATA_POSITION"], json.dumps(position, indent=4), qos=1) + client.publish(Topics["ROBOT_DATA_POSITION"], json.dumps(position, indent=4), qos=1) def get_batteryStatus(client: mqtt.Client, userdata, message: mqtt.MQTTMessage):