Skip to content

Commit

Permalink
modernise AoI feature
Browse files Browse the repository at this point in the history 
overhaul AoI as 4 locations + enabled flag:
- the 4 locations represent the corners of a bounding box
- add decision logic to aoi_manager to compare against all 4 corners
- add decision logic to aoi_manager to compare against the minimum and
  maximum altitudes out of the 4 corners
- add enabled flag to AoI
- add logic to aoi_manager to only consider an AoI for decision if its
  enabled flag is true

overhaul AoI config TC as one of:
- configure (legacy add)
- enable: set enabled flag for AoI of specified index
- disable: reset enabled flag for AoI of specified index

switch location interfaces from "interrupting" to "polled":
- move cyclical location request trigger from location_tracker to
  aoi_manager
- add request_location interface, cyclically triggered
- trigger location_tracker's location sending with location request

in aoi_manager, also change loop keyword and remove excessively simple
procedures

also remove print_service and its references, and add SDL x86
implementation to HAL for simulation
  • Loading branch information
Giorgio Ciacchella authored and Giorgio Ciacchella committed Sep 5, 2023
1 parent d634fcb commit d626360
Show file tree
Hide file tree
Showing 17 changed files with 567 additions and 550 deletions.
29 changes: 29 additions & 0 deletions obc-firmware/deploymentview.ui.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<UI version="1.0" ><Entity id="{a6724234-231c-4d11-b848-95e8a4c3c902}"><Taste coordinates="9700 16300 9700 11200">
</Taste>
</Entity><Entity id="{64504a99-7bf1-4b62-8a8c-fc55470a8581}">
</Entity><Entity id="{165708a3-961a-4374-851c-96adfa4a23b7}">
</Entity><Entity id="{70b410c9-0afe-4c34-90c8-fdb227cfecc6}">
</Entity><Entity id="{90fc578d-c711-4aad-9292-d4c765281cff}">
</Entity><Entity id="{32f133c1-ca30-4790-a82b-5e4c11b01217}">
</Entity><Entity id="{a32b6748-321e-4c31-9718-f119e20b435c}">
</Entity><Entity id="{578a9277-0067-44fa-8e0b-d2c9024ee06a}">
</Entity><Entity id="{522a25fc-f5aa-493c-af3c-bc67fd1c633e}">
</Entity><Entity id="{c5d57340-aeef-431d-9cd1-a725ac236fc7}">
</Entity><Entity id="{a268d416-8a05-4f42-ba10-09048bc4c122}">
</Entity><Entity id="{c47d0e43-6fc1-44de-b747-0cf5c6ccab63}">
</Entity><Entity id="{44d8566e-a8fb-45e4-a0f2-5e08b5405895}">
</Entity><Entity id="{772644a1-7c7d-4622-8cf7-9e64a0c0c2a0}">
</Entity><Entity id="{7eaf2396-3384-499e-b71c-2b9efeca515e}">
</Entity><Entity id="{657a0ec5-6273-462c-b1e2-fed7bb51d9bf}"><Taste coordinates="9700 10200">
</Taste>
</Entity><Entity id="{2156f236-ac23-4b65-9f57-0d83b9da7087}"><Taste coordinates="-2500 17300 21900 29700">
</Taste>
</Entity><Entity id="{399021ef-039a-40cc-a886-d05d75c01642}"><Taste coordinates="-300 19500 19700 27500">
</Taste>
</Entity><Entity id="{ff8d73b1-e7ca-4967-88ee-4a88fc86a170}">
</Entity><Entity id="{d7af9b42-787f-4e76-a336-9accc5c9ab1c}">
</Entity><Entity id="{67fc7a17-f45a-4c02-9b0f-69c085a87236}">
</Entity><Entity id="{e50fec9c-f85e-4b7f-9ff8-6b6643c31189}"><Taste coordinates="9700 17300">
</Taste>
</Entity>
</UI>
62 changes: 62 additions & 0 deletions obc-firmware/interfaceview.ui.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<UI version="1.0" ><Entity id="{f32ccc90-a4dc-4d65-a4db-5ac21762161c}"><Taste coordinates="5400 -11300 46700 4300">
</Taste>
</Entity><Entity id="{c33634c0-179b-4a2d-b638-d8c1661de03c}"><Taste coordinates="75000 104500 248700 119300">
</Taste>
</Entity><Entity id="{0e54e30f-870e-4145-86e9-217b00147bc7}"><Taste coordinates="75000 116300">
</Taste>
</Entity><Entity id="{7c0d553f-84d6-4b1b-be30-af36a986f6a3}"><Taste coordinates="75000 109400">
</Taste>
</Entity><Entity id="{6507063f-6e07-45df-ac63-dfd2190f3da3}"><Taste coordinates="100700 104500">
</Taste>
</Entity><Entity id="{7267dcbd-b862-4ba4-bde4-fa0a8396b387}"><Taste coordinates="119900 104500">
</Taste>
</Entity><Entity id="{5124adaa-865f-442b-ba88-211e66163740}"><Taste coordinates="13000 14200 33000 106500">
</Taste>
</Entity><Entity id="{a81b7710-9fd6-4838-8751-c26db314c883}"><Taste coordinates="33000 28200">
</Taste>
</Entity><Entity id="{59ae0167-d6b5-4218-ae15-3d3a37e70de3}"><Taste coordinates="33000 21200">
</Taste>
</Entity><Entity id="{27533798-8150-4970-a518-566135dfc093}"><Taste coordinates="67600 32700 67600 109400 74700 109400">
</Taste>
</Entity><Entity id="{c4baf195-426a-40b7-ba48-3352de3c9090}"><Taste coordinates="80300 20300 87200 20300 87200 22200 94000 22200">
</Taste>
</Entity><Entity id="{9c3ea27f-cd3a-4720-a4d2-5829567173a4}"><Taste coordinates="93800 26700 86900 26700 86900 28300 80100 28300">
</Taste>
</Entity><Entity id="{0fa6d71e-91d8-4092-824b-808da6e23099}"><Taste coordinates="119900 31200 119900 104200">
</Taste>
</Entity><Entity id="{68804259-afe8-4dd4-b285-96de563398b3}"><Taste coordinates="94300 17900 130700 30700">
</Taste>
</Entity><Entity id="{cb2d55c7-4ff7-4df1-bd0c-696e051ff315}"><Taste coordinates="101700 17900">
</Taste>
</Entity><Entity id="{22d0455b-1a41-47d6-8ce0-4dda8cf16605}"><Taste coordinates="119900 17900">
</Taste>
</Entity><Entity id="{7a677f10-fa36-4143-af0a-711fcfd994a5}"><Taste coordinates="94300 22200">
</Taste>
</Entity><Entity id="{268aeec3-9700-4bcc-9010-f17b63efc4f3}"><Taste coordinates="100700 30700">
</Taste>
</Entity><Entity id="{149052d3-4640-43fe-a984-f997367bf940}"><Taste coordinates="119900 30700">
</Taste>
</Entity><Entity id="{f5aabd44-ec75-4201-9bd3-f6abddbd9ad0}"><Taste coordinates="94300 26700">
</Taste>
</Entity><Entity id="{e9fe715b-0c51-4129-b0c9-e88fcd81f565}"><Taste coordinates="100700 31200 100700 104200">
</Taste>
</Entity><Entity id="{ee16e559-3d27-4b2d-9065-47d0d872df4f}"><Taste coordinates="54700 28200 33300 28200">
</Taste>
</Entity><Entity id="{2ce9d4b0-b813-4ee9-80a6-302282cf0064}"><Taste coordinates="55300 16800 79800 32200">
</Taste>
</Entity><Entity id="{9141f1da-6068-434a-8922-e4ae4fbc2f24}"><Taste coordinates="55300 21200">
</Taste>
</Entity><Entity id="{32565e36-cb73-4abd-8819-6b0e41fbc754}"><Taste coordinates="79800 28300">
</Taste>
</Entity><Entity id="{c7fc4fb2-971e-48e3-aafa-89b5e636a8ab}"><Taste coordinates="67300 16800">
</Taste>
</Entity><Entity id="{38ac000d-efae-4879-9510-70fd6e482be8}"><Taste coordinates="55300 28200">
</Taste>
</Entity><Entity id="{e09fb80a-5714-4b60-8b65-0672158e8dda}"><Taste coordinates="79800 20300">
</Taste>
</Entity><Entity id="{4602aca2-fbec-4038-9141-47e9c3cbc8b6}"><Taste coordinates="67600 32200">
</Taste>
</Entity><Entity id="{a75e8137-dc90-465c-8724-8e8c52f452d0}"><Taste coordinates="33600 21200 55000 21200">
</Taste>
</Entity>
</UI>
Loading

0 comments on commit d626360

Please sign in to comment.