renamed files and newhardware variable -> new_hardware

Author: apal6981

display/physical_screen2.py display/physical_screen_v2.py

@@ -2,7 +2,7 @@
 import time
 
 from .display import Display
-from .seven_seg2 import SevenSegment
+from .seven_seg_v2 import SevenSegment
 
 
 class PhysicalScreen:

display/seven_seg2.py display/seven_seg_v2.py

@@ -40,7 +40,7 @@ def run_simulator():
 )
 @click.option(
     "-n",
-    "--newhardware",
+    "--new_hardware",
     is_flag=True,
     default=False,
     help="Run on new hardware.",
@@ -54,9 +54,9 @@ def run_simulator():
     help="Run in test mode. This shortens the demo time and user input time "
     "for testing purposes.",
 )
-def run_kiosk(simulate, newhardware, testing):
+def run_kiosk(simulate, new_hardware, testing):
     """CLI command to run kiosk."""
-    kiosk.run(simulate, testing=testing, newhardware=newhardware)
+    kiosk.run(simulate, testing=testing, new_hardware=new_hardware)
 
 
 @cli.command("demo")
@@ -75,7 +75,7 @@ def run_kiosk(simulate, newhardware, testing):
 )
 @click.option(
     "-n",
-    "--newhardware",
+    "--new_hardware",
     is_flag=True,
     default=False,
     help="Run on new hardware.",
@@ -89,9 +89,9 @@ def run_kiosk(simulate, newhardware, testing):
     help="Run in test mode. This provides feedback for if your demo is "
     "running fast enough relative to the set frame rate.",
 )
-def run_demo(name, simulate, newhardware, testing):
+def run_demo(name, simulate, new_hardware, testing):
     """CLI command to run demo."""
-    demo.run(name, simulate, newhardware, testing=testing)
+    demo.run(name, simulate, new_hardware, testing=testing)
 
 
 @cli.command("test")

main.py

@@ -8,7 +8,7 @@
 from runners import utils
 
 
-def run(demo_name, simulate, newhardware, testing):
+def run(demo_name, simulate, new_hardware, testing):
     """Main function that runs the demo.
 
     Args:
@@ -25,8 +25,8 @@ def run(demo_name, simulate, newhardware, testing):
 
         logger.debug("Starting virtual screen...")
         screen = VirtualScreen()
-    elif newhardware:
-        from display.physical_screen2 import (  # pylint: disable=import-outside-toplevel
+    elif new_hardware:
+        from display.physical_screen_v2 import (  # pylint: disable=import-outside-toplevel
             PhysicalScreen,
         )
 

runners/demo.py

@@ -251,7 +251,7 @@ def run_loop(screen, user_input_timeout=300, demo_time_override=None):
             screen.clear()
 
 
-def run(simulate, testing=False, newhardware=False):
+def run(simulate, testing=False, new_hardware=False):
     """Runs the kiosk
 
     Args:
@@ -267,8 +267,8 @@ def run(simulate, testing=False, newhardware=False):
 
         logger.debug("Starting virtual screen")
         screen = VirtualScreen()
-    elif newhardware:
-        from display.physical_screen2 import (  # pylint: disable=import-outside-toplevel
+    elif new_hardware:
+        from display.physical_screen_v2 import (  # pylint: disable=import-outside-toplevel
             PhysicalScreen,
         )