Clean up trailing spaces
This commit is contained in:
parent
138d0622ee
commit
aea60d9450
15 changed files with 43 additions and 43 deletions
|
@ -1689,7 +1689,7 @@
|
||||||
// increasing the height the probe is raised to.
|
// increasing the height the probe is raised to.
|
||||||
// #define PTC_PROBE_RAISE 15U
|
// #define PTC_PROBE_RAISE 15U
|
||||||
|
|
||||||
// If the probe is outside of the defined range, use linear extrapolation using the closest
|
// If the probe is outside of the defined range, use linear extrapolation using the closest
|
||||||
// point and the PTC_LINEAR_EXTRAPOLATION'th next point. E.g. if set to 4 it will use data[0]
|
// point and the PTC_LINEAR_EXTRAPOLATION'th next point. E.g. if set to 4 it will use data[0]
|
||||||
// and data[4] to perform linear extrapolation for values below PTC_SAMPLE_START.
|
// and data[4] to perform linear extrapolation for values below PTC_SAMPLE_START.
|
||||||
// #define PTC_LINEAR_EXTRAPOLATION 4
|
// #define PTC_LINEAR_EXTRAPOLATION 4
|
||||||
|
|
|
@ -102,7 +102,7 @@ bool SDIO_ReadBlock_DMA(uint32_t blockAddress, uint8_t *data) {
|
||||||
}
|
}
|
||||||
|
|
||||||
while (!SDIO_GET_FLAG(SDIO_STA_DATAEND | SDIO_STA_TRX_ERROR_FLAGS)) { /* wait */ }
|
while (!SDIO_GET_FLAG(SDIO_STA_DATAEND | SDIO_STA_TRX_ERROR_FLAGS)) { /* wait */ }
|
||||||
|
|
||||||
//If there were SDIO errors, do not wait DMA.
|
//If there were SDIO errors, do not wait DMA.
|
||||||
if (SDIO->STA & SDIO_STA_TRX_ERROR_FLAGS) {
|
if (SDIO->STA & SDIO_STA_TRX_ERROR_FLAGS) {
|
||||||
SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
|
SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
|
||||||
|
@ -118,7 +118,7 @@ bool SDIO_ReadBlock_DMA(uint32_t blockAddress, uint8_t *data) {
|
||||||
SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
|
SDIO_CLEAR_FLAG(SDIO_ICR_CMD_FLAGS | SDIO_ICR_DATA_FLAGS);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
dma_disable(SDIO_DMA_DEV, SDIO_DMA_CHANNEL);
|
dma_disable(SDIO_DMA_DEV, SDIO_DMA_CHANNEL);
|
||||||
|
|
||||||
if (SDIO->STA & SDIO_STA_RXDAVL) {
|
if (SDIO->STA & SDIO_STA_RXDAVL) {
|
||||||
|
|
|
@ -233,7 +233,7 @@ public:
|
||||||
// Inline modes of all other functions; all enable planner inline power control
|
// Inline modes of all other functions; all enable planner inline power control
|
||||||
static inline void set_inline_enabled(const bool enable) {
|
static inline void set_inline_enabled(const bool enable) {
|
||||||
if (enable)
|
if (enable)
|
||||||
inline_power(cpwr_to_upwr(SPEED_POWER_STARTUP));
|
inline_power(cpwr_to_upwr(SPEED_POWER_STARTUP));
|
||||||
else {
|
else {
|
||||||
isReady = false;
|
isReady = false;
|
||||||
unitPower = menuPower = 0;
|
unitPower = menuPower = 0;
|
||||||
|
|
|
@ -65,7 +65,7 @@
|
||||||
SERIAL_ECHOLNPGM("?L value out of range (0-20).");
|
SERIAL_ECHOLNPGM("?L value out of range (0-20).");
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
planner.calculate_volumetric_multipliers();
|
planner.calculate_volumetric_multipliers();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
|
|
||||||
#if ENABLED(LED_CONTROL_MENU)
|
#if ENABLED(LED_CONTROL_MENU)
|
||||||
#include "../../feature/leds/leds.h"
|
#include "../../feature/leds/leds.h"
|
||||||
|
|
||||||
#if ENABLED(LED_COLOR_PRESETS)
|
#if ENABLED(LED_COLOR_PRESETS)
|
||||||
void menu_led_presets() {
|
void menu_led_presets() {
|
||||||
START_MENU();
|
START_MENU();
|
||||||
|
@ -71,7 +71,7 @@
|
||||||
|
|
||||||
#if ENABLED(CASE_LIGHT_MENU)
|
#if ENABLED(CASE_LIGHT_MENU)
|
||||||
#include "../../feature/caselight.h"
|
#include "../../feature/caselight.h"
|
||||||
|
|
||||||
#if DISABLED(CASE_LIGHT_NO_BRIGHTNESS)
|
#if DISABLED(CASE_LIGHT_NO_BRIGHTNESS)
|
||||||
void menu_case_light() {
|
void menu_case_light() {
|
||||||
START_MENU();
|
START_MENU();
|
||||||
|
|
|
@ -2107,9 +2107,9 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
|
||||||
* TERN(HAS_MIXER_SYNC_CHANNEL, MIXING_STEPPERS, 1);
|
* TERN(HAS_MIXER_SYNC_CHANNEL, MIXING_STEPPERS, 1);
|
||||||
|
|
||||||
if (cs > max_fr) NOMORE(speed_factor, max_fr / cs); //respect max feedrate on any movement (doesn't matter if E axes only or not)
|
if (cs > max_fr) NOMORE(speed_factor, max_fr / cs); //respect max feedrate on any movement (doesn't matter if E axes only or not)
|
||||||
|
|
||||||
#if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
|
#if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
|
||||||
const feedRate_t max_vfr = volumetric_extruder_feedrate_limit[extruder]
|
const feedRate_t max_vfr = volumetric_extruder_feedrate_limit[extruder]
|
||||||
* TERN(HAS_MIXER_SYNC_CHANNEL, MIXING_STEPPERS, 1);
|
* TERN(HAS_MIXER_SYNC_CHANNEL, MIXING_STEPPERS, 1);
|
||||||
|
|
||||||
// TODO: Doesn't work properly for joined segments. Set MIN_STEPS_PER_SEGMENT 1 as workaround.
|
// TODO: Doesn't work properly for joined segments. Set MIN_STEPS_PER_SEGMENT 1 as workaround.
|
||||||
|
|
|
@ -493,7 +493,7 @@ class Planner {
|
||||||
|
|
||||||
// Update multipliers based on new diameter measurements
|
// Update multipliers based on new diameter measurements
|
||||||
static void calculate_volumetric_multipliers();
|
static void calculate_volumetric_multipliers();
|
||||||
|
|
||||||
#if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
|
#if ENABLED(VOLUMETRIC_EXTRUDER_LIMIT)
|
||||||
// Update pre calculated extruder feedrate limits based on volumetric values
|
// Update pre calculated extruder feedrate limits based on volumetric values
|
||||||
static void calculate_volumetric_extruder_limit(const uint8_t e);
|
static void calculate_volumetric_extruder_limit(const uint8_t e);
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#define BOARD_INFO_NAME "RUMBA32"
|
#define BOARD_INFO_NAME "RUMBA32"
|
||||||
|
|
||||||
#if NO_EEPROM_SELECTED
|
#if NO_EEPROM_SELECTED
|
||||||
#if MB(RUMBA32_V1_0)
|
#if MB(RUMBA32_V1_0)
|
||||||
#define FLASH_EEPROM_EMULATION
|
#define FLASH_EEPROM_EMULATION
|
||||||
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
|
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
|
||||||
#elif MB(RUMBA32_V1_1)
|
#elif MB(RUMBA32_V1_1)
|
||||||
|
|
|
@ -71,19 +71,19 @@ void boardInit(void) {
|
||||||
|
|
||||||
extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
|
extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
|
||||||
/*
|
/*
|
||||||
gpio_dev *gpio_device; GPIO device
|
gpio_dev *gpio_device; GPIO device
|
||||||
timer_dev *timer_device; Pin's timer device, if any.
|
timer_dev *timer_device; Pin's timer device, if any.
|
||||||
const adc_dev *adc_device; ADC device, if any.
|
const adc_dev *adc_device; ADC device, if any.
|
||||||
uint8 gpio_bit; Pin's GPIO port bit.
|
uint8 gpio_bit; Pin's GPIO port bit.
|
||||||
uint8 timer_channel; Timer channel, or 0 if none.
|
uint8 timer_channel; Timer channel, or 0 if none.
|
||||||
uint8 adc_channel; Pin ADC channel, or ADCx if none.
|
uint8 adc_channel; Pin ADC channel, or ADCx if none.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
{&gpioa, &timer2, &adc1, 0, 1, 0}, /* PA0 */
|
{&gpioa, &timer2, &adc1, 0, 1, 0}, /* PA0 */
|
||||||
{&gpioa, &timer2, &adc1, 1, 2, 1}, /* PA1 */
|
{&gpioa, &timer2, &adc1, 1, 2, 1}, /* PA1 */
|
||||||
{&gpioa, &timer2, &adc1, 2, 3, 2}, /* PA2 */
|
{&gpioa, &timer2, &adc1, 2, 3, 2}, /* PA2 */
|
||||||
{&gpioa, &timer2, &adc1, 3, 4, 3}, /* PA3 */
|
{&gpioa, &timer2, &adc1, 3, 4, 3}, /* PA3 */
|
||||||
{&gpioa, NULL, &adc1, 4, 0, 4}, /* PA4 */
|
{&gpioa, NULL, &adc1, 4, 0, 4}, /* PA4 */
|
||||||
{&gpioa, NULL, &adc1, 5, 0, 5}, /* PA5 */
|
{&gpioa, NULL, &adc1, 5, 0, 5}, /* PA5 */
|
||||||
{&gpioa, &timer3, &adc1, 6, 1, 6}, /* PA6 */
|
{&gpioa, &timer3, &adc1, 6, 1, 6}, /* PA6 */
|
||||||
{&gpioa, &timer3, &adc1, 7, 2, 7}, /* PA7 */
|
{&gpioa, &timer3, &adc1, 7, 2, 7}, /* PA7 */
|
||||||
|
@ -91,7 +91,7 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
|
||||||
{&gpioa, &timer1, NULL, 9, 2, ADCx}, /* PA9 */
|
{&gpioa, &timer1, NULL, 9, 2, ADCx}, /* PA9 */
|
||||||
{&gpioa, &timer1, NULL, 10, 3, ADCx}, /* PA10 */
|
{&gpioa, &timer1, NULL, 10, 3, ADCx}, /* PA10 */
|
||||||
{&gpioa, NULL, NULL, 11, 0, ADCx}, /* PA11 */
|
{&gpioa, NULL, NULL, 11, 0, ADCx}, /* PA11 */
|
||||||
{&gpioa, NULL, NULL, 12, 0, ADCx}, /* PA12 */
|
{&gpioa, NULL, NULL, 12, 0, ADCx}, /* PA12 */
|
||||||
{&gpioa, NULL, NULL, 13, 0, ADCx}, /* PA13 */
|
{&gpioa, NULL, NULL, 13, 0, ADCx}, /* PA13 */
|
||||||
{&gpioa, NULL, NULL, 14, 0, ADCx}, /* PA14 */
|
{&gpioa, NULL, NULL, 14, 0, ADCx}, /* PA14 */
|
||||||
{&gpioa, NULL, NULL, 15, 0, ADCx}, /* PA15 */
|
{&gpioa, NULL, NULL, 15, 0, ADCx}, /* PA15 */
|
||||||
|
@ -120,13 +120,13 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
|
||||||
{&gpioc, NULL, &adc1, 3, 0, 13}, /* PC3 */
|
{&gpioc, NULL, &adc1, 3, 0, 13}, /* PC3 */
|
||||||
{&gpioc, NULL, &adc1, 4, 0, 14}, /* PC4 */
|
{&gpioc, NULL, &adc1, 4, 0, 14}, /* PC4 */
|
||||||
{&gpioc, NULL, &adc1, 5, 0, 15}, /* PC5 */
|
{&gpioc, NULL, &adc1, 5, 0, 15}, /* PC5 */
|
||||||
{&gpioc, &timer8, NULL, 6, 1, ADCx}, /* PC6 */
|
{&gpioc, &timer8, NULL, 6, 1, ADCx}, /* PC6 */
|
||||||
{&gpioc, &timer8, NULL, 7, 2, ADCx}, /* PC7 */
|
{&gpioc, &timer8, NULL, 7, 2, ADCx}, /* PC7 */
|
||||||
{&gpioc, &timer8, NULL, 8, 3, ADCx}, /* PC8 */
|
{&gpioc, &timer8, NULL, 8, 3, ADCx}, /* PC8 */
|
||||||
{&gpioc, &timer8, NULL, 9, 4, ADCx}, /* PC9 */
|
{&gpioc, &timer8, NULL, 9, 4, ADCx}, /* PC9 */
|
||||||
{&gpioc, NULL, NULL, 10, 0, ADCx}, /* PC10 UART4_TX/SDIO_D2 */
|
{&gpioc, NULL, NULL, 10, 0, ADCx}, /* PC10 UART4_TX/SDIO_D2 */
|
||||||
{&gpioc, NULL, NULL, 11, 0, ADCx}, /* PC11 UART4_RX/SDIO_D3 */
|
{&gpioc, NULL, NULL, 11, 0, ADCx}, /* PC11 UART4_RX/SDIO_D3 */
|
||||||
{&gpioc, NULL, NULL, 12, 0, ADCx}, /* PC12 UART5_TX/SDIO_CK */
|
{&gpioc, NULL, NULL, 12, 0, ADCx}, /* PC12 UART5_TX/SDIO_CK */
|
||||||
{&gpioc, NULL, NULL, 13, 0, ADCx}, /* PC13 TAMPER-RTC */
|
{&gpioc, NULL, NULL, 13, 0, ADCx}, /* PC13 TAMPER-RTC */
|
||||||
{&gpioc, NULL, NULL, 14, 0, ADCx}, /* PC14 OSC32_IN */
|
{&gpioc, NULL, NULL, 14, 0, ADCx}, /* PC14 OSC32_IN */
|
||||||
{&gpioc, NULL, NULL, 15, 0, ADCx}, /* PC15 OSC32_OUT */
|
{&gpioc, NULL, NULL, 15, 0, ADCx}, /* PC15 OSC32_OUT */
|
||||||
|
@ -134,7 +134,7 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
|
||||||
{&gpiod, NULL, NULL, 0, 0, ADCx} , /* PD0 OSC_IN */
|
{&gpiod, NULL, NULL, 0, 0, ADCx} , /* PD0 OSC_IN */
|
||||||
{&gpiod, NULL, NULL, 1, 0, ADCx} , /* PD1 OSC_OUT */
|
{&gpiod, NULL, NULL, 1, 0, ADCx} , /* PD1 OSC_OUT */
|
||||||
{&gpiod, NULL, NULL, 2, 0, ADCx} , /* PD2 TIM3_ETR/UART5_RX SDIO_CMD */
|
{&gpiod, NULL, NULL, 2, 0, ADCx} , /* PD2 TIM3_ETR/UART5_RX SDIO_CMD */
|
||||||
|
|
||||||
{&gpiod, NULL, NULL, 3, 0, ADCx} , /* PD3 FSMC_CLK */
|
{&gpiod, NULL, NULL, 3, 0, ADCx} , /* PD3 FSMC_CLK */
|
||||||
{&gpiod, NULL, NULL, 4, 0, ADCx} , /* PD4 FSMC_NOE */
|
{&gpiod, NULL, NULL, 4, 0, ADCx} , /* PD4 FSMC_NOE */
|
||||||
{&gpiod, NULL, NULL, 5, 0, ADCx} , /* PD5 FSMC_NWE */
|
{&gpiod, NULL, NULL, 5, 0, ADCx} , /* PD5 FSMC_NWE */
|
||||||
|
@ -145,10 +145,10 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
|
||||||
{&gpiod, NULL, NULL, 10, 0, ADCx} , /* PD10 FSMC_D15 */
|
{&gpiod, NULL, NULL, 10, 0, ADCx} , /* PD10 FSMC_D15 */
|
||||||
{&gpiod, NULL, NULL, 11, 0, ADCx} , /* PD11 FSMC_A16 */
|
{&gpiod, NULL, NULL, 11, 0, ADCx} , /* PD11 FSMC_A16 */
|
||||||
{&gpiod, NULL, NULL, 12, 0, ADCx} , /* PD12 FSMC_A17 */
|
{&gpiod, NULL, NULL, 12, 0, ADCx} , /* PD12 FSMC_A17 */
|
||||||
{&gpiod, NULL, NULL, 13, 0, ADCx} , /* PD13 FSMC_A18 */
|
{&gpiod, NULL, NULL, 13, 0, ADCx} , /* PD13 FSMC_A18 */
|
||||||
{&gpiod, NULL, NULL, 14, 0, ADCx} , /* PD14 FSMC_D0 */
|
{&gpiod, NULL, NULL, 14, 0, ADCx} , /* PD14 FSMC_D0 */
|
||||||
{&gpiod, NULL, NULL, 15, 0, ADCx} , /* PD15 FSMC_D1 */
|
{&gpiod, NULL, NULL, 15, 0, ADCx} , /* PD15 FSMC_D1 */
|
||||||
|
|
||||||
{&gpioe, NULL, NULL, 0, 0, ADCx} , /* PE0 */
|
{&gpioe, NULL, NULL, 0, 0, ADCx} , /* PE0 */
|
||||||
{&gpioe, NULL, NULL, 1, 0, ADCx} , /* PE1 */
|
{&gpioe, NULL, NULL, 1, 0, ADCx} , /* PE1 */
|
||||||
{&gpioe, NULL, NULL, 2, 0, ADCx} , /* PE2 */
|
{&gpioe, NULL, NULL, 2, 0, ADCx} , /* PE2 */
|
||||||
|
@ -162,9 +162,9 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
|
||||||
{&gpioe, NULL, NULL, 10, 0, ADCx} , /* PE10 */
|
{&gpioe, NULL, NULL, 10, 0, ADCx} , /* PE10 */
|
||||||
{&gpioe, NULL, NULL, 11, 0, ADCx} , /* PE11 */
|
{&gpioe, NULL, NULL, 11, 0, ADCx} , /* PE11 */
|
||||||
{&gpioe, NULL, NULL, 12, 0, ADCx} , /* PE12 */
|
{&gpioe, NULL, NULL, 12, 0, ADCx} , /* PE12 */
|
||||||
{&gpioe, NULL, NULL, 13, 0, ADCx} , /* PE13 */
|
{&gpioe, NULL, NULL, 13, 0, ADCx} , /* PE13 */
|
||||||
{&gpioe, NULL, NULL, 14, 0, ADCx} , /* PE14 */
|
{&gpioe, NULL, NULL, 14, 0, ADCx} , /* PE14 */
|
||||||
{&gpioe, NULL, NULL, 15, 0, ADCx} , /* PE15 */
|
{&gpioe, NULL, NULL, 15, 0, ADCx} , /* PE15 */
|
||||||
|
|
||||||
{&gpiof, NULL, NULL, 0, 0, ADCx} , /* PF0 */
|
{&gpiof, NULL, NULL, 0, 0, ADCx} , /* PF0 */
|
||||||
{&gpiof, NULL, NULL, 1, 0, ADCx} , /* PF1 */
|
{&gpiof, NULL, NULL, 1, 0, ADCx} , /* PF1 */
|
||||||
|
@ -179,10 +179,10 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
|
||||||
{&gpiof, NULL, NULL, 10, 0, ADCx} , /* PF10 */
|
{&gpiof, NULL, NULL, 10, 0, ADCx} , /* PF10 */
|
||||||
{&gpiof, NULL, NULL, 11, 0, ADCx} , /* PF11 */
|
{&gpiof, NULL, NULL, 11, 0, ADCx} , /* PF11 */
|
||||||
{&gpiof, NULL, NULL, 12, 0, ADCx} , /* PF12 */
|
{&gpiof, NULL, NULL, 12, 0, ADCx} , /* PF12 */
|
||||||
{&gpiof, NULL, NULL, 13, 0, ADCx} , /* PF13 */
|
{&gpiof, NULL, NULL, 13, 0, ADCx} , /* PF13 */
|
||||||
{&gpiof, NULL, NULL, 14, 0, ADCx} , /* PF14 */
|
{&gpiof, NULL, NULL, 14, 0, ADCx} , /* PF14 */
|
||||||
{&gpiof, NULL, NULL, 15, 0, ADCx} , /* PF15 */
|
{&gpiof, NULL, NULL, 15, 0, ADCx} , /* PF15 */
|
||||||
|
|
||||||
{&gpiog, NULL, NULL, 0, 0, ADCx} , /* PG0 */
|
{&gpiog, NULL, NULL, 0, 0, ADCx} , /* PG0 */
|
||||||
{&gpiog, NULL, NULL, 1, 0, ADCx} , /* PG1 */
|
{&gpiog, NULL, NULL, 1, 0, ADCx} , /* PG1 */
|
||||||
{&gpiog, NULL, NULL, 2, 0, ADCx} , /* PG2 */
|
{&gpiog, NULL, NULL, 2, 0, ADCx} , /* PG2 */
|
||||||
|
@ -196,9 +196,9 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
|
||||||
{&gpiog, NULL, NULL, 10, 0, ADCx} , /* PG10 */
|
{&gpiog, NULL, NULL, 10, 0, ADCx} , /* PG10 */
|
||||||
{&gpiog, NULL, NULL, 11, 0, ADCx} , /* PG11 */
|
{&gpiog, NULL, NULL, 11, 0, ADCx} , /* PG11 */
|
||||||
{&gpiog, NULL, NULL, 12, 0, ADCx} , /* PG12 */
|
{&gpiog, NULL, NULL, 12, 0, ADCx} , /* PG12 */
|
||||||
{&gpiog, NULL, NULL, 13, 0, ADCx} , /* PG13 */
|
{&gpiog, NULL, NULL, 13, 0, ADCx} , /* PG13 */
|
||||||
{&gpiog, NULL, NULL, 14, 0, ADCx} , /* PG14 */
|
{&gpiog, NULL, NULL, 14, 0, ADCx} , /* PG14 */
|
||||||
{&gpiog, NULL, NULL, 15, 0, ADCx} /* PG15 */
|
{&gpiog, NULL, NULL, 15, 0, ADCx} /* PG15 */
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Basically everything that is defined as having a timer us PWM */
|
/* Basically everything that is defined as having a timer us PWM */
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* libmaple linker script
|
* libmaple linker script
|
||||||
*
|
*
|
||||||
* This build puts .text (and .rodata) in Flash, and
|
* This build puts .text (and .rodata) in Flash, and
|
||||||
* .data/.bss/heap (of course) in SRAM, but links starting at the
|
* .data/.bss/heap (of course) in SRAM, but links starting at the
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* libmaple linker script
|
* libmaple linker script
|
||||||
*
|
*
|
||||||
* This build puts .text (and .rodata) in Flash, and
|
* This build puts .text (and .rodata) in Flash, and
|
||||||
* .data/.bss/heap (of course) in SRAM, but links starting at the
|
* .data/.bss/heap (of course) in SRAM, but links starting at the
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* libmaple linker script
|
* libmaple linker script
|
||||||
*
|
*
|
||||||
* This build puts .text (and .rodata) in Flash, and
|
* This build puts .text (and .rodata) in Flash, and
|
||||||
* .data/.bss/heap (of course) in SRAM, but links starting at the
|
* .data/.bss/heap (of course) in SRAM, but links starting at the
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* libmaple linker script
|
* libmaple linker script
|
||||||
*
|
*
|
||||||
* This build puts .text (and .rodata) in Flash, and
|
* This build puts .text (and .rodata) in Flash, and
|
||||||
* .data/.bss/heap (of course) in SRAM, but links starting at the
|
* .data/.bss/heap (of course) in SRAM, but links starting at the
|
||||||
|
|
|
@ -87,8 +87,8 @@ namespace wirish {
|
||||||
#if F_CPU == 72000000
|
#if F_CPU == 72000000
|
||||||
rcc_set_prescaler(RCC_PRESCALER_USB, RCC_USB_SYSCLK_DIV_1_5);
|
rcc_set_prescaler(RCC_PRESCALER_USB, RCC_USB_SYSCLK_DIV_1_5);
|
||||||
#elif F_CPU == 48000000
|
#elif F_CPU == 48000000
|
||||||
rcc_set_prescaler(RCC_PRESCALER_USB, RCC_USB_SYSCLK_DIV_1);
|
rcc_set_prescaler(RCC_PRESCALER_USB, RCC_USB_SYSCLK_DIV_1);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
__weak void board_setup_gpio(void) {
|
__weak void board_setup_gpio(void) {
|
||||||
|
@ -96,18 +96,18 @@ namespace wirish {
|
||||||
}
|
}
|
||||||
|
|
||||||
__weak void board_setup_usb(void) {
|
__weak void board_setup_usb(void) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef SERIAL_USB
|
|
||||||
#ifdef GENERIC_BOOTLOADER
|
#ifdef SERIAL_USB
|
||||||
|
#ifdef GENERIC_BOOTLOADER
|
||||||
//Reset the USB interface on generic boards - developed by Victor PV
|
//Reset the USB interface on generic boards - developed by Victor PV
|
||||||
gpio_set_mode(PIN_MAP[PA12].gpio_device, PIN_MAP[PA12].gpio_bit, GPIO_OUTPUT_PP);
|
gpio_set_mode(PIN_MAP[PA12].gpio_device, PIN_MAP[PA12].gpio_bit, GPIO_OUTPUT_PP);
|
||||||
gpio_write_bit(PIN_MAP[PA12].gpio_device, PIN_MAP[PA12].gpio_bit,0);
|
gpio_write_bit(PIN_MAP[PA12].gpio_device, PIN_MAP[PA12].gpio_bit,0);
|
||||||
|
|
||||||
for(volatile unsigned int i=0;i<512;i++);// Only small delay seems to be needed, and USB pins will get configured in Serial.begin
|
for(volatile unsigned int i=0;i<512;i++);// Only small delay seems to be needed, and USB pins will get configured in Serial.begin
|
||||||
gpio_set_mode(PIN_MAP[PA12].gpio_device, PIN_MAP[PA12].gpio_bit, GPIO_INPUT_FLOATING);
|
gpio_set_mode(PIN_MAP[PA12].gpio_device, PIN_MAP[PA12].gpio_bit, GPIO_INPUT_FLOATING);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
Serial.begin();// Roger Clark. Changed SerialUSB to Serial for Arduino sketch compatibility
|
Serial.begin();// Roger Clark. Changed SerialUSB to Serial for Arduino sketch compatibility
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -93,7 +93,7 @@ N234 G1 X-5 Y+2 *64 error
|
||||||
; ^constant.numeric.checksum.gcode
|
; ^constant.numeric.checksum.gcode
|
||||||
; ^invalid.error.syntax.gcode
|
; ^invalid.error.syntax.gcode
|
||||||
|
|
||||||
N234 M107 *64
|
N234 M107 *64
|
||||||
; ^-invalid.error.syntax.gcode
|
; ^-invalid.error.syntax.gcode
|
||||||
|
|
||||||
M92 E304.5:304.5:420:420:420:420 ; EOL Comment
|
M92 E304.5:304.5:420:420:420:420 ; EOL Comment
|
||||||
|
|
Reference in a new issue