python: Rename to framework16_inputmodule

JohnAZoidberg · JohnAZoidberg · commit 860d53a6b0af · 2023-11-27T23:51:44.000+08:00
Signed-off-by: Daniel Schaefer &lt;dhs@frame.work&gt;
diff --git a/python/framework16_inputmodule/__init__.py b/python/framework16_inputmodule/__init__.py
diff --git a/python/framework16_inputmodule/cli.py b/python/framework16_inputmodule/cli.py
@@ -6,8 +6,8 @@
 from serial.tools import list_ports
 
 # Local dependencies
-from framework16_inputmodules import gui
-from framework16_inputmodules.inputmodule import (
+from framework16_inputmodule import gui
+from framework16_inputmodule.inputmodule import (
     INPUTMODULE_PIDS,
     send_command,
     get_version,
@@ -18,15 +18,15 @@
     GameOfLifeStartParam,
     GameControlVal,
 )
-from framework16_inputmodules.gui.games import (
+from framework16_inputmodule.gui.games import (
     snake,
     snake_embedded,
     pong_embedded,
     game_of_life_embedded,
     wpm_demo,
 )
-from framework16_inputmodules.gui.ledmatrix import random_eq, clock, blinking
-from framework16_inputmodules.inputmodule.ledmatrix import (
+from framework16_inputmodule.gui.ledmatrix import random_eq, clock, blinking
+from framework16_inputmodule.inputmodule.ledmatrix import (
     eq,
     breathing,
     camera,
@@ -44,7 +44,7 @@
     image_bl,
     image_greyscale,
 )
-from framework16_inputmodules.inputmodule.b1display import (
+from framework16_inputmodule.inputmodule.b1display import (
     b1image_bl,
     invert_screen_cmd,
     screen_saver_cmd,
@@ -56,7 +56,7 @@
     display_on_cmd,
     display_string,
 )
-from framework16_inputmodules.inputmodule.c1minimal import (
+from framework16_inputmodule.inputmodule.c1minimal import (
     set_color,
     get_color,
     RGB_COLORS,
diff --git a/python/framework16_inputmodule/font.py b/python/framework16_inputmodule/font.py
diff --git a/python/framework16_inputmodule/gui/__init__.py b/python/framework16_inputmodule/gui/__init__.py
@@ -4,18 +4,18 @@
 
 import PySimpleGUI as sg
 
-from framework16_inputmodules.inputmodule import (
+from framework16_inputmodule.inputmodule import (
     send_command,
     get_version,
     brightness,
     get_brightness,
     bootloader,
     CommandVals,
 )
-from framework16_inputmodules.gui.games import snake
-from framework16_inputmodules.gui.ledmatrix import countdown, random_eq, clock
-from framework16_inputmodules.gui.gui_threading import stop_thread, is_dev_disconnected
-from framework16_inputmodules.inputmodule.ledmatrix import (
+from framework16_inputmodule.gui.games import snake
+from framework16_inputmodule.gui.ledmatrix import countdown, random_eq, clock
+from framework16_inputmodule.gui.gui_threading import stop_thread, is_dev_disconnected
+from framework16_inputmodule.inputmodule.ledmatrix import (
     percentage,
     pattern,
     animate,
diff --git a/python/framework16_inputmodule/gui/games.py b/python/framework16_inputmodule/gui/games.py
@@ -4,13 +4,13 @@
 import time
 import threading
 
-from framework16_inputmodules.inputmodule import (
+from framework16_inputmodule.inputmodule import (
     GameControlVal,
     send_command,
     CommandVals,
     Game,
 )
-from framework16_inputmodules.inputmodule.ledmatrix import (
+from framework16_inputmodule.inputmodule.ledmatrix import (
     show_string,
     WIDTH,
     HEIGHT,
diff --git a/python/framework16_inputmodule/gui/gui_threading.py b/python/framework16_inputmodule/gui/gui_threading.py
diff --git a/python/framework16_inputmodule/gui/ledmatrix.py b/python/framework16_inputmodule/gui/ledmatrix.py
@@ -2,18 +2,18 @@
 import time
 import random
 
-from framework16_inputmodules.gui.gui_threading import (
+from framework16_inputmodule.gui.gui_threading import (
     reset_thread,
     is_thread_stopped,
     is_dev_disconnected,
 )
-from framework16_inputmodules.inputmodule.ledmatrix import (
+from framework16_inputmodule.inputmodule.ledmatrix import (
     light_leds,
     show_string,
     eq,
     breathing,
 )
-from framework16_inputmodules.inputmodule import brightness
+from framework16_inputmodule.inputmodule import brightness
 
 
 def countdown(dev, seconds):
diff --git a/python/framework16_inputmodule/inputmodule/__init__.py b/python/framework16_inputmodule/inputmodule/__init__.py
@@ -2,7 +2,7 @@
 import serial
 
 # TODO: Make independent from GUI
-from framework16_inputmodules.gui.gui_threading import disconnect_dev
+from framework16_inputmodule.gui.gui_threading import disconnect_dev
 
 FWK_MAGIC = [0x32, 0xAC]
 FWK_VID = 0x32AC
diff --git a/python/framework16_inputmodule/inputmodule/b1display.py b/python/framework16_inputmodule/inputmodule/b1display.py
@@ -1,6 +1,6 @@
 import sys
 
-from framework16_inputmodules.inputmodule import send_command, CommandVals, FWK_MAGIC
+from framework16_inputmodule.inputmodule import send_command, CommandVals, FWK_MAGIC
 
 B1_WIDTH = 300
 B1_HEIGHT = 400
diff --git a/python/framework16_inputmodule/inputmodule/c1minimal.py b/python/framework16_inputmodule/inputmodule/c1minimal.py
@@ -1,4 +1,4 @@
-from framework16_inputmodules.inputmodule import send_command, CommandVals
+from framework16_inputmodule.inputmodule import send_command, CommandVals
 
 RGB_COLORS = ["white", "black", "red", "green", "blue", "cyan", "yellow", "purple"]
 
diff --git a/python/framework16_inputmodule/inputmodule/ledmatrix.py b/python/framework16_inputmodule/inputmodule/ledmatrix.py
@@ -2,8 +2,8 @@
 
 import serial
 
-from framework16_inputmodules import font
-from framework16_inputmodules.inputmodule import (
+from framework16_inputmodule import font
+from framework16_inputmodule.inputmodule import (
     send_command,
     CommandVals,
     PatternVals,
diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -3,7 +3,7 @@ requires = ["hatchling", "hatch-vcs"]
 build-backend = "hatchling.build"
 
 [project]
-name = "framework16-inputmodule"
+name = "framework16_inputmodule"
 # TODO: Dynamic version from git (requires tags)
 #dynamic = ["version"]
 version = "0.1.0"
@@ -38,16 +38,16 @@ Source = "https://github.com/FrameworkComputer/inputmodule-rs"
 
 # TODO: Figure out how to add a runnable-script
 [project.scripts]
-ledmatrixctl = "framework16_inputmodules.cli:main_cli"
+ledmatrixctl = "framework16_inputmodule.cli:main_cli"
 
 [project.gui-scripts]
-ledmatrixgui = "framework16_inputmodules.cli:main_gui"
+ledmatrixgui = "framework16_inputmodule.cli:main_gui"
 
 [tool.hatch.version]
 source = "vcs"
 
 [tool.hatch.build.hooks.vcs]
-version-file = "framework16_inputmodules/_version.py"
+version-file = "framework16_inputmodule/_version.py"
 
 [tool.hatch.build.targets.sdist]
 exclude = [

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from framework16_inputmodules.inputmodule import send_command, CommandVals`
	`1`	`+from framework16_inputmodule.inputmodule import send_command, CommandVals`
`2`	`2`
`3`	`3`	`RGB_COLORS = ["white", "black", "red", "green", "blue", "cyan", "yellow", "purple"]`
`4`	`4`