Mercurial > public > ostc4

comparison Discovery/Src/tMenuEditSystem.c @ 102:4276d56eb37c kittz

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hPa instead of mbar, enabled Spanish language
author heinrichsweikamp
date Tue, 27 Nov 2018 18:31:21 +0100
parents 98b479d0618f
children f5d2f02dc73f
comparison
equal deleted inserted replaced
101:83feba2ad1c3 102:4276d56eb37c
504 active = 1; 504 active = 1;
505 else 505 else
506 active = 0; 506 active = 0;
507 write_field_on_off(StMSYS2_Italian, 30, 800, ME_Y_LINE4, &FontT48, text, active); 507 write_field_on_off(StMSYS2_Italian, 30, 800, ME_Y_LINE4, &FontT48, text, active);
508 508
509 /* 509
510 pSettings->selected_language = LANGUAGE_Espanol; 510 pSettings->selected_language = LANGUAGE_Espanol;
511 if( actualLanguage == pSettings->selected_language) 511 if( actualLanguage == pSettings->selected_language)
512 active = 1; 512 active = 1;
513 else 513 else
514 active = 0; 514 active = 0;
515 write_field_on_off(StMSYS2_Espanol, 30, 800, ME_Y_LINE5, &FontT48, text, active); 515 write_field_on_off(StMSYS2_Espanol, 30, 800, ME_Y_LINE5, &FontT48, text, active);
516 */ 516
517 pSettings->selected_language = actualLanguage; 517 pSettings->selected_language = actualLanguage;
518 518
519 write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext); 519 write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext);
520 520
521 setEvent(StMSYS2_English, (uint32_t)OnAction_English); 521 setEvent(StMSYS2_English, (uint32_t)OnAction_English);
522 setEvent(StMSYS2_German, (uint32_t)OnAction_German); 522 setEvent(StMSYS2_German, (uint32_t)OnAction_German);
523 setEvent(StMSYS2_French, (uint32_t)OnAction_French); 523 setEvent(StMSYS2_French, (uint32_t)OnAction_French);
524 setEvent(StMSYS2_Italian, (uint32_t)OnAction_Italian); 524 setEvent(StMSYS2_Italian, (uint32_t)OnAction_Italian);
525 //setEvent(StMSYS2_Espanol, (uint32_t)OnAction_Espanol); 525 setEvent(StMSYS2_Espanol, (uint32_t)OnAction_Espanol);
526 } 526 }
527 527
528 528
529 uint8_t OnAction_English (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action) 529 uint8_t OnAction_English (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action)
530 { 530 {
1235 text_content[1] = TXT2BYTE_Korrekturwerte; 1235 text_content[1] = TXT2BYTE_Korrekturwerte;
1236 text_content[2] = 0; 1236 text_content[2] = 0;
1237 write_label_var( 20, 800, ME_Y_LINE4, &FontT42, text_content); 1237 write_label_var( 20, 800, ME_Y_LINE4, &FontT42, text_content);
1238 1238
1239 offsetTemperature = ((float)settingsGetPointer()->offsetTemperature_centigrad) / 10; 1239 offsetTemperature = ((float)settingsGetPointer()->offsetTemperature_centigrad) / 10;
1240 snprintf(text_content,80,"%i mbar / %0.2f\140C",settingsGetPointer()->offsetPressure_mbar, offsetTemperature); 1240 snprintf(text_content,80,"%i hPa / %0.2f\140C",settingsGetPointer()->offsetPressure_mbar, offsetTemperature);
1241 write_label_var( 20, 800, ME_Y_LINE5, &FontT42, text_content); 1241 write_label_var( 20, 800, ME_Y_LINE5, &FontT42, text_content);
1242 1242
1243 text_button[0] = TXT_2BYTE; 1243 text_button[0] = TXT_2BYTE;
1244 text_button[1] = TXT2BYTE_Exit; 1244 text_button[1] = TXT2BYTE_Exit;
1245 text_button[2] = 0; 1245 text_button[2] = 0;