josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move timer macros from config.h.dist and derivates to timer.c. 

This sould confuse users less and neither value is subject to change
per configuration. Reviewed also by Markus Amsler.
This commit is contained in:
Markus Hitter 2011-02-22 21:06:44 +01:00
parent 2c53dbe2a8
commit 4ca9e470a5
5 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.gen3.h
View File

@ -368,12 +368,6 @@ DEFINE_TEMP_SENSOR(noheater, TT_INTERCOM, 0)
*/
#define STEP_INTERRUPT_INTERRUPTIBLE 1
/*
how often we overflow and update our clock; with F_CPU=16MHz, max is < 4.096ms (TICK_TIME = 65535)
*/
#define TICK_TIME 2 MS
#define TICK_TIME_MS (TICK_TIME / (F_CPU / 1000))
/*
temperature history count. This is how many temperature readings to keep in order to calculate derivative in PID loop
higher values make PID derivative term more stable at the expense of reaction time

6
config.gen6.h
View File

@ -357,12 +357,6 @@ DEFINE_HEATER(extruder, PORTD, PIND6, OCR2B)
*/
#define STEP_INTERRUPT_INTERRUPTIBLE 1
/*
how often we overflow and update our clock; with F_CPU=16MHz, max is < 4.096ms (TICK_TIME = 65535)
*/
#define TICK_TIME 2 MS
#define TICK_TIME_MS (TICK_TIME / (F_CPU / 1000))
/*
temperature history count. This is how many temperature readings to keep in order to calculate derivative in PID loop
higher values make PID derivative term more stable at the expense of reaction time

6
config.h.dist
View File

@ -385,12 +385,6 @@ DEFINE_HEATER(bed, PORTB, PINB4, OCR0B)
*/
#define STEP_INTERRUPT_INTERRUPTIBLE 1
/*
how often we overflow and update our clock; with F_CPU=16MHz, max is < 4.096ms (TICK_TIME = 65535)
*/
#define TICK_TIME 2 MS
#define TICK_TIME_MS (TICK_TIME / (F_CPU / 1000))
/*
temperature history count. This is how many temperature readings to keep in order to calculate derivative in PID loop
higher values make PID derivative term more stable at the expense of reaction time

6
config.ramps.h
View File

@ -371,12 +371,6 @@ DEFINE_HEATER(fan, PORTH, PINH6, OCR2B)
*/
#define STEP_INTERRUPT_INTERRUPTIBLE 1
/*
how often we overflow and update our clock; with F_CPU=16MHz, max is < 4.096ms (TICK_TIME = 65535)
*/
#define TICK_TIME 2 MS
#define TICK_TIME_MS (TICK_TIME / (F_CPU / 1000))
/*
temperature history count. This is how many temperature readings to keep in order to calculate derivative in PID loop
higher values make PID derivative term more stable at the expense of reaction time

6
timer.c
View File

@ -4,6 +4,12 @@
#include "dda_queue.h"
/*
how often we overflow and update our clock; with F_CPU=16MHz, max is < 4.096ms (TICK_TIME = 65535)
*/
#define TICK_TIME 2 MS
#define TICK_TIME_MS (TICK_TIME / (F_CPU / 1000))
volatile uint32_t next_step_time;
uint8_t clock_counter_10ms = 0;