diff --git a/.github/workflows/3d.yml b/.github/workflows/3d.yml index bddef6ee..17708b0b 100644 --- a/.github/workflows/3d.yml +++ b/.github/workflows/3d.yml @@ -37,18 +37,6 @@ jobs: cp 3d/build/laser_parts/combined.svg 3d/build/outputs/3d_laser_vector-ponoko-3mm-acrylic_1x.svg cp 3d/build/laser_parts/combined_dimensions.txt 3d/build/outputs/3d_laser_vector-ponoko-3mm-acrylic_1x_dimensions.txt - - name: Generate 2d output (Ponoko 3mm MDF - 4x) - run: | - xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" python3 -u 3d/scripts/generate_2d.py --calculate-dimensions --kerf-preset ponoko-3mm-mdf --panelize 4 - cp 3d/build/laser_parts/combined.svg 3d/build/outputs/3d_laser_vector-ponoko-3mm-mdf_4x.svg - cp 3d/build/laser_parts/combined_dimensions.txt 3d/build/outputs/3d_laser_vector-ponoko-3mm-mdf_4x.txt - - - name: Generate 2d output (Ponoko 3mm Acrylic - 4x) - run: | - xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" python3 -u 3d/scripts/generate_2d.py --calculate-dimensions --kerf-preset ponoko-3mm-acrylic --panelize 4 - cp 3d/build/laser_parts/combined.svg 3d/build/outputs/3d_laser_vector-ponoko-3mm-acrylic_4x.svg - cp 3d/build/laser_parts/combined_dimensions.txt 3d/build/outputs/3d_laser_vector-ponoko-3mm-acrylic_4x_dimensions.txt - - name: Generate 2d output (Elecrow 3mm Wood) run: | xvfb-run --auto-servernum --server-args "-screen 0 1024x768x24" python3 -u 3d/scripts/generate_2d.py --kerf-preset elecrow-3mm-wood --render-elecrow diff --git a/3d/scripts/generate_2d.py b/3d/scripts/generate_2d.py index e6db8888..5e181ec2 100755 --- a/3d/scripts/generate_2d.py +++ b/3d/scripts/generate_2d.py @@ -60,8 +60,8 @@ parser.add_argument('--render-elecrow', action='store_true', help='Render an additional zipped pdf with labeled ' 'dimensions and only cut lines, for Elecrow. ' 'Requires Inkscape and pdfjam. Implies ' - '--no-etch, --calculate-dimensions, and ' - '--skip-optimize') + '--no-etch, --calculate-dimensions, ' + '--skip-optimize, and --mirror') parser.add_argument('--no-alignment-bar', action='store_true', help='Do not include features for the alignment bar') parser.add_argument('--no-front-panel', action='store_true', help='Do not include the front face of the enclosure, ' 'e.g. if you will use ' @@ -75,10 +75,15 @@ 'indicator on the spool.') args = parser.parse_args() + + if args.panelize > 1: + raise RuntimeError('The --panelize option is no longer supported for v2 hardware') + if args.render_elecrow: args.no_etch = True args.calculate_dimensions = True args.skip_optimize = True + args.mirror = True laser_parts_directory = os.path.join(source_parts_dir, 'build', 'laser_parts') diff --git a/README.md b/README.md index 824e91e1..4ca22e0d 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ This is a DIY ESP32-based [split-flap display](https://en.wikipedia.org/wiki/Spl ![animated rendering](https://s3.amazonaws.com/splitflap-artifacts/fontExploration/3d/3d_animation.gif) -[![Build Status](https://github.com/scottbez1/splitflap/actions/workflows/3d.yml/badge.svg?branch=master)](https://github.com/scottbez1/splitflap/actions/workflows/3d.yml) -[![Build Status](https://github.com/scottbez1/splitflap/actions/workflows/electronics.yml/badge.svg?branch=master)](https://github.com/scottbez1/splitflap/actions/workflows/electronics.yml) -[![Build Status](https://github.com/scottbez1/splitflap/actions/workflows/pio.yml/badge.svg?branch=master)](https://github.com/scottbez1/splitflap/actions/workflows/pio.yml) +[![Build Status](https://github.com/scottbez1/splitflap/actions/workflows/3d.yml/badge.svg?branch=fontExploration)](https://github.com/scottbez1/splitflap/actions/workflows/3d.yml?query=branch%3AfontExploration) +[![Build Status](https://github.com/scottbez1/splitflap/actions/workflows/electronics.yml/badge.svg?branch=fontExploration)](https://github.com/scottbez1/splitflap/actions/workflows/electronics.yml?query=branch%3AfontExploration) +[![Build Status](https://github.com/scottbez1/splitflap/actions/workflows/pio.yml/badge.svg?branch=fontExploration)](https://github.com/scottbez1/splitflap/actions/workflows/pio.yml?query=branch%3AfontExploration) The goal is to make a low-cost display that's easy to fabricate at home in small/single quantities (e.g. custom parts can be easily ordered online, and other hardware is generally available).