From 541c2990c6024250a896d533ce9665271736fe61 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Fri, 22 Mar 2019 12:36:18 -0400 Subject: [PATCH] test: Rename atmega2560-16mhz.config to atmega2560.config There's no need to include the 16mhz as basically all atmega chips are run at 16mhz. Signed-off-by: Kevin O'Connor --- .../{atmega2560-16mhz.config => atmega2560.config} | 0 test/configs/{atmega328-16mhz.config => atmega328.config} | 0 test/klippy/bed_screws.test | 2 +- test/klippy/bltouch.test | 2 +- test/klippy/commands.test | 2 +- test/klippy/delta.test | 2 +- test/klippy/dual_carriage.test | 2 +- test/klippy/manual_stepper.test | 2 +- test/klippy/multi_z.test | 2 +- test/klippy/out_of_bounds.test | 2 +- test/klippy/polar.test | 2 +- test/klippy/printers.test | 8 ++++---- test/klippy/screws_tilt_adjust.test | 2 +- test/klippy/temperature.test | 2 +- test/klippy/z_virtual_endstop.test | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) rename test/configs/{atmega2560-16mhz.config => atmega2560.config} (100%) rename test/configs/{atmega328-16mhz.config => atmega328.config} (100%) diff --git a/test/configs/atmega2560-16mhz.config b/test/configs/atmega2560.config similarity index 100% rename from test/configs/atmega2560-16mhz.config rename to test/configs/atmega2560.config diff --git a/test/configs/atmega328-16mhz.config b/test/configs/atmega328.config similarity index 100% rename from test/configs/atmega328-16mhz.config rename to test/configs/atmega328.config diff --git a/test/klippy/bed_screws.test b/test/klippy/bed_screws.test index 53fa2cb1..49002938 100644 --- a/test/klippy/bed_screws.test +++ b/test/klippy/bed_screws.test @@ -1,6 +1,6 @@ # Test case for bed screws helper tool CONFIG bed_screws.cfg -DICTIONARY atmega2560-16mhz.dict +DICTIONARY atmega2560.dict # Start helper script and then abort it G28 diff --git a/test/klippy/bltouch.test b/test/klippy/bltouch.test index bbfda377..7c843d03 100644 --- a/test/klippy/bltouch.test +++ b/test/klippy/bltouch.test @@ -1,6 +1,6 @@ # Test case for bltouch support CONFIG bltouch.cfg -DICTIONARY atmega2560-16mhz.dict +DICTIONARY atmega2560.dict # Start by homing the printer. G28 diff --git a/test/klippy/commands.test b/test/klippy/commands.test index a9581dae..a32b26e2 100644 --- a/test/klippy/commands.test +++ b/test/klippy/commands.test @@ -1,5 +1,5 @@ # Tests for miscellaneous g-code commands -DICTIONARY atmega2560-16mhz.dict +DICTIONARY atmega2560.dict CONFIG ../../config/example.cfg # Simple status commands diff --git a/test/klippy/delta.test b/test/klippy/delta.test index 34ca3068..31bc079f 100644 --- a/test/klippy/delta.test +++ b/test/klippy/delta.test @@ -1,6 +1,6 @@ # Test case for basic movement on delta printers CONFIG ../../config/example-delta.cfg -DICTIONARY atmega2560-16mhz.dict +DICTIONARY atmega2560.dict # Start by homing the printer. Also tests Z moves. G28 diff --git a/test/klippy/dual_carriage.test b/test/klippy/dual_carriage.test index d9d8009f..5b2f9e65 100644 --- a/test/klippy/dual_carriage.test +++ b/test/klippy/dual_carriage.test @@ -1,6 +1,6 @@ # Test cases on printers with dual carriage and multiple extruders CONFIG dual_carriage.cfg -DICTIONARY atmega2560-16mhz.dict +DICTIONARY atmega2560.dict # First home the printer G90 diff --git a/test/klippy/manual_stepper.test b/test/klippy/manual_stepper.test index 0d11970b..af0d406a 100644 --- a/test/klippy/manual_stepper.test +++ b/test/klippy/manual_stepper.test @@ -1,6 +1,6 @@ # Test case for manual_stepper CONFIG manual_stepper.cfg -DICTIONARY atmega2560-16mhz.dict +DICTIONARY atmega2560.dict # Test basic moves MANUAL_STEPPER STEPPER=basic_stepper ENABLE=1 diff --git a/test/klippy/multi_z.test b/test/klippy/multi_z.test index 41ea9fea..add117c5 100644 --- a/test/klippy/multi_z.test +++ b/test/klippy/multi_z.test @@ -1,6 +1,6 @@ # Test case with multiple z stepper motors CONFIG multi_z.cfg -DICTIONARY atmega2560-16mhz.dict +DICTIONARY atmega2560.dict # Start by homing the printer. G28 diff --git a/test/klippy/out_of_bounds.test b/test/klippy/out_of_bounds.test index 5375ea7e..9a56dea9 100644 --- a/test/klippy/out_of_bounds.test +++ b/test/klippy/out_of_bounds.test @@ -1,6 +1,6 @@ # Test that basic bounds checks work CONFIG ../../config/example.cfg -DICTIONARY atmega2560-16mhz.dict +DICTIONARY atmega2560.dict SHOULD_FAIL # Home the printer, and then attempt to move to an obviously bad location diff --git a/test/klippy/polar.test b/test/klippy/polar.test index 54cd1c14..040531ce 100644 --- a/test/klippy/polar.test +++ b/test/klippy/polar.test @@ -1,6 +1,6 @@ # Test case for basic movement on polar printers CONFIG ../../config/example-polar.cfg -DICTIONARY atmega2560-16mhz.dict +DICTIONARY atmega2560.dict ; Start by homing the printer. G28 diff --git a/test/klippy/printers.test b/test/klippy/printers.test index 348abbad..a387a9ba 100644 --- a/test/klippy/printers.test +++ b/test/klippy/printers.test @@ -2,14 +2,14 @@ GCODE move.gcode # Example kinematic files -DICTIONARY atmega2560-16mhz.dict +DICTIONARY atmega2560.dict CONFIG ../../config/example.cfg CONFIG ../../config/example-corexy.cfg CONFIG ../../config/example-delta.cfg CONFIG ../../config/example-winch.cfg # Printers using the atmega2560 -DICTIONARY atmega2560-16mhz.dict +DICTIONARY atmega2560.dict CONFIG ../../config/generic-einsy-rambo.cfg CONFIG ../../config/generic-fysetc-f6.cfg CONFIG ../../config/generic-gt2560.cfg @@ -74,7 +74,7 @@ CONFIG ../../config/generic-cramps.cfg CONFIG ../../config/generic-replicape.cfg # Tests with multiple mcus -DICTIONARY atmega2560-16mhz.dict zboard=atmega2560-16mhz.dict auxboard=atmega2560-16mhz.dict +DICTIONARY atmega2560.dict zboard=atmega2560.dict auxboard=atmega2560.dict CONFIG ../../config/example-multi-mcu.cfg -DICTIONARY atmega2560-16mhz.dict z=atmega2560-16mhz.dict +DICTIONARY atmega2560.dict z=atmega2560.dict CONFIG ../../config/kit-voron2-250mm.cfg diff --git a/test/klippy/screws_tilt_adjust.test b/test/klippy/screws_tilt_adjust.test index 62b1d53a..2ad683fa 100644 --- a/test/klippy/screws_tilt_adjust.test +++ b/test/klippy/screws_tilt_adjust.test @@ -1,6 +1,6 @@ # Test case for bed screws tilt helper tool CONFIG screws_tilt_adjust.cfg -DICTIONARY atmega2560-16mhz.dict +DICTIONARY atmega2560.dict # Simple script to test G28 diff --git a/test/klippy/temperature.test b/test/klippy/temperature.test index efbeb3c3..31acde32 100644 --- a/test/klippy/temperature.test +++ b/test/klippy/temperature.test @@ -1,5 +1,5 @@ # Tests for various temperature sensors -DICTIONARY atmega2560-16mhz.dict +DICTIONARY atmega2560.dict CONFIG temperature.cfg # Set various temperatures diff --git a/test/klippy/z_virtual_endstop.test b/test/klippy/z_virtual_endstop.test index 85e7a3eb..76726113 100644 --- a/test/klippy/z_virtual_endstop.test +++ b/test/klippy/z_virtual_endstop.test @@ -1,6 +1,6 @@ # Test case for probe:z_virtual_endstop support CONFIG z_virtual_endstop.cfg -DICTIONARY atmega2560-16mhz.dict +DICTIONARY atmega2560.dict # Start by homing the printer. G28