Browse Source

signed/unsigned fixes.

daid303 12 years ago
parent
commit
f6ff0ab767
2 changed files with 8 additions and 8 deletions
  1. 2
    2
      Marlin/Configuration_adv.h
  2. 6
    6
      Marlin/ultralcd.cpp

+ 2
- 2
Marlin/Configuration_adv.h View File

@@ -179,7 +179,7 @@
179 179
 
180 180
 
181 181
 #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
182
-#define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // no z because of layer shift.
182
+#define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.
183 183
 
184 184
 // The hardware watchdog should reset the Microcontroller disabling all outputs, in case the firmware gets stuck and doesn't do temperature regulation.
185 185
 //#define USE_WATCHDOG
@@ -188,7 +188,7 @@
188 188
 // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on.
189 189
 // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset.
190 190
 //  However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled.
191
-#define WATCHDOG_RESET_MANUAL
191
+//#define WATCHDOG_RESET_MANUAL
192 192
 #endif
193 193
 
194 194
 // extruder advance constant (s2/mm3)

+ 6
- 6
Marlin/ultralcd.cpp View File

@@ -53,9 +53,9 @@ static unsigned long previous_millis_lcd=0;
53 53
 
54 54
 
55 55
 #ifdef NEWPANEL
56
- static long blocking=0;
56
+ static unsigned long blocking=0;
57 57
 #else
58
- static long blocking[8]={0,0,0,0,0,0,0,0};
58
+ static unsigned long blocking[8]={0,0,0,0,0,0,0,0};
59 59
 #endif
60 60
  
61 61
 static MainMenu menu;
@@ -225,7 +225,7 @@ void lcd_status()
225 225
     //static long previous_lcdinit=0;
226 226
   //  buttons_check(); // Done in temperature interrupt
227 227
     //previous_millis_buttons=millis();
228
-    long ms=millis();
228
+    unsigned long ms=millis();
229 229
     for(int8_t i=0; i<8; i++) {
230 230
       #ifndef NEWPANEL
231 231
       if((blocking[i]>ms))
@@ -2365,7 +2365,7 @@ void MainMenu::showSD()
2365 2365
           card.getfilename(i-FIRSTITEM);
2366 2366
           if(card.filenameIsDir)
2367 2367
           {
2368
-            for(int8_t i=0;i<strlen(card.filename);i++)
2368
+            for(uint8_t i=0;i<strlen(card.filename);i++)
2369 2369
               card.filename[i]=tolower(card.filename[i]);
2370 2370
             card.chdir(card.filename);
2371 2371
             lineoffset=0;
@@ -2374,7 +2374,7 @@ void MainMenu::showSD()
2374 2374
           else
2375 2375
           {
2376 2376
             char cmd[30];
2377
-            for(int8_t i=0;i<strlen(card.filename);i++)
2377
+            for(uint8_t i=0;i<strlen(card.filename);i++)
2378 2378
               card.filename[i]=tolower(card.filename[i]);
2379 2379
             sprintf(cmd,"M23 %s",card.filename);
2380 2380
             //sprintf(cmd,"M115");
@@ -2549,7 +2549,7 @@ void MainMenu::showMainMenu()
2549 2549
 void MainMenu::update()
2550 2550
 {
2551 2551
   static MainStatus oldstatus=Main_Menu;  //init automatically causes foce_lcd_update=true
2552
-  static long timeoutToStatus=0;
2552
+  static unsigned long timeoutToStatus=0;
2553 2553
   static bool oldcardstatus=false;
2554 2554
   #ifdef CARDINSERTED
2555 2555
     if((CARDINSERTED != oldcardstatus))

Loading…
Cancel
Save