Przeglądaj źródła

Fix some compile warnings

Scott Lahteine 6 lat temu
rodzic
commit
c173a31060

+ 1
- 1
Marlin/src/HAL/HAL_AVR/endstop_interrupts.h Wyświetl plik

86
 
86
 
87
 
87
 
88
 // Install Pin change interrupt for a pin. Can be called multiple times.
88
 // Install Pin change interrupt for a pin. Can be called multiple times.
89
-void pciSetup(byte pin) {
89
+void pciSetup(const int8_t pin) {
90
   SBI(*digitalPinToPCMSK(pin), digitalPinToPCMSKbit(pin));  // enable pin
90
   SBI(*digitalPinToPCMSK(pin), digitalPinToPCMSKbit(pin));  // enable pin
91
   SBI(PCIFR, digitalPinToPCICRbit(pin)); // clear any outstanding interrupt
91
   SBI(PCIFR, digitalPinToPCICRbit(pin)); // clear any outstanding interrupt
92
   SBI(PCICR, digitalPinToPCICRbit(pin)); // enable interrupt for the group
92
   SBI(PCICR, digitalPinToPCICRbit(pin)); // enable interrupt for the group

+ 12
- 12
Marlin/src/gcode/bedlevel/G26.cpp Wyświetl plik

160
 
160
 
161
 int8_t g26_prime_flag;
161
 int8_t g26_prime_flag;
162
 
162
 
163
-#if ENABLED(NEWPANEL)
163
+#if ENABLED(ULTIPANEL)
164
 
164
 
165
   /**
165
   /**
166
    * If the LCD is clicked, cancel, wait for release, return true
166
    * If the LCD is clicked, cancel, wait for release, return true
331
   for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
331
   for (uint8_t i = 0; i < GRID_MAX_POINTS_X; i++) {
332
     for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
332
     for (uint8_t j = 0; j < GRID_MAX_POINTS_Y; j++) {
333
 
333
 
334
-      #if ENABLED(NEWPANEL)
334
+      #if ENABLED(ULTIPANEL)
335
         if (user_canceled()) return true;     // Check if the user wants to stop the Mesh Validation
335
         if (user_canceled()) return true;     // Check if the user wants to stop the Mesh Validation
336
       #endif
336
       #endif
337
 
337
 
422
       if (g26_bed_temp > 25) {
422
       if (g26_bed_temp > 25) {
423
         lcd_setstatusPGM(PSTR("G26 Heating Bed."), 99);
423
         lcd_setstatusPGM(PSTR("G26 Heating Bed."), 99);
424
         lcd_quick_feedback(true);
424
         lcd_quick_feedback(true);
425
-        #if ENABLED(NEWPANEL)
425
+        #if ENABLED(ULTIPANEL)
426
           lcd_external_control = true;
426
           lcd_external_control = true;
427
         #endif
427
         #endif
428
     #endif
428
     #endif
429
         thermalManager.setTargetBed(g26_bed_temp);
429
         thermalManager.setTargetBed(g26_bed_temp);
430
         while (ABS(thermalManager.degBed() - g26_bed_temp) > 3) {
430
         while (ABS(thermalManager.degBed() - g26_bed_temp) > 3) {
431
 
431
 
432
-          #if ENABLED(NEWPANEL)
432
+          #if ENABLED(ULTIPANEL)
433
             if (is_lcd_clicked()) return exit_from_g26();
433
             if (is_lcd_clicked()) return exit_from_g26();
434
           #endif
434
           #endif
435
 
435
 
452
   thermalManager.setTargetHotend(g26_hotend_temp, 0);
452
   thermalManager.setTargetHotend(g26_hotend_temp, 0);
453
   while (ABS(thermalManager.degHotend(0) - g26_hotend_temp) > 3) {
453
   while (ABS(thermalManager.degHotend(0) - g26_hotend_temp) > 3) {
454
 
454
 
455
-    #if ENABLED(NEWPANEL)
455
+    #if ENABLED(ULTIPANEL)
456
       if (is_lcd_clicked()) return exit_from_g26();
456
       if (is_lcd_clicked()) return exit_from_g26();
457
     #endif
457
     #endif
458
 
458
 
478
  */
478
  */
479
 inline bool prime_nozzle() {
479
 inline bool prime_nozzle() {
480
 
480
 
481
-  #if ENABLED(NEWPANEL)
481
+  #if ENABLED(ULTIPANEL)
482
     float Total_Prime = 0.0;
482
     float Total_Prime = 0.0;
483
 
483
 
484
     if (g26_prime_flag == -1) {  // The user wants to control how much filament gets purged
484
     if (g26_prime_flag == -1) {  // The user wants to control how much filament gets purged
623
 
623
 
624
   if (parser.seen('P')) {
624
   if (parser.seen('P')) {
625
     if (!parser.has_value()) {
625
     if (!parser.has_value()) {
626
-      #if ENABLED(NEWPANEL)
626
+      #if ENABLED(ULTIPANEL)
627
         g26_prime_flag = -1;
627
         g26_prime_flag = -1;
628
       #else
628
       #else
629
         SERIAL_PROTOCOLLNPGM("?Prime length must be specified when not using an LCD.");
629
         SERIAL_PROTOCOLLNPGM("?Prime length must be specified when not using an LCD.");
668
   }
668
   }
669
 
669
 
670
   int16_t g26_repeats;
670
   int16_t g26_repeats;
671
-  #if ENABLED(NEWPANEL)
671
+  #if ENABLED(ULTIPANEL)
672
     g26_repeats = parser.intval('R', GRID_MAX_POINTS + 1);
672
     g26_repeats = parser.intval('R', GRID_MAX_POINTS + 1);
673
   #else
673
   #else
674
     if (!parser.seen('R')) {
674
     if (!parser.seen('R')) {
727
   move_to(destination, 0.0);
727
   move_to(destination, 0.0);
728
   move_to(destination, g26_ooze_amount);
728
   move_to(destination, g26_ooze_amount);
729
 
729
 
730
-  #if ENABLED(NEWPANEL)
730
+  #if ENABLED(ULTIPANEL)
731
     lcd_external_control = true;
731
     lcd_external_control = true;
732
   #endif
732
   #endif
733
 
733
 
835
         plan_arc(endpoint, arc_offset, false);  // Draw a counter-clockwise arc
835
         plan_arc(endpoint, arc_offset, false);  // Draw a counter-clockwise arc
836
         feedrate_mm_s = save_feedrate;
836
         feedrate_mm_s = save_feedrate;
837
         set_destination_from_current();
837
         set_destination_from_current();
838
-        #if ENABLED(NEWPANEL)
838
+        #if ENABLED(ULTIPANEL)
839
           if (user_canceled()) goto LEAVE; // Check if the user wants to stop the Mesh Validation
839
           if (user_canceled()) goto LEAVE; // Check if the user wants to stop the Mesh Validation
840
         #endif
840
         #endif
841
 
841
 
861
 
861
 
862
         for (int8_t ind = start_ind; ind <= end_ind; ind++) {
862
         for (int8_t ind = start_ind; ind <= end_ind; ind++) {
863
 
863
 
864
-          #if ENABLED(NEWPANEL)
864
+          #if ENABLED(ULTIPANEL)
865
             if (user_canceled()) goto LEAVE;          // Check if the user wants to stop the Mesh Validation
865
             if (user_canceled()) goto LEAVE;          // Check if the user wants to stop the Mesh Validation
866
           #endif
866
           #endif
867
 
867
 
910
   move_to(destination, 0); // Move back to the starting position
910
   move_to(destination, 0); // Move back to the starting position
911
   //debug_current_and_destination(PSTR("done doing X/Y move."));
911
   //debug_current_and_destination(PSTR("done doing X/Y move."));
912
 
912
 
913
-  #if ENABLED(NEWPANEL)
913
+  #if ENABLED(ULTIPANEL)
914
     lcd_external_control = false;     // Give back control of the LCD Panel!
914
     lcd_external_control = false;     // Give back control of the LCD Panel!
915
   #endif
915
   #endif
916
 
916
 

+ 1
- 1
Marlin/src/lcd/ultralcd.cpp Wyświetl plik

3335
     lcd_completion_feedback();
3335
     lcd_completion_feedback();
3336
   }
3336
   }
3337
 
3337
 
3338
-  #if ENABLED(EEPROM_SETTINGS)
3338
+  #if ENABLED(EEPROM_SETTINGS) && DISABLED(SLIM_LCD_MENUS)
3339
 
3339
 
3340
     static void lcd_init_eeprom() {
3340
     static void lcd_init_eeprom() {
3341
       lcd_completion_feedback(settings.init_eeprom());
3341
       lcd_completion_feedback(settings.init_eeprom());

+ 1
- 1
Marlin/src/pins/pins_ANET_10.h Wyświetl plik

89
  */
89
  */
90
 
90
 
91
 #ifndef __AVR_ATmega1284P__
91
 #ifndef __AVR_ATmega1284P__
92
-  #error "Oops!  Make sure you have 'Anet V1.0', 'Anet V1.0 (Optiboot)' or 'Sanguino' selected from the 'Tools -> Boards' menu."
92
+  #error "Oops!  Make sure you have 'Anet V1.0', 'Anet V1.0 (Optiboot)' or 'Sanguino' selected in the 'Tools -> Boards' menu and ATmega1284P selected in 'Tools -> Processor' menu."
93
 #endif
93
 #endif
94
 
94
 
95
 #ifndef BOARD_NAME
95
 #ifndef BOARD_NAME

Ładowanie…
Anuluj
Zapisz