Mercurial > public > ostc4
annotate Discovery/Src/tMenuEditXtra.c @ 574:01ee21dd311f
Improved focus detection:
In previous version th calibration window was turned into the current one. At all two translations were used causing a jitter. Now the current view is translated into the calibration windows by one step increasing the quality of the prediction.
Reworked detection of pitch/sector/scroll events:
Sector and scroll uses pitch angles to calculate the view to show. Movment detection uses movment, which may also be out of focus for a short time. To improve all detections these two use cases are now handled individual. Sector and scroll have increased action angle in case yaw and roll stay stable.
| author | Ideenmodellierer |
|---|---|
| date | Wed, 25 Nov 2020 20:26:01 +0100 |
| parents | 531e7818b737 |
| children | ff2b393e290f |
| rev | line source |
|---|---|
| 38 | 1 /////////////////////////////////////////////////////////////////////////////// |
| 2 /// -*- coding: UTF-8 -*- | |
| 3 /// | |
| 4 /// \file Discovery/Src/tMenuEditXtra.c | |
| 5 /// \brief Menu Edit Xtra - Specials in Divemode like Reset Stopwatch | |
| 6 /// \author heinrichs weikamp gmbh | |
| 7 /// \date 02-Mar-2015 | |
| 8 /// | |
| 9 /// \details | |
| 10 /// | |
| 11 /// $Id$ | |
| 12 /////////////////////////////////////////////////////////////////////////////// | |
| 13 /// \par Copyright (c) 2014-2018 Heinrichs Weikamp gmbh | |
| 14 /// | |
| 15 /// This program is free software: you can redistribute it and/or modify | |
| 16 /// it under the terms of the GNU General Public License as published by | |
| 17 /// the Free Software Foundation, either version 3 of the License, or | |
| 18 /// (at your option) any later version. | |
| 19 /// | |
| 20 /// This program is distributed in the hope that it will be useful, | |
| 21 /// but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 22 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 23 /// GNU General Public License for more details. | |
| 24 /// | |
| 25 /// You should have received a copy of the GNU General Public License | |
| 26 /// along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 27 ////////////////////////////////////////////////////////////////////////////// | |
| 28 | |
| 29 /* Includes ------------------------------------------------------------------*/ | |
| 30 #include "tMenuEditXtra.h" | |
| 31 | |
| 32 #include "gfx_fonts.h" | |
| 33 #include "simulation.h" | |
| 34 #include "timer.h" | |
| 35 #include "tMenuEdit.h" | |
|
347
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
36 #include "data_exchange_main.h" |
| 547 | 37 #include "motion.h" |
|
347
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
38 |
| 38 | 39 |
| 40 /* Private function prototypes -----------------------------------------------*/ | |
| 41 void openEdit_CompassHeading(void); | |
| 42 void openEdit_ResetStopwatch(void); | |
| 43 void openEdit_SimFollowDecostops(void); | |
| 44 void openEdit_SetManualMarker(void); | |
|
347
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
45 void openEdit_SetEndDive(void); |
|
552
531e7818b737
Added menu structure to acces viewport calibration:
Ideenmodellierer
parents:
547
diff
changeset
|
46 void openEdit_CalibViewport(void); |
| 38 | 47 |
| 48 /* Announced function prototypes -----------------------------------------------*/ | |
| 49 uint8_t OnAction_CompassHeading (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); | |
| 50 | |
| 51 /* Exported functions --------------------------------------------------------*/ | |
| 52 | |
| 53 void openEdit_Xtra(uint8_t line) | |
| 54 { | |
| 55 set_globalState_Menu_Line(line); | |
| 56 resetMenuEdit(CLUT_MenuPageXtra); | |
| 57 | |
| 58 switch(line) | |
| 59 { | |
| 60 case 1: | |
| 61 default: | |
| 62 openEdit_ResetStopwatch(); | |
| 63 break; | |
| 64 case 2: | |
| 65 openEdit_CompassHeading(); | |
| 66 break; | |
| 67 case 3: | |
| 68 openEdit_SetManualMarker(); | |
| 69 break; | |
| 70 case 4: | |
| 547 | 71 openEdit_CalibViewport(); |
| 72 break; | |
| 73 case 5: | |
|
347
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
74 if(is_stateUsedSetToSim()) |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
75 { |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
76 openEdit_SimFollowDecostops(); |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
77 } |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
78 else |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
79 { |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
80 openEdit_SetEndDive(); |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
81 } |
| 38 | 82 break; |
| 83 } | |
| 84 } | |
| 85 | |
| 86 /* Private functions ---------------------------------------------------------*/ | |
| 87 void openEdit_ResetStopwatch(void) | |
| 88 { | |
| 89 timer_Stopwatch_Restart(); | |
| 90 exitMenuEdit_to_Home(); | |
| 91 } | |
| 92 | |
| 93 void openEdit_SetManualMarker(void) | |
| 94 { | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
95 stateUsedWrite->events.manualMarker = 1; |
| 38 | 96 exitMenuEdit_to_Home(); |
| 97 } | |
| 98 | |
|
347
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
99 void openEdit_SetEndDive(void) |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
100 { |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
101 dataOutGetPointer()->setEndDive = 1; |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
102 exitMenuEdit_to_Home(); |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
103 } |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
104 |
| 38 | 105 void openEdit_SimFollowDecostops(void) |
| 106 { | |
| 107 simulation_set_heed_decostops(!simulation_get_heed_decostops()); | |
| 108 exitMenuEdit_to_Menu_with_Menu_Update(); | |
| 109 } | |
| 110 | |
| 547 | 111 void openEdit_CalibViewport(void) |
| 112 { | |
| 113 calibrateViewport(stateUsed->lifeData.compass_roll, stateUsed->lifeData.compass_pitch, stateUsed->lifeData.compass_heading); | |
| 114 exitMenuEdit_to_Home(); | |
| 115 } | |
| 116 | |
| 38 | 117 void refresh_CompassHeading(void) |
| 118 { | |
| 119 uint16_t heading; | |
| 120 char text[32]; | |
| 121 | |
| 122 text[0] = '\001'; | |
| 123 text[1] = TXT_2BYTE; | |
| 124 text[2] = TXT2BYTE_CompassHeading; | |
| 125 text[3] = 0; | |
| 126 write_topline(text); | |
| 127 | |
| 128 heading = (uint16_t)stateUsed->lifeData.compass_heading; | |
| 129 snprintf(text,32,"\001%03i`",heading); | |
| 130 write_label_var( 0, 800, ME_Y_LINE1, &FontT54, text); | |
| 131 | |
| 132 tMenuEdit_refresh_field(StMXTRA_CompassHeading); | |
| 133 } | |
| 134 | |
| 135 void openEdit_CompassHeading(void) | |
| 136 { | |
| 137 | |
| 138 write_field_button(StMXTRA_CompassHeading,20, 800, ME_Y_LINE4, &FontT48, "Set"); | |
| 139 | |
| 140 setEvent(StMXTRA_CompassHeading, (uint32_t)OnAction_CompassHeading); | |
| 141 // startEdit(); | |
| 142 } | |
| 143 | |
| 144 | |
| 145 uint8_t OnAction_CompassHeading (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) | |
| 146 { | |
|
272
74a8296a2318
cleanup: simplify stateUsed usage
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
147 stateUsedWrite->diveSettings.compassHeading = (uint16_t)stateUsed->lifeData.compass_heading; |
| 38 | 148 exitMenuEdit_to_Home_with_Menu_Update(); |
| 149 return EXIT_TO_HOME; | |
| 150 } |