Pārlūkot izejas kodu

Use American English

Scott Lahteine 6 gadus atpakaļ
vecāks
revīzija
0987ed2a18

+ 3
- 3
Marlin/src/HAL/HAL_LPC1768/main.cpp Parādīt failu

@@ -59,7 +59,7 @@ extern "C" {
59 59
 
60 60
   // Runs after clock init and before global static constructors
61 61
   void SystemPostInit() {
62
-    _millis = 0;                            // Initialise the millisecond counter value;
62
+    _millis = 0;                            // Initialize the millisecond counter value
63 63
     SysTick_Config(SystemCoreClock / 1000); // Start millisecond global counter
64 64
 
65 65
     // Runs before setup() need to configure LED_PIN and use to indicate succsessful bootloader execution
@@ -96,7 +96,7 @@ int main(void) {
96 96
   while (!USB_Configuration && PENDING(millis(), usb_timeout)) {
97 97
     delay(50);
98 98
     #if PIN_EXISTS(LED)
99
-      TOGGLE(LED_PIN);     // Flash fast while USB initialisation completes
99
+      TOGGLE(LED_PIN);     // Flash quickly during USB initialization
100 100
     #endif
101 101
   }
102 102
 
@@ -105,7 +105,7 @@ int main(void) {
105 105
     #if NUM_SERIAL > 1
106 106
       MYSERIAL1.begin(BAUDRATE);
107 107
     #endif
108
-    SERIAL_PRINTF("\n\necho:%s (%dMhz) Initialised\n", isLPC1769() ? "LPC1769" : "LPC1768", SystemCoreClock / 1000000);
108
+    SERIAL_PRINTF("\n\necho:%s (%dMhz) Initialized\n", isLPC1769() ? "LPC1769" : "LPC1768", SystemCoreClock / 1000000);
109 109
     SERIAL_FLUSHTX();
110 110
   #endif
111 111
 

+ 1
- 1
Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.cpp Parādīt failu

@@ -78,7 +78,7 @@ static uint16_t EE_VerifyPageFullyErased(uint32_t Address);
78 78
   * @retval - Flash error code: on write Flash error
79 79
   *         - FLASH_COMPLETE: on success
80 80
   */
81
-uint16_t EE_Initialise(void) {
81
+uint16_t EE_Initialize(void) {
82 82
   uint16_t PageStatus0 = 6, PageStatus1 = 6;
83 83
   uint16_t VarIdx = 0;
84 84
   uint16_t EepromStatus = 0, ReadStatus = 0;

+ 1
- 1
Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.h Parādīt failu

@@ -108,7 +108,7 @@
108 108
 /* Exported types ------------------------------------------------------------*/
109 109
 /* Exported macro ------------------------------------------------------------*/
110 110
 /* Exported functions ------------------------------------------------------- */
111
-uint16_t EE_Initialise(void);
111
+uint16_t EE_Initialize(void);
112 112
 uint16_t EE_ReadVariable(uint16_t VirtAddress, uint16_t* Data);
113 113
 uint16_t EE_WriteVariable(uint16_t VirtAddress, uint16_t Data);
114 114
 

+ 4
- 4
Marlin/src/HAL/HAL_STM32F4/EmulatedEeprom.cpp Parādīt failu

@@ -59,7 +59,7 @@
59 59
 // --------------------------------------------------------------------------
60 60
 // Private Variables
61 61
 // --------------------------------------------------------------------------
62
-static bool eeprom_initialised = false;
62
+static bool eeprom_initialized = false;
63 63
 // --------------------------------------------------------------------------
64 64
 // Function prototypes
65 65
 // --------------------------------------------------------------------------
@@ -82,17 +82,17 @@ static bool eeprom_initialised = false;
82 82
 
83 83
 
84 84
 void eeprom_init() {
85
-  if (!eeprom_initialised) {
85
+  if (!eeprom_initialized) {
86 86
     HAL_FLASH_Unlock();
87 87
 
88 88
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR |FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR);
89 89
 
90 90
     /* EEPROM Init */
91
-    if (EE_Initialise() != EE_OK)
91
+    if (EE_Initialize() != EE_OK)
92 92
       for (;;) HAL_Delay(1); // Spin forever until watchdog reset
93 93
 
94 94
     HAL_FLASH_Lock();
95
-    eeprom_initialised = true;
95
+    eeprom_initialized = true;
96 96
   }
97 97
 }
98 98
 

+ 3
- 3
Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.cpp Parādīt failu

@@ -69,11 +69,11 @@ stm32f4_timer_t TimerHandle[NUM_HARDWARE_TIMERS];
69 69
 // Public functions
70 70
 // --------------------------------------------------------------------------
71 71
 
72
-bool timers_initialised[NUM_HARDWARE_TIMERS] = {false};
72
+bool timers_initialized[NUM_HARDWARE_TIMERS] = {false};
73 73
 
74 74
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
75 75
 
76
-  if (!timers_initialised[timer_num]) {
76
+  if (!timers_initialized[timer_num]) {
77 77
     constexpr uint32_t step_prescaler = STEPPER_TIMER_PRESCALE - 1,
78 78
                        temp_prescaler = TEMP_TIMER_PRESCALE - 1;
79 79
     switch (timer_num) {
@@ -111,7 +111,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
111 111
         HAL_NVIC_SetPriority(TEMP_TIMER_IRQ_ID, 2, 0);
112 112
         break;
113 113
     }
114
-    timers_initialised[timer_num] = true;
114
+    timers_initialized[timer_num] = true;
115 115
   }
116 116
 
117 117
   #ifdef STM32GENERIC

+ 1
- 1
Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.cpp Parādīt failu

@@ -78,7 +78,7 @@ static uint16_t EE_VerifyPageFullyErased(uint32_t Address);
78 78
   * @retval - Flash error code: on write Flash error
79 79
   *         - FLASH_COMPLETE: on success
80 80
   */
81
-uint16_t EE_Initialise(void) {
81
+uint16_t EE_Initialize(void) {
82 82
   uint16_t PageStatus0 = 6, PageStatus1 = 6;
83 83
   uint16_t VarIdx = 0;
84 84
   uint16_t EepromStatus = 0, ReadStatus = 0;

+ 1
- 1
Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.h Parādīt failu

@@ -109,7 +109,7 @@
109 109
 /* Exported types ------------------------------------------------------------*/
110 110
 /* Exported macro ------------------------------------------------------------*/
111 111
 /* Exported functions ------------------------------------------------------- */
112
-uint16_t EE_Initialise(void);
112
+uint16_t EE_Initialize(void);
113 113
 uint16_t EE_ReadVariable(uint16_t VirtAddress, uint16_t* Data);
114 114
 uint16_t EE_WriteVariable(uint16_t VirtAddress, uint16_t Data);
115 115
 

+ 4
- 4
Marlin/src/HAL/HAL_STM32F7/EmulatedEeprom.cpp Parādīt failu

@@ -57,7 +57,7 @@
57 57
 // --------------------------------------------------------------------------
58 58
 // Private Variables
59 59
 // --------------------------------------------------------------------------
60
-static bool eeprom_initialised = false;
60
+static bool eeprom_initialized = false;
61 61
 // --------------------------------------------------------------------------
62 62
 // Function prototypes
63 63
 // --------------------------------------------------------------------------
@@ -80,17 +80,17 @@ static bool eeprom_initialised = false;
80 80
 
81 81
 
82 82
 void eeprom_init() {
83
-  if (!eeprom_initialised) {
83
+  if (!eeprom_initialized) {
84 84
     HAL_FLASH_Unlock();
85 85
 
86 86
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR |FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR);
87 87
 
88 88
     /* EEPROM Init */
89
-    if (EE_Initialise() != EE_OK)
89
+    if (EE_Initialize() != EE_OK)
90 90
       for (;;) HAL_Delay(1); // Spin forever until watchdog reset
91 91
 
92 92
     HAL_FLASH_Lock();
93
-    eeprom_initialised = true;
93
+    eeprom_initialized = true;
94 94
   }
95 95
 }
96 96
 

+ 3
- 3
Marlin/src/HAL/HAL_STM32F7/HAL_timers_STM32F7.cpp Parādīt failu

@@ -69,11 +69,11 @@ tTimerConfig timerConfig[NUM_HARDWARE_TIMERS];
69 69
 // --------------------------------------------------------------------------
70 70
 
71 71
 
72
-bool timers_initialised[NUM_HARDWARE_TIMERS] = {false};
72
+bool timers_initialized[NUM_HARDWARE_TIMERS] = {false};
73 73
 
74 74
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
75 75
 
76
-  if (!timers_initialised[timer_num]) {
76
+  if (!timers_initialized[timer_num]) {
77 77
     switch (timer_num) {
78 78
       case STEP_TIMER_NUM:
79 79
       //STEPPER TIMER TIM5 //use a 32bit timer
@@ -100,7 +100,7 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
100 100
       HAL_NVIC_SetPriority(timerConfig[1].IRQ_Id, 2, 0);
101 101
       break;
102 102
     }
103
-    timers_initialised[timer_num] = true;
103
+    timers_initialized[timer_num] = true;
104 104
   }
105 105
 
106 106
   timerConfig[timer_num].timerdef.Init.Period = (((HAL_TIMER_RATE) / timerConfig[timer_num].timerdef.Init.Prescaler) / frequency) - 1;

+ 1
- 1
Marlin/src/HAL/HAL_TEENSY35_36/HAL_spi_Teensy.cpp Parādīt failu

@@ -9,7 +9,7 @@
9 9
 static SPISettings spiConfig;
10 10
 
11 11
 // Standard SPI functions
12
-/** Initialise SPI bus */
12
+/** Initialize SPI bus */
13 13
 void spiBegin(void) {
14 14
   #if !PIN_EXISTS(SS)
15 15
     #error SS_PIN not defined!

+ 1
- 1
Marlin/src/HAL/shared/HAL_SPI.h Parādīt failu

@@ -64,7 +64,7 @@
64 64
 #define SPI_DATAMODE_3 0x0C
65 65
 
66 66
 // Standard SPI functions
67
-/** Initialise SPI bus */
67
+/** Initialize SPI bus */
68 68
 void spiBegin(void);
69 69
 /** Configure SPI for specified SPI speed */
70 70
 void spiInit(uint8_t spiRate);

+ 3
- 3
Marlin/src/HAL/shared/I2cEeprom.cpp Parādīt failu

@@ -75,10 +75,10 @@
75 75
 static uint8_t eeprom_device_address = 0x50;
76 76
 
77 77
 static void eeprom_init(void) {
78
-  static bool eeprom_initialised = false;
79
-  if (!eeprom_initialised) {
78
+  static bool eeprom_initialized = false;
79
+  if (!eeprom_initialized) {
80 80
     Wire.begin();
81
-    eeprom_initialised = true;
81
+    eeprom_initialized = true;
82 82
   }
83 83
 }
84 84
 

+ 1
- 1
Marlin/src/HAL/shared/backtrace/unwarm.cpp Parādīt failu

@@ -51,7 +51,7 @@ void UnwInvalidateRegisterFile(RegData *regFile) {
51 51
 
52 52
 
53 53
 /**
54
- * Initialise the data used for unwinding.
54
+ * Initialize the data used for unwinding.
55 55
  */
56 56
 void UnwInitState(UnwState * const state,     /**< Pointer to structure to fill. */
57 57
                   const UnwindCallbacks *cb,  /**< Callbacks. */

+ 1
- 1
Marlin/src/HAL/shared/backtrace/unwinder.cpp Parādīt failu

@@ -44,7 +44,7 @@ UnwResult UnwindStart(UnwindFrame* frame, const UnwindCallbacks *cb, void *data)
44 44
     /* We don't have unwind information tables */
45 45
     UnwState state;
46 46
 
47
-    /* Initialise the unwinding state */
47
+    /* Initialize the unwinding state */
48 48
     UnwInitState(&state, cb, data, frame->pc, frame->sp);
49 49
 
50 50
     /* Check the Thumb bit */

+ 4
- 4
Marlin/src/feature/I2CPositionEncoder.cpp Parādīt failu

@@ -45,7 +45,7 @@ void I2CPositionEncoder::init(const uint8_t address, const AxisEnum axis) {
45 45
   encoderAxis = axis;
46 46
   i2cAddress = address;
47 47
 
48
-  initialised++;
48
+  initialized++;
49 49
 
50 50
   SERIAL_ECHOPAIR("Setting up encoder on ", axis_codes[encoderAxis]);
51 51
   SERIAL_ECHOLNPAIR(" axis, addr = ", address);
@@ -54,7 +54,7 @@ void I2CPositionEncoder::init(const uint8_t address, const AxisEnum axis) {
54 54
 }
55 55
 
56 56
 void I2CPositionEncoder::update() {
57
-  if (!initialised || !homed || !active) return; //check encoder is set up and active
57
+  if (!initialized || !homed || !active) return; //check encoder is set up and active
58 58
 
59 59
   position = get_position();
60 60
 
@@ -98,7 +98,7 @@ void I2CPositionEncoder::update() {
98 98
         SERIAL_ECHOLNPGM(" axis has been fault-free for set duration, reinstating error correction.");
99 99
 
100 100
         //the encoder likely lost its place when the error occured, so we'll reset and use the printer's
101
-        //idea of where it the axis is to re-initialise
101
+        //idea of where it the axis is to re-initialize
102 102
         const float pos = planner.get_axis_position_mm(encoderAxis);
103 103
         int32_t positionInTicks = pos * get_ticks_unit();
104 104
 
@@ -712,7 +712,7 @@ void I2CPositionEncodersMgr::change_module_address(const uint8_t oldaddr, const
712 712
   SERIAL_ECHOLNPGM("Address change successful!");
713 713
 
714 714
   // Now, if this module is configured, find which encoder instance it's supposed to correspond to
715
-  // and enable it (it will likely have failed initialisation on power-up, before the address change).
715
+  // and enable it (it will likely have failed initialization on power-up, before the address change).
716 716
   const int8_t idx = idx_from_addr(newaddr);
717 717
   if (idx >= 0 && !encoders[idx].get_active()) {
718 718
     SERIAL_ECHO(axis_codes[encoders[idx].get_axis()]);

+ 1
- 1
Marlin/src/feature/I2CPositionEncoder.h Parādīt failu

@@ -120,7 +120,7 @@ class I2CPositionEncoder {
120 120
 
121 121
     bool      homed               = false,
122 122
               trusted             = false,
123
-              initialised         = false,
123
+              initialized         = false,
124 124
               active              = false,
125 125
               invert              = false,
126 126
               ec                  = true;

+ 1
- 1
frameworks/CMSIS/LPC1768/include/core_cm3.h Parādīt failu

@@ -1120,7 +1120,7 @@ static __INLINE void NVIC_SystemReset(void)
1120 1120
 
1121 1121
 /** \brief  System Tick Configuration
1122 1122
 
1123
-    This function initialises the system tick timer and its interrupt and start the system tick timer.
1123
+    This function initializes the system tick timer and its interrupt and start the system tick timer.
1124 1124
     Counter is in free running mode to generate periodical interrupts.
1125 1125
 
1126 1126
     \param [in]  ticks  Number of ticks between two interrupts

+ 1
- 1
frameworks/CMSIS/LPC1768/lib/usb/cdcuser.cpp Parādīt failu

@@ -71,7 +71,7 @@ uint32_t CDC_OutBufAvailChar(uint32_t *availChar) {
71 71
 /* end Buffer handling */
72 72
 
73 73
 /*----------------------------------------------------------------------------
74
- CDC Initialisation
74
+ CDC Initialization
75 75
  Initializes the data structures and serial port
76 76
  Parameters:   None
77 77
  Return Value: None

Notiek ielāde…
Atcelt
Saglabāt