Mercurial > public > ostc4

comparison Discovery/Src/text_multilanguage.c @ 225:2bb1db22b5f5 div-fixes-3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: random set of cleanups A random set of cleanups, as found during code reading, and looking around fixing issues. Contains all kinds of things: typo's in comment, typo in variable name, removal of unused code, making things static where possible. Does not contain any functional changes. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author Jan Mulder <jlmulder@xs4all.nl>
date Mon, 01 Apr 2019 15:50:41 +0200
parents cc9c18075e00
children 3949781096d4
comparison
equal deleted inserted replaced
224:ceecabfddb57 225:2bb1db22b5f5
1514 static uint8_t text_EN_WirelessDisconnect[] = "Disconnect"; 1514 static uint8_t text_EN_WirelessDisconnect[] = "Disconnect";
1515 static uint8_t text_DE_WirelessDisconnect[] = "Nicht verbunden"; 1515 static uint8_t text_DE_WirelessDisconnect[] = "Nicht verbunden";
1516 static uint8_t text_FR_WirelessDisconnect[] = ""; 1516 static uint8_t text_FR_WirelessDisconnect[] = "";
1517 static uint8_t text_IT_WirelessDisconnect[] = "Disconnesso"; 1517 static uint8_t text_IT_WirelessDisconnect[] = "Disconnesso";
1518 static uint8_t text_ES_WirelessDisconnect[] = "Desconectado"; 1518 static uint8_t text_ES_WirelessDisconnect[] = "Desconectado";
1519
1520 /*
1521 static uint8_t text_EN_Luftintegration[] = "air integration";
1522 static uint8_t text_DE_Luftintegration[] = "Luftintegration";
1523 static uint8_t text_FR_Luftintegration[] = "";
1524 static uint8_t text_IT_Luftintegration[] = "ARIA";
1525 static uint8_t text_ES_Luftintegration[] = "aire integrado";
1526 */
1527 1519
1528 static uint8_t text_EN_FlipDisplay[] = "Flip display"; 1520 static uint8_t text_EN_FlipDisplay[] = "Flip display";
1529 static uint8_t text_DE_FlipDisplay[] = "Anzeige spiegeln"; 1521 static uint8_t text_DE_FlipDisplay[] = "Anzeige spiegeln";
1530 static uint8_t text_FR_FlipDisplay[] = ""; 1522 static uint8_t text_FR_FlipDisplay[] = "";
1531 static uint8_t text_IT_FlipDisplay[] = ""; 1523 static uint8_t text_IT_FlipDisplay[] = "";
1607 {(uint8_t)TXT_Daylightsaving, {text_EN_Daylightsaving, text_DE_Daylightsaving, text_FR_Daylightsaving, text_IT_Daylightsaving, text_ES_Daylightsaving}}, 1599 {(uint8_t)TXT_Daylightsaving, {text_EN_Daylightsaving, text_DE_Daylightsaving, text_FR_Daylightsaving, text_IT_Daylightsaving, text_ES_Daylightsaving}},
1608 {(uint8_t)TXT_Logbook, {text_EN_Logbook, text_DE_Logbook, text_FR_Logbook, text_IT_Logbook, text_ES_Logbook}}, 1600 {(uint8_t)TXT_Logbook, {text_EN_Logbook, text_DE_Logbook, text_FR_Logbook, text_IT_Logbook, text_ES_Logbook}},
1609 {(uint8_t)TXT_LogbookEmpty, {text_EN_LogbookEmpty, text_DE_LogbookEmpty, text_FR_LogbookEmpty, text_IT_LogbookEmpty, text_ES_LogbookEmpty}}, 1601 {(uint8_t)TXT_LogbookEmpty, {text_EN_LogbookEmpty, text_DE_LogbookEmpty, text_FR_LogbookEmpty, text_IT_LogbookEmpty, text_ES_LogbookEmpty}},
1610 {(uint8_t)TXT_Start_Calculation,{text_EN_Start_Calculation, text_DE_Start_Calculation, text_FR_Start_Calculation, text_IT_Start_Calculation, text_ES_Start_Calculation}}, 1602 {(uint8_t)TXT_Start_Calculation,{text_EN_Start_Calculation, text_DE_Start_Calculation, text_FR_Start_Calculation, text_IT_Start_Calculation, text_ES_Start_Calculation}},
1611 {(uint8_t)TXT_Information, {text_EN_Information, text_DE_Information, text_FR_Information, text_IT_Information, text_ES_Information}}, 1603 {(uint8_t)TXT_Information, {text_EN_Information, text_DE_Information, text_FR_Information, text_IT_Information, text_ES_Information}},
1612 // unused{(uint8_t)TXT_Conservatism, {text_EN_Conservatism, text_DE_Conservatism, text_FR_Conservatism, text_IT_Conservatism, text_ES_Conservatism}},
1613 // unused{(uint8_t)TXT_Change, {text_EN_Change, text_DE_Change, text_FR_Change, text_IT_Change, text_ES_Change}},
1614 // unused{(uint8_t)TXT_enter, {text_EN_enter, text_DE_enter, text_FR_enter, text_IT_enter, text_ES_enter}},
1615 // unused{(uint8_t)TXT_down, {text_EN_down, text_DE_down, text_FR_down, text_IT_down, text_ES_down}},
1616 // unused{(uint8_t)TXT_Luftintegration, {text_EN_Luftintegration, text_DE_Luftintegration, text_FR_Luftintegration, text_IT_Luftintegration, text_ES_Luftintegration}},
1617 // unused{(uint8_t)TXT_FirmwareUpdate, {text_EN_FirmwareUpdate, text_DE_FirmwareUpdate, text_FR_FirmwareUpdate, text_IT_FirmwareUpdate, text_ES_FirmwareUpdate}},
1618 // unused{(uint8_t)TXT_ppo2_setting, {text_EN_ppo2_setting, text_DE_ppo2_setting, text_FR_ppo2_setting, text_IT_ppo2_setting, text_ES_ppo2_setting}},
1619 // unused{(uint8_t)TXT_Yes, {text_EN_Yes, text_DE_Yes, text_FR_Yes, text_IT_Yes, text_ES_Yes}},
1620 // unused{(uint8_t)TXT_No, {text_EN_No, text_DE_No, text_FR_No, text_IT_No, text_ES_No}},
1621 }; 1604 };
1622 1605
1623 const tText text_array2[] = 1606 const tText text_array2[] =
1624 { 1607 {
1625 {(uint8_t)TXT2BYTE_ResetMenu, {text_EN_ResetMenu, text_DE_ResetMenu, text_FR_ResetMenu, text_IT_ResetMenu, text_ES_ResetMenu}}, 1608 {(uint8_t)TXT2BYTE_ResetMenu, {text_EN_ResetMenu, text_DE_ResetMenu, text_FR_ResetMenu, text_IT_ResetMenu, text_ES_ResetMenu}},
1741 {(uint8_t)TXT2BYTE_Sensor, {text_EN_SensorList, text_DE_SensorList, text_FR_SensorList, text_IT_SensorList, text_ES_SensorList}}, 1724 {(uint8_t)TXT2BYTE_Sensor, {text_EN_SensorList, text_DE_SensorList, text_FR_SensorList, text_IT_SensorList, text_ES_SensorList}},
1742 {(uint8_t)TXT2BYTE_Maintenance, {text_EN_Maintenance, text_DE_Maintenance, text_FR_Maintenance, text_IT_Maintenance, text_ES_Maintenance}}, 1725 {(uint8_t)TXT2BYTE_Maintenance, {text_EN_Maintenance, text_DE_Maintenance, text_FR_Maintenance, text_IT_Maintenance, text_ES_Maintenance}},
1743 {(uint8_t)TXT2BYTE_SetBatteryCharge,{text_EN_SetBatteryCharge, text_DE_SetBatteryCharge, text_FR_SetBatteryCharge, text_IT_SetBatteryCharge, text_ES_SetBatteryCharge}}, 1726 {(uint8_t)TXT2BYTE_SetBatteryCharge,{text_EN_SetBatteryCharge, text_DE_SetBatteryCharge, text_FR_SetBatteryCharge, text_IT_SetBatteryCharge, text_ES_SetBatteryCharge}},
1744 {(uint8_t)TXT2BYTE_SetFactoryDefaults,{text_EN_SetFactoryDefaults, text_DE_SetFactoryDefaults, text_FR_SetFactoryDefaults, text_IT_SetFactoryDefaults, text_ES_SetFactoryDefaults}}, 1727 {(uint8_t)TXT2BYTE_SetFactoryDefaults,{text_EN_SetFactoryDefaults, text_DE_SetFactoryDefaults, text_FR_SetFactoryDefaults, text_IT_SetFactoryDefaults, text_ES_SetFactoryDefaults}},
1745 1728
1746
1747 {(uint8_t)TXT2BYTE_Reboot, {text_EN_Reboot, text_DE_Reboot, text_FR_Reboot, text_IT_Reboot, text_ES_Reboot}}, 1729 {(uint8_t)TXT2BYTE_Reboot, {text_EN_Reboot, text_DE_Reboot, text_FR_Reboot, text_IT_Reboot, text_ES_Reboot}},
1748 {(uint8_t)TXT2BYTE_ButtonLeft, {text_EN_ButtonLeft, text_DE_ButtonLeft, text_FR_ButtonLeft, text_IT_ButtonLeft, text_ES_ButtonLeft}}, 1730 {(uint8_t)TXT2BYTE_ButtonLeft, {text_EN_ButtonLeft, text_DE_ButtonLeft, text_FR_ButtonLeft, text_IT_ButtonLeft, text_ES_ButtonLeft}},
1749 {(uint8_t)TXT2BYTE_ButtonMitte, {text_EN_ButtonMitte, text_DE_ButtonMitte, text_FR_ButtonMitte, text_IT_ButtonMitte, text_ES_ButtonMitte}}, 1731 {(uint8_t)TXT2BYTE_ButtonMitte, {text_EN_ButtonMitte, text_DE_ButtonMitte, text_FR_ButtonMitte, text_IT_ButtonMitte, text_ES_ButtonMitte}},
1750 {(uint8_t)TXT2BYTE_ButtonRight, {text_EN_ButtonRight, text_DE_ButtonRight, text_FR_ButtonRight, text_IT_ButtonRight, text_ES_ButtonRight}}, 1732 {(uint8_t)TXT2BYTE_ButtonRight, {text_EN_ButtonRight, text_DE_ButtonRight, text_FR_ButtonRight, text_IT_ButtonRight, text_ES_ButtonRight}},
1751 {(uint8_t)TXT2BYTE_Summary, {text_EN_Summary, text_DE_Summary, text_FR_Summary, text_IT_Summary, text_ES_Summary}}, 1733 {(uint8_t)TXT2BYTE_Summary, {text_EN_Summary, text_DE_Summary, text_FR_Summary, text_IT_Summary, text_ES_Summary}},
1753 {(uint8_t)TXT2BYTE_ApneaTotal, {text_EN_ApneaTotal, text_DE_ApneaTotal, text_FR_ApneaTotal, text_IT_ApneaTotal, text_ES_ApneaTotal}}, 1735 {(uint8_t)TXT2BYTE_ApneaTotal, {text_EN_ApneaTotal, text_DE_ApneaTotal, text_FR_ApneaTotal, text_IT_ApneaTotal, text_ES_ApneaTotal}},
1754 {(uint8_t)TXT2BYTE_ApneaSurface, {text_EN_ApneaSurface, text_DE_ApneaSurface, text_FR_ApneaSurface, text_IT_ApneaSurface, text_ES_ApneaSurface}}, 1736 {(uint8_t)TXT2BYTE_ApneaSurface, {text_EN_ApneaSurface, text_DE_ApneaSurface, text_FR_ApneaSurface, text_IT_ApneaSurface, text_ES_ApneaSurface}},
1755 1737
1756 {(uint8_t)TXT2BYTE_FLIPDISPLAY, {text_EN_FlipDisplay, text_DE_FlipDisplay, text_FR_FlipDisplay, text_IT_FlipDisplay, text_ES_FlipDisplay}}, 1738 {(uint8_t)TXT2BYTE_FLIPDISPLAY, {text_EN_FlipDisplay, text_DE_FlipDisplay, text_FR_FlipDisplay, text_IT_FlipDisplay, text_ES_FlipDisplay}},
1757 1739
1758
1759 // {(uint8_t)TXT2BYTE_ApneaCount, {text_EN_ApneaCount, text_DE_ApneaCount, text_FR_ApneaCount, text_IT_ApneaCount, text_ES_ApneaCount}},
1760 // unused {(uint8_t)TXT2BYTE_Button1, {text_EN_Button1, text_DE_Button1, text_FR_Button1, text_IT_Button1, text_ES_Button1}},
1761 // unused {(uint8_t)TXT2BYTE_Button2, {text_EN_Button2, text_DE_Button2, text_FR_Button2, text_IT_Button2, text_ES_Button2}},
1762 // unused {(uint8_t)TXT2BYTE_Button3, {text_EN_Button3, text_DE_Button3, text_FR_Button3, text_IT_Button3, text_ES_Button3}},
1763 // unused {(uint8_t)TXT2BYTE_Button4, {text_EN_Button4, text_DE_Button4, text_FR_Button4, text_IT_Button4, text_ES_Button4}},
1764 }; 1740 };
1765