Mercurial > public > ostc4
annotate Discovery/Src/tMenuEditXtra.c @ 352:1f24022345d1 fix-merge-mess
Fix merge problem
The merge in changeset 352 is simply wrong, so revert all changes
made in that merge.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
| author | Jan Mulder <jlmulder@xs4all.nl> |
|---|---|
| date | Tue, 08 Oct 2019 16:35:45 +0200 |
| parents | 77de014928d6 |
| children | 12f8745c8a94 |
| 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" |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
37 |
| 38 | 38 |
| 39 /* Private function prototypes -----------------------------------------------*/ | |
| 40 void openEdit_CompassHeading(void); | |
| 41 void openEdit_ResetStopwatch(void); | |
| 42 void openEdit_SimFollowDecostops(void); | |
| 43 void openEdit_SetManualMarker(void); | |
|
347
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
44 void openEdit_SetEndDive(void); |
| 38 | 45 |
| 46 /* Announced function prototypes -----------------------------------------------*/ | |
| 47 uint8_t OnAction_CompassHeading (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); | |
| 48 | |
| 49 /* Exported functions --------------------------------------------------------*/ | |
| 50 | |
| 51 void openEdit_Xtra(uint8_t line) | |
| 52 { | |
| 53 set_globalState_Menu_Line(line); | |
| 54 resetMenuEdit(CLUT_MenuPageXtra); | |
| 55 | |
| 56 switch(line) | |
| 57 { | |
| 58 case 1: | |
| 59 default: | |
| 60 openEdit_ResetStopwatch(); | |
| 61 break; | |
| 62 case 2: | |
| 63 openEdit_CompassHeading(); | |
| 64 break; | |
| 65 case 3: | |
| 66 openEdit_SetManualMarker(); | |
| 67 break; | |
| 68 case 4: | |
|
347
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
69 if(is_stateUsedSetToSim()) |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
70 { |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
71 openEdit_SimFollowDecostops(); |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
72 } |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
73 else |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
74 { |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
75 openEdit_SetEndDive(); |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
76 } |
| 38 | 77 break; |
| 78 } | |
| 79 } | |
| 80 | |
| 81 /* Private functions ---------------------------------------------------------*/ | |
| 82 void openEdit_ResetStopwatch(void) | |
| 83 { | |
| 84 timer_Stopwatch_Restart(); | |
| 85 exitMenuEdit_to_Home(); | |
| 86 } | |
| 87 | |
| 88 void openEdit_SetManualMarker(void) | |
| 89 { | |
|
288
ba229a012ac7
cleanup: no useless checks for simulator state
Jan Mulder <jlmulder@xs4all.nl>
parents:
272
diff
changeset
|
90 stateUsedWrite->events.manualMarker = 1; |
| 38 | 91 exitMenuEdit_to_Home(); |
| 92 } | |
| 93 | |
|
347
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
94 void openEdit_SetEndDive(void) |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
95 { |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
96 dataOutGetPointer()->setEndDive = 1; |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
97 exitMenuEdit_to_Home(); |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
98 } |
|
77de014928d6
Added option to manually leave dive mode to system menu
ideenmodellierer
parents:
288
diff
changeset
|
99 |
| 38 | 100 void openEdit_SimFollowDecostops(void) |
| 101 { | |
| 102 simulation_set_heed_decostops(!simulation_get_heed_decostops()); | |
| 103 exitMenuEdit_to_Menu_with_Menu_Update(); | |
| 104 } | |
| 105 | |
| 106 void refresh_CompassHeading(void) | |
| 107 { | |
| 108 uint16_t heading; | |
| 109 char text[32]; | |
| 110 | |
| 111 text[0] = '\001'; | |
| 112 text[1] = TXT_2BYTE; | |
| 113 text[2] = TXT2BYTE_CompassHeading; | |
| 114 text[3] = 0; | |
| 115 write_topline(text); | |
| 116 | |
| 117 heading = (uint16_t)stateUsed->lifeData.compass_heading; | |
| 118 snprintf(text,32,"\001%03i`",heading); | |
| 119 write_label_var( 0, 800, ME_Y_LINE1, &FontT54, text); | |
| 120 | |
| 121 tMenuEdit_refresh_field(StMXTRA_CompassHeading); | |
| 122 } | |
| 123 | |
| 124 void openEdit_CompassHeading(void) | |
| 125 { | |
| 126 | |
| 127 write_field_button(StMXTRA_CompassHeading,20, 800, ME_Y_LINE4, &FontT48, "Set"); | |
| 128 | |
| 129 setEvent(StMXTRA_CompassHeading, (uint32_t)OnAction_CompassHeading); | |
| 130 // startEdit(); | |
| 131 } | |
| 132 | |
| 133 | |
| 134 uint8_t OnAction_CompassHeading (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) | |
| 135 { | |
|
272
74a8296a2318
cleanup: simplify stateUsed usage
Jan Mulder <jlmulder@xs4all.nl>
parents:
38
diff
changeset
|
136 stateUsedWrite->diveSettings.compassHeading = (uint16_t)stateUsed->lifeData.compass_heading; |
| 38 | 137 exitMenuEdit_to_Home_with_Menu_Update(); |
| 138 return EXIT_TO_HOME; | |
| 139 } |