Browse Source

STM32F1 SD EEPROM Emulation Fixes (#14261)

Phr3d13 6 years ago
parent
commit
34c8204d25

+ 9
- 0
Marlin/src/sd/cardreader.cpp View File

32
 #include "../module/printcounter.h"
32
 #include "../module/printcounter.h"
33
 #include "../core/language.h"
33
 #include "../core/language.h"
34
 #include "../gcode/queue.h"
34
 #include "../gcode/queue.h"
35
+#include "../module/configuration_store.h"
35
 
36
 
36
 #if ENABLED(EMERGENCY_PARSER)
37
 #if ENABLED(EMERGENCY_PARSER)
37
   #include "../feature/emergency_parser.h"
38
   #include "../feature/emergency_parser.h"
352
   else {
353
   else {
353
     flag.detected = true;
354
     flag.detected = true;
354
     SERIAL_ECHO_MSG(MSG_SD_CARD_OK);
355
     SERIAL_ECHO_MSG(MSG_SD_CARD_OK);
356
+    #if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION)
357
+      (void)settings.load();
358
+    #endif
355
   }
359
   }
356
   setroot();
360
   setroot();
357
 
361
 
557
 
561
 
558
   if (!isDetected()) initsd();
562
   if (!isDetected()) initsd();
559
 
563
 
564
+  #if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION)
565
+    SERIAL_ECHOLNPGM("Loading settings from SD");
566
+    (void)settings.load();
567
+  #endif
568
+
560
   if (isDetected()
569
   if (isDetected()
561
     #if ENABLED(POWER_LOSS_RECOVERY)
570
     #if ENABLED(POWER_LOSS_RECOVERY)
562
       && !recovery.valid() // Don't run auto#.g when a resume file exists
571
       && !recovery.valid() // Don't run auto#.g when a resume file exists

+ 9
- 8
config/examples/delta/Geeetech/Rostock 301/Configuration.h View File

73
 // User-specified version info of this build to display in [Pronterface, etc] terminal window during
73
 // User-specified version info of this build to display in [Pronterface, etc] terminal window during
74
 // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
74
 // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
75
 // build by the user have been successfully uploaded into firmware.
75
 // build by the user have been successfully uploaded into firmware.
76
-#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
76
+#define STRING_CONFIG_H_AUTHOR "(Phr3d13, Geeetech Rostock 301)" // Who made the changes.
77
 #define SHOW_BOOTSCREEN
77
 #define SHOW_BOOTSCREEN
78
 #define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
78
 #define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
79
 #define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
79
 #define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
104
  *
104
  *
105
  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
105
  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
106
  */
106
  */
107
-#define SERIAL_PORT 0
107
+#define SERIAL_PORT 1
108
 
108
 
109
 /**
109
 /**
110
  * Select a secondary serial port on the board to use for communication with the host.
110
  * Select a secondary serial port on the board to use for communication with the host.
113
  *
113
  *
114
  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
114
  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7]
115
  */
115
  */
116
-#define SERIAL_PORT_2 1
116
+//#define SERIAL_PORT_2 1
117
 
117
 
118
 /**
118
 /**
119
  * This setting determines the communication speed of the printer.
119
  * This setting determines the communication speed of the printer.
389
  *
389
  *
390
  * :{ '0':"Not used", '1':"100k / 4.7k - EPCOS", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '501':"100K Zonestar (Tronxy X3A)", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950  1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '18':"ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327" '20':"PT100 (Ultimainboard V2.x)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '61':"100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup", '66':"Dyze Design 4.7M High Temperature thermistor", '67':"Slice Engineering 450C High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-4':"Thermocouple + AD8495", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595", '998':"Dummy 1", '999':"Dummy 2", '1000':"Custom thermistor params" }
390
  * :{ '0':"Not used", '1':"100k / 4.7k - EPCOS", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '501':"100K Zonestar (Tronxy X3A)", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950  1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '18':"ATC Semitec 204GT-2 (4.7k pullup) Dagoma.Fr - MKS_Base_DKU001327" '20':"PT100 (Ultimainboard V2.x)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '61':"100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup", '66':"Dyze Design 4.7M High Temperature thermistor", '67':"Slice Engineering 450C High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-4':"Thermocouple + AD8495", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595", '998':"Dummy 1", '999':"Dummy 2", '1000':"Custom thermistor params" }
391
  */
391
  */
392
-#define TEMP_SENSOR_0 1
392
+#define TEMP_SENSOR_0 5
393
 #define TEMP_SENSOR_1 0
393
 #define TEMP_SENSOR_1 0
394
 #define TEMP_SENSOR_2 0
394
 #define TEMP_SENSOR_2 0
395
 #define TEMP_SENSOR_3 0
395
 #define TEMP_SENSOR_3 0
396
 #define TEMP_SENSOR_4 0
396
 #define TEMP_SENSOR_4 0
397
 #define TEMP_SENSOR_5 0
397
 #define TEMP_SENSOR_5 0
398
-#define TEMP_SENSOR_BED 1
398
+#define TEMP_SENSOR_BED 5
399
 #define TEMP_SENSOR_CHAMBER 0
399
 #define TEMP_SENSOR_CHAMBER 0
400
 
400
 
401
 // Dummy thermistor constant temperature readings, for use with 998 and 999
401
 // Dummy thermistor constant temperature readings, for use with 998 and 999
1556
  *    P1  Raise the nozzle always to Z-park height.
1556
  *    P1  Raise the nozzle always to Z-park height.
1557
  *    P2  Raise the nozzle by Z-park amount, limited to Z_MAX_POS.
1557
  *    P2  Raise the nozzle by Z-park amount, limited to Z_MAX_POS.
1558
  */
1558
  */
1559
-//#define NOZZLE_PARK_FEATURE
1559
+#define NOZZLE_PARK_FEATURE
1560
 
1560
 
1561
 #if ENABLED(NOZZLE_PARK_FEATURE)
1561
 #if ENABLED(NOZZLE_PARK_FEATURE)
1562
   // Specify a park position as { X, Y, Z_raise }
1562
   // Specify a park position as { X, Y, Z_raise }
1715
  *
1715
  *
1716
  */
1716
  */
1717
 #define SDSUPPORT
1717
 #define SDSUPPORT
1718
+#define SDIO_SUPPORT
1718
 
1719
 
1719
 /**
1720
 /**
1720
  * SD CARD: SPI SPEED
1721
  * SD CARD: SPI SPEED
1794
 // If you have a speaker that can produce tones, enable it here.
1795
 // If you have a speaker that can produce tones, enable it here.
1795
 // By default Marlin assumes you have a buzzer with a fixed frequency.
1796
 // By default Marlin assumes you have a buzzer with a fixed frequency.
1796
 //
1797
 //
1797
-//#define SPEAKER
1798
+#define SPEAKER
1798
 
1799
 
1799
 //
1800
 //
1800
 // The duration and frequency for the UI feedback sound.
1801
 // The duration and frequency for the UI feedback sound.
2146
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
2147
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
2147
 // which is not as annoying as with the hardware PWM. On the other hand, if this frequency
2148
 // which is not as annoying as with the hardware PWM. On the other hand, if this frequency
2148
 // is too low, you should also increment SOFT_PWM_SCALE.
2149
 // is too low, you should also increment SOFT_PWM_SCALE.
2149
-//#define FAN_SOFT_PWM
2150
+#define FAN_SOFT_PWM
2150
 
2151
 
2151
 // Incrementing this by 1 will double the software PWM frequency,
2152
 // Incrementing this by 1 will double the software PWM frequency,
2152
 // affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
2153
 // affecting heaters, and the fan if FAN_SOFT_PWM is enabled.

+ 1
- 1
config/examples/delta/Geeetech/Rostock 301/Configuration_adv.h View File

975
   #endif
975
   #endif
976
 
976
 
977
   // This allows hosts to request long names for files and folders with M33
977
   // This allows hosts to request long names for files and folders with M33
978
-  //#define LONG_FILENAME_HOST_SUPPORT
978
+  #define LONG_FILENAME_HOST_SUPPORT
979
 
979
 
980
   // Enable this option to scroll long filenames in the SD card menu
980
   // Enable this option to scroll long filenames in the SD card menu
981
   //#define SCROLL_LONG_FILENAMES
981
   //#define SCROLL_LONG_FILENAMES

Loading…
Cancel
Save