Browse Source

Fix firmware-retract compile errors (#12061)

InsanityAutomation 6 years ago
parent
commit
d332fcb8fa
2 changed files with 11 additions and 6 deletions
  1. 3
    1
      Marlin/src/feature/fwretract.cpp
  2. 8
    5
      Marlin/src/module/configuration_store.cpp

+ 3
- 1
Marlin/src/feature/fwretract.cpp View File

60
       FWRetract::current_hop;
60
       FWRetract::current_hop;
61
 
61
 
62
 void FWRetract::reset() {
62
 void FWRetract::reset() {
63
-  autoretract_enabled = false;
63
+  #if ENABLED(FWRETRACT_AUTORETRACT)
64
+    autoretract_enabled = false;
65
+  #endif
64
   settings.retract_length = RETRACT_LENGTH;
66
   settings.retract_length = RETRACT_LENGTH;
65
   settings.retract_feedrate_mm_s = RETRACT_FEEDRATE;
67
   settings.retract_feedrate_mm_s = RETRACT_FEEDRATE;
66
   settings.retract_zlift = RETRACT_ZLIFT;
68
   settings.retract_zlift = RETRACT_ZLIFT;

+ 8
- 5
Marlin/src/module/configuration_store.cpp View File

697
 
697
 
698
       #if ENABLED(FWRETRACT)
698
       #if ENABLED(FWRETRACT)
699
         EEPROM_WRITE(fwretract.settings);
699
         EEPROM_WRITE(fwretract.settings);
700
-        EEPROM_WRITE(fwretract.autoretract_enabled);
701
       #else
700
       #else
702
         const fwretract_settings_t autoretract_defaults = { 3, 45, 0, 0, 0, 13, 0, 8 };
701
         const fwretract_settings_t autoretract_defaults = { 3, 45, 0, 0, 0, 13, 0, 8 };
703
-        const bool autoretract_enabled = false;
704
         EEPROM_WRITE(autoretract_defaults);
702
         EEPROM_WRITE(autoretract_defaults);
703
+      #endif
704
+      #if ENABLED(FWRETRACT) && ENABLED(FWRETRACT_AUTORETRACT)
705
+        EEPROM_WRITE(fwretract.autoretract_enabled);
706
+      #else
707
+        const bool autoretract_enabled = false;
705
         EEPROM_WRITE(autoretract_enabled);
708
         EEPROM_WRITE(autoretract_enabled);
706
       #endif
709
       #endif
707
     }
710
     }
1311
 
1314
 
1312
         #if ENABLED(FWRETRACT)
1315
         #if ENABLED(FWRETRACT)
1313
           EEPROM_READ(fwretract.settings);
1316
           EEPROM_READ(fwretract.settings);
1317
+        #endif
1318
+        #if ENABLED(FWRETRACT) && ENABLED(FWRETRACT_AUTORETRACT)
1314
           EEPROM_READ(fwretract.autoretract_enabled);
1319
           EEPROM_READ(fwretract.autoretract_enabled);
1315
         #else
1320
         #else
1316
-          fwretract_settings_t fwretract_settings;
1317
           bool autoretract_enabled;
1321
           bool autoretract_enabled;
1318
-          EEPROM_READ(fwretract_settings);
1319
           EEPROM_READ(autoretract_enabled);
1322
           EEPROM_READ(autoretract_enabled);
1320
         #endif
1323
         #endif
1321
       }
1324
       }
1575
         _FIELD_TEST(sn_settings);
1578
         _FIELD_TEST(sn_settings);
1576
         EEPROM_READ(sn_settings);
1579
         EEPROM_READ(sn_settings);
1577
       #endif
1580
       #endif
1578
-  
1581
+
1579
       eeprom_error = size_error(eeprom_index - (EEPROM_OFFSET));
1582
       eeprom_error = size_error(eeprom_index - (EEPROM_OFFSET));
1580
       if (eeprom_error) {
1583
       if (eeprom_error) {
1581
         #if ENABLED(EEPROM_CHITCHAT)
1584
         #if ENABLED(EEPROM_CHITCHAT)

Loading…
Cancel
Save