From 0987ed2a1816699b87a367cc4aec2a39dcf5abef Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 22 Aug 2018 17:14:38 -0500 Subject: [PATCH] Use American English --- Marlin/src/HAL/HAL_LPC1768/main.cpp | 6 +++--- Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.cpp | 2 +- Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.h | 2 +- Marlin/src/HAL/HAL_STM32F4/EmulatedEeprom.cpp | 8 ++++---- Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.cpp | 6 +++--- Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.cpp | 2 +- Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.h | 2 +- Marlin/src/HAL/HAL_STM32F7/EmulatedEeprom.cpp | 8 ++++---- Marlin/src/HAL/HAL_STM32F7/HAL_timers_STM32F7.cpp | 6 +++--- Marlin/src/HAL/HAL_TEENSY35_36/HAL_spi_Teensy.cpp | 2 +- Marlin/src/HAL/shared/HAL_SPI.h | 2 +- Marlin/src/HAL/shared/I2cEeprom.cpp | 6 +++--- Marlin/src/HAL/shared/backtrace/unwarm.cpp | 2 +- Marlin/src/HAL/shared/backtrace/unwinder.cpp | 2 +- Marlin/src/feature/I2CPositionEncoder.cpp | 8 ++++---- Marlin/src/feature/I2CPositionEncoder.h | 2 +- frameworks/CMSIS/LPC1768/include/core_cm3.h | 2 +- frameworks/CMSIS/LPC1768/lib/usb/cdcuser.cpp | 2 +- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Marlin/src/HAL/HAL_LPC1768/main.cpp b/Marlin/src/HAL/HAL_LPC1768/main.cpp index 5f4e672f38..8941703f2e 100644 --- a/Marlin/src/HAL/HAL_LPC1768/main.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/main.cpp @@ -59,7 +59,7 @@ extern "C" { // Runs after clock init and before global static constructors void SystemPostInit() { - _millis = 0; // Initialise the millisecond counter value; + _millis = 0; // Initialize the millisecond counter value SysTick_Config(SystemCoreClock / 1000); // Start millisecond global counter // Runs before setup() need to configure LED_PIN and use to indicate succsessful bootloader execution @@ -96,7 +96,7 @@ int main(void) { while (!USB_Configuration && PENDING(millis(), usb_timeout)) { delay(50); #if PIN_EXISTS(LED) - TOGGLE(LED_PIN); // Flash fast while USB initialisation completes + TOGGLE(LED_PIN); // Flash quickly during USB initialization #endif } @@ -105,7 +105,7 @@ int main(void) { #if NUM_SERIAL > 1 MYSERIAL1.begin(BAUDRATE); #endif - SERIAL_PRINTF("\n\necho:%s (%dMhz) Initialised\n", isLPC1769() ? "LPC1769" : "LPC1768", SystemCoreClock / 1000000); + SERIAL_PRINTF("\n\necho:%s (%dMhz) Initialized\n", isLPC1769() ? "LPC1769" : "LPC1768", SystemCoreClock / 1000000); SERIAL_FLUSHTX(); #endif diff --git a/Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.cpp b/Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.cpp index 26ab2fc92c..7be880ace0 100644 --- a/Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.cpp +++ b/Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.cpp @@ -78,7 +78,7 @@ static uint16_t EE_VerifyPageFullyErased(uint32_t Address); * @retval - Flash error code: on write Flash error * - FLASH_COMPLETE: on success */ -uint16_t EE_Initialise(void) { +uint16_t EE_Initialize(void) { uint16_t PageStatus0 = 6, PageStatus1 = 6; uint16_t VarIdx = 0; uint16_t EepromStatus = 0, ReadStatus = 0; diff --git a/Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.h b/Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.h index 476baee92f..a7e3e0f012 100644 --- a/Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.h +++ b/Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.h @@ -108,7 +108,7 @@ /* Exported types ------------------------------------------------------------*/ /* Exported macro ------------------------------------------------------------*/ /* Exported functions ------------------------------------------------------- */ -uint16_t EE_Initialise(void); +uint16_t EE_Initialize(void); uint16_t EE_ReadVariable(uint16_t VirtAddress, uint16_t* Data); uint16_t EE_WriteVariable(uint16_t VirtAddress, uint16_t Data); diff --git a/Marlin/src/HAL/HAL_STM32F4/EmulatedEeprom.cpp b/Marlin/src/HAL/HAL_STM32F4/EmulatedEeprom.cpp index b76de3dbe8..19853171fe 100644 --- a/Marlin/src/HAL/HAL_STM32F4/EmulatedEeprom.cpp +++ b/Marlin/src/HAL/HAL_STM32F4/EmulatedEeprom.cpp @@ -59,7 +59,7 @@ // -------------------------------------------------------------------------- // Private Variables // -------------------------------------------------------------------------- -static bool eeprom_initialised = false; +static bool eeprom_initialized = false; // -------------------------------------------------------------------------- // Function prototypes // -------------------------------------------------------------------------- @@ -82,17 +82,17 @@ static bool eeprom_initialised = false; void eeprom_init() { - if (!eeprom_initialised) { + if (!eeprom_initialized) { HAL_FLASH_Unlock(); __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR |FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR); /* EEPROM Init */ - if (EE_Initialise() != EE_OK) + if (EE_Initialize() != EE_OK) for (;;) HAL_Delay(1); // Spin forever until watchdog reset HAL_FLASH_Lock(); - eeprom_initialised = true; + eeprom_initialized = true; } } diff --git a/Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.cpp b/Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.cpp index d03bf4c09b..64da993ef8 100644 --- a/Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.cpp +++ b/Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.cpp @@ -69,11 +69,11 @@ stm32f4_timer_t TimerHandle[NUM_HARDWARE_TIMERS]; // Public functions // -------------------------------------------------------------------------- -bool timers_initialised[NUM_HARDWARE_TIMERS] = {false}; +bool timers_initialized[NUM_HARDWARE_TIMERS] = {false}; void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) { - if (!timers_initialised[timer_num]) { + if (!timers_initialized[timer_num]) { constexpr uint32_t step_prescaler = STEPPER_TIMER_PRESCALE - 1, temp_prescaler = TEMP_TIMER_PRESCALE - 1; switch (timer_num) { @@ -111,7 +111,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) { HAL_NVIC_SetPriority(TEMP_TIMER_IRQ_ID, 2, 0); break; } - timers_initialised[timer_num] = true; + timers_initialized[timer_num] = true; } #ifdef STM32GENERIC diff --git a/Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.cpp b/Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.cpp index 029378561b..d28577758c 100644 --- a/Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.cpp +++ b/Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.cpp @@ -78,7 +78,7 @@ static uint16_t EE_VerifyPageFullyErased(uint32_t Address); * @retval - Flash error code: on write Flash error * - FLASH_COMPLETE: on success */ -uint16_t EE_Initialise(void) { +uint16_t EE_Initialize(void) { uint16_t PageStatus0 = 6, PageStatus1 = 6; uint16_t VarIdx = 0; uint16_t EepromStatus = 0, ReadStatus = 0; diff --git a/Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.h b/Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.h index d5c54985f5..8a45608ed9 100644 --- a/Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.h +++ b/Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.h @@ -109,7 +109,7 @@ /* Exported types ------------------------------------------------------------*/ /* Exported macro ------------------------------------------------------------*/ /* Exported functions ------------------------------------------------------- */ -uint16_t EE_Initialise(void); +uint16_t EE_Initialize(void); uint16_t EE_ReadVariable(uint16_t VirtAddress, uint16_t* Data); uint16_t EE_WriteVariable(uint16_t VirtAddress, uint16_t Data); diff --git a/Marlin/src/HAL/HAL_STM32F7/EmulatedEeprom.cpp b/Marlin/src/HAL/HAL_STM32F7/EmulatedEeprom.cpp index 390ff35de5..0a7f5193f0 100644 --- a/Marlin/src/HAL/HAL_STM32F7/EmulatedEeprom.cpp +++ b/Marlin/src/HAL/HAL_STM32F7/EmulatedEeprom.cpp @@ -57,7 +57,7 @@ // -------------------------------------------------------------------------- // Private Variables // -------------------------------------------------------------------------- -static bool eeprom_initialised = false; +static bool eeprom_initialized = false; // -------------------------------------------------------------------------- // Function prototypes // -------------------------------------------------------------------------- @@ -80,17 +80,17 @@ static bool eeprom_initialised = false; void eeprom_init() { - if (!eeprom_initialised) { + if (!eeprom_initialized) { HAL_FLASH_Unlock(); __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR |FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR); /* EEPROM Init */ - if (EE_Initialise() != EE_OK) + if (EE_Initialize() != EE_OK) for (;;) HAL_Delay(1); // Spin forever until watchdog reset HAL_FLASH_Lock(); - eeprom_initialised = true; + eeprom_initialized = true; } } diff --git a/Marlin/src/HAL/HAL_STM32F7/HAL_timers_STM32F7.cpp b/Marlin/src/HAL/HAL_STM32F7/HAL_timers_STM32F7.cpp index 9454b71c81..c6b22fd441 100644 --- a/Marlin/src/HAL/HAL_STM32F7/HAL_timers_STM32F7.cpp +++ b/Marlin/src/HAL/HAL_STM32F7/HAL_timers_STM32F7.cpp @@ -69,11 +69,11 @@ tTimerConfig timerConfig[NUM_HARDWARE_TIMERS]; // -------------------------------------------------------------------------- -bool timers_initialised[NUM_HARDWARE_TIMERS] = {false}; +bool timers_initialized[NUM_HARDWARE_TIMERS] = {false}; void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) { - if (!timers_initialised[timer_num]) { + if (!timers_initialized[timer_num]) { switch (timer_num) { case STEP_TIMER_NUM: //STEPPER TIMER TIM5 //use a 32bit timer @@ -100,7 +100,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) { HAL_NVIC_SetPriority(timerConfig[1].IRQ_Id, 2, 0); break; } - timers_initialised[timer_num] = true; + timers_initialized[timer_num] = true; } timerConfig[timer_num].timerdef.Init.Period = (((HAL_TIMER_RATE) / timerConfig[timer_num].timerdef.Init.Prescaler) / frequency) - 1; diff --git a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_spi_Teensy.cpp b/Marlin/src/HAL/HAL_TEENSY35_36/HAL_spi_Teensy.cpp index 3be0fdd3af..6220225a1d 100644 --- a/Marlin/src/HAL/HAL_TEENSY35_36/HAL_spi_Teensy.cpp +++ b/Marlin/src/HAL/HAL_TEENSY35_36/HAL_spi_Teensy.cpp @@ -9,7 +9,7 @@ static SPISettings spiConfig; // Standard SPI functions -/** Initialise SPI bus */ +/** Initialize SPI bus */ void spiBegin(void) { #if !PIN_EXISTS(SS) #error SS_PIN not defined! diff --git a/Marlin/src/HAL/shared/HAL_SPI.h b/Marlin/src/HAL/shared/HAL_SPI.h index c011436b77..388b9f9cfb 100644 --- a/Marlin/src/HAL/shared/HAL_SPI.h +++ b/Marlin/src/HAL/shared/HAL_SPI.h @@ -64,7 +64,7 @@ #define SPI_DATAMODE_3 0x0C // Standard SPI functions -/** Initialise SPI bus */ +/** Initialize SPI bus */ void spiBegin(void); /** Configure SPI for specified SPI speed */ void spiInit(uint8_t spiRate); diff --git a/Marlin/src/HAL/shared/I2cEeprom.cpp b/Marlin/src/HAL/shared/I2cEeprom.cpp index 792f2c65f6..a73cefa2d3 100644 --- a/Marlin/src/HAL/shared/I2cEeprom.cpp +++ b/Marlin/src/HAL/shared/I2cEeprom.cpp @@ -75,10 +75,10 @@ static uint8_t eeprom_device_address = 0x50; static void eeprom_init(void) { - static bool eeprom_initialised = false; - if (!eeprom_initialised) { + static bool eeprom_initialized = false; + if (!eeprom_initialized) { Wire.begin(); - eeprom_initialised = true; + eeprom_initialized = true; } } diff --git a/Marlin/src/HAL/shared/backtrace/unwarm.cpp b/Marlin/src/HAL/shared/backtrace/unwarm.cpp index f6d85b708b..13079817ba 100644 --- a/Marlin/src/HAL/shared/backtrace/unwarm.cpp +++ b/Marlin/src/HAL/shared/backtrace/unwarm.cpp @@ -51,7 +51,7 @@ void UnwInvalidateRegisterFile(RegData *regFile) { /** - * Initialise the data used for unwinding. + * Initialize the data used for unwinding. */ void UnwInitState(UnwState * const state, /**< Pointer to structure to fill. */ const UnwindCallbacks *cb, /**< Callbacks. */ diff --git a/Marlin/src/HAL/shared/backtrace/unwinder.cpp b/Marlin/src/HAL/shared/backtrace/unwinder.cpp index 66281670c6..9c30016165 100644 --- a/Marlin/src/HAL/shared/backtrace/unwinder.cpp +++ b/Marlin/src/HAL/shared/backtrace/unwinder.cpp @@ -44,7 +44,7 @@ UnwResult UnwindStart(UnwindFrame* frame, const UnwindCallbacks *cb, void *data) /* We don't have unwind information tables */ UnwState state; - /* Initialise the unwinding state */ + /* Initialize the unwinding state */ UnwInitState(&state, cb, data, frame->pc, frame->sp); /* Check the Thumb bit */ diff --git a/Marlin/src/feature/I2CPositionEncoder.cpp b/Marlin/src/feature/I2CPositionEncoder.cpp index d817f1400c..f5bec8885c 100644 --- a/Marlin/src/feature/I2CPositionEncoder.cpp +++ b/Marlin/src/feature/I2CPositionEncoder.cpp @@ -45,7 +45,7 @@ void I2CPositionEncoder::init(const uint8_t address, const AxisEnum axis) { encoderAxis = axis; i2cAddress = address; - initialised++; + initialized++; SERIAL_ECHOPAIR("Setting up encoder on ", axis_codes[encoderAxis]); SERIAL_ECHOLNPAIR(" axis, addr = ", address); @@ -54,7 +54,7 @@ void I2CPositionEncoder::init(const uint8_t address, const AxisEnum axis) { } void I2CPositionEncoder::update() { - if (!initialised || !homed || !active) return; //check encoder is set up and active + if (!initialized || !homed || !active) return; //check encoder is set up and active position = get_position(); @@ -98,7 +98,7 @@ void I2CPositionEncoder::update() { SERIAL_ECHOLNPGM(" axis has been fault-free for set duration, reinstating error correction."); //the encoder likely lost its place when the error occured, so we'll reset and use the printer's - //idea of where it the axis is to re-initialise + //idea of where it the axis is to re-initialize const float pos = planner.get_axis_position_mm(encoderAxis); int32_t positionInTicks = pos * get_ticks_unit(); @@ -712,7 +712,7 @@ void I2CPositionEncodersMgr::change_module_address(const uint8_t oldaddr, const SERIAL_ECHOLNPGM("Address change successful!"); // Now, if this module is configured, find which encoder instance it's supposed to correspond to - // and enable it (it will likely have failed initialisation on power-up, before the address change). + // and enable it (it will likely have failed initialization on power-up, before the address change). const int8_t idx = idx_from_addr(newaddr); if (idx >= 0 && !encoders[idx].get_active()) { SERIAL_ECHO(axis_codes[encoders[idx].get_axis()]); diff --git a/Marlin/src/feature/I2CPositionEncoder.h b/Marlin/src/feature/I2CPositionEncoder.h index 224e0da8b2..f5fe8bced8 100644 --- a/Marlin/src/feature/I2CPositionEncoder.h +++ b/Marlin/src/feature/I2CPositionEncoder.h @@ -120,7 +120,7 @@ class I2CPositionEncoder { bool homed = false, trusted = false, - initialised = false, + initialized = false, active = false, invert = false, ec = true; diff --git a/frameworks/CMSIS/LPC1768/include/core_cm3.h b/frameworks/CMSIS/LPC1768/include/core_cm3.h index 76bf26f6e3..b09ff8db47 100644 --- a/frameworks/CMSIS/LPC1768/include/core_cm3.h +++ b/frameworks/CMSIS/LPC1768/include/core_cm3.h @@ -1120,7 +1120,7 @@ static __INLINE void NVIC_SystemReset(void) /** \brief System Tick Configuration - This function initialises the system tick timer and its interrupt and start the system tick timer. + This function initializes the system tick timer and its interrupt and start the system tick timer. Counter is in free running mode to generate periodical interrupts. \param [in] ticks Number of ticks between two interrupts diff --git a/frameworks/CMSIS/LPC1768/lib/usb/cdcuser.cpp b/frameworks/CMSIS/LPC1768/lib/usb/cdcuser.cpp index 4f6f0a337a..23805ba93a 100644 --- a/frameworks/CMSIS/LPC1768/lib/usb/cdcuser.cpp +++ b/frameworks/CMSIS/LPC1768/lib/usb/cdcuser.cpp @@ -71,7 +71,7 @@ uint32_t CDC_OutBufAvailChar(uint32_t *availChar) { /* end Buffer handling */ /*---------------------------------------------------------------------------- - CDC Initialisation + CDC Initialization Initializes the data structures and serial port Parameters: None Return Value: None