@@ -4,6 +4,7 @@ // v1.2 by Chris Meighan - cleanup / G2&G3 support (cmeighan@gmail.com) // v1.3 by Zach Smith - added thermocouple support and multi-sample temp readings. (hoeken@gmail.com) // also added preliminary and experimental support for rotary encoders. + #include <HardwareSerial.h> //our command string GCode_Interpreter_Experimental/GCode_Interpreter_Experimental.pde @@ -28,7 +28,7 @@ #define TEMPERATURE_SAMPLES 5 //these defines are for using rotary encoders on the extruder -#define EXTRUDER_ENCODER_STEPS 1024 //number of steps per revolution +#define EXTRUDER_ENCODER_STEPS 512 //number of steps per revolution #define EXTRUDER_MIN_SPEED 50 //minimum PWM speed to use #define EXTRUDER_MAX_SPEED 255 //maximum PWM speed to use #define EXTRUDER_ERROR_MARGIN 10 //our error margin (to prevent constant seeking) GCode_Interpreter_Experimental/_init.pde @@ -59,7 +59,7 @@ int last_extruder_error = 0; int last_extruder_delta = 0; int last_extruder_speed = 0; -void extruder_read_quadrature_a() +void extruder_read_quadrature() { // found a low-to-high on channel A if (digitalRead(EXTRUDER_ENCODER_A_PIN) == HIGH) @@ -101,48 +101,6 @@ void extruder_read_quadrature_a() } } -void extruder_read_quadrature_b() -{ - // found a low-to-high on channel A - if (digitalRead(EXTRUDER_ENCODER_B_PIN) == HIGH) - { - // check channel B to see which way - if (digitalRead(EXTRUDER_ENCODER_A_PIN) == LOW) - { - if (INVERT_QUADRATURE) - extruder_error; - else - extruder_error++; - } - else - { - if (INVERT_QUADRATURE) - extruder_error++; - else - extruder_error--; - } - } - // found a high-to-low on channel A - else - { - // check channel B to see which way - if (digitalRead(EXTRUDER_ENCODER_A_PIN) == LOW) - { - if (INVERT_QUADRATURE) - extruder_error--; - else - extruder_error++; - } - else - { - if (INVERT_QUADRATURE) - extruder_error++; - else - extruder_error--; - } - } -} - void init_extruder() { //default to room temp. @@ -170,8 +128,7 @@ void init_extruder() digitalWrite(EXTRUDER_ENCODER_A_PIN, HIGH); //attach our interrupt handlers - attachInterrupt(0, extruder_read_quadrature_a, CHANGE); - attachInterrupt(1, extruder_read_quadrature_b, CHANGE); + attachInterrupt(0, extruder_read_quadrature, CHANGE); //setup our timer interrupt stuff setupTimer1Interrupt(); GCode_Interpreter_Experimental/extruder.pde 1611963088645fcde3490b14bc5750bb08e9a7d1 hoekstar hoekstar@cb376a5e-1013-0410-a455-b6b1f9ac8223 http://github.com/alx/reprap-arduino-firmware/commit/bde60d5e472a24532574a0435104d319244e8d7f bde60d5e472a24532574a0435104d319244e8d7f 2008-05-27T11:20:43-07:00 2008-05-26T19:13:44-07:00 did a bunch of work on the experimental gcode firmware git-svn-id: https://reprap.svn.sourceforge.net/svnroot/reprap/trunk/reprap/firmware/Arduino@1606 cb376a5e-1013-0410-a455-b6b1f9ac8223 e9813aa91ef67e42cf9746d667e1e64c1b0d5c03 Alexandre Girard alx.girard@gmail.com