STM32F1 SD EEPROM Emulation Fixes (#14261)
This commit is contained in:
		
							parent
							
								
									e6cf7860e8
								
							
						
					
					
						commit
						34c8204d25
					
				| @ -32,6 +32,7 @@ | |||||||
| #include "../module/printcounter.h" | #include "../module/printcounter.h" | ||||||
| #include "../core/language.h" | #include "../core/language.h" | ||||||
| #include "../gcode/queue.h" | #include "../gcode/queue.h" | ||||||
|  | #include "../module/configuration_store.h" | ||||||
| 
 | 
 | ||||||
| #if ENABLED(EMERGENCY_PARSER) | #if ENABLED(EMERGENCY_PARSER) | ||||||
|   #include "../feature/emergency_parser.h" |   #include "../feature/emergency_parser.h" | ||||||
| @ -352,6 +353,9 @@ void CardReader::initsd() { | |||||||
|   else { |   else { | ||||||
|     flag.detected = true; |     flag.detected = true; | ||||||
|     SERIAL_ECHO_MSG(MSG_SD_CARD_OK); |     SERIAL_ECHO_MSG(MSG_SD_CARD_OK); | ||||||
|  |     #if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION) | ||||||
|  |       (void)settings.load(); | ||||||
|  |     #endif | ||||||
|   } |   } | ||||||
|   setroot(); |   setroot(); | ||||||
| 
 | 
 | ||||||
| @ -557,6 +561,11 @@ void CardReader::checkautostart() { | |||||||
| 
 | 
 | ||||||
|   if (!isDetected()) initsd(); |   if (!isDetected()) initsd(); | ||||||
| 
 | 
 | ||||||
|  |   #if ENABLED(EEPROM_SETTINGS) && DISABLED(FLASH_EEPROM_EMULATION) | ||||||
|  |     SERIAL_ECHOLNPGM("Loading settings from SD"); | ||||||
|  |     (void)settings.load(); | ||||||
|  |   #endif | ||||||
|  | 
 | ||||||
|   if (isDetected() |   if (isDetected() | ||||||
|     #if ENABLED(POWER_LOSS_RECOVERY) |     #if ENABLED(POWER_LOSS_RECOVERY) | ||||||
|       && !recovery.valid() // Don't run auto#.g when a resume file exists
 |       && !recovery.valid() // Don't run auto#.g when a resume file exists
 | ||||||
|  | |||||||
| @ -73,7 +73,7 @@ | |||||||
| // User-specified version info of this build to display in [Pronterface, etc] terminal window during
 | // User-specified version info of this build to display in [Pronterface, etc] terminal window during
 | ||||||
| // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
 | // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
 | ||||||
| // build by the user have been successfully uploaded into firmware.
 | // build by the user have been successfully uploaded into firmware.
 | ||||||
| #define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
 | #define STRING_CONFIG_H_AUTHOR "(Phr3d13, Geeetech Rostock 301)" // Who made the changes.
 | ||||||
| #define SHOW_BOOTSCREEN | #define SHOW_BOOTSCREEN | ||||||
| #define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
 | #define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1
 | ||||||
| #define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
 | #define STRING_SPLASH_LINE2 WEBSITE_URL         // will be shown during bootup in line 2
 | ||||||
| @ -104,7 +104,7 @@ | |||||||
|  * |  * | ||||||
|  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7] |  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7] | ||||||
|  */ |  */ | ||||||
| #define SERIAL_PORT 0 | #define SERIAL_PORT 1 | ||||||
| 
 | 
 | ||||||
| /**
 | /**
 | ||||||
|  * Select a secondary serial port on the board to use for communication with the host. |  * Select a secondary serial port on the board to use for communication with the host. | ||||||
| @ -113,7 +113,7 @@ | |||||||
|  * |  * | ||||||
|  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7] |  * :[-1, 0, 1, 2, 3, 4, 5, 6, 7] | ||||||
|  */ |  */ | ||||||
| #define SERIAL_PORT_2 1 | //#define SERIAL_PORT_2 1
 | ||||||
| 
 | 
 | ||||||
| /**
 | /**
 | ||||||
|  * This setting determines the communication speed of the printer. |  * This setting determines the communication speed of the printer. | ||||||
| @ -389,13 +389,13 @@ | |||||||
|  * |  * | ||||||
|  * :{ '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" } |  * :{ '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" } | ||||||
|  */ |  */ | ||||||
| #define TEMP_SENSOR_0 1 | #define TEMP_SENSOR_0 5 | ||||||
| #define TEMP_SENSOR_1 0 | #define TEMP_SENSOR_1 0 | ||||||
| #define TEMP_SENSOR_2 0 | #define TEMP_SENSOR_2 0 | ||||||
| #define TEMP_SENSOR_3 0 | #define TEMP_SENSOR_3 0 | ||||||
| #define TEMP_SENSOR_4 0 | #define TEMP_SENSOR_4 0 | ||||||
| #define TEMP_SENSOR_5 0 | #define TEMP_SENSOR_5 0 | ||||||
| #define TEMP_SENSOR_BED 1 | #define TEMP_SENSOR_BED 5 | ||||||
| #define TEMP_SENSOR_CHAMBER 0 | #define TEMP_SENSOR_CHAMBER 0 | ||||||
| 
 | 
 | ||||||
| // Dummy thermistor constant temperature readings, for use with 998 and 999
 | // Dummy thermistor constant temperature readings, for use with 998 and 999
 | ||||||
| @ -1556,7 +1556,7 @@ | |||||||
|  *    P1  Raise the nozzle always to Z-park height. |  *    P1  Raise the nozzle always to Z-park height. | ||||||
|  *    P2  Raise the nozzle by Z-park amount, limited to Z_MAX_POS. |  *    P2  Raise the nozzle by Z-park amount, limited to Z_MAX_POS. | ||||||
|  */ |  */ | ||||||
| //#define NOZZLE_PARK_FEATURE
 | #define NOZZLE_PARK_FEATURE | ||||||
| 
 | 
 | ||||||
| #if ENABLED(NOZZLE_PARK_FEATURE) | #if ENABLED(NOZZLE_PARK_FEATURE) | ||||||
|   // Specify a park position as { X, Y, Z_raise }
 |   // Specify a park position as { X, Y, Z_raise }
 | ||||||
| @ -1715,6 +1715,7 @@ | |||||||
|  * |  * | ||||||
|  */ |  */ | ||||||
| #define SDSUPPORT | #define SDSUPPORT | ||||||
|  | #define SDIO_SUPPORT | ||||||
| 
 | 
 | ||||||
| /**
 | /**
 | ||||||
|  * SD CARD: SPI SPEED |  * SD CARD: SPI SPEED | ||||||
| @ -1794,7 +1795,7 @@ | |||||||
| // If you have a speaker that can produce tones, enable it here.
 | // If you have a speaker that can produce tones, enable it here.
 | ||||||
| // By default Marlin assumes you have a buzzer with a fixed frequency.
 | // By default Marlin assumes you have a buzzer with a fixed frequency.
 | ||||||
| //
 | //
 | ||||||
| //#define SPEAKER
 | #define SPEAKER | ||||||
| 
 | 
 | ||||||
| //
 | //
 | ||||||
| // The duration and frequency for the UI feedback sound.
 | // The duration and frequency for the UI feedback sound.
 | ||||||
| @ -2146,7 +2147,7 @@ | |||||||
| // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
 | // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
 | ||||||
| // which is not as annoying as with the hardware PWM. On the other hand, if this frequency
 | // which is not as annoying as with the hardware PWM. On the other hand, if this frequency
 | ||||||
| // is too low, you should also increment SOFT_PWM_SCALE.
 | // is too low, you should also increment SOFT_PWM_SCALE.
 | ||||||
| //#define FAN_SOFT_PWM
 | #define FAN_SOFT_PWM | ||||||
| 
 | 
 | ||||||
| // Incrementing this by 1 will double the software PWM frequency,
 | // Incrementing this by 1 will double the software PWM frequency,
 | ||||||
| // affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
 | // affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
 | ||||||
|  | |||||||
| @ -975,7 +975,7 @@ | |||||||
|   #endif |   #endif | ||||||
| 
 | 
 | ||||||
|   // This allows hosts to request long names for files and folders with M33
 |   // This allows hosts to request long names for files and folders with M33
 | ||||||
|   //#define LONG_FILENAME_HOST_SUPPORT
 |   #define LONG_FILENAME_HOST_SUPPORT | ||||||
| 
 | 
 | ||||||
|   // Enable this option to scroll long filenames in the SD card menu
 |   // Enable this option to scroll long filenames in the SD card menu
 | ||||||
|   //#define SCROLL_LONG_FILENAMES
 |   //#define SCROLL_LONG_FILENAMES
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user