From c1f0bfc8b69b65eaed4882ced45007823114220b Mon Sep 17 00:00:00 2001 From: Rob Giseburt Date: Thu, 27 Oct 2016 16:06:59 -0500 Subject: [PATCH] Fixes for gQuintic-b timer configuration --- g2core/board/gquintic/gquintic-b-pinout.h | 22 +++++++++++----------- g2core/board/gquintic/hardware.h | 10 +++++----- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/g2core/board/gquintic/gquintic-b-pinout.h b/g2core/board/gquintic/gquintic-b-pinout.h index d4dbe127..4134a229 100755 --- a/g2core/board/gquintic/gquintic-b-pinout.h +++ b/g2core/board/gquintic/gquintic-b-pinout.h @@ -100,17 +100,17 @@ // So we have to explicitly enable them as PWM pins. // Generated with: // perl -e 'for($i=1;$i<14;$i++) { print "#define OUTPUT${i}_PWM 0\n";}' -#define OUTPUT1_PWM 1 // PWM1 - Fet 1 -#define OUTPUT2_PWM 1 // PWM2 - Fet 2 -#define OUTPUT3_PWM 1 // PWM3 - Fan 1 -#define OUTPUT4_PWM 0 // PWM2 - Fan 2 -#define OUTPUT5_PWM 1 // Timer2ch0 - Fan 3 -#define OUTPUT6_PWM 1 // Timer2ch1 -#define OUTPUT7_PWM 0 // PWM2 -#define OUTPUT8_PWM 1 // PWM0 -#define OUTPUT9_PWM 0 // PWM3 or Timer1ch0 -#define OUTPUT10_PWM 0 // PWM1 -#define OUTPUT11_PWM 0 // Can't PWM - Fet 3 +#define OUTPUT1_PWM 1 // TC0,1 - Fet 1 +#define OUTPUT2_PWM 1 // PWM1 - Fet 2 +#define OUTPUT3_PWM 1 // TC1,0 - Fan 1 +#define OUTPUT4_PWM 1 // TC1,1 - Fan 2 +#define OUTPUT5_PWM 1 // TC2,0 - Fan 3 +#define OUTPUT6_PWM 1 // PWM8+0 +#define OUTPUT7_PWM 1 // PWM3 +#define OUTPUT8_PWM 1 // PWM2 +#define OUTPUT9_PWM 0 // PWM2 +#define OUTPUT10_PWM 1 // PWM8+2 +#define OUTPUT11_PWM 1 // PWM8+3 - Fet 3 #define OUTPUT12_PWM 0 // Unused #define OUTPUT13_PWM 0 // Unused diff --git a/g2core/board/gquintic/hardware.h b/g2core/board/gquintic/hardware.h index 78943c2d..5dbe9ac3 100755 --- a/g2core/board/gquintic/hardware.h +++ b/g2core/board/gquintic/hardware.h @@ -128,11 +128,11 @@ using Motate::OutputPin; /**** Motate Definitions ****/ // Timer definitions. See stepper.h and other headers for setup -typedef TimerChannel<0,0> dda_timer_type; // stepper pulse generation in stepper.cpp -typedef TimerChannel<1,0> dwell_timer_type; // dwell timing in stepper.cpp -typedef ServiceCall<0> load_timer_type; // request load timer in stepper.cpp -typedef ServiceCall<1> exec_timer_type; // request exec timer in stepper.cpp -typedef ServiceCall<2> fwd_plan_timer_type; // request exec timer in stepper.cpp +typedef TimerChannel<9, 0> dda_timer_type; // stepper pulse generation in stepper.cpp +typedef TimerChannel<10, 0> dwell_timer_type; // dwell timing in stepper.cpp +typedef ServiceCall<0> load_timer_type; // request load timer in stepper.cpp +typedef ServiceCall<1> exec_timer_type; // request exec timer in stepper.cpp +typedef ServiceCall<2> fwd_plan_timer_type; // request exec timer in stepper.cpp // Pin assignments