Merge pull request #43 from ian57/master

chore: add french accentuated character
1 year ago · c3e3132ba2
parent 908c393de0 28b570c487
commit c3e3132ba2
5 changed files with 286 additions and 240 deletions
--- a/README.md
+++ b/README.md
@ -1,7 +1,11 @@
 # Led-Badge-44x11
 Upload tool for an led name tag with USB-HID interface

-![LED Mini Board](photos/green_badge.jpg)
+![LED Mini Board](photos/blueBadge.jpg)
+
+Added Accentuated french Characters
+
+![French LED Mini Board](photos/accentuated.gif)

 ## Hardware

@ -129,6 +133,10 @@ shows a bicycle crossing the display in left-to-right and right-to-left (as a se

 shows a simple animation of a slowly beating heart on the first message, and a blinking heart on the second message.

+    ./led-badge-11x44.py -B 50 -m 0 -s 8 "Bonjour à toutes et à tous" "Bienvenu(e)s en Master 2 EEA ISHM" "Ingénierie des systèmes Humains Machines" "Bonne réussite à votre promotion 2023-2024"
+
+![M2 ishm](photos/m2ishm.gif)
+
    python3 ./led-badge-11x44.py --list-names

 prints the list of builtin icon names, including :happy: :happy2: :heart: :HEART: :heart2: :HEART2: :fablab: :bicycle: :bicycle_r: :owncloud: ::
@ -138,36 +146,27 @@ prints the list of builtin icon names, including :happy: :happy2: :heart: :HEART
 prints some condensed help:

 <pre>
-usage: led-badge-11x44.py [-h] [-t TYPE] [-s SPEED] [-m MODE] [-b BLINK]
-			  [-a ANTS] [-p FILE] [-l]
-                          MESSAGE [MESSAGE ...]
+usage: led-badge-11x44.py [-h] [-t TYPE] [-s SPEED] [-B BRIGHTNESS] [-m MODE] [-b BLINK] [-a ANTS] [-l] MESSAGE [MESSAGE ...]

-Upload messages or graphics to a 44x11 led badge via USB HID.
-Version 0.6 from https://github.com/jnweiger/led-badge-44x11
+Upload messages or graphics to a 11x44 led badge via USB HID.
+Version 0.12 from https://github.com/jnweiger/led-name-badge-ls32
 -- see there for more examples and for updates.

 positional arguments:
-  MESSAGE               Up to 8 message texts with embedded builtin icons or
-                        loaded images within colons(:) -- See -l for a list of
-                        builtins
+  MESSAGE               Up to 8 message texts with embedded builtin icons or loaded images within colons(:) -- See -l for a list of builtins

-optional arguments:
+options:
  -h, --help            show this help message and exit
-  -t TYPE, --type TYPE
-			Type of display: supported values are 12x48 or
-			(default) 11x44. Rename the program to led-badge-12x48,
-			to switch the default.
+  -t TYPE, --type TYPE  Type of display: supported values are 12x48 or (default) 11x44. Rename the program to led-badge-12x48, to switch the default.
  -s SPEED, --speed SPEED
-                        Scroll speed (Range 1..8). Up to 8 comma-seperated
-                        values
-  -m MODE, --mode MODE  Up to 8 mode values: Scroll-left(0) -right(1) -up(2)
-                        -down(3); still-centered(4); animation(5); drop-
-                        down(6); curtain(7); laser(8); See '--mode-help' for
-                        more details.
+                        Scroll speed (Range 1..8). Up to 8 comma-separated values
+  -B BRIGHTNESS, --brightness BRIGHTNESS
+                        Brightness for the display in percent: 25, 50, 75, or 100
+  -m MODE, --mode MODE  Up to 8 mode values: Scroll-left(0) -right(1) -up(2) -down(3); still-centered(4); animation(5); drop-down(6); curtain(7);
+                        laser(8); See '--mode-help' for more details.
  -b BLINK, --blink BLINK
-                        1: blinking, 0: normal. Up to 8 comma-seperated values
-  -a ANTS, --ants ANTS  1: animated border, 0: normal. Up to 8 comma-seperated
-                        values
+                        1: blinking, 0: normal. Up to 8 comma-separated values
+  -a ANTS, --ants ANTS  1: animated border, 0: normal. Up to 8 comma-separated values
  -l, --list-names      list named icons to be embedded in messages and exit

 Example combining image and text:
--- a/led-badge-11x44.py
+++ b/led-badge-11x44.py
@ -52,9 +52,12 @@
 import sys, os, re, time, argparse
 from datetime import datetime
 from array import array
+
 try:
-  if sys.version_info[0] < 3: raise Exception("prefer usb.core with python-2.x because of https://github.com/jnweiger/led-badge-ls32/issues/9")
+    if sys.version_info[0] < 3: raise Exception(
+        "prefer usb.core with python-2.x because of https://github.com/jnweiger/led-badge-ls32/issues/9")
    import pyhidapi
+
    pyhidapi.hid_init()
    have_pyhidapi = True
 except:
@ -80,7 +83,6 @@ or
            print("""Please with Linux or MacOS or help us implement support for """ + sys.platform)
        sys.exit(1)

-
 __version = "0.12"

 font_11x44 = (
@ -201,20 +203,55 @@ font_11x44 = (
  0xc6, 0xc6, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00,
  0xc6, 0xc6, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00,
  0x00, 0x3c, 0x66, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x66, 0x6c, 0x60,
+
+  # "àäòöùüèéêëôöûîïÿç"
+  0x00, 0x60, 0x18, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0x76, 0x00,
+  0x00, 0x6c, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0x76, 0x00,
+  0x00, 0x60, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00,
+  0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00,
+  0x00, 0x60, 0x18, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00,
+  0x00, 0x6c, 0x6c, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00,
+  0x00, 0x60, 0x18, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc6, 0x7c, 0x00,
+  0x00, 0x18, 0x60, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc6, 0x7c, 0x00,
+  0x00, 0x10, 0x6c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc6, 0x7c, 0x00,
+  0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc6, 0x7c, 0x00,
+  0x00, 0x10, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00,
+  0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00,
+  0x00, 0x10, 0x6c, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76, 0x00,
+  0x00, 0x10, 0x6c, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00,
+  0x00, 0x6c, 0x6c, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00,
+  0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8,
+  0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc6, 0x7c, 0x10, 0x30,
+
+  # "ÀÅÄÉÈÊËÖÔÜÛÙŸ"
+  0x60, 0x18, 0x38, 0x6c, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00,
+  0x10, 0x6c, 0x38, 0x6c, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00,
+  0x6c, 0x6c, 0x38, 0x6c, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00,
+  0x18, 0x60, 0xfe, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00,
+  0x60, 0x18, 0xfe, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00,
+  0x10, 0x6c, 0xfe, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00,
+  0x6c, 0x6c, 0xfe, 0x62, 0x68, 0x78, 0x68, 0x62, 0x66, 0xfe, 0x00,
+  0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00,  # Ö
+  0x10, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00,  # Ô
+  0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00,  # Ü
+  0x10, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00,  # Û
+  0x60, 0x18, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00,  # Ù
+  0x66, 0x66, 0x00, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x3c, 0x00,  # Ÿ
 )

 charmap = u'ABCDEFGHIJKLMNOPQRSTUVWXYZ' + \
          u'abcdefghijklmnopqrstuvwxyz' + \
          u'0987654321^ !"\0$%&/()=?` °\\}][{' + \
          u"@ ~ |<>,;.:-_#'+* " + \
-          u"äöüÄÖÜß"
+          u"äöüÄÖÜß" + \
+          u"àäòöùüèéêëôöûîïÿç" + \
+          u"ÀÅÄÉÈÊËÖÔÜÛÙŸ"

 char_offset = {}
 for i in range(len(charmap)):
    char_offset[charmap[i]] = 11 * i
    # print(i, charmap[i], char_offset[charmap[i]])

-
 bitmap_preloaded = [([], 0)]
 bitmaps_preloaded_unused = False

@ -296,6 +333,7 @@ def bitmap_text(text):
      ":heart:" is replaced with a reference to a builtin heart glyph
      ":gfx/logo.png:" preloads the file gfx/logo.png and is replaced the corresponding control char.
  """
+
    def colonrepl(m):
        name = m.group(1)
        if name == '':
@ -405,7 +443,6 @@ def header(lengths, speeds, modes, blink, ants, brightness=100):
        h[17 + (2 * i) - 1] = lengths[i] // 256
        h[17 + (2 * i)] = lengths[i] % 256

-
    cdate = datetime.now()
    h[38 + 0] = cdate.year % 100
    h[38 + 1] = cdate.month
@ -417,16 +454,24 @@ def header(lengths, speeds, modes, blink, ants, brightness=100):
    return h


-parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter, description='Upload messages or graphics to a 11x44 led badge via USB HID.\nVersion %s from https://github.com/jnweiger/led-badge-ls32\n -- see there for more examples and for updates.' % __version, epilog='Example combining image and text:\n sudo %s "I:HEART2:you"' % sys.argv[0])
-parser.add_argument('-t', '--type', default='11x44', help="Type of display: supported values are 12x48 or (default) 11x44. Rename the program to led-badge-12x48, to switch the default.")
+parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter,
+                                 description='Upload messages or graphics to a 11x44 led badge via USB HID.\nVersion %s from https://github.com/jnweiger/led-badge-ls32\n -- see there for more examples and for updates.' % __version,
+                                 epilog='Example combining image and text:\n sudo %s "I:HEART2:you"' % sys.argv[0])
+parser.add_argument('-t', '--type', default='11x44',
+                    help="Type of display: supported values are 12x48 or (default) 11x44. Rename the program to led-badge-12x48, to switch the default.")
 parser.add_argument('-s', '--speed', default='4', help="Scroll speed (Range 1..8). Up to 8 comma-separated values")
-parser.add_argument('-B', '--brightness', default='100', help="Brightness for the display in percent: 25, 50, 75, or 100")
-parser.add_argument('-m', '--mode',  default='0', help="Up to 8 mode values: Scroll-left(0) -right(1) -up(2) -down(3); still-centered(4); animation(5); drop-down(6); curtain(7); laser(8); See '--mode-help' for more details.")
+parser.add_argument('-B', '--brightness', default='100',
+                    help="Brightness for the display in percent: 25, 50, 75, or 100")
+parser.add_argument('-m', '--mode', default='0',
+                    help="Up to 8 mode values: Scroll-left(0) -right(1) -up(2) -down(3); still-centered(4); animation(5); drop-down(6); curtain(7); laser(8); See '--mode-help' for more details.")
 parser.add_argument('-b', '--blink', default='0', help="1: blinking, 0: normal. Up to 8 comma-separated values")
 parser.add_argument('-a', '--ants', default='0', help="1: animated border, 0: normal. Up to 8 comma-separated values")
-parser.add_argument('-p', '--preload',  metavar='FILE', action='append', help=argparse.SUPPRESS)       # "Load bitmap images. Use ^A, ^B, ^C, ... in text messages to make them visible. Deprecated, embed within ':' instead")
-parser.add_argument('-l', '--list-names', action='version', help="list named icons to be embedded in messages and exit", version=':'+':  :'.join(bitmap_named.keys())+':  ::  or e.g. :path/to/some_icon.png:')
-parser.add_argument('message', metavar='MESSAGE', nargs='+', help="Up to 8 message texts with embedded builtin icons or loaded images within colons(:) -- See -l for a list of builtins")
+parser.add_argument('-p', '--preload', metavar='FILE', action='append',
+                    help=argparse.SUPPRESS)  # "Load bitmap images. Use ^A, ^B, ^C, ... in text messages to make them visible. Deprecated, embed within ':' instead")
+parser.add_argument('-l', '--list-names', action='version', help="list named icons to be embedded in messages and exit",
+                    version=':' + ':  :'.join(bitmap_named.keys()) + ':  ::  or e.g. :path/to/some_icon.png:')
+parser.add_argument('message', metavar='MESSAGE', nargs='+',
+                    help="Up to 8 message texts with embedded builtin icons or loaded images within colons(:) -- See -l for a list of builtins")
 parser.add_argument('--mode-help', action='version', help=argparse.SUPPRESS, version="""

 -m 5 "Animation"
@ -458,7 +503,8 @@ else:
 if have_pyhidapi:
    if devinfo:
        dev = pyhidapi.hid_open_path(devinfo[0].path)
-    print("using [%s %s] int=%d page=%s via pyHIDAPI" % (devinfo[0].manufacturer_string, devinfo[0].product_string, devinfo[0].interface_number, devinfo[0].usage_page))
+        print("using [%s %s] int=%d page=%s via pyHIDAPI" % (
+        devinfo[0].manufacturer_string, devinfo[0].product_string, devinfo[0].interface_number, devinfo[0].usage_page))
    else:
        print("No led tag with vendorID 0x0416 and productID 0x5020 found.")
        print("Connect the led tag and run this tool as root.")
@ -487,7 +533,8 @@ for arg in args.message:
    msgs.append(bitmap(arg))

 if bitmaps_preloaded_unused == True:
-  print("\nWARNING:\n Your preloaded images are not used.\n Try without '-p' or embed the control character '^A' in your message.\n")
+    print(
+        "\nWARNING:\n Your preloaded images are not used.\n Try without '-p' or embed the control character '^A' in your message.\n")

 if '12' in args.type or '12' in sys.argv[0]:
    print("Type: 12x48")
--- a/photos/accentuated.gif
+++ b/photos/accentuated.gif
--- a/photos/blueBadge.jpg
+++ b/photos/blueBadge.jpg
--- a/photos/m2ishm.gif
+++ b/photos/m2ishm.gif