Merge tag 'upstream/4.3.0'

Upstream version 4.3.0

13 files changed, 125 insertions, 442 deletions

diff --git a/app/bin/bitmaps/block.xpm b/app/bin/bitmaps/block.xpm
new file mode 100644
index 0000000..232d859
--- /dev/null
+++ b/app/bin/bitmaps/block.xpm
@@ -0,0 +1,24 @@
+/* XPM */

+static char * block_xpm[] = {

+"16 16 5 1",

+" 	c None",

+".	c #2E3436",

+"+	c #00FFFF",

+"@	c #25E100",

+"#	c #EF2929",

+"..   .          ",

+"... ...         ",

+" .....++  @@@   ",

+"  ...+++ @@@@@  ",

+" ...+++  @@@@@  ",

+"...++++  @@@@@  ",

+" .++++++  @@@   ",

+"  ++  +++       ",

+"       +++   +  ",

+"   ###  +++ +++ ",

+"  #####  +++++..",

+"  #####   +++...",

+"  #####  +++... ",

+"   ###  +++.... ",

+"         +......",

+"          .. ..."};

diff --git a/app/bin/bitmaps/blockdel.xpm b/app/bin/bitmaps/blockdel.xpm
deleted file mode 100644
index 5a02815..0000000
--- a/app/bin/bitmaps/blockdel.xpm
+++ /dev/null
@@ -1,52 +0,0 @@
-/* XPM */
-static char * blockdel_xpm[] = {
-"16 16 33 1",
-" 	c None",
-".	c #FE0C28",
-"+	c #FE102B",
-"@	c #D1FCD1",
-"#	c #D2FCD2",
-"$	c #FF0000",
-"%	c #FF102A",
-"&	c #D3FCD3",
-"*	c #FF0101",
-"=	c #000000",
-"-	c #C38790",
-";	c #FE0D29",
-">	c #B2A8AA",
-",	c #ACB5B7",
-"'	c #FE122B",
-")	c #ACB6B7",
-"!	c #DE5162",
-"~	c #B5A0A2",
-"{	c #F51819",
-"]	c #FE0A23",
-"^	c #D66070",
-"/	c #FF0202",
-"(	c #C67C7E",
-"_	c #B6A0A5",
-":	c #FF0303",
-"<	c #FFF5F5",
-"[	c #FEEEEE",
-"}	c #FFF6F6",
-"|	c #FDF1F1",
-"1	c #FE142F",
-"2	c #FFF0F0",
-"3	c #FD102C",
-"4	c #FE0D28",
-"                ",
-" .+   @#      $$",
-" %..  @&     $$ ",
-"   ..      *$$  ",
-" =  ..    $$  = ",
-" =  -.;  $$>  = ",
-" =  , .'$$ ,  = ",
-"=== ,)!$$~,, ===",
-"=== ,,{$]^,, ===",
-" =  ,/$ +. ,  = ",
-" =  ($   .._  = ",
-"    $: <  .+    ",
-"   $* [}| 1.    ",
-"  $$  2}   .3   ",
-" *$        4.   ",
-" *          .   "};
diff --git a/app/bin/bitmaps/blockedit.xpm b/app/bin/bitmaps/blockedit.xpm
deleted file mode 100644
index cfe3e5e..0000000
--- a/app/bin/bitmaps/blockedit.xpm
+++ /dev/null
@@ -1,89 +0,0 @@
-/* XPM */
-static char * blockedit_xpm[] = {
-"16 16 70 1",
-" 	c None",
-".	c #028D05",
-"+	c #008B04",
-"@	c #815C14",
-"#	c #C88F21",
-"$	c #6AC66C",
-"%	c #94DA95",
-"&	c #008C03",
-"*	c #008D03",
-"=	c #875F15",
-"-	c #CA8F22",
-";	c #CB9022",
-">	c #008C04",
-",	c #8CD68D",
-"'	c #99DD9A",
-")	c #008B03",
-"!	c #8E6516",
-"~	c #B7821F",
-"{	c #575B0E",
-"]	c #976A17",
-"^	c #B07D1D",
-"/	c #6C4C10",
-"(	c #000000",
-"_	c #4E610C",
-":	c #9F7119",
-"<	c #A8781C",
-"[	c #5D420D",
-"}	c #00C3FF",
-"|	c #63540F",
-"1	c #A7771A",
-"2	c #A0711B",
-"3	c #61450F",
-"4	c #090601",
-"5	c #704E11",
-"6	c #AE7C1C",
-"7	c #956B1B",
-"8	c #5E5526",
-"9	c #34898C",
-"0	c #BA9E58",
-"a	c #CE972E",
-"b	c #C88E21",
-"c	c #8D661B",
-"d	c #4C6B4F",
-"e	c #00C4FF",
-"f	c #01C1FB",
-"g	c #7F7C4C",
-"h	c #E3D6A3",
-"i	c #DDC482",
-"j	c #82621C",
-"k	c #467461",
-"l	c #01C2FC",
-"m	c #C9AB64",
-"n	c #CBB06D",
-"o	c #997C3E",
-"p	c #6A4E10",
-"q	c #03BEF7",
-"r	c #634813",
-"s	c #886628",
-"t	c #95360D",
-"u	c #EE2C2C",
-"v	c #F46E6E",
-"w	c #EC1C1C",
-"x	c #EA0000",
-"y	c #F99A9A",
-"z	c #F9B3B3",
-"A	c #F37E7E",
-"B	c #F48080",
-"C	c #F16262",
-"D	c #EB0000",
-"E	c #E90000",
-"       .+     @#",
-"      $%&*   =-;",
-"     >,'&)  !;;~",
-"      *&&&{];;^/",
-" (    &&)_:;;<[ ",
-" (  }   |1;;234 ",
-" (  }  56;-78 ( ",
-"((( }}90abcd (((",
-"((( efghijkl (((",
-" (  e mnop }  ( ",
-" (  qrst   }  ( ",
-"      uvwx      ",
-"      yzAx      ",
-"      BzCx      ",
-"      DEEx      ",
-"                "};
diff --git a/app/bin/bitmaps/blocknew.xpm b/app/bin/bitmaps/blocknew.xpm
deleted file mode 100644
index 92685f4..0000000
--- a/app/bin/bitmaps/blocknew.xpm
+++ /dev/null
@@ -1,90 +0,0 @@
-/* XPM */
-static char * blocknew_xpm[] = {
-"16 16 71 1",
-" 	c None",
-".	c #028D05",
-"+	c #3DA505",
-"@	c #C1DB0D",
-"#	c #FFF417",
-"$	c #FFF41A",
-"%	c #6AC66C",
-"&	c #96DC91",
-"*	c #7BBE08",
-"=	c #C2DB12",
-"-	c #FCF427",
-";	c #FFF750",
-">	c #FFF528",
-",	c #FFF518",
-"'	c #008C04",
-")	c #8CD68D",
-"!	c #A9E084",
-"~	c #9CCC0B",
-"{	c #E4EA1B",
-"]	c #F9F560",
-"^	c #FFFAA5",
-"/	c #FFF864",
-"(	c #FFF41E",
-"_	c #008D03",
-":	c #40A604",
-"<	c #A5CF0D",
-"[	c #EDED1D",
-"}	c #FBF676",
-"|	c #FFFCD0",
-"1	c #FFFCD1",
-"2	c #FFF878",
-"3	c #FFF51F",
-"4	c #FFF413",
-"5	c #000000",
-"6	c #008C03",
-"7	c #299C05",
-"8	c #95C90A",
-"9	c #E4E919",
-"0	c #FFF756",
-"a	c #F4F795",
-"b	c #FCFA91",
-"c	c #FAF255",
-"d	c #D3CA17",
-"e	c #00C3FF",
-"f	c #FDF215",
-"g	c #E6F14D",
-"h	c #F4F443",
-"i	c #EFE61C",
-"j	c #9B940D",
-"k	c #A4E36A",
-"l	c #D0EC42",
-"m	c #C3BA0E",
-"n	c #585404",
-"o	c #0DC6F2",
-"p	c #3ACEC6",
-"q	c #49D1B9",
-"r	c #7EDB86",
-"s	c #4C4901",
-"t	c #080700",
-"u	c #00C4FF",
-"v	c #EE2C2C",
-"w	c #F46E6E",
-"x	c #EC1C1C",
-"y	c #EA0000",
-"z	c #F99A9A",
-"A	c #F9B3B3",
-"B	c #F37E7E",
-"C	c #F48080",
-"D	c #F16262",
-"E	c #EB0000",
-"F	c #E90000",
-"       .+@#$$#  ",
-"      %&*=-;;>, ",
-"     ')!~{]^^/( ",
-"      _:<[}|1234",
-" 5    67890abcd ",
-" 5  e    f(ghij ",
-" 5  e     4klmn ",
-"555 eeeeeopqrst5",
-"555 ueeeeeee 555",
-" 5  u      e  5 ",
-" 5  e      e  5 ",
-"      vwxy      ",
-"      zABy      ",
-"      CADy      ",
-"      EFFy      ",
-"                "};
diff --git a/app/bin/bitmaps/control.xpm b/app/bin/bitmaps/control.xpm
new file mode 100644
index 0000000..bc73a57
--- /dev/null
+++ b/app/bin/bitmaps/control.xpm
@@ -0,0 +1,24 @@
+/* XPM */

+static char * control_xpm[] = {

+"16 16 5 1",

+" 	c None",

+".	c #05FB0B",

+"+	c #000000",

+"@	c #EF2929",

+"#	c #25E100",

+".+            + ",

+"+++          +++",

+" +++        +++ ",

+"  +++ +++  +++  ",

+"   ++++++++++   ",

+"   +++@@@+++    ",

+"   ++@@@@@++    ",

+"  ++###@@@@++   ",

+"  ++####@@@++   ",

+"  ++#####@@++   ",

+"   ++####@++    ",

+"   +++###++++   ",

+"  ++++++++++++  ",

+" +++  +++   +++ ",

+"+++          +++",

+"++            ++"};

diff --git a/app/bin/bitmaps/sensor.xpm b/app/bin/bitmaps/sensor.xpm
new file mode 100644
index 0000000..6ed65a3
--- /dev/null
+++ b/app/bin/bitmaps/sensor.xpm
@@ -0,0 +1,22 @@
+/* XPM */

+static char * sensor_xpm[] = {

+"16 16 3 1",

+" 	c None",

+".	c #00FFFF",

+"+	c #FFFFFF",

+"                ",

+"                ",

+"     .....      ",

+"   +.......+    ",

+"  +++.....+++   ",

+"  .+++...+++.   ",

+" ...+++.+++...  ",

+" ....+++++....  ",

+" .....+++.....  ",

+" ....+++++....  ",

+" ...+++.+++...  ",

+"  .+++...+++.   ",

+"  +++.....+++   ",

+"   +.......+    ",

+"     .....      ",

+"                "};

diff --git a/app/bin/bitmaps/signal.xpm b/app/bin/bitmaps/signal.xpm
new file mode 100644
index 0000000..521adad
--- /dev/null
+++ b/app/bin/bitmaps/signal.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * signal_xpm[] = {
+"16 16 6 1",
+" 	c None",
+".	c #000000",
+"+	c #3A000B",
+"@	c #C90328",
+"#	c #D9032B",
+"$	c #F30431",
+"        ..      ",
+"       ....     ",
+"      .+$@+.    ",
+"      .#$$#.    ",
+"      .+$@+.    ",
+"       ....     ",
+"        ..      ",
+"        ..      ",
+"        ..      ",
+"        ..      ",
+"        ..      ",
+"        ..      ",
+"        ..      ",
+"        ..      ",
+"   ............ ",
+"   ............ "};
diff --git a/app/bin/bitmaps/square10.xbm b/app/bin/bitmaps/square10.xbm
deleted file mode 100644
index d419974..0000000
--- a/app/bin/bitmaps/square10.xbm
+++ /dev/null
@@ -1,7 +0,0 @@
-#define square10_width 14
-#define square10_height 14
-// static unsigned char square10_bits[] = {
-static char square10_bits[] = {
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0xff};
diff --git a/app/bin/bitmaps/switchm.xpm b/app/bin/bitmaps/switchm.xpm
new file mode 100644
index 0000000..0230351
--- /dev/null
+++ b/app/bin/bitmaps/switchm.xpm
@@ -0,0 +1,30 @@
+/* XPM */

+static char * switchm_xpm[] = {

+"16 16 11 1",

+" 	c None",

+".	c #EE2828",

+"+	c #EF2828",

+"@	c #EF2929",

+"#	c #ED2828",

+"$	c #EE2929",

+"%	c #EC2828",

+"&	c #E92C2C",

+"*	c #D5403F",

+"=	c #2E3436",

+"-	c #898A83",

+"                ",

+"   .+@          ",

+"   ..@#         ",

+"    $@$         ",

+"    .@@.        ",

+"     @@.        ",

+"     .@%.       ",

+"      &*.       ",

+"       =        ",

+"      ===       ",

+"     == ==      ",

+"    ==   ==     ",

+"    ==    =     ",

+"   ==     ==    ",

+"  ===   - ===   ",

+"  ==       ==   "};

diff --git a/app/bin/bitmaps/switchmdel.xpm b/app/bin/bitmaps/switchmdel.xpm
deleted file mode 100644
index a6dc5ae..0000000
--- a/app/bin/bitmaps/switchmdel.xpm
+++ /dev/null
@@ -1,54 +0,0 @@
-/* XPM */
-static char * switchmdel_xpm[] = {
-"16 16 35 1",
-" 	c None",
-".	c #CC0000",
-"+	c #CB0000",
-"@	c #FF0000",
-"#	c #FE0C28",
-"$	c #FE112B",
-"%	c #FF0101",
-"&	c #F00D21",
-"*	c #FE142E",
-"=	c #F80E27",
-"-	c #D00103",
-";	c #E80306",
-">	c #FF0303",
-",	c #FF0611",
-"'	c #FF060D",
-")	c #FF0202",
-"!	c #F51022",
-"~	c #FD132E",
-"{	c #5A5954",
-"]	c #E71B32",
-"^	c #FE132D",
-"/	c #595C58",
-"(	c #575954",
-"_	c #FE102C",
-":	c #61635F",
-"<	c #5A5D5A",
-"[	c #545652",
-"}	c #5E5F5C",
-"|	c #555753",
-"1	c #FE1530",
-"2	c #5B5C58",
-"3	c #626460",
-"4	c #565752",
-"5	c #575854",
-"6	c #575A56",
-"                ",
-"    ..          ",
-"    +.+       @ ",
-" #$ ...     @@% ",
-"  ##&..   %@@   ",
-"   *#=-. @@     ",
-"     ##;@>      ",
-"      ,@'       ",
-"     )@!#~      ",
-"    %@ {]#^     ",
-"   @@  /( #_    ",
-"  @@   :<  #    ",
-" @@   [ }| 1#   ",
-"@@      2   #$  ",
-"        3    #  ",
-"    4   56 |    "};
diff --git a/app/bin/bitmaps/switchmedit.xpm b/app/bin/bitmaps/switchmedit.xpm
deleted file mode 100644
index 05168b2..0000000
--- a/app/bin/bitmaps/switchmedit.xpm
+++ /dev/null
@@ -1,78 +0,0 @@
-/* XPM */
-static char * switchmedit_xpm[] = {
-"16 16 59 1",
-" 	c None",
-".	c #6F4D10",
-"+	c #A0711A",
-"@	c #EF2828",
-"#	c #EF2929",
-"$	c #704E10",
-"%	c #A9781B",
-"&	c #CB9022",
-"*	c #EE2828",
-"=	c #ED2828",
-"-	c #B07D1D",
-";	c #EE2929",
-">	c #715010",
-",	c #B7821E",
-"'	c #CA8F22",
-")	c #9B6C1A",
-"!	c #71510F",
-"~	c #BC851F",
-"{	c #C98E22",
-"]	c #906717",
-"^	c #684A0F",
-"/	c #F02929",
-"(	c #755311",
-"_	c #BF8820",
-":	c #C68D21",
-"<	c #886116",
-"[	c #674A10",
-"}	c #D92D24",
-"|	c #775511",
-"1	c #C38B21",
-"2	c #C38A21",
-"3	c #7E5B14",
-"4	c #6D4B11",
-"5	c #D03026",
-"6	c #855517",
-"7	c #C68D22",
-"8	c #795613",
-"9	c #815D19",
-"0	c #C88F21",
-"a	c #B9831F",
-"b	c #725012",
-"c	c #896C2E",
-"d	c #D3AE5A",
-"e	c #CB9124",
-"f	c #B4801E",
-"g	c #6E4D11",
-"h	c #CDB678",
-"i	c #E2D29B",
-"j	c #BC9746",
-"k	c #8A6C2B",
-"l	c #D7BC78",
-"m	c #AD904F",
-"n	c #816632",
-"o	c #836C40",
-"p	c #65490C",
-"q	c #7A5B21",
-"r	c #785618",
-"s	c #878A85",
-"t	c #898B86",
-"              .+",
-"    @#       $%&",
-"    *#=     $-&&",
-"    ;#;    >,&')",
-"     ##   !~&{]^",
-"     ##/ (_&:<[ ",
-"     *#}|1&234  ",
-"      567&_8    ",
-"      90&ab     ",
-"     cdefg      ",
-"     hijg       ",
-"    klmnog      ",
-"   pqrg sg      ",
-"     g  ssg     ",
-"     g  tsg     ",
-"    gggggggg    "};
diff --git a/app/bin/bitmaps/switchmnew.xpm b/app/bin/bitmaps/switchmnew.xpm
deleted file mode 100644
index 403a8b7..0000000
--- a/app/bin/bitmaps/switchmnew.xpm
+++ /dev/null
@@ -1,66 +0,0 @@
-/* XPM */
-static char * switchmnew_xpm[] = {
-"16 16 47 1",
-" 	c None",
-".	c #FFF414",
-"+	c #FFF416",
-"@	c #FFF314",
-"#	c #EF2828",
-"$	c #EF2929",
-"%	c #FFF518",
-"&	c #FFF41E",
-"*	c #FFF639",
-"=	c #FFF52B",
-"-	c #FFF41A",
-";	c #FFF512",
-">	c #EE2828",
-",	c #ED2828",
-"'	c #FFF513",
-")	c #FFF521",
-"!	c #FFF969",
-"~	c #FFFA92",
-"{	c #FFF97C",
-"]	c #FFF63B",
-"^	c #FFF317",
-"/	c #EE2929",
-"(	c #FFF417",
-"_	c #FFF63C",
-":	c #FFFA95",
-"<	c #FFFDE7",
-"[	c #FFFBB3",
-"}	c #FFF75C",
-"|	c #FFF51B",
-"1	c #FFF531",
-"2	c #FFF980",
-"3	c #FFFBB5",
-"4	c #FFFA98",
-"5	c #FFF64C",
-"6	c #F35820",
-"7	c #FFF63E",
-"8	c #FFF74D",
-"9	c #FFF51F",
-"0	c #FFF515",
-"a	c #EC2828",
-"b	c #FFF312",
-"c	c #FFF319",
-"d	c #E92C2C",
-"e	c #D5403F",
-"f	c #898A83",
-"g	c #8B7247",
-"h	c #8A8577",
-"          .+@   ",
-"    #$   %&*=-; ",
-"    >$, ')!~{]^ ",
-"    /$/ (_:<[}| ",
-"     $$ (12345- ",
-"     $$6 |7}890 ",
-"     >$a bc|-0  ",
-"      de        ",
-"       f        ",
-"       g        ",
-"       gg       ",
-"      ghf       ",
-"      g fg      ",
-"     g  f g     ",
-"     g  f g     ",
-"    gggggggg    "};
diff --git a/app/bin/bitmaps/switchmotormark.xbm b/app/bin/bitmaps/switchmotormark.xbm
deleted file mode 100644
index 7a476d9..0000000
--- a/app/bin/bitmaps/switchmotormark.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define switchmotormark_width 16
-#define switchmotormark_height 16
-static char switchmotormark_bits[] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC8, 0x3F, 
-  0xC8, 0x3F, 0xFC, 0x3F, 0xFC, 0x3F, 0xC8, 0x3F, 0xC8, 0x3F, 0x08, 0x00, 
-  0x08, 0x00, 0x08, 0x00, 0x08, 0x00, 0x08, 0x00, };