Th3maz1ng/ESP8266_swiss_army_board
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor changes

Browse Source
This commit is contained in:
anschrammh 2019-03-16 22:39:24 +01:00
parent 87983cb00e
commit 420c0a3fab
2 changed files with 52 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
documentation/app_class_diagram.mdj
View File

@ -3803,7 +3803,8 @@
}, },
"visible": false, "visible": false,
"font": "Arial;13;0", "font": "Arial;13;0",
"top": 544, "left": -16,
"top": 656,
"height": 13 "height": 13
}, },
{ {
@ -3813,8 +3814,8 @@
"$ref": "AAAAAAFpIVCNABPYowM=" "$ref": "AAAAAAFpIVCNABPYowM="
}, },
"font": "Arial;13;1", "font": "Arial;13;1",
"left": 421, "left": 413,
"top": 1271, "top": 1327,
"width": 153.55615234375, "width": 153.55615234375,
"height": 13, "height": 13,
"text": "ViewLinkedList" "text": "ViewLinkedList"
@ -3827,7 +3828,8 @@
}, },
"visible": false, "visible": false,
"font": "Arial;13;0", "font": "Arial;13;0",
"top": 544, "left": -16,
"top": 656,
"width": 73.67724609375, "width": 73.67724609375,
"height": 13, "height": 13,
"text": "(from Model)" "text": "(from Model)"
@ -3840,14 +3842,15 @@
}, },
"visible": false, "visible": false,
"font": "Arial;13;0", "font": "Arial;13;0",
"top": 544, "left": -16,
"top": 656,
"height": 13, "height": 13,
"horizontalAlignment": 1 "horizontalAlignment": 1
} }
], ],
"font": "Arial;13;0", "font": "Arial;13;0",
"left": 416, "left": 408,
"top": 1264, "top": 1320,
"width": 163.55615234375, "width": 163.55615234375,
"height": 25, "height": 25,
"stereotypeLabel": { "stereotypeLabel": {
@ -3883,8 +3886,8 @@
"$ref": "AAAAAAFpIVFv0xYYyKo=" "$ref": "AAAAAAFpIVFv0xYYyKo="
}, },
"font": "Arial;13;0", "font": "Arial;13;0",
"left": 421, "left": 413,
"top": 1294, "top": 1350,
"width": 153.55615234375, "width": 153.55615234375,
"height": 13, "height": 13,
"text": "-pData: void*", "text": "-pData: void*",
@ -3900,8 +3903,8 @@
"$ref": "AAAAAAFpIVHZcha1vLw=" "$ref": "AAAAAAFpIVHZcha1vLw="
}, },
"font": "Arial;13;0", "font": "Arial;13;0",
"left": 421, "left": 413,
"top": 1309, "top": 1365,
"width": 153.55615234375, "width": 153.55615234375,
"height": 13, "height": 13,
"text": "-logic_function: boolean*", "text": "-logic_function: boolean*",
@ -3917,8 +3920,8 @@
"$ref": "AAAAAAFpIVKy4BfqLR4=" "$ref": "AAAAAAFpIVKy4BfqLR4="
}, },
"font": "Arial;13;0", "font": "Arial;13;0",
"left": 421, "left": 413,
"top": 1324, "top": 1380,
"width": 153.55615234375, "width": 153.55615234375,
"height": 13, "height": 13,
"text": "-UID: const int", "text": "-UID: const int",
@ -3934,8 +3937,8 @@
"$ref": "AAAAAAFpIVL7ehiHAoI=" "$ref": "AAAAAAFpIVL7ehiHAoI="
}, },
"font": "Arial;13;0", "font": "Arial;13;0",
"left": 421, "left": 413,
"top": 1339, "top": 1395,
"width": 153.55615234375, "width": 153.55615234375,
"height": 13, "height": 13,
"text": "-next: ViewLink*", "text": "-next: ViewLink*",
@ -3943,8 +3946,8 @@
} }
], ],
"font": "Arial;13;0", "font": "Arial;13;0",
"left": 416, "left": 408,
"top": 1289, "top": 1345,
"width": 163.55615234375, "width": 163.55615234375,
"height": 68 "height": 68
}, },
@ -3958,8 +3961,8 @@
"$ref": "AAAAAAFpIVCM/xPV/bU=" "$ref": "AAAAAAFpIVCM/xPV/bU="
}, },
"font": "Arial;13;0", "font": "Arial;13;0",
"left": 416, "left": 408,
"top": 1357, "top": 1413,
"width": 163.55615234375, "width": 163.55615234375,
"height": 10 "height": 10
}, },
@ -3974,7 +3977,8 @@
}, },
"visible": false, "visible": false,
"font": "Arial;13;0", "font": "Arial;13;0",
"top": 272, "left": -8,
"top": 328,
"width": 10, "width": 10,
"height": 10 "height": 10
}, },
@ -3989,15 +3993,16 @@
}, },
"visible": false, "visible": false,
"font": "Arial;13;0", "font": "Arial;13;0",
"top": 272, "left": -8,
"top": 328,
"width": 10, "width": 10,
"height": 10 "height": 10
} }
], ],
"font": "Arial;13;0", "font": "Arial;13;0",
"containerChangeable": true, "containerChangeable": true,
"left": 416, "left": 408,
"top": 1264, "top": 1320,
"width": 163.55615234375, "width": 163.55615234375,
"height": 133, "height": 133,
"nameCompartment": { "nameCompartment": {
@ -4037,8 +4042,8 @@
}, },
"visible": false, "visible": false,
"font": "Arial;13;0", "font": "Arial;13;0",
"left": 507, "left": 501,
"top": 1244, "top": 1273,
"height": 13, "height": 13,
"alpha": 1.5707963267948966, "alpha": 1.5707963267948966,
"distance": 15, "distance": 15,
@ -4058,8 +4063,8 @@
}, },
"visible": null, "visible": null,
"font": "Arial;13;0", "font": "Arial;13;0",
"left": 522, "left": 516,
"top": 1243, "top": 1273,
"height": 13, "height": 13,
"alpha": 1.5707963267948966, "alpha": 1.5707963267948966,
"distance": 30, "distance": 30,
@ -4079,8 +4084,8 @@
}, },
"visible": false, "visible": false,
"font": "Arial;13;0", "font": "Arial;13;0",
"left": 478, "left": 472,
"top": 1247, "top": 1274,
"height": 13, "height": 13,
"alpha": -1.5707963267948966, "alpha": -1.5707963267948966,
"distance": 15, "distance": 15,
@ -4100,7 +4105,7 @@
}, },
"visible": false, "visible": false,
"font": "Arial;13;0", "font": "Arial;13;0",
"left": 509, "left": 501,
"top": 1261, "top": 1261,
"height": 13, "height": 13,
"alpha": 0.5235987755982988, "alpha": 0.5235987755982988,
@ -4121,8 +4126,8 @@
}, },
"visible": false, "visible": false,
"font": "Arial;13;0", "font": "Arial;13;0",
"left": 522, "left": 515,
"top": 1262, "top": 1263,
"height": 13, "height": 13,
"alpha": 0.7853981633974483, "alpha": 0.7853981633974483,
"distance": 40, "distance": 40,
@ -4142,8 +4147,8 @@
}, },
"visible": false, "visible": false,
"font": "Arial;13;0", "font": "Arial;13;0",
"left": 481, "left": 474,
"top": 1258, "top": 1257,
"height": 13, "height": 13,
"alpha": -0.5235987755982988, "alpha": -0.5235987755982988,
"distance": 25, "distance": 25,
@ -4163,8 +4168,8 @@
}, },
"visible": false, "visible": false,
"font": "Arial;13;0", "font": "Arial;13;0",
"left": 507, "left": 502,
"top": 1230, "top": 1286,
"height": 13, "height": 13,
"alpha": -0.5235987755982988, "alpha": -0.5235987755982988,
"distance": 30, "distance": 30,
@ -4183,8 +4188,8 @@
}, },
"visible": false, "visible": false,
"font": "Arial;13;0", "font": "Arial;13;0",
"left": 520, "left": 515,
"top": 1227, "top": 1283,
"height": 13, "height": 13,
"alpha": -0.7853981633974483, "alpha": -0.7853981633974483,
"distance": 40, "distance": 40,
@ -4203,8 +4208,8 @@
}, },
"visible": false, "visible": false,
"font": "Arial;13;0", "font": "Arial;13;0",
"left": 480, "left": 474,
"top": 1235, "top": 1291,
"height": 13, "height": 13,
"alpha": 0.5235987755982988, "alpha": 0.5235987755982988,
"distance": 25, "distance": 25,
@ -4249,7 +4254,7 @@
"$ref": "AAAAAAFpHq11gr6quCs=" "$ref": "AAAAAAFpHq11gr6quCs="
}, },
"lineStyle": 1, "lineStyle": 1,
"points": "493:1242;494:1263", "points": "486:1242;488:1319",
"showVisibility": true, "showVisibility": true,
"nameLabel": { "nameLabel": {
"$ref": "AAAAAAFpIVDGIBS5fjw=" "$ref": "AAAAAAFpIVDGIBS5fjw="

10
src/app/app.ino
View File

@ -8,7 +8,7 @@ SAB sab;
unsigned long currentMs = 0, batteryMs = 0, buttonMs = 0; unsigned long currentMs = 0, batteryMs = 0, buttonMs = 0;
int mySize = 0; int mySize = 0;
unsigned char curView = 0; unsigned char curView = 0;
View1Packet v1p = {sab.getRtcManager().getDateTime(), sab.getSdCardManager().getSize(GBYTE), sab.getPowerInfo()}; View1Packet v1p = {sab.getRtcManager().getDateTime(), sab.getSdCardManager().getSize(GBYTE), sab.getPowerInfo(),0};
ViewAPPacket vap = {sab.getConnectivityManager().softAPmacAddress(), sab.getConnectivityManager().softAPSSID(), sab.getConnectivityManager().softAPIP(), sab.getConnectivityManager().softAPgetStationNum()}; ViewAPPacket vap = {sab.getConnectivityManager().softAPmacAddress(), sab.getConnectivityManager().softAPSSID(), sab.getConnectivityManager().softAPIP(), sab.getConnectivityManager().softAPgetStationNum()};
void setup() void setup()
@ -36,6 +36,7 @@ void loop()
{ {
currentMs = millis(); currentMs = millis();
v1p.dateTime = sab.getRtcManager().getDateTime(); v1p.dateTime = sab.getRtcManager().getDateTime();
v1p.nbViews = sab.getScreenManager().getViewCount();
vap.ipAddr = sab.getConnectivityManager().softAPIP(); vap.ipAddr = sab.getConnectivityManager().softAPIP();
vap.macAddr = sab.getConnectivityManager().softAPmacAddress(); vap.macAddr = sab.getConnectivityManager().softAPmacAddress();
vap.nbOfCon = sab.getConnectivityManager().softAPgetStationNum(); vap.nbOfCon = sab.getConnectivityManager().softAPgetStationNum();
@ -54,9 +55,10 @@ void loop()
{ {
buttonMs = millis(); buttonMs = millis();
Serial.println("Changing view"); Serial.println("Changing view");
curView++; Serial.print("Selected view is : ");Serial.println(sab.getScreenManager().getCurrentViewUID());
curView %= 3; /*curView++;
sab.getScreenManager().displayView(curView); curView %= 3;*/
sab.getScreenManager().displayNextView();
} }
} }