Added symbol for overriding SD card frequency, bug fix

grblHAL · Oct 2, 2024 · 7b7bd8b · 7b7bd8b
1 parent 2da8bbd
commit 7b7bd8b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/main/boards/xPro_v5_map.h b/main/boards/xPro_v5_map.h
@@ -110,4 +110,5 @@
 #define MOTOR_CS_PIN        GPIO_NUM_17
 #if SDCARD_ENABLE
 #define PIN_NUM_CS          GPIO_NUM_5
+#define SDMMC_FREQ_KHZ		10000
 #endif
diff --git a/main/driver.c b/main/driver.c
@@ -795,7 +795,7 @@ IRAM_ATTR static void I2SStepperPulseStart (stepper_t *stepper)
 static void I2SStepperWakeUp (void)
 {
     // Enable stepper drivers.
-    hal.stepper.enable((axes_signals_t){AXES_BITMASK});
+    hal.stepper.enable((axes_signals_t){AXES_BITMASK}, false);
     i2s_out_set_stepping();
 }
 
@@ -2577,6 +2577,9 @@ static char *sdcard_mount (FATFS **fs)
         };
 
         sdmmc_host_t host = SDSPI_HOST_DEFAULT();
+#ifdef SDMMC_FREQ_KHZ
+        host.max_freq_khz = SDMMC_FREQ_KHZ;
+#endif
         sdspi_device_config_t slot_config = SDSPI_DEVICE_CONFIG_DEFAULT();
         slot_config.gpio_cs = PIN_NUM_CS;
         slot_config.host_id = host.slot;
@@ -2981,7 +2984,7 @@ bool driver_init (void)
 #else
     hal.info = "ESP32";
 #endif
-    hal.driver_version = "240921";
+    hal.driver_version = "241002";
     hal.driver_url = GRBL_URL "/ESP32";
 #ifdef BOARD_NAME
     hal.board = BOARD_NAME;

diff --git a/main/driver.h b/main/driver.h
@@ -173,7 +173,7 @@ typedef struct {
 #error "Pins 34 - 39 are input only!"
 #endif
 
-#if USE_I2S_OUT && STEP_INJECT_ENABLE
+#if defined(USE_I2S_OUT) && STEP_INJECT_ENABLE
 #error "Step injection not yet possible with I2S streaming!"
 #endif