bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Updated SERIAL define to MYSERIAL, because Arduino 1.0 defines SERIAL as 0.

Browse Source
This commit is contained in:
daid
2012-02-11 16:02:47 +01:00
parent d47a3e5950
commit 2a77c84c8f
5 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/Marlin.pde
View File

@@ -247,7 +247,7 @@ void suicide()
void setup()
{
setup_powerhold();
SERIAL.begin(BAUDRATE);
MYSERIAL.begin(BAUDRATE);
SERIAL_PROTOCOLLNPGM("start");
SERIAL_ECHO_START;
SERIAL_ECHOPGM("Marlin: ");
@@ -328,8 +328,8 @@ void loop()
void get_command()
{
while( SERIAL.available() > 0 && buflen < BUFSIZE) {
serial_char = SERIAL.read();
while( MYSERIAL.available() > 0 && buflen < BUFSIZE) {
serial_char = MYSERIAL.read();
if(serial_char == '\n' || serial_char == '\r' || serial_char == ':' || serial_count >= (MAX_CMD_SIZE - 1) )
{
if(!serial_count) return; //if empty line
@@ -1219,7 +1219,7 @@ void process_commands()
void FlushSerialRequestResend()
{
//char cmdbuffer[bufindr][100]="Resend:";
SERIAL.flush();
MYSERIAL.flush();
SERIAL_PROTOCOLPGM("Resend:");
SERIAL_PROTOCOLLN(gcode_LastN + 1);
ClearToSend();