Changeset 15385

Timestamp:

04/27/12 21:37:36 (11 years ago)

Author:

gost

Message:

[lcdpearl] adjustable

Files:

• ipk/source.sh4/titanswaptools_lcdpearl1/CONTROL/control (modified) (1 diff)
• titan/plugins/lcdpearl1/lcdpearl1.c (modified) (13 diffs)
• titan/plugins/lcdpearl1/lcdpearl_grep.h (deleted)
• titan/skins/lcdpearl1/skin.xml (modified) (1 diff)

ipk/source.sh4/titanswaptools_lcdpearl1/CONTROL/control

@@ -1 +1 @@
 Package: titan-plugin-swaptools-pearllcd
-Version: 2.3
-Description: Treiber fuer Pearl LCD V2.3
+Version: 3.0
+Description: Treiber fuer Pearl LCD V3.0
 Section: tools
 Priority: optional

titan/plugins/lcdpearl1/lcdpearl1.c

@@ -13 +13 @@
 struct stimerthread* LCD_Pearl1thread = NULL;
 int firststart = 0;
-int draw = 0;
 
 void LCD_start_lcd4linux()
@@ -19 +18 @@
         int count = 0;
         char* startlcd = ostrcat(getconfig("pluginpath", NULL), "/lcdpearl1/start.sh", 0, 0);
-/*      while (draw == 0 && LCD_Pearl1thread != NULL)
-        {
-                sleep(1);
-        }
-        sleep(2);*/
+
         if(LCD_Pearl1thread == NULL)
                 return;
@@ -71 +66 @@
                 sleep(8);
         firststart = 0;
-        draw = 0;
         status.write_png = 0;
         if(ostrcmp(getconfig("write_fb_to_png", NULL), "yes") == 0)
@@ -80 +74 @@
                 tmpstr = gettime(NULL, "%H:%M");
                 
+                // TV Programm läuft
                 if(status.infobaraktiv == 1)
                 {
@@ -88 +83 @@
                         type = 1;
                 }
+                // Aufzeichnung wird abgespielt
                 else if(status.playspeed != 0 || status.play != 0 || status.pause != 0)
                 {
@@ -94 +90 @@
                         type = 2;
                 }
+                // Sonstige Anzeigen
                 else
                 {
@@ -111 +108 @@
                 else
                         put = 0;
-                
-                if(draw == 0)
-                        put = 1;
-                
+
                 if(status.security == 1)
                 {
@@ -170 +164 @@
                                         {
                                                 changetext(akttime, tmpstr);
-                                                if(drawscreen(LCD_Pearl1, 0) == 0)
-                                                        draw = 1;
-                                                else
-                                                        draw = 0;
+                                                drawscreen(LCD_Pearl1, 0);
+
                                                 //system(fbgrab);
                                                 //system("mv /tmp/.titanlcd1.png /tmp/titanlcd.png");
@@ -221 +213 @@
                                                 changetext(akttimeplay, tmpstr);
                                                 changetext(stitle, basename(status.playfile));
-                                                if (drawscreen(LCD_Play, 0) == 0)
-                                                        draw = 1;
-                                                else
-                                                        draw = 0;       
-                                        }
+                                                drawscreen(LCD_Play, 0);
+
                                         //else if(type == 999 && status.mcaktiv == 1) 
                                         //else if(type == 999)  
@@ -232 +221 @@
                                                 //drawscreen(LCD_MC_Menu, 3);
                                         //}
+                                        }
                                 }
                         }
@@ -263 +253 @@
                 system(tmpstr);
                 free(tmpstr); tmpstr=NULL;
-                textbox(_("Message"), _("LCD Pearl1 starts ..."), _("OK"), getrcconfigint("rcok", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 5, 0);
+                //textbox(_("Message"), _("LCD Pearl1 starts ..."), _("OK"), getrcconfigint("rcok", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 5, 0);
                 addconfig("lcd_pearl1_plugin_running", "yes");
                 LCD_Pearl1thread = addtimer(&LCD_Pearl1_thread, START, 10000, 1, NULL, NULL, NULL);
@@ -271 +261 @@
         else
         {
-                if (textbox(_("Message"), _("Stop LCD Pearl1 ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("exit", NULL), NULL, 0, NULL, 0, 600, 200, 5, 0) != 2);
-                {
+                //if (textbox(_("Message"), _("Stop LCD Pearl1 ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("exit", NULL), NULL, 0, NULL, 0, 600, 200, 5, 0) != 2);
+                //{
                         LCD_Pearl1thread->aktion = STOP;
                         system("echo ende > /tmp/titanlcd.png");
                         sleep(1);
                         system("killall lcd4linux");
-                }
+                //}
         }
 }       
@@ -313 +303 @@
 void start(void)
 {
-        LCD_Pearl1_main();
-}
+        struct skin* pearl1_main = getscreen("pearl1_main");
+        struct skin* listbox = getscreennode(pearl1_main, "listbox");
+        struct skin* allmenu = getscreennode(pearl1_main, "allmenu");
+        struct skin* b3 = getscreennode(pearl1_main, "b3");
+        struct skin* tmp = NULL;
+        
+        int rcret = 0;
+        int startstop = 0;
+        int restart = 0;
+        
+  addchoicebox(allmenu, "no", _("nein"));
+  addchoicebox(allmenu, "yes", _("ja"));
+        setchoiceboxselection(allmenu, getconfig("write_fb_to_png", NULL));
+        
+        if(LCD_Pearl1thread != NULL)
+                changetext(b3, "STOP");
+        else
+                changetext(b3, "START");
+                
+        drawscreen(pearl1_main, 0);
+        addscreenrc(pearl1_main, listbox);
+        tmp = listbox->select;
+        
+        while(1)
+        {
+                addscreenrc(pearl1_main, tmp);
+                rcret = waitrc(pearl1_main, 0, 0);
+                tmp = listbox->select;
+                
+                if(rcret == getrcconfigint("rcexit", NULL))
+                        break;
+                if(rcret == getrcconfigint("rcgreen", NULL))
+                {
+                        addconfig("write_fb_to_png", allmenu->ret);
+                        restart = 1;
+                        break;
+                }
+                        
+                if(rcret == getrcconfigint("rcblue", NULL))
+                {
+                        startstop = 1;
+                        break;
+                }
+        }
+        delownerrc(pearl1_main);
+        clearscreen(pearl1_main);
+        
+        if(LCD_Pearl1thread != NULL && restart == 1)
+        {
+                LCD_Pearl1thread->aktion = STOP;
+                sleep(2);
+                LCD_Pearl1thread = addtimer(&LCD_Pearl1_thread, START, 10000, 1, NULL, NULL, NULL);
+                sleep(1);
+                return;
+        }
+        if(startstop == 1)
+        {
+                if(LCD_Pearl1thread != NULL)
+                {
+                        addconfig("lcd_pearl1_plugin_running", "no");
+                        LCD_Pearl1thread->aktion = STOP;
+                        sleep(1);
+                        system("killall lcd4linux");
+                        debug(10, "LCD Pearl1 unloadet !!!");   
+                        sleep(1);
+                }
+                else {
+                        addconfig("lcd_pearl1_plugin_running", "yes");
+                        LCD_Pearl1thread = addtimer(&LCD_Pearl1_thread, START, 10000, 1, NULL, NULL, NULL);
+                        addtimer(&LCD_start_lcd4linux, START, 10000, 1, NULL, NULL, NULL);
+                        sleep(1);
+                }
+        }
+        return;
+}
+

titan/skins/lcdpearl1/skin.xml

@@ +1 @@
+<screen name="pearl1_main" title="Pearl LCD Settings" titlealign=center fontcol=fontcol valign=bottom fontsize=30 posx=center posy=center width=50% height=40% bordercol=bordercol bordersize=2 bgcol=bgcol>
+<node bordercol=bordercol scrollbar=auto type=listbox posy=center posx=center name=listbox width=85% height=70%>
+<node name=allmenu type=choicebox parent=listbox valign=middle posx=0 text="alle Menus anzeigen" bordercol=bordercol bordersize=2 width=100% height=25>
+<node name=b1 text=SAVE halign=center valign=middle bordercol=green bordersize=2 bordertype=2 posx=0 posy=0 width=150 height=30/>
+<node name=b2 text=EXIT halign=center valign=middle bordercol=exitcol bordersize=2 bordertype=2 posx=160 posy=0 width=150 height=30/>
+<node name=b3 text=START halign=center valign=middle bordercol=blue bordersize=2 bordertype=2 posx=400 posy=0 width=200 height=30/>
+</screen>
+
 <screen halign=center fontcol=fontcol fontsize=30 name=LCD_Pearl1 posx=0 posy=0 width=320 height=240 bgcol=bgcol>
 <node fontsize=40 halign=center text="" func=getaktchannelname name=channelname posx=5 posy=5 width=310 height=40 fontcol=fontcol/>