Changeset 20431 for titan/plugins/lcdsamsung
- Timestamp:
- 03/09/13 14:29:52 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/plugins/lcdsamsung/lcdsamsung.c
r20422 r20431 100 100 struct skin* n_minute_standby = NULL; 101 101 102 struct skin* n_stunde2 = NULL; 103 struct skin* n_minute2 = NULL; 104 struct skin* n_stunde2_standby = NULL; 105 struct skin* n_minute2_standby = NULL; 106 102 107 struct skin* sday0_t = NULL; 103 108 struct skin* sday0_i = NULL; … … 116 121 char* tmpstr = NULL, *tmpstr2 = NULL, *tmpstr3 = NULL, *timemerk = NULL, *sendermerk = NULL, *recmerk = NULL; 117 122 char* pichr = NULL, *picmin = NULL, *pichr_standby = NULL, *picmin_standby = NULL; 123 char* pichr2 = NULL, *picmin2 = NULL, *pichr2_standby = NULL, *picmin2_standby = NULL; 124 int digitaluhr = 0, digitaluhr_standby = 0; 118 125 FILE *fd = NULL; 119 126 char *fileline = NULL; … … 160 167 n_stunde = getscreennode(LCD_Samsung1, "stunde"); 161 168 if(n_stunde != NULL) 169 { 162 170 pichr = ostrcat(n_stunde->pic, "", 0, 0); 171 if(ostrstr(pichr, "Digital") != NULL) 172 digitaluhr = 1; 173 } 163 174 n_minute = getscreennode(LCD_Samsung1, "minute"); 164 175 if(n_minute != NULL) 165 176 picmin = ostrcat(n_minute->pic, "", 0, 0); 177 if(digitaluhr == 1) 178 { 179 n_stunde2 = getscreennode(LCD_Samsung1, "stunde2"); 180 n_minute2 = getscreennode(LCD_Samsung1, "minute2"); 181 picmin2 = ostrcat(n_minute2->pic, "", 0, 0); 182 pichr2 = ostrcat(n_stunde2->pic, "", 0, 0); 183 } 166 184 if(file_exist("/tmp/lcdweather")) 167 185 system("rm /tmp/lcdweather"); … … 192 210 n_stunde = getscreennode(LCD_Samsung1, "stunde"); 193 211 if(n_stunde != NULL) 212 { 194 213 pichr = ostrcat(n_stunde->pic, "", 0, 0); 214 if(ostrstr(pichr, "Digital") != NULL) 215 digitaluhr = 1; 216 } 195 217 n_minute = getscreennode(LCD_Samsung1, "minute"); 196 218 if(n_minute != NULL) 197 219 picmin = ostrcat(n_minute->pic, "", 0, 0); 220 if(digitaluhr == 1) 221 { 222 n_stunde2 = getscreennode(LCD_Samsung1, "stunde2"); 223 n_minute2 = getscreennode(LCD_Samsung1, "minute2"); 224 picmin2 = ostrcat(n_minute2->pic, "", 0, 0); 225 pichr2 = ostrcat(n_stunde2->pic, "", 0, 0); 226 } 198 227 } 199 228 … … 287 316 n_stunde_standby = getscreennode(LCD_Standby, "stunde"); 288 317 if(n_stunde_standby != NULL) 318 { 289 319 pichr_standby = ostrcat(n_stunde_standby->pic, "", 0, 0); 320 if(ostrstr(pichr_standby, "Digital") != NULL) 321 digitaluhr_standby = 1; 322 } 290 323 n_minute_standby = getscreennode(LCD_Standby, "minute"); 291 324 if(n_minute_standby != NULL) 292 325 picmin_standby = ostrcat(n_minute_standby->pic, "", 0, 0); 293 326 if(digitaluhr_standby == 1) 327 { 328 n_stunde2_standby = getscreennode(LCD_Standby, "stunde2"); 329 n_minute2_standby = getscreennode(LCD_Standby, "minute2"); 330 picmin2_standby = ostrcat(n_minute2_standby->pic, "", 0, 0); 331 pichr2_standby = ostrcat(n_stunde2_standby->pic, "", 0, 0); 332 } 294 333 } 295 334 … … 549 588 if(akttime != NULL) 550 589 changetext(akttime, tmpstr); 551 if(n_minute != NULL )590 if(n_minute != NULL && digitaluhr == 0) 552 591 { 553 592 free(tmpstr);tmpstr=NULL; … … 557 596 free(tmpstr);tmpstr=NULL; 558 597 } 559 if(n_stunde != NULL )598 if(n_stunde != NULL && digitaluhr == 0) 560 599 { 561 600 free(tmpstr);tmpstr=NULL; … … 579 618 n_stunde->pic = string_replace("hr_hhmm", tmpstr, pichr, 0); 580 619 free(tmpstr);tmpstr=NULL; 620 } 621 if(digitaluhr == 1) 622 { 623 free(tmpstr);tmpstr=NULL; 624 tmpstr = ostrcat("wert_",oitoa(hr/10), 0, 1); 625 n_stunde->pic = string_replace("wert_w", tmpstr, pichr, 0); 626 free(tmpstr);tmpstr=NULL; 627 tmpstr = ostrcat("wert_",oitoa(hr%10), 0, 1); 628 n_stunde2->pic = string_replace("wert_w", tmpstr, pichr2, 0); 629 free(tmpstr);tmpstr=NULL; 630 tmpstr = ostrcat("wert_",oitoa(min/10), 0, 1); 631 n_minute->pic = string_replace("wert_w", tmpstr, picmin, 0); 632 free(tmpstr);tmpstr=NULL; 633 tmpstr = ostrcat("wert_",oitoa(min%10), 0, 1); 634 n_minute2->pic = string_replace("wert_w", tmpstr, picmin2, 0); 635 free(tmpstr);tmpstr=NULL; 581 636 } 582 637 … … 589 644 if(akttime_Standby != NULL) 590 645 changetext(akttime_Standby, tmpstr); 591 if(n_minute_standby != NULL )646 if(n_minute_standby != NULL && digitaluhr_standby == 0) 592 647 { 593 648 free(tmpstr);tmpstr=NULL; … … 597 652 free(tmpstr);tmpstr=NULL; 598 653 } 599 if(n_stunde_standby != NULL )654 if(n_stunde_standby != NULL && digitaluhr_standby == 0) 600 655 { 601 656 free(tmpstr);tmpstr=NULL; … … 620 675 free(tmpstr);tmpstr=NULL; 621 676 } 677 if(digitaluhr_standby == 1) 678 { 679 free(tmpstr);tmpstr=NULL; 680 tmpstr = ostrcat("wert_",oitoa(hr/10), 0, 1); 681 n_stunde_standby->pic = string_replace("wert_w", tmpstr, pichr_standby, 0); 682 free(tmpstr);tmpstr=NULL; 683 tmpstr = ostrcat("wert_",oitoa(hr%10), 0, 1); 684 n_stunde2_standby->pic = string_replace("wert_w", tmpstr, pichr2_standby, 0); 685 free(tmpstr);tmpstr=NULL; 686 tmpstr = ostrcat("wert_",oitoa(min/10), 0, 1); 687 n_minute_standby->pic = string_replace("wert_w", tmpstr, picmin_standby, 0); 688 free(tmpstr);tmpstr=NULL; 689 tmpstr = ostrcat("wert_",oitoa(min%10), 0, 1); 690 n_minute2_standby->pic = string_replace("wert_w", tmpstr, picmin2_standby, 0); 691 free(tmpstr);tmpstr=NULL; 692 } 693 622 694 drawscreen(LCD_Standby, 0, 0); 623 695 put = 0; … … 707 779 free(pichr_standby);pichr=NULL; 708 780 free(picmin_standby);picmin=NULL; 781 free(pichr2);pichr2=NULL; 782 free(picmin2);picmin2=NULL; 783 free(pichr2_standby);pichr2_standby=NULL; 784 free(picmin2_standby);picmin2_standby=NULL; 709 785 addconfig("lcd_samsung_plugin_running", "no"); 710 786 LCD_Samsung1thread = NULL;
Note: See TracChangeset
for help on using the changeset viewer.