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

use x_enable and friends more, use sersendf_P more

This commit is contained in:
Michael Moon 2010-11-12 12:51:13 +11:00
parent dfb5de7b33
commit 3b6326911a
1 changed files with 32 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
gcode_process.c
View File

@ -163,9 +163,8 @@ void process_gcode_command() {
// unknown gcode: spit an error // unknown gcode: spit an error
default: default:
serial_writestr_P(PSTR("E: Bad G-code ")); sersendf_P(PSTR("E: Bad G-code %d"), next_target.G);
serwrite_uint8(next_target.G); // newline is sent from gcode_parse after we return
serial_writechar('\n');
} }
} }
else if (next_target.seen_M) { else if (next_target.seen_M) {
@ -260,11 +259,13 @@ void process_gcode_command() {
// M113- extruder PWM // M113- extruder PWM
// M114- report XYZEF to host // M114- report XYZEF to host
case 114: case 114:
sersendf_P(PSTR("X:%ld,Y:%ld,Z:%ld,E:%ld,F:%ld\n"), current_position.X, current_position.Y, current_position.Z, current_position.E, current_position.F); sersendf_P(PSTR("X:%ld,Y:%ld,Z:%ld,E:%ld,F:%ld"), current_position.X, current_position.Y, current_position.Z, current_position.E, current_position.F);
// newline is sent from gcode_parse after we return
break; break;
// M115- capabilities string // M115- capabilities string
case 115: case 115:
sersendf_P(PSTR("FIRMWARE_NAME:FiveD_on_Arduino FIRMWARE_URL:http%3A//github.com/triffid/FiveD_on_Arduino/ PROTOCOL_VERSION:1.0 MACHINE_TYPE:Mendel EXTRUDER_COUNT:%d TEMP_SENSOR_COUNT:%d HEATER_COUNT:%d\n"), 1, NUM_TEMP_SENSORS, NUM_HEATERS); sersendf_P(PSTR("FIRMWARE_NAME:FiveD_on_Arduino FIRMWARE_URL:http%3A//github.com/triffid/FiveD_on_Arduino/ PROTOCOL_VERSION:1.0 MACHINE_TYPE:Mendel EXTRUDER_COUNT:%d TEMP_SENSOR_COUNT:%d HEATER_COUNT:%d"), 1, NUM_TEMP_SENSORS, NUM_HEATERS);
// newline is sent from gcode_parse after we return
break; break;
#if NUM_HEATERS > 0 #if NUM_HEATERS > 0
@ -302,76 +303,42 @@ void process_gcode_command() {
// M190- power on // M190- power on
case 190: case 190:
power_on(); power_on();
#ifdef X_ENABLE_PIN x_enable();
WRITE(X_ENABLE_PIN, 0); y_enable();
#endif z_enable();
#ifdef Y_ENABLE_PIN
WRITE(Y_ENABLE_PIN, 0);
#endif
#ifdef Z_ENABLE_PIN
WRITE(Z_ENABLE_PIN, 0);
#endif
steptimeout = 0; steptimeout = 0;
break; break;
// M191- power off // M191- power off
case 191: case 191:
#ifdef X_ENABLE_PIN x_disable();
WRITE(X_ENABLE_PIN, 1); y_disable();
#endif z_disable();
#ifdef Y_ENABLE_PIN
WRITE(Y_ENABLE_PIN, 1);
#endif
#ifdef Z_ENABLE_PIN
WRITE(Z_ENABLE_PIN, 1);
#endif
power_off(); power_off();
break; break;
#ifdef DEBUG #ifdef DEBUG
// M140- echo off // M140- echo off
case 140: case 140:
debug_flags &= ~DEBUG_ECHO; debug_flags &= ~DEBUG_ECHO;
serial_writestr_P(PSTR("Echo off\n")); serial_writestr_P(PSTR("Echo off"));
// newline is sent from gcode_parse after we return
break; break;
// M141- echo on // M141- echo on
case 141: case 141:
debug_flags |= DEBUG_ECHO; debug_flags |= DEBUG_ECHO;
serial_writestr_P(PSTR("Echo on\n")); serial_writestr_P(PSTR("Echo on"));
// newline is sent from gcode_parse after we return
break; break;
// DEBUG: return current position // DEBUG: return current position, end position, queue
case 250: case 250:
serial_writestr_P(PSTR("{X:")); sersendf_P(PSTR("{X:%ld,Y:%ld,Z:%ld,E:%ld,F:%lu,c:%lu}\t{X:%ld,Y:%ld,Z:%ld,E:%ld,F:%lu,c:%lu}\t"), current_position.X, current_position.Y, current_position.Z, current_position.E, current_position.F, movebuffer[mb_tail].c, movebuffer[mb_tail].endpoint.X, movebuffer[mb_tail].endpoint.Y, movebuffer[mb_tail].endpoint.Z, movebuffer[mb_tail].endpoint.E, movebuffer[mb_tail].endpoint.F,
serwrite_int32(current_position.X); #ifdef ACCELERATION_REPRAP
serial_writestr_P(PSTR(",Y:")); movebuffer[mb_tail].end_c
serwrite_int32(current_position.Y); #else
serial_writestr_P(PSTR(",Z:")); movebuffer[mb_tail].c
serwrite_int32(current_position.Z); #endif
serial_writestr_P(PSTR(",E:")); );
serwrite_int32(current_position.E);
serial_writestr_P(PSTR(",F:"));
serwrite_int32(current_position.F);
serial_writestr_P(PSTR(",c:"));
serwrite_uint32(movebuffer[mb_tail].c);
serial_writestr_P(PSTR("}\n"));
serial_writestr_P(PSTR("{X:"));
serwrite_int32(movebuffer[mb_tail].endpoint.X);
serial_writestr_P(PSTR(",Y:"));
serwrite_int32(movebuffer[mb_tail].endpoint.Y);
serial_writestr_P(PSTR(",Z:"));
serwrite_int32(movebuffer[mb_tail].endpoint.Z);
serial_writestr_P(PSTR(",E:"));
serwrite_int32(movebuffer[mb_tail].endpoint.E);
serial_writestr_P(PSTR(",F:"));
serwrite_int32(movebuffer[mb_tail].endpoint.F);
serial_writestr_P(PSTR(",c:"));
#ifdef ACCELERATION_REPRAP
serwrite_uint32(movebuffer[mb_tail].end_c);
#else
serwrite_uint32(movebuffer[mb_tail].c);
#endif
serial_writestr_P(PSTR("}\n"));
print_queue(); print_queue();
break; break;
@ -384,27 +351,20 @@ void process_gcode_command() {
serwrite_hex8(*(volatile uint8_t *)(next_target.S)); serwrite_hex8(*(volatile uint8_t *)(next_target.S));
next_target.S++; next_target.S++;
} }
serial_writechar('\n'); // newline is sent from gcode_parse after we return
break; break;
// DEBUG: write arbitrary memory locatiom // DEBUG: write arbitrary memory locatiom
case 254: case 254:
// serwrite_hex8(next_target.S); sersendf_P(PSTR("%x:%x->%x"), next_target.S, *(volatile uint8_t *)(next_target.S), next_target.P);
// serial_writechar(':');
// serwrite_hex8(*(volatile uint8_t *)(next_target.S));
// serial_writestr_P(PSTR("->"));
// serwrite_hex8(next_target.P);
// serial_writechar('\n');
sersendf_P(PSTR("%x:%x->%x\n"), next_target.S, *(volatile uint8_t *)(next_target.S), next_target.P);
(*(volatile uint8_t *)(next_target.S)) = next_target.P; (*(volatile uint8_t *)(next_target.S)) = next_target.P;
// newline is sent from gcode_parse after we return
break; break;
#endif /* DEBUG */ #endif /* DEBUG */
// unknown mcode: spit an error // unknown mcode: spit an error
default: default:
/* serial_writestr_P(PSTR("E: Bad M-code ")); sersendf_P(PSTR("E: Bad M-code %d"), next_target.M);
serwrite_uint8(next_target.M); // newline is sent from gcode_parse after we return
serial_writechar('\n');*/
sersendf_P(PSTR("E: Bad M-code %d\n"), next_target.M);
} }
} }
} }