From ad400b754609db3cdee5cebad3160c5b65f4b7a3 Mon Sep 17 00:00:00 2001 From: anschrammh Date: Sat, 16 Mar 2019 19:44:08 +0100 Subject: [PATCH] Reworking ScreenManager's error handling --- documentation/app_class_diagram.mdj | 562 ++++++++++++++++++++-------- 1 file changed, 399 insertions(+), 163 deletions(-) diff --git a/documentation/app_class_diagram.mdj b/documentation/app_class_diagram.mdj index e74feb4..5db86b7 100644 --- a/documentation/app_class_diagram.mdj +++ b/documentation/app_class_diagram.mdj @@ -237,7 +237,7 @@ "top": 865, "width": 624.67919921875, "height": 13, - "text": "+const getScreenManager(): &ScreenManager", + "text": "+const getScreenManager(): ScreenManager&", "horizontalAlignment": 0 }, { @@ -254,7 +254,7 @@ "top": 880, "width": 624.67919921875, "height": 13, - "text": "+const getRtcManager(): &RTCManager", + "text": "+const getRtcManager(): RTCManager&", "horizontalAlignment": 0 }, { @@ -271,7 +271,7 @@ "top": 895, "width": 624.67919921875, "height": 13, - "text": "+getSdCardManager(): &SDCardManager", + "text": "+getSdCardManager(): SDCardManager&", "horizontalAlignment": 0 }, { @@ -288,7 +288,7 @@ "top": 910, "width": 624.67919921875, "height": 13, - "text": "+getConnectivityManager(): &ConnectivityManager", + "text": "+getConnectivityManager(): ConnectivityManager&", "horizontalAlignment": 0 }, { @@ -640,13 +640,81 @@ "height": 13, "text": "-currentView: ViewLink*", "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAFph7+Hmq103E0=", + "_parent": { + "$ref": "AAAAAAFpHq11g76wgf4=" + }, + "model": { + "$ref": "AAAAAAFph7+HZq1xIXA=" + }, + "font": "Arial;13;0", + "left": 221, + "top": 856, + "width": 523.16748046875, + "height": 13, + "text": "-viewNotFound: ViewLink", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAFph8A2+K4juXs=", + "_parent": { + "$ref": "AAAAAAFpHq11g76wgf4=" + }, + "model": { + "$ref": "AAAAAAFph8A2wK4gaJM=" + }, + "font": "Arial;13;0", + "left": 221, + "top": 871, + "width": 523.16748046875, + "height": 13, + "text": "-viewFuncUndefined: ViewLink", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAFph8DG/q/bGvM=", + "_parent": { + "$ref": "AAAAAAFpHq11g76wgf4=" + }, + "model": { + "$ref": "AAAAAAFph8DGzK/YD+k=" + }, + "font": "Arial;13;0", + "left": 221, + "top": 886, + "width": 523.16748046875, + "height": 13, + "text": "-currentViewUndefined: ViewLink", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAFph8Fp77CKhP8=", + "_parent": { + "$ref": "AAAAAAFpHq11g76wgf4=" + }, + "model": { + "$ref": "AAAAAAFph8Fpt7CHaJU=" + }, + "font": "Arial;13;0", + "left": 221, + "top": 901, + "width": 523.16748046875, + "height": 13, + "text": "-viewFunctionFailedToExecute: ViewLink", + "horizontalAlignment": 0 } ], "font": "Arial;13;0", "left": 216, "top": 761, "width": 533.16748046875, - "height": 98 + "height": 158 }, { "_type": "UMLOperationCompartmentView", @@ -669,10 +737,10 @@ }, "font": "Arial;13;0", "left": 221, - "top": 864, + "top": 924, "width": 523.16748046875, "height": 13, - "text": "#ScreenManager(&display: Adafruit_SSD1306)", + "text": "#ScreenManager(display: Adafruit_SSD1306&)", "horizontalAlignment": 0 }, { @@ -686,7 +754,7 @@ }, "font": "Arial;13;0", "left": 221, - "top": 879, + "top": 939, "width": 523.16748046875, "height": 13, "text": "+addView(*logic_function: boolean, pData: void *, UID: const unsigned char): boolean", @@ -703,7 +771,7 @@ }, "font": "Arial;13;0", "left": 221, - "top": 894, + "top": 954, "width": 523.16748046875, "height": 13, "text": "+removeView(UID: const unsigned char): boolean", @@ -720,12 +788,29 @@ }, "font": "Arial;13;0", "left": 221, - "top": 909, + "top": 969, "width": 523.16748046875, "height": 13, "text": "+displayView(UID: const int = -1): boolean", "horizontalAlignment": 0 }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAFphtpQgmtlS20=", + "_parent": { + "$ref": "AAAAAAFpHq11g76xBiU=" + }, + "model": { + "$ref": "AAAAAAFphtpQVGtity0=" + }, + "font": "Arial;13;0", + "left": 221, + "top": 984, + "width": 523.16748046875, + "height": 13, + "text": "+displayNextView(): boolean", + "horizontalAlignment": 0 + }, { "_type": "UMLOperationView", "_id": "AAAAAAFpHuK2sr8lozM=", @@ -737,7 +822,7 @@ }, "font": "Arial;13;0", "left": 221, - "top": 924, + "top": 999, "width": 523.16748046875, "height": 13, "text": "+invertDisplayColor(inverted: const boolean): void", @@ -754,7 +839,7 @@ }, "font": "Arial;13;0", "left": 221, - "top": 939, + "top": 1014, "width": 523.16748046875, "height": 13, "text": "+orientDisplay(orientation: const Orientation): void", @@ -771,7 +856,7 @@ }, "font": "Arial;13;0", "left": 221, - "top": 954, + "top": 1029, "width": 523.16748046875, "height": 13, "text": "+dimDisplay(dimmed: const boolean): void", @@ -788,7 +873,7 @@ }, "font": "Arial;13;0", "left": 221, - "top": 969, + "top": 1044, "width": 523.16748046875, "height": 13, "text": "+clearDisplay(bufferOnly: boolean = false): void", @@ -805,7 +890,7 @@ }, "font": "Arial;13;0", "left": 221, - "top": 984, + "top": 1059, "width": 523.16748046875, "height": 13, "text": "+const getError(): unsigned char", @@ -822,7 +907,7 @@ }, "font": "Arial;13;0", "left": 221, - "top": 999, + "top": 1074, "width": 523.16748046875, "height": 13, "text": "+const isDisplayColorInverted(): boolean", @@ -839,7 +924,7 @@ }, "font": "Arial;13;0", "left": 221, - "top": 1014, + "top": 1089, "width": 523.16748046875, "height": 13, "text": "+const getDisplayOrientation(): Orientation", @@ -856,7 +941,7 @@ }, "font": "Arial;13;0", "left": 221, - "top": 1029, + "top": 1104, "width": 523.16748046875, "height": 13, "text": "+const isDisplayDimmed(): boolean", @@ -873,10 +958,27 @@ }, "font": "Arial;13;0", "left": 221, - "top": 1044, + "top": 1119, "width": 523.16748046875, "height": 13, - "text": "+const getCurrentView(): ViewLink*", + "text": "+const getCurrentViewUID(): int", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAFphsx7N2cTzvA=", + "_parent": { + "$ref": "AAAAAAFpHq11g76xBiU=" + }, + "model": { + "$ref": "AAAAAAFphsx7GmcQvjI=" + }, + "font": "Arial;13;0", + "left": 221, + "top": 1134, + "width": 523.16748046875, + "height": 13, + "text": "+const getViewCount(): unsigned char", "horizontalAlignment": 0 }, { @@ -890,7 +992,7 @@ }, "font": "Arial;13;0", "left": 221, - "top": 1059, + "top": 1149, "width": 523.16748046875, "height": 13, "text": "-addNewLinkAtTheEnd(viewLinkedList: ViewLinkedList *, viewLink: ViewLink): boolean", @@ -907,7 +1009,7 @@ }, "font": "Arial;13;0", "left": 221, - "top": 1074, + "top": 1164, "width": 523.16748046875, "height": 13, "text": "-createEmptyList(): void *", @@ -924,7 +1026,7 @@ }, "font": "Arial;13;0", "left": 221, - "top": 1089, + "top": 1179, "width": 523.16748046875, "height": 13, "text": "-isListEmpty(ViewLinkedList viewLinkedList): boolean", @@ -941,7 +1043,7 @@ }, "font": "Arial;13;0", "left": 221, - "top": 1104, + "top": 1194, "width": 523.16748046875, "height": 13, "text": "-removeLinkByUID(viewLinkedList: ViewLinkedList *, UID: const unsigned char): boolean", @@ -958,18 +1060,36 @@ }, "font": "Arial;13;0", "left": 221, - "top": 1119, + "top": 1209, "width": 523.16748046875, "height": 13, "text": "-getLinkByUID(viewLinkedList: ViewLinkedList, UID: const unsigned char): ViewLink *", "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAFphuIkfHHsNeU=", + "_parent": { + "$ref": "AAAAAAFpHq11g76xBiU=" + }, + "model": { + "$ref": "AAAAAAFphuIkTXHpnkM=" + }, + "font": "Arial;13;0", + "left": 221, + "top": 1224, + "width": 523.16748046875, + "height": 13, + "underline": true, + "text": "-displayError(display: Adafruit_SSD1306&, pData: void *): boolean", + "horizontalAlignment": 0 } ], "font": "Arial;13;0", "left": 216, - "top": 859, + "top": 919, "width": 533.16748046875, - "height": 278 + "height": 323 }, { "_type": "UMLReceptionCompartmentView", @@ -1009,7 +1129,7 @@ "left": 216, "top": 736, "width": 533.16748046875, - "height": 416, + "height": 506, "nameCompartment": { "$ref": "AAAAAAFpHq11gr6ruDw=" }, @@ -1047,8 +1167,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 815, - "top": 920, + "left": 816, + "top": 944, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -1068,8 +1188,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 816, - "top": 935, + "left": 818, + "top": 959, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -1089,8 +1209,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 812, - "top": 891, + "left": 811, + "top": 915, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -1110,8 +1230,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 854, - "top": 917, + "left": 855, + "top": 938, "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -1131,8 +1251,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 853, - "top": 930, + "left": 855, + "top": 952, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -1152,8 +1272,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 856, - "top": 889, + "left": 855, + "top": 910, "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -1172,8 +1292,8 @@ "$ref": "AAAAAAFpHucSu788r0g=" }, "font": "Arial;13;0", - "left": 760, - "top": 924, + "left": 761, + "top": 949, "width": 94.65625, "height": 13, "alpha": -0.3058788210270264, @@ -1194,8 +1314,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 779, - "top": 937, + "left": 781, + "top": 963, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -1214,8 +1334,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 769, - "top": 897, + "left": 768, + "top": 924, "height": 13, "alpha": 0.5235987755982988, "distance": 25, @@ -1260,7 +1380,7 @@ "$ref": "AAAAAAFpHqCuVb5uVUA=" }, "lineStyle": 1, - "points": "879:906;749:918", + "points": "879:926;749:946", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAFpHucSvL8/DjI=" @@ -3683,8 +3803,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 16, - "top": 448, + "top": 544, "height": 13 }, { @@ -3694,8 +3813,8 @@ "$ref": "AAAAAAFpIVCNABPYowM=" }, "font": "Arial;13;1", - "left": 429, - "top": 1223, + "left": 421, + "top": 1271, "width": 153.55615234375, "height": 13, "text": "ViewLinkedList" @@ -3708,8 +3827,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 16, - "top": 448, + "top": 544, "width": 73.67724609375, "height": 13, "text": "(from Model)" @@ -3722,15 +3840,14 @@ }, "visible": false, "font": "Arial;13;0", - "left": 16, - "top": 448, + "top": 544, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", - "left": 424, - "top": 1216, + "left": 416, + "top": 1264, "width": 163.55615234375, "height": 25, "stereotypeLabel": { @@ -3766,11 +3883,11 @@ "$ref": "AAAAAAFpIVFv0xYYyKo=" }, "font": "Arial;13;0", - "left": 429, - "top": 1246, + "left": 421, + "top": 1294, "width": 153.55615234375, "height": 13, - "text": "+*pData: void", + "text": "-pData: void*", "horizontalAlignment": 0 }, { @@ -3783,11 +3900,11 @@ "$ref": "AAAAAAFpIVHZcha1vLw=" }, "font": "Arial;13;0", - "left": 429, - "top": 1261, + "left": 421, + "top": 1309, "width": 153.55615234375, "height": 13, - "text": "+*logic_function: boolean", + "text": "-logic_function: boolean*", "horizontalAlignment": 0 }, { @@ -3800,11 +3917,11 @@ "$ref": "AAAAAAFpIVKy4BfqLR4=" }, "font": "Arial;13;0", - "left": 429, - "top": 1276, + "left": 421, + "top": 1324, "width": 153.55615234375, "height": 13, - "text": "+UID: const unsigned char", + "text": "-UID: const int", "horizontalAlignment": 0 }, { @@ -3817,17 +3934,17 @@ "$ref": "AAAAAAFpIVL7ehiHAoI=" }, "font": "Arial;13;0", - "left": 429, - "top": 1291, + "left": 421, + "top": 1339, "width": 153.55615234375, "height": 13, - "text": "+next: ViewLink*", + "text": "-next: ViewLink*", "horizontalAlignment": 0 } ], "font": "Arial;13;0", - "left": 424, - "top": 1241, + "left": 416, + "top": 1289, "width": 163.55615234375, "height": 68 }, @@ -3841,8 +3958,8 @@ "$ref": "AAAAAAFpIVCM/xPV/bU=" }, "font": "Arial;13;0", - "left": 424, - "top": 1309, + "left": 416, + "top": 1357, "width": 163.55615234375, "height": 10 }, @@ -3857,8 +3974,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 8, - "top": 224, + "top": 272, "width": 10, "height": 10 }, @@ -3873,16 +3989,15 @@ }, "visible": false, "font": "Arial;13;0", - "left": 8, - "top": 224, + "top": 272, "width": 10, "height": 10 } ], "font": "Arial;13;0", "containerChangeable": true, - "left": 424, - "top": 1216, + "left": 416, + "top": 1264, "width": 163.55615234375, "height": 133, "nameCompartment": { @@ -3922,8 +4037,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 512, - "top": 1176, + "left": 507, + "top": 1244, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -3943,8 +4058,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 527, - "top": 1175, + "left": 522, + "top": 1243, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -3964,8 +4079,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 483, - "top": 1177, + "left": 478, + "top": 1247, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -3985,8 +4100,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 512, - "top": 1170, + "left": 509, + "top": 1261, "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -4006,8 +4121,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 526, - "top": 1172, + "left": 522, + "top": 1262, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -4027,8 +4142,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 484, - "top": 1168, + "left": 481, + "top": 1258, "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -4048,8 +4163,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 513, - "top": 1182, + "left": 507, + "top": 1230, "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -4068,8 +4183,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 526, - "top": 1178, + "left": 520, + "top": 1227, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -4088,8 +4203,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 486, - "top": 1188, + "left": 480, + "top": 1235, "height": 13, "alpha": 0.5235987755982988, "distance": 25, @@ -4134,7 +4249,7 @@ "$ref": "AAAAAAFpHq11gr6quCs=" }, "lineStyle": 1, - "points": "496:1152;500:1215", + "points": "493:1242;494:1263", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAFpIVDGIBS5fjw=" @@ -4688,8 +4803,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 168, - "top": 931, + "left": 167, + "top": 942, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -4709,8 +4824,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 167, - "top": 946, + "left": 165, + "top": 957, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -4730,8 +4845,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 171, - "top": 902, + "left": 172, + "top": 913, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -4749,7 +4864,7 @@ "$ref": "AAAAAAFpHq11gr6quCs=" }, "lineStyle": 1, - "points": "215:926;126:920", + "points": "215:942;126:927", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAFpQ2gCbx60qvc=" @@ -5289,8 +5404,8 @@ "$ref": "AAAAAAFpQ/IawK+pmSI=" }, "font": "Arial;13;0", - "left": 621, - "top": 1181, + "left": 725, + "top": 1253, "width": 116.34619140625, "height": 13, "text": "«enumeration»" @@ -5302,8 +5417,8 @@ "$ref": "AAAAAAFpQ/IawK+pmSI=" }, "font": "Arial;13;1", - "left": 621, - "top": 1196, + "left": 725, + "top": 1268, "width": 116.34619140625, "height": 13, "text": "SizeUnit" @@ -5316,8 +5431,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -1440, - "top": -320, + "left": -1232, + "top": -176, "width": 73.67724609375, "height": 13, "text": "(from Model)" @@ -5330,15 +5445,15 @@ }, "visible": false, "font": "Arial;13;0", - "left": -1440, - "top": -320, + "left": -1232, + "top": -176, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", - "left": 616, - "top": 1176, + "left": 720, + "top": 1248, "width": 126.34619140625, "height": 38, "stereotypeLabel": { @@ -5365,8 +5480,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -720, - "top": -160, + "left": -616, + "top": -88, "width": 10, "height": 10 }, @@ -5381,8 +5496,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -720, - "top": -160, + "left": -616, + "top": -88, "width": 10, "height": 10 }, @@ -5397,8 +5512,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -720, - "top": -160, + "left": -616, + "top": -88, "width": 10, "height": 10 }, @@ -5413,8 +5528,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -720, - "top": -160, + "left": -616, + "top": -88, "width": 10, "height": 10 }, @@ -5438,8 +5553,8 @@ "$ref": "AAAAAAFpQ/J2ebOvHFw=" }, "font": "Arial;13;0", - "left": 621, - "top": 1219, + "left": 725, + "top": 1291, "width": 116.34619140625, "height": 13, "text": "BIT", @@ -5455,8 +5570,8 @@ "$ref": "AAAAAAFpQ/Kj97SIuvc=" }, "font": "Arial;13;0", - "left": 621, - "top": 1234, + "left": 725, + "top": 1306, "width": 116.34619140625, "height": 13, "text": "BYTE", @@ -5472,8 +5587,8 @@ "$ref": "AAAAAAFpQ/KwcLUi39g=" }, "font": "Arial;13;0", - "left": 621, - "top": 1249, + "left": 725, + "top": 1321, "width": 116.34619140625, "height": 13, "text": "KBIT", @@ -5489,8 +5604,8 @@ "$ref": "AAAAAAFpQ/LOy7W8rTg=" }, "font": "Arial;13;0", - "left": 621, - "top": 1264, + "left": 725, + "top": 1336, "width": 116.34619140625, "height": 13, "text": "KBYTE", @@ -5506,8 +5621,8 @@ "$ref": "AAAAAAFpQ/LgwbZWUvU=" }, "font": "Arial;13;0", - "left": 621, - "top": 1279, + "left": 725, + "top": 1351, "width": 116.34619140625, "height": 13, "text": "MBIT", @@ -5523,8 +5638,8 @@ "$ref": "AAAAAAFpQ/OaGbcvMjs=" }, "font": "Arial;13;0", - "left": 621, - "top": 1294, + "left": 725, + "top": 1366, "width": 116.34619140625, "height": 13, "text": "MBYTE", @@ -5540,8 +5655,8 @@ "$ref": "AAAAAAFpQ/Oo4LfJBu8=" }, "font": "Arial;13;0", - "left": 621, - "top": 1309, + "left": 725, + "top": 1381, "width": 116.34619140625, "height": 13, "text": "GBIT", @@ -5557,8 +5672,8 @@ "$ref": "AAAAAAFpQ/O1ALhj/oY=" }, "font": "Arial;13;0", - "left": 621, - "top": 1324, + "left": 725, + "top": 1396, "width": 116.34619140625, "height": 13, "text": "GBYTE", @@ -5566,16 +5681,16 @@ } ], "font": "Arial;13;0", - "left": 616, - "top": 1214, + "left": 720, + "top": 1286, "width": 126.34619140625, "height": 128 } ], "font": "Arial;13;0", "containerChangeable": true, - "left": 616, - "top": 1176, + "left": 720, + "top": 1248, "width": 126.34619140625, "height": 166, "nameCompartment": { @@ -5620,8 +5735,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 859, - "top": 1299, + "left": 913, + "top": 1343, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -5641,8 +5756,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 856, - "top": 1314, + "left": 912, + "top": 1358, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -5662,8 +5777,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 864, - "top": 1270, + "left": 914, + "top": 1314, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -5681,7 +5796,7 @@ "$ref": "AAAAAAFpKneDch8OUuM=" }, "lineStyle": 1, - "points": "983:1313;742:1270", + "points": "983:1338;846:1332", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAFpQ/Pv17tOWK0=" @@ -8231,7 +8346,7 @@ "_parent": { "$ref": "AAAAAAFpHukSSsASC8A=" }, - "type": "&ScreenManager", + "type": "ScreenManager&", "direction": "return" } ] @@ -8250,7 +8365,7 @@ "_parent": { "$ref": "AAAAAAFpHuy+acEXKRg=" }, - "type": "&RTCManager", + "type": "RTCManager&", "direction": "return" } ] @@ -8269,7 +8384,7 @@ "_parent": { "$ref": "AAAAAAFpRAHUOMXUqWA=" }, - "type": "&SDCardManager", + "type": "SDCardManager&", "direction": "return" } ] @@ -8288,7 +8403,7 @@ "_parent": { "$ref": "AAAAAAFpaUokKIo/RjI=" }, - "type": "&ConnectivityManager", + "type": "ConnectivityManager&", "direction": "return" } ] @@ -8520,6 +8635,46 @@ "name": "currentView", "visibility": "private", "type": "ViewLink*" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAFph7+HZq1xIXA=", + "_parent": { + "$ref": "AAAAAAFpHq11gr6oq4M=" + }, + "name": "viewNotFound", + "visibility": "private", + "type": "ViewLink" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAFph8A2wK4gaJM=", + "_parent": { + "$ref": "AAAAAAFpHq11gr6oq4M=" + }, + "name": "viewFuncUndefined", + "visibility": "private", + "type": "ViewLink" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAFph8DGzK/YD+k=", + "_parent": { + "$ref": "AAAAAAFpHq11gr6oq4M=" + }, + "name": "currentViewUndefined", + "visibility": "private", + "type": "ViewLink" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAFph8Fpt7CHaJU=", + "_parent": { + "$ref": "AAAAAAFpHq11gr6oq4M=" + }, + "name": "viewFunctionFailedToExecute", + "visibility": "private", + "type": "ViewLink" } ], "operations": [ @@ -8538,8 +8693,8 @@ "_parent": { "$ref": "AAAAAAFpHq4kf77UUiM=" }, - "name": "&display", - "type": "Adafruit_SSD1306" + "name": "display", + "type": "Adafruit_SSD1306&" } ] }, @@ -8647,6 +8802,25 @@ } ] }, + { + "_type": "UMLOperation", + "_id": "AAAAAAFphtpQVGtity0=", + "_parent": { + "$ref": "AAAAAAFpHq11gr6oq4M=" + }, + "name": "displayNextView", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFphtrXsG7AePw=", + "_parent": { + "$ref": "AAAAAAFphtpQVGtity0=" + }, + "type": "boolean", + "direction": "return" + } + ] + }, { "_type": "UMLOperation", "_id": "AAAAAAFpHuK2fL8ilKQ=", @@ -8844,7 +9018,7 @@ "_parent": { "$ref": "AAAAAAFpHq11gr6oq4M=" }, - "name": "const getCurrentView", + "name": "const getCurrentViewUID", "parameters": [ { "_type": "UMLParameter", @@ -8852,7 +9026,26 @@ "_parent": { "$ref": "AAAAAAFpMOabFFsCl+E=" }, - "type": "ViewLink*", + "type": "int", + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAFphsx7GmcQvjI=", + "_parent": { + "$ref": "AAAAAAFpHq11gr6oq4M=" + }, + "name": "const getViewCount", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFphsz/Lmi119g=", + "_parent": { + "$ref": "AAAAAAFphsx7GmcQvjI=" + }, + "type": "unsigned char", "direction": "return" } ] @@ -9019,6 +9212,45 @@ "type": "const unsigned char" } ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAFphuIkTXHpnkM=", + "_parent": { + "$ref": "AAAAAAFpHq11gr6oq4M=" + }, + "name": "displayError", + "visibility": "private", + "isStatic": true, + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAFphuLCUnJonjU=", + "_parent": { + "$ref": "AAAAAAFphuIkTXHpnkM=" + }, + "name": "display", + "type": "Adafruit_SSD1306&" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAFphuPkOnPrLHs=", + "_parent": { + "$ref": "AAAAAAFphuIkTXHpnkM=" + }, + "type": "boolean", + "direction": "return" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAFph5YGA3yn/2w=", + "_parent": { + "$ref": "AAAAAAFphuIkTXHpnkM=" + }, + "name": "pData", + "type": "void *" + } + ] } ] }, @@ -9803,8 +10035,9 @@ "_parent": { "$ref": "AAAAAAFpIVCM/xPV/bU=" }, - "name": "*pData", - "type": "void" + "name": "pData", + "visibility": "private", + "type": "void*" }, { "_type": "UMLAttribute", @@ -9812,8 +10045,9 @@ "_parent": { "$ref": "AAAAAAFpIVCM/xPV/bU=" }, - "name": "*logic_function", - "type": "boolean" + "name": "logic_function", + "visibility": "private", + "type": "boolean*" }, { "_type": "UMLAttribute", @@ -9822,7 +10056,8 @@ "$ref": "AAAAAAFpIVCM/xPV/bU=" }, "name": "UID", - "type": "const unsigned char" + "visibility": "private", + "type": "const int" }, { "_type": "UMLAttribute", @@ -9831,6 +10066,7 @@ "$ref": "AAAAAAFpIVCM/xPV/bU=" }, "name": "next", + "visibility": "private", "type": "ViewLink*" } ]