piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Andre Bernet added to the authors list

Browse Source
This commit is contained in:
bsongis
2013-01-11 13:32:27 +00:00
parent ca617d8094
commit 7f9092a90e
109 changed files with 118 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/general_menus.cpp
+10 -11
View File
@@ -1,5 +1,6 @@
/*
* Authors (alphabetical order)
* - Andre Bernet <bernet.andre@gmail.com>
* - Bertrand Songis <bsongis@gmail.com>
* - Bryan J. Rentoul (Gruvin) <gruvin@gmail.com>
* - Cameron Weeks <th9xer@gmail.com>
@@ -143,7 +144,15 @@ void menuGeneralSetup(uint8_t event)
{
#if defined(RTCLOCK)
static struct gtm t;
if ((m_posVert!=ITEM_SETUP_DATE+1 && m_posVert!=ITEM_SETUP_TIME+1) || s_editMode<=0) {
if (m_posVert==ITEM_SETUP_DATE+1 || m_posVert!=ITEM_SETUP_TIME+1) {
if (s_editMode<=0 && event == EVT_KEY_FIRST(KEY_ENTER)) {
// set the date and time into RTC chip
rtc_settime(&t);
g_rtcTime = gmktime(t); // update local timestamp and get wday calculated
g_ms100 = 0; // start of next second begins now
}
}
else if (s_editMode<=0) {
gettime(&t);
}
#endif
@@ -186,11 +195,6 @@ void menuGeneralSetup(uint8_t event)
}
}
}
if (attr && s_editMode<=0 && event == EVT_KEY_FIRST(KEY_MENU)) {
// set the date and time into RTC chip
rtc_settime(&t);
}
break;
case ITEM_SETUP_TIME:
@@ -213,11 +217,6 @@ void menuGeneralSetup(uint8_t event)
break;
}
}
if (attr && s_editMode<=0 && event == EVT_KEY_FIRST(KEY_MENU)) {
// set the date and time into RTC chip
rtc_settime(&t);
}
break;
#endif