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

dda_queue.c/.h: merge enqueue() and enqueue_temp_wait(). This 

saves almost 200 bytes.
This commit is contained in:
Markus Hitter 2010-09-30 21:51:18 +02:00
parent 94e0cce89b
commit 90fca50535
3 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dda_queue.c
View File

@ -69,7 +69,21 @@ void enqueue(TARGET *t) {
uint8_t h = mb_head + 1; uint8_t h = mb_head + 1;
h &= (MOVEBUFFER_SIZE - 1); h &= (MOVEBUFFER_SIZE - 1);
dda_create(&movebuffer[h], t); if (t != NULL) {
dda_create(&movebuffer[h], t);
}
else {
// it's a wait for temp
movebuffer[h].waitfor_temp = 1;
movebuffer[h].nullmove = 0;
#if (F_CPU & 0xFF000000) == 0
// set "step" timeout to 1 second
movebuffer[h].c = F_CPU << 8;
#else
// set "step" timeout to maximum
movebuffer[h].c = 0xFFFFFF00;
#endif
}
mb_head = h; mb_head = h;
@ -84,36 +98,6 @@ void enqueue(TARGET *t) {
enableTimerInterrupt(); enableTimerInterrupt();
} }
void enqueue_temp_wait() {
// don't call this function when the queue is full, but just in case, wait for a move to complete and free up the space for the passed target
while (queue_full())
delay(WAITING_DELAY);
uint8_t h = mb_head + 1;
h &= (MOVEBUFFER_SIZE - 1);
// wait for temp flag
movebuffer[h].waitfor_temp = 1;
movebuffer[h].nullmove = 0;
#if (F_CPU & 0xFF000000) == 0
// set "step" timeout to 1 second
movebuffer[h].c = F_CPU << 8;
#else
// set "step" timeout to maximum
movebuffer[h].c = 0xFFFFFF00;
#endif
mb_head = h;
#ifdef XONXOFF
if (((mb_tail - mb_head - 1) & (MOVEBUFFER_SIZE - 1)) < (MOVEBUFFER_SIZE - 2))
xoff();
#endif
// fire up in case we're not running yet
enableTimerInterrupt();
}
void next_move() { void next_move() {
if (queue_empty() == 0) { if (queue_empty() == 0) {
// next item // next item

4
dda_queue.h
View File

@ -24,11 +24,9 @@ uint8_t queue_empty(void);
void queue_step(void); void queue_step(void);
// add a new target to the queue // add a new target to the queue
// t == NULL means add a wait for target temp to the queue
void enqueue(TARGET *t); void enqueue(TARGET *t);
// add a wait for target temp to the queue
void enqueue_temp_wait(void);
// called from step timer when current move is complete // called from step timer when current move is complete
void next_move(void) __attribute__ ((hot)); void next_move(void) __attribute__ ((hot));

4
gcode.c
View File

@ -533,7 +533,7 @@ void process_gcode_command(GCODE_COMMAND *gcmd) {
// M101- extruder on // M101- extruder on
case 101: case 101:
if (temp_achieved() == 0) { if (temp_achieved() == 0) {
enqueue_temp_wait(); enqueue(NULL);
} }
do { do {
// backup feedrate, move E very quickly then restore feedrate // backup feedrate, move E very quickly then restore feedrate
@ -595,7 +595,7 @@ void process_gcode_command(GCODE_COMMAND *gcmd) {
else { else {
disable_heater(); disable_heater();
} }
enqueue_temp_wait(); enqueue(NULL);
break; break;
// M110- set line number // M110- set line number