comparison Discovery/Src/tMenuEditSystem.c @ 461:b3f684cea9c0

Merged in Ideenmodellierer/ostc4/minor_improvments (pull request #41) Minor improvments
author heinrichsweikamp <bitbucket@heinrichsweikamp.com>
date Mon, 30 Mar 2020 13:16:11 +0000
parents f1257a32f2d4
children aa1d71875e25
comparison
equal deleted inserted replaced
441:9a9e4908ce2e 461:b3f684cea9c0
874 text[2] = ' '; 874 text[2] = ' ';
875 text[3] = ' '; 875 text[3] = ' ';
876 switch(settingsGetPointer()->tX_userselectedLeftLowerCornerPrimary) 876 switch(settingsGetPointer()->tX_userselectedLeftLowerCornerPrimary)
877 { 877 {
878 /* Temperature */ 878 /* Temperature */
879 case 1: 879 case LLC_Temperature:
880 text[4] = TXT_Temperature; 880 text[4] = TXT_Temperature;
881 break; 881 break;
882 /* Average Depth */ 882 /* Average Depth */
883 case 2: 883 case LLC_AverageDepth:
884 text[4] = TXT_AvgDepth; 884 text[4] = TXT_AvgDepth;
885 break; 885 break;
886 /* ppO2 */ 886 /* ppO2 */
887 case 3: 887 case LLC_ppO2:
888 text[4] = TXT_ppO2; 888 text[4] = TXT_ppO2;
889 break; 889 break;
890 /* Stop Uhr */ 890 /* Stop Uhr */
891 case 4: 891 case LLC_Stopwatch:
892 text[4] = TXT_Stopwatch; 892 text[4] = TXT_Stopwatch;
893 break; 893 break;
894 /* Ceiling */ 894 /* Ceiling */
895 case 5: 895 case LLC_Ceiling:
896 text[4] = TXT_Ceiling; 896 text[4] = TXT_Ceiling;
897 break; 897 break;
898 /* Future TTS */ 898 /* Future TTS */
899 case 6: 899 case LLC_FutureTTS:
900 text[4] = TXT_FutureTTS; 900 text[4] = TXT_FutureTTS;
901 break; 901 break;
902 /* CNS */ 902 /* CNS */
903 case 7: 903 case LLC_CNS:
904 text[4] = TXT_CNS; 904 text[4] = TXT_CNS;
905 break; 905 break;
906 case 8: 906 case LLC_GF:
907 text[4] = TXT_ActualGradient; 907 text[4] = TXT_ActualGradient;
908 break; 908 break;
909 #ifdef ENABLE_BOTTLE_SENSOR
910 case LCC_BottleBar:
911 text[4] = TXT_AtemGasVorrat;
912 break;
913 #endif
909 /* none */ 914 /* none */
910 case 0: 915 case LLC_Empty:
911 text[4] = '-'; 916 text[4] = '-';
912 break; 917 break;
913 default: 918 default:
914 snprintf(&text[4],2,"%u",settingsGetPointer()->tX_userselectedLeftLowerCornerPrimary); 919 snprintf(&text[4],2,"%u",settingsGetPointer()->tX_userselectedLeftLowerCornerPrimary);
915 break; 920 break;
1078 uint8_t value; 1083 uint8_t value;
1079 value = settingsGetPointer()->tX_userselectedLeftLowerCornerPrimary; 1084 value = settingsGetPointer()->tX_userselectedLeftLowerCornerPrimary;
1080 1085
1081 value += 1; 1086 value += 1;
1082 1087
1083 if(value > 8) 1088 if(value >= LLC_END)
1084 value = 0; 1089 value = 0;
1085 1090
1086 settingsGetPointer()->tX_userselectedLeftLowerCornerPrimary = value; 1091 settingsGetPointer()->tX_userselectedLeftLowerCornerPrimary = value;
1087 return UPDATE_DIVESETTINGS; 1092 return UPDATE_DIVESETTINGS;
1088 } 1093 }