Mercurial > public > ostc4

comparison Discovery/Src/t7.c @ 318:bc31d078fb90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged in Ideenmodellierer/ostc4/Bugfix_Flip_FirmwareUpdate (pull request #26) Bugfix Flip FirmwareUpdate
author heinrichsweikamp <bitbucket@heinrichsweikamp.com>
date Wed, 19 Jun 2019 13:12:01 +0000
parents 7420ed6c3508
children 449e9e9632e4 e309f78f89a5
comparison
equal deleted inserted replaced
313:49f5db6139d5 318:bc31d078fb90
1832 } 1832 }
1833 } 1833 }
1834 t7cC.WindowLineSpacing = 95; 1834 t7cC.WindowLineSpacing = 95;
1835 t7cC.WindowNumberOfTextLines = 3; 1835 t7cC.WindowNumberOfTextLines = 3;
1836 text[textpointer] = 0; 1836 text[textpointer] = 0;
1837 if(pSettings->FlipDisplay)
1838 {
1839 t7cC.WindowY1 -= 40;
1840 }
1837 GFX_write_string(&FontT105,&t7cC,text,1); 1841 GFX_write_string(&FontT105,&t7cC,text,1);
1842 if(pSettings->FlipDisplay)
1843 {
1844 t7cC.WindowY1 += 40;
1845 }
1838 break; 1846 break;
1839 1847
1840 case CVIEW_sensors_mV: 1848 case CVIEW_sensors_mV:
1841 snprintf(text,100,"\032\f\001%c%c",TXT_2BYTE,TXT2BYTE_O2voltage); 1849 snprintf(text,100,"\032\f\001%c%c",TXT_2BYTE,TXT2BYTE_O2voltage);
1842 GFX_write_string(&FontT42,&t7cH,text,0); 1850 GFX_write_string(&FontT42,&t7cH,text,0);
1862 } 1870 }
1863 } 1871 }
1864 t7cC.WindowLineSpacing = 95; 1872 t7cC.WindowLineSpacing = 95;
1865 t7cC.WindowNumberOfTextLines = 3; 1873 t7cC.WindowNumberOfTextLines = 3;
1866 text[textpointer] = 0; 1874 text[textpointer] = 0;
1875 if(pSettings->FlipDisplay)
1876 {
1877 t7cC.WindowY1 -= 40;
1878 }
1867 GFX_write_string(&FontT48,&t7cC,text,1); 1879 GFX_write_string(&FontT48,&t7cC,text,1);
1880 if(pSettings->FlipDisplay)
1881 {
1882 t7cC.WindowY1 += 40;
1883 }
1868 break; 1884 break;
1869 1885
1870 case CVIEW_Compass: 1886 case CVIEW_Compass:
1871 default: 1887 default:
1872 snprintf(text,100,"\032\f\001%c%c",TXT_2BYTE, TXT2BYTE_Compass); 1888 snprintf(text,100,"\032\f\001%c%c",TXT_2BYTE, TXT2BYTE_Compass);
3053 fCNS = stateUsed->lifeData .cns; 3069 fCNS = stateUsed->lifeData .cns;
3054 if(fCNS > 999) 3070 if(fCNS > 999)
3055 fCNS = 999; 3071 fCNS = 999;
3056 3072
3057 t7cY0free.WindowY0 = t7cC.WindowY0 - 10; 3073 t7cY0free.WindowY0 = t7cC.WindowY0 - 10;
3074 if(settingsGetPointer()->FlipDisplay)
3075 {
3076 t7cY0free.WindowY1 = 400;
3077 }
3078
3058 t7cY0free.WindowLineSpacing = 48; 3079 t7cY0free.WindowLineSpacing = 48;
3059 t7cY0free.WindowNumberOfTextLines = 6; 3080 t7cY0free.WindowNumberOfTextLines = 6;
3060 t7cY0free.WindowTab = 420; 3081 t7cY0free.WindowTab = 420;
3061 3082
3062 // header 3083 // header
3077 text[textpointer++] = '\n'; 3098 text[textpointer++] = '\n';
3078 text[textpointer++] = '\r'; 3099 text[textpointer++] = '\r';
3079 text[textpointer++] = TXT_FutureTTS; 3100 text[textpointer++] = TXT_FutureTTS;
3080 text[textpointer++] = '\017'; 3101 text[textpointer++] = '\017';
3081 text[textpointer++] = 0; 3102 text[textpointer++] = 0;
3082 t7cY0free.WindowX0 += 10; 3103
3083 t7cY0free.WindowY0 += 10; 3104 if(!settingsGetPointer()->FlipDisplay)
3084 GFX_write_string(&FontT24, &t7cY0free, text, 1); 3105 {
3085 t7cY0free.WindowX0 -= 10; 3106 t7cY0free.WindowX0 += 10;
3086 t7cY0free.WindowY0 -= 10; 3107 t7cY0free.WindowY0 += 10;
3087 3108 GFX_write_string(&FontT24, &t7cY0free, text, 1);
3109 t7cY0free.WindowX0 -= 10;
3110 t7cY0free.WindowY0 -= 10;
3111 }
3112 else
3113 {
3114 t7cY0free.WindowY1 -= 10;
3115 t7cY0free.WindowX1 -= 10;
3116 GFX_write_string(&FontT24, &t7cY0free, text, 1);
3117 t7cY0free.WindowY1 += 10;
3118 t7cY0free.WindowX1 += 10;
3119 }
3088 textpointer = 0; 3120 textpointer = 0;
3089 text[textpointer++] = '\t'; 3121 text[textpointer++] = '\t';
3090 textpointer += snprintf(&text[textpointer],10,"\020%01.2f", stateUsed->lifeData.ppO2); 3122 textpointer += snprintf(&text[textpointer],10,"\020%01.2f", stateUsed->lifeData.ppO2);
3091 text[textpointer++] = '\n'; 3123 text[textpointer++] = '\n';
3092 text[textpointer++] = '\r'; 3124 text[textpointer++] = '\r';