Version 3.2

evil-mad · Feb 28, 2022 · dbe080e · dbe080e
1 parent 7ba774a
commit dbe080e
Show file tree

Hide file tree

Showing 9 changed files with 141 additions and 96 deletions.
diff --git a/cli/axicli/axidraw_cli.py b/cli/axicli/axidraw_cli.py
@@ -73,7 +73,7 @@
 from plotink.plot_utils_import import from_dependency_import # plotink
 exit_status = from_dependency_import("ink_extensions_utils.exit_status")
 
-cli_version = "AxiDraw Command Line Interface 3.1.0"
+cli_version = "AxiDraw Command Line Interface 3.2.0"
 
 quick_help = '''
     Basic syntax to plot a file:      axicli svg_in [OPTIONS]
@@ -156,8 +156,9 @@ def axidraw_CLI(dev = False):
     parser.add_argument("-M","--manual_cmd", \
             metavar='COMMAND', type=str, \
             help="Manual command. One of: [fw_version, lower_pen, raise_pen, "\
-            + "walk_x, walk_y, enable_xy, disable_xy, bootload, strip_data, " \
-            + "read_name, list_names,  write_name]. Default: fw_version")
+            + "walk_x, walk_y, walk_mmx, walk_mmy, walk_home, enable_xy, disable_xy, "\
+            + "bootload, strip_data, read_name, list_names,  write_name]. "\
+            + "Default: fw_version")
 
     parser.add_argument("-w","--walk_dist", \
             metavar='DISTANCE', type=float, \
@@ -197,8 +198,9 @@ def axidraw_CLI(dev = False):
 
     parser.add_argument("-L","--model",\
             metavar='MODELCODE', type=int,\
-            help="AxiDraw Model (1-4). 1: AxiDraw V2 or V3. " \
-            + "2: AxiDraw V3/A3. 3: AxiDraw V3 XLX. 4: AxiDraw MiniKit")
+            help="AxiDraw Model (1-6). 1: AxiDraw V2 or V3. " \
+            + "2:AxiDraw V3/A3 or SE/A3. 3: AxiDraw V3 XLX. " \
+            + "4:AxiDraw MiniKit. 5:AxiDraw SE/A1. 6: AxiDraw SE/A2.")
 
     parser.add_argument("-p","--port",\
             metavar='PORTNAME', type=str,\

diff --git a/cli/requirements/requirements.txt b/cli/requirements/requirements.txt
@@ -5,8 +5,8 @@ charset-normalizer==2.0.7
 future==0.18.2
 idna==3.3
 ink-extensions==1.1.0
-lxml==4.6.4
-plotink==1.4.0
+lxml==4.6.5
+plotink==1.5.0
 pyserial==3.5
 requests==2.26.0
 urllib3==1.26.7
diff --git a/cli/setup.py b/cli/setup.py
@@ -57,7 +57,7 @@ def replacement_setup(*args, **kwargs):
 
 replacement_setup(
     name='axicli',
-    version='3.1.0',
+    version='3.2.0',
     python_requires='>=3.6.0',
     long_description=long_description,
     long_description_content_type='text/plain',
@@ -66,9 +66,10 @@ def replacement_setup(*args, **kwargs):
     author_email='[email protected]',
     packages=setuptools.find_packages(exclude=['contrib', 'docs', 'test']),
     install_requires=[
+        # this only includes publicly available dependencies
         'ink_extensions>=1.1.0',
-        'lxml>=4.6.2',
-        'plotink>=1.4.0',
+        'lxml>=4.6.5',
+        'plotink>=1.5.0',
         'pyserial>=3.5',
         'requests', # just for the certificates for now
     ],

diff --git a/inkscape driver/axidraw.inx b/inkscape driver/axidraw.inx
@@ -143,6 +143,8 @@ _gui-text="Pen height: DOWN, (%):">30</param>
 <_option value="1">AxiDraw V2 or AxiDraw V3</_option>
 <_option value="2">AxiDraw V3/A3 or SE/A3</_option>
 <_option value="4">AxiDraw MiniKit</_option>
+<_option value="5">AxiDraw SE/A1</_option>
+<_option value="6">AxiDraw SE/A2</_option>
 <_option value="3">AxiDraw V3 XLX</_option>
 </param>
 <param name="port_config" type="optiongroup" appearance="minimal" indent="1" _gui-text="Machine selection:">
@@ -176,17 +178,18 @@ raise or lower the pen, or enable or disable the motors.
 
 <param name="manual_cmd" type="optiongroup" appearance="minimal"
 _gui-text="               Command: ">
-<_option value="none"           >- Select -</_option>
-<_option value="walk_x"   >Walk Carriage (X, inches)</_option>
-<_option value="walk_y"   >Walk Carriage (Y, inches)</_option>
+<_option value="none"       >- Select -</_option>
+<_option value="walk_x"     >Walk Carriage (X, inches)</_option>
+<_option value="walk_y"     >Walk Carriage (Y, inches)</_option>
 <_option value="walk_mmx"   >Walk Carriage (X, mm)</_option>
 <_option value="walk_mmy"   >Walk Carriage (Y, mm)</_option>
-<_option value="raise_pen"      >Raise the Pen</_option>
-<_option value="lower_pen"      >Lower the Pen</_option>
+<_option value="walk_home"  >Walk Home</_option>
+<_option value="raise_pen"  >Raise the Pen</_option>
+<_option value="lower_pen"  >Lower the Pen</_option>
 <_option value="enable_xy"  >Enable XY Motors</_option>
 <_option value="disable_xy" >Disable XY Motors</_option> 
-<_option value="bootload"       >Enter Bootloader mode</_option>
-<_option value="strip_data"     >Strip plotter data from file</_option>
+<_option value="bootload"   >Enter Bootloader mode</_option>
+<_option value="strip_data" >Strip plotter data from file</_option>
 </param>
 
 <param name="walk_dist" indent="1" type="float" precision="3" min="-300" max="300" _gui-text="Walk distance (+ or -):">1.000</param>
@@ -256,7 +259,7 @@ the Return to Home Corner command.
 
 </param>
 <_param name="copyright" type="description" indent="5" xml:space="preserve"
->Version 3.1.0      —      Copyright 2021 Evil Mad Scientist</_param>
+>Version 3.2.0      —      Copyright 2022 Evil Mad Scientist</_param>