Mercurial > public > ostc4

comparison Discovery/Src/t7.c @ 367:e309f78f89a5 MotionDetection

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge default
author Ideenmodellierer
date Sat, 20 Jul 2019 21:42:45 +0200
parents 3c7030d6d67a 7420ed6c3508
children 210bffc496a3
comparison
equal deleted inserted replaced
366:3c7030d6d67a 367:e309f78f89a5
1862 } 1862 }
1863 } 1863 }
1864 t7cC.WindowLineSpacing = 95; 1864 t7cC.WindowLineSpacing = 95;
1865 t7cC.WindowNumberOfTextLines = 3; 1865 t7cC.WindowNumberOfTextLines = 3;
1866 text[textpointer] = 0; 1866 text[textpointer] = 0;
1867 if(pSettings->FlipDisplay)
1868 {
1869 t7cC.WindowY1 -= 40;
1870 }
1867 GFX_write_string(&FontT105,&t7cC,text,1); 1871 GFX_write_string(&FontT105,&t7cC,text,1);
1872 if(pSettings->FlipDisplay)
1873 {
1874 t7cC.WindowY1 += 40;
1875 }
1868 break; 1876 break;
1869 1877
1870 case CVIEW_sensors_mV: 1878 case CVIEW_sensors_mV:
1871 snprintf(text,100,"\032\f\001%c%c",TXT_2BYTE,TXT2BYTE_O2voltage); 1879 snprintf(text,100,"\032\f\001%c%c",TXT_2BYTE,TXT2BYTE_O2voltage);
1872 GFX_write_string(&FontT42,&t7cH,text,0); 1880 GFX_write_string(&FontT42,&t7cH,text,0);
1892 } 1900 }
1893 } 1901 }
1894 t7cC.WindowLineSpacing = 95; 1902 t7cC.WindowLineSpacing = 95;
1895 t7cC.WindowNumberOfTextLines = 3; 1903 t7cC.WindowNumberOfTextLines = 3;
1896 text[textpointer] = 0; 1904 text[textpointer] = 0;
1905 if(pSettings->FlipDisplay)
1906 {
1907 t7cC.WindowY1 -= 40;
1908 }
1897 GFX_write_string(&FontT48,&t7cC,text,1); 1909 GFX_write_string(&FontT48,&t7cC,text,1);
1910 if(pSettings->FlipDisplay)
1911 {
1912 t7cC.WindowY1 += 40;
1913 }
1898 break; 1914 break;
1899 1915
1900 case CVIEW_Compass: 1916 case CVIEW_Compass:
1901 default: 1917 default:
1902 snprintf(text,100,"\032\f\001%c%c",TXT_2BYTE, TXT2BYTE_Compass); 1918 snprintf(text,100,"\032\f\001%c%c",TXT_2BYTE, TXT2BYTE_Compass);
3083 fCNS = stateUsed->lifeData .cns; 3099 fCNS = stateUsed->lifeData .cns;
3084 if(fCNS > 999) 3100 if(fCNS > 999)
3085 fCNS = 999; 3101 fCNS = 999;
3086 3102
3087 t7cY0free.WindowY0 = t7cC.WindowY0 - 10; 3103 t7cY0free.WindowY0 = t7cC.WindowY0 - 10;
3104 if(settingsGetPointer()->FlipDisplay)
3105 {
3106 t7cY0free.WindowY1 = 400;
3107 }
3108
3088 t7cY0free.WindowLineSpacing = 48; 3109 t7cY0free.WindowLineSpacing = 48;
3089 t7cY0free.WindowNumberOfTextLines = 6; 3110 t7cY0free.WindowNumberOfTextLines = 6;
3090 t7cY0free.WindowTab = 420; 3111 t7cY0free.WindowTab = 420;
3091 3112
3092 // header 3113 // header
3107 text[textpointer++] = '\n'; 3128 text[textpointer++] = '\n';
3108 text[textpointer++] = '\r'; 3129 text[textpointer++] = '\r';
3109 text[textpointer++] = TXT_FutureTTS; 3130 text[textpointer++] = TXT_FutureTTS;
3110 text[textpointer++] = '\017'; 3131 text[textpointer++] = '\017';
3111 text[textpointer++] = 0; 3132 text[textpointer++] = 0;
3112 t7cY0free.WindowX0 += 10; 3133
3113 t7cY0free.WindowY0 += 10; 3134 if(!settingsGetPointer()->FlipDisplay)
3114 GFX_write_string(&FontT24, &t7cY0free, text, 1); 3135 {
3115 t7cY0free.WindowX0 -= 10; 3136 t7cY0free.WindowX0 += 10;
3116 t7cY0free.WindowY0 -= 10; 3137 t7cY0free.WindowY0 += 10;
3117 3138 GFX_write_string(&FontT24, &t7cY0free, text, 1);
3139 t7cY0free.WindowX0 -= 10;
3140 t7cY0free.WindowY0 -= 10;
3141 }
3142 else
3143 {
3144 t7cY0free.WindowY1 -= 10;
3145 t7cY0free.WindowX1 -= 10;
3146 GFX_write_string(&FontT24, &t7cY0free, text, 1);
3147 t7cY0free.WindowY1 += 10;
3148 t7cY0free.WindowX1 += 10;
3149 }
3118 textpointer = 0; 3150 textpointer = 0;
3119 text[textpointer++] = '\t'; 3151 text[textpointer++] = '\t';
3120 textpointer += snprintf(&text[textpointer],10,"\020%01.2f", stateUsed->lifeData.ppO2); 3152 textpointer += snprintf(&text[textpointer],10,"\020%01.2f", stateUsed->lifeData.ppO2);
3121 text[textpointer++] = '\n'; 3153 text[textpointer++] = '\n';
3122 text[textpointer++] = '\r'; 3154 text[textpointer++] = '\r';