Fixes #1392
This commit is contained in:
@@ -229,16 +229,16 @@ void menuGeneralSetup(uint8_t event)
|
|||||||
#if defined(RTCLOCK)
|
#if defined(RTCLOCK)
|
||||||
case ITEM_SETUP_DATE:
|
case ITEM_SETUP_DATE:
|
||||||
lcd_putsLeft(y, STR_DATE);
|
lcd_putsLeft(y, STR_DATE);
|
||||||
lcd_putc(RADIO_SETUP_DATE_COLUMN, y, '-'); lcd_putc(RADIO_SETUP_DATE_COLUMN+3*FW-1, y, '-');
|
lcd_putc(RADIO_SETUP_DATE_COLUMN+2, y, '-'); lcd_putc(RADIO_SETUP_DATE_COLUMN+3*FW, y, '-');
|
||||||
for (uint8_t j=0; j<3; j++) {
|
for (uint8_t j=0; j<3; j++) {
|
||||||
uint8_t rowattr = (m_posHorz==j ? attr : 0);
|
uint8_t rowattr = (m_posHorz==j ? attr : 0);
|
||||||
switch (j) {
|
switch (j) {
|
||||||
case 0:
|
case 0:
|
||||||
lcd_outdezAtt(RADIO_SETUP_DATE_COLUMN, y, t.tm_year+1900, rowattr);
|
lcd_outdezAtt(RADIO_SETUP_DATE_COLUMN+2, y, t.tm_year+1900, rowattr);
|
||||||
if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_year = checkIncDec(event, t.tm_year, 112, 200, 0);
|
if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_year = checkIncDec(event, t.tm_year, 112, 200, 0);
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
lcd_outdezNAtt(RADIO_SETUP_DATE_COLUMN+3*FW-1, y, t.tm_mon+1, rowattr|LEADING0, 2);
|
lcd_outdezNAtt(RADIO_SETUP_DATE_COLUMN+3*FW, y, t.tm_mon+1, rowattr|LEADING0, 2);
|
||||||
if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_mon = checkIncDec(event, t.tm_mon, 0, 11, 0);
|
if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_mon = checkIncDec(event, t.tm_mon, 0, 11, 0);
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
|
|||||||
@@ -215,8 +215,8 @@ extern "C" void TWI0_IRQHandler()
|
|||||||
utm.tm_min = fromBCD( Rtc_status[1] & 0x7F ) ;
|
utm.tm_min = fromBCD( Rtc_status[1] & 0x7F ) ;
|
||||||
utm.tm_hour = fromBCD( Rtc_status[2] & 0x3F ) ;
|
utm.tm_hour = fromBCD( Rtc_status[2] & 0x3F ) ;
|
||||||
utm.tm_mday = fromBCD( Rtc_status[4] & 0x3F ) ;
|
utm.tm_mday = fromBCD( Rtc_status[4] & 0x3F ) ;
|
||||||
utm.tm_mon = fromBCD( Rtc_status[5] & 0x1F ) ;
|
utm.tm_mon = fromBCD( Rtc_status[5] & 0x1F ) - 1;
|
||||||
utm.tm_year = fromBCD( Rtc_status[6] ) + 2000 ;
|
utm.tm_year = fromBCD( Rtc_status[6] ) + 100 ;
|
||||||
g_rtcTime = gmktime(&utm);
|
g_rtcTime = gmktime(&utm);
|
||||||
|
|
||||||
TWI0->TWI_PTCR = TWI_PTCR_RXTDIS ; // Stop transfers
|
TWI0->TWI_PTCR = TWI_PTCR_RXTDIS ; // Stop transfers
|
||||||
|
|||||||
Reference in New Issue
Block a user