Mercurial > public > ostc4

comparison Discovery/Src/tMenuEditXtra.c @ 350:607099140a41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged in Ideenmodellierer/ostc4/FlightMode_Improvment (pull request #32) FlightMode Improvment
author heinrichsweikamp <bitbucket@heinrichsweikamp.com>
date Sun, 06 Oct 2019 11:58:36 +0000
parents 77de014928d6
children 12f8745c8a94
comparison
equal deleted inserted replaced
340:0756013e43b3 350:607099140a41
31 31
32 #include "gfx_fonts.h" 32 #include "gfx_fonts.h"
33 #include "simulation.h" 33 #include "simulation.h"
34 #include "timer.h" 34 #include "timer.h"
35 #include "tMenuEdit.h" 35 #include "tMenuEdit.h"
36 #include "data_exchange_main.h"
37
36 38
37 /* Private function prototypes -----------------------------------------------*/ 39 /* Private function prototypes -----------------------------------------------*/
38 void openEdit_CompassHeading(void); 40 void openEdit_CompassHeading(void);
39 void openEdit_ResetStopwatch(void); 41 void openEdit_ResetStopwatch(void);
40 void openEdit_SimFollowDecostops(void); 42 void openEdit_SimFollowDecostops(void);
41 void openEdit_SetManualMarker(void); 43 void openEdit_SetManualMarker(void);
44 void openEdit_SetEndDive(void);
42 45
43 /* Announced function prototypes -----------------------------------------------*/ 46 /* Announced function prototypes -----------------------------------------------*/
44 uint8_t OnAction_CompassHeading (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); 47 uint8_t OnAction_CompassHeading (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
45 48
46 /* Exported functions --------------------------------------------------------*/ 49 /* Exported functions --------------------------------------------------------*/
61 break; 64 break;
62 case 3: 65 case 3:
63 openEdit_SetManualMarker(); 66 openEdit_SetManualMarker();
64 break; 67 break;
65 case 4: 68 case 4:
66 openEdit_SimFollowDecostops(); 69 if(is_stateUsedSetToSim())
70 {
71 openEdit_SimFollowDecostops();
72 }
73 else
74 {
75 openEdit_SetEndDive();
76 }
67 break; 77 break;
68 } 78 }
69 } 79 }
70 80
71 /* Private functions ---------------------------------------------------------*/ 81 /* Private functions ---------------------------------------------------------*/
76 } 86 }
77 87
78 void openEdit_SetManualMarker(void) 88 void openEdit_SetManualMarker(void)
79 { 89 {
80 stateUsedWrite->events.manualMarker = 1; 90 stateUsedWrite->events.manualMarker = 1;
91 exitMenuEdit_to_Home();
92 }
93
94 void openEdit_SetEndDive(void)
95 {
96 dataOutGetPointer()->setEndDive = 1;
81 exitMenuEdit_to_Home(); 97 exitMenuEdit_to_Home();
82 } 98 }
83 99
84 void openEdit_SimFollowDecostops(void) 100 void openEdit_SimFollowDecostops(void)
85 { 101 {