pingu_98/Sprinter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed initialization order to enable Mega 2560 users to connect more reliably

Browse source
This commit is contained in:
kliment 2011-03-28 18:19:03 +02:00
parent a3bd2c88b7
commit 00fbfefd12
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Tonokip_Firmware/Tonokip_Firmware.pde
View file

@ -98,7 +98,7 @@ int16_t n;
void initsd(){ void initsd(){
sdactive=false; sdactive=false;
if (!card.init(SPI_HALF_SPEED)){ if (!card.init(SPI_FULL_SPEED)){
if (!card.init(SPI_HALF_SPEED)) if (!card.init(SPI_HALF_SPEED))
Serial.println("SD init fail"); Serial.println("SD init fail");
} }
@ -115,6 +115,10 @@ else
void setup() void setup()
{ {
Serial.begin(BAUDRATE);
Serial.println("start");
//cmdbuffer[0]="\0"; //cmdbuffer[0]="\0";
//cmdbuffer[1]="\0"; //cmdbuffer[1]="\0";
//cmdbuffer[2]=char[4]; //cmdbuffer[2]=char[4];
@ -157,13 +161,11 @@ void setup()
if(HEATER_0_PIN > -1) pinMode(HEATER_0_PIN,OUTPUT); if(HEATER_0_PIN > -1) pinMode(HEATER_0_PIN,OUTPUT);
Serial.begin(BAUDRATE);
#ifdef SDSUPPORT #ifdef SDSUPPORT
initsd(); initsd();
#endif #endif
Serial.println("start");
} }
@ -272,6 +274,9 @@ inline void get_command()
} }
} }
else if(strstr(cmdbuffer[bufindw], "M105") != NULL){
Serial.println("ok");
}
@ -511,9 +516,6 @@ inline void process_commands()
Serial.println( analog2temp(analogRead(TEMP_0_PIN)) ); Serial.println( analog2temp(analogRead(TEMP_0_PIN)) );
Serial.print("Bed:"); Serial.print("Bed:");
Serial.println( analog2tempBed(analogRead(TEMP_1_PIN)) ); Serial.println( analog2tempBed(analogRead(TEMP_1_PIN)) );
if(!code_seen('N')) {
return; // If M105 is sent from generated gcode, then it needs a response.
}
break; break;
case 109: // M109 - Wait for heater to reach target. case 109: // M109 - Wait for heater to reach target.
if (code_seen('S')) target_raw = temp2analog(code_value()); if (code_seen('S')) target_raw = temp2analog(code_value());