Seitenbastelei

tools/drcs.py

@@ -13,10 +13,10 @@ pyramide = ( # 4 Zeichen, 4farbig
     b"\x31" b"\x40\x41\x40\x43\x21\x40\x47\x21\x40\x4f\x21\x40\x5f\x21\x40\x7f"
     b"\x30" b"\x40\x40\x27\x42\x40\x47\x40"
     b"\x31" b"\x60\x40\x70\x40\x21\x78\x40\x21\x7c\x40\x21\x78\x40\x21\x70\x40"
-    b"\x30" b"\x40\x40\x26\x40\x41\x22"
+    b"\x30" b"\x40\x40\x28\x40\x41"
     b"\x31" b"\x40\x7f\x41\x7f\x21\x43\x7f\x21\x47\x7e\x21\x4f\x7c\x4f\x7d\x5f\x78"
-    b"\x30" b"\x47\x40\x4e\x40\x4e\x60\x5d\x70\x7b\x70\x67\x70\x5e\x48\x71\x7c\x4f\x7c\x7f\x7e"
-    b"\x31" b"\x70\x40\x60\x40\x21\x41\x70\x43\x70\x47\x70\x5e\x40\x70\x40\x40\x40\x21"
+    b"\x30" b"\x47\x40\x4E\x40\x4E\x60\x5D\x70\x5B\x70\x77\x70\x6E\x48\x51\x7C\x6F\x7C\x7F\x7E"
+    b"\x31" b"\x70\x40\x60\x40\x60\x60\x41\x70\x43\x70\x47\x70\x4E\x40\x50\x40\x60\x40\x40\x40"
 )
 
 colorpyramide = (
@@ -25,12 +25,38 @@ colorpyramide = (
     b"\x1f\x26\x32\x4f"
     b"\x1f\x26\x33\x43"
 )
+
+btxlogo = (
+    b"\x1F\x23\x21"
+    b"\x30\x40\x40\x40\x40\x43\x7F\x4C\x40\x70\x40\x70\x4F\x70\x7F\x71\x7F\x70\x7C\x70\x40"
+    b"\x30\x40\x40\x40\x40\x7F\x7F\x40\x40\x40\x40\x7F\x7F\x7F\x7F\x40\x40\x43\x70\x4F\x7C"
+    b"\x30\x40\x40\x40\x40\x7F\x70\x40\x4C\x40\x43\x7C\x43\x7F\x43\x7F\x63\x4F\x43\x40\x43"
+    b"\x30\x70\x4F\x70\x7F\x70\x7F\x70\x7F\x70\x7F\x70\x40\x4C\x40\x43\x7F\x40\x40\x40\x40"
+    b"\x30\x4F\x7C\x4F\x7C\x73\x73\x7C\x4F\x7F\x7F\x40\x40\x40\x40\x7F\x7F\x40\x40\x40\x40"
+    b"\x30\x7C\x43\x7F\x43\x7F\x43\x7F\x43\x7F\x43\x40\x43\x40\x4C\x7F\x70\x40\x40\x40\x40"
+)
+
+# "..." auf "." (2e)
+ellipse = ( b"\x1f\x23\x2e" b"\x30\x27\x59\x66\x20" )
+
+# Farbtafel 2 (Farbe Nr. 16-19):
+alternativefarben = (
+    b"\x1F\x26\x20\x1F\x26\x31\x36"  # init + Start ab 16
+    b"\x7F\x40\x78\x78\x78\x40\x60\x60" # Farben 0-3
+)
  
 liste = [
     (b"reset_12x10_4c", b"\x1f\x23\x20\x28\x20\x40\x47\x42"),
     (b"reset_12x10_2c", b"\x1f\x23\x20\x28\x20\x40\x47\x41"),
-    (b"Dcolorstart", b"\x1f\x26\x20\x22\x20\x35\x40"),
-    (b"Dcolorpyramide", colorpyramide),
+    (b"Dstart_12x10_4c", b"\x1f\x23\x20\x47\x42"),
+    (b"Dstart_12x10_2c", b"\x1f\x23\x20\x47\x41"),
+    (b"Dcolorstart", b"\x1f\x26\x20\x22\x20\x35\x40"), # Änderung der Farbtafel folgt
+    (b"Dcolorpyramide", colorpyramide),                # ...hiermit
     (b"Dpyramide", pyramide),
+    (b"Dbtxlogo", btxlogo),
+    (b"Dellipse", ellipse),
+
+    (b"Creset", b"\x1f\x26\x21"),
+    (b"Calt2", alternativefarben),
 ]
 

tools/tagliste.py

@@ -52,14 +52,15 @@ liste = [
     ## DRCs ablegen:
     (b"DRCinG0", b"\x1b\x28\x20\x40"), (b"DRCinG1", b"\x1b\x29\x20\x40"), (b"DRCinG2", b"\x1b\x2a\x20\x40"), (b"DRCinG3", b"\x1b\x2b\x20\x40"),
 
-    ## Umlaute + Eszett:
+    ## Umlaute + Eszett: -- dafür muß G2 in G2 liegen!
     (b"uml", b"\x19\x48"),  # folgendes Zeichen erhält Umlautpunkte <uml>a => ä
     (b"sz", b"\x19\xfb"),   # ß
 
     # Steuerzeichen:
-    (b"CurL", b"\x08"), (b"CurR", b"\x09"), (b"CurU", b"\x0a"), (b"CurD", b"\x0b"), # Cursor bewegen (left/right/up/down)
+    (b"CurL", b"\x08"), (b"CurR", b"\x09"), (b"CurU", b"\x0b"), (b"CurD", b"\x0a"), # Cursor bewegen (left/right/up/down)
     (b"cls", b"\x0c"),      # Clear Screen
     (b"CR", b"\x0d"),       # Cursor zum Zeilenanfang (CR)
+    (b"br", b"\x0d\x0a"),   # "CRLF"
     (b"Cursor", b"\x11"),   # Cursor sichtbar
     (b"/Cursor", b"\x14"),  # Cursor unsichtbar
     (b"blink", b"\x88"),    # Blinken an
@@ -76,7 +77,7 @@ liste = [
     (b"/u", b"\x99"),       # Unterstreichen aus
     # Zeichenwiederholung: x<Rep><03> => wiederholt x 3x => xxxx
     # TODO: evtl. noch mehr Zahlenwerte einfügen - aktuell nur bis 40 (s.o.)
-    (b"Rep", b"\x12"),
+    (b"rep", b"\x12"),
 
     # für ganze Zeile gültige Attribute:
     (b"Lu", b"\x1b\x23\x21\x5a"),       # unterstreichen
@@ -96,12 +97,21 @@ liste = [
     # Farben Vordergrund (par) / G1-Satz (ser)
     (b"black", b"\x80"),  (b"red", b"\x81"),      (b"green", b"\x82"),  (b"yellow", b"\x83"),
     (b"blue", b"\x84"),   (b"magenta", b"\x85"),  (b"cyan", b"\x86"),   (b"white", b"\x87"),
+    # Alternativ: Referenz per Nummer:
+    (b"c0", b"\x80"), (b"c1", b"\x81"), (b"c2", b"\x82"), (b"c3", b"\x83"),
+    (b"c4", b"\x84"), (b"c5", b"\x85"), (b"c6", b"\x86"), (b"c7", b"\x87"),
     # Farben Hintergrund (background; par) / L-Satz (ser)
     (b"Bblack", b"\x90"), (b"Bred", b"\x91"),     (b"Bgreen", b"\x92"), (b"Byellow", b"\x93"),
     (b"Bblue", b"\x94"),  (b"Bmagenta", b"\x95"), (b"Bcyan", b"\x96"),  (b"Bwhite", b"\x97"),
+    # Alternativ: Referenz per Nummer:
+    (b"Bc0", b"\x90"), (b"Bc1", b"\x91"), (b"Bc2", b"\x92"), (b"Bc3", b"\x93"),
+    (b"Bc4", b"\x94"), (b"Bc5", b"\x95"), (b"Bc6", b"\x96"), (b"Bc7", b"\x97"),
     # Hintergrundfarbe für ganzen Bildschirm: (Screen)
     (b"Sblack", b"\x1b\x23\x20\x50"), (b"Sred", b"\x1b\x23\x20\x51"),     (b"Sgreen", b"\x1b\x23\x20\x52"), (b"Syellow", b"\x1b\x23\x20\x53"),
     (b"Sblue", b"\x1b\x23\x20\x54"),  (b"Smagenta", b"\x1b\x23\x20\x55"), (b"Scyan", b"\x1b\x23\x20\x56"),  (b"Swhite", b"\x1b\x23\x20\x57"),
+    # Alternativ: Referenz per Nummer:
+    (b"Sc0", b"\x1b\x23\x20\x50"), (b"Sc1", b"\x1b\x23\x20\x51"), (b"Sc2", b"\x1b\x23\x20\x52"), (b"Sc3", b"\x1b\x23\x20\x53"),
+    (b"Sc4", b"\x1b\x23\x20\x54"), (b"Sc5", b"\x1b\x23\x20\x55"), (b"Sc6", b"\x1b\x23\x20\x56"), (b"Sc7", b"\x1b\x23\x20\x57"),
     # Hintergrundfarbe für ganze Zeile (mit Rand):
     (b"Rblack", b"\x1b\x23\x21\x50"), (b"Rred", b"\x1b\x23\x21\x51"),     (b"Rgreen", b"\x1b\x23\x21\x52"), (b"Ryellow", b"\x1b\x23\x21\x53"),
     (b"Rblue", b"\x1b\x23\x21\x54"),  (b"Rmagenta", b"\x1b\x23\x21\x55"), (b"Rcyan", b"\x1b\x23\x21\x56"),  (b"Rwhite", b"\x1b\x23\x21\x57"),