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

more code cleanup

This commit is contained in:
Michael Moon 2010-09-12 14:24:19 +10:00
parent c5b3408b52
commit e5d393a592
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dda_queue.c
View File

@ -49,6 +49,7 @@ void queue_step() {
// serial_writechar('!'); // serial_writechar('!');
// fall directly into dda_start instead of waiting for another step // fall directly into dda_start instead of waiting for another step
// the dda dies not directly after its last step, but when the timer fires and there's no steps to do
if (movebuffer[mb_tail].live == 0) if (movebuffer[mb_tail].live == 0)
next_move(); next_move();
@ -65,10 +66,8 @@ void enqueue(TARGET *t) {
while (queue_full()) while (queue_full())
delay(WAITING_DELAY); delay(WAITING_DELAY);
uint8_t h = mb_head; uint8_t h = mb_head + 1;
h++; h &= (MOVEBUFFER_SIZE - 1);
if (h == MOVEBUFFER_SIZE)
h = 0;
dda_create(&movebuffer[h], t); dda_create(&movebuffer[h], t);

9
gcode.c
View File

@ -537,15 +537,6 @@ 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) {
// serial_writestr_P(PSTR("Waiting for extruder to reach target temperature\n"));
// // here we wait until target temperature is reached, and emulate main loop so the temperature can actually be updated
// while (temp_achieved() == 0) {
// ifclock(CLOCK_FLAG_250MS) {
// // this is cosmetically nasty, but exactly what needs to happen
// void clock_250ms(void);
// clock_250ms();
// }
// }
enqueue_temp_wait(); enqueue_temp_wait();
} }
do { do {