Scott Lahteine 6 роки тому
джерело
коміт
0987ed2a18

+ 3
- 3
Marlin/src/HAL/HAL_LPC1768/main.cpp Переглянути файл

59
 
59
 
60
   // Runs after clock init and before global static constructors
60
   // Runs after clock init and before global static constructors
61
   void SystemPostInit() {
61
   void SystemPostInit() {
62
-    _millis = 0;                            // Initialise the millisecond counter value;
62
+    _millis = 0;                            // Initialize the millisecond counter value
63
     SysTick_Config(SystemCoreClock / 1000); // Start millisecond global counter
63
     SysTick_Config(SystemCoreClock / 1000); // Start millisecond global counter
64
 
64
 
65
     // Runs before setup() need to configure LED_PIN and use to indicate succsessful bootloader execution
65
     // Runs before setup() need to configure LED_PIN and use to indicate succsessful bootloader execution
96
   while (!USB_Configuration && PENDING(millis(), usb_timeout)) {
96
   while (!USB_Configuration && PENDING(millis(), usb_timeout)) {
97
     delay(50);
97
     delay(50);
98
     #if PIN_EXISTS(LED)
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
     #endif
100
     #endif
101
   }
101
   }
102
 
102
 
105
     #if NUM_SERIAL > 1
105
     #if NUM_SERIAL > 1
106
       MYSERIAL1.begin(BAUDRATE);
106
       MYSERIAL1.begin(BAUDRATE);
107
     #endif
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
     SERIAL_FLUSHTX();
109
     SERIAL_FLUSHTX();
110
   #endif
110
   #endif
111
 
111
 

+ 1
- 1
Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.cpp Переглянути файл

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

+ 1
- 1
Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.h Переглянути файл

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

+ 4
- 4
Marlin/src/HAL/HAL_STM32F4/EmulatedEeprom.cpp Переглянути файл

59
 // --------------------------------------------------------------------------
59
 // --------------------------------------------------------------------------
60
 // Private Variables
60
 // Private Variables
61
 // --------------------------------------------------------------------------
61
 // --------------------------------------------------------------------------
62
-static bool eeprom_initialised = false;
62
+static bool eeprom_initialized = false;
63
 // --------------------------------------------------------------------------
63
 // --------------------------------------------------------------------------
64
 // Function prototypes
64
 // Function prototypes
65
 // --------------------------------------------------------------------------
65
 // --------------------------------------------------------------------------
82
 
82
 
83
 
83
 
84
 void eeprom_init() {
84
 void eeprom_init() {
85
-  if (!eeprom_initialised) {
85
+  if (!eeprom_initialized) {
86
     HAL_FLASH_Unlock();
86
     HAL_FLASH_Unlock();
87
 
87
 
88
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR |FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR);
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
     /* EEPROM Init */
90
     /* EEPROM Init */
91
-    if (EE_Initialise() != EE_OK)
91
+    if (EE_Initialize() != EE_OK)
92
       for (;;) HAL_Delay(1); // Spin forever until watchdog reset
92
       for (;;) HAL_Delay(1); // Spin forever until watchdog reset
93
 
93
 
94
     HAL_FLASH_Lock();
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 Переглянути файл

69
 // Public functions
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
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
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
     constexpr uint32_t step_prescaler = STEPPER_TIMER_PRESCALE - 1,
77
     constexpr uint32_t step_prescaler = STEPPER_TIMER_PRESCALE - 1,
78
                        temp_prescaler = TEMP_TIMER_PRESCALE - 1;
78
                        temp_prescaler = TEMP_TIMER_PRESCALE - 1;
79
     switch (timer_num) {
79
     switch (timer_num) {
111
         HAL_NVIC_SetPriority(TEMP_TIMER_IRQ_ID, 2, 0);
111
         HAL_NVIC_SetPriority(TEMP_TIMER_IRQ_ID, 2, 0);
112
         break;
112
         break;
113
     }
113
     }
114
-    timers_initialised[timer_num] = true;
114
+    timers_initialized[timer_num] = true;
115
   }
115
   }
116
 
116
 
117
   #ifdef STM32GENERIC
117
   #ifdef STM32GENERIC

+ 1
- 1
Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.cpp Переглянути файл

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

+ 1
- 1
Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.h Переглянути файл

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

+ 4
- 4
Marlin/src/HAL/HAL_STM32F7/EmulatedEeprom.cpp Переглянути файл

57
 // --------------------------------------------------------------------------
57
 // --------------------------------------------------------------------------
58
 // Private Variables
58
 // Private Variables
59
 // --------------------------------------------------------------------------
59
 // --------------------------------------------------------------------------
60
-static bool eeprom_initialised = false;
60
+static bool eeprom_initialized = false;
61
 // --------------------------------------------------------------------------
61
 // --------------------------------------------------------------------------
62
 // Function prototypes
62
 // Function prototypes
63
 // --------------------------------------------------------------------------
63
 // --------------------------------------------------------------------------
80
 
80
 
81
 
81
 
82
 void eeprom_init() {
82
 void eeprom_init() {
83
-  if (!eeprom_initialised) {
83
+  if (!eeprom_initialized) {
84
     HAL_FLASH_Unlock();
84
     HAL_FLASH_Unlock();
85
 
85
 
86
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR |FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR);
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
     /* EEPROM Init */
88
     /* EEPROM Init */
89
-    if (EE_Initialise() != EE_OK)
89
+    if (EE_Initialize() != EE_OK)
90
       for (;;) HAL_Delay(1); // Spin forever until watchdog reset
90
       for (;;) HAL_Delay(1); // Spin forever until watchdog reset
91
 
91
 
92
     HAL_FLASH_Lock();
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 Переглянути файл

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
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
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
     switch (timer_num) {
77
     switch (timer_num) {
78
       case STEP_TIMER_NUM:
78
       case STEP_TIMER_NUM:
79
       //STEPPER TIMER TIM5 //use a 32bit timer
79
       //STEPPER TIMER TIM5 //use a 32bit timer
100
       HAL_NVIC_SetPriority(timerConfig[1].IRQ_Id, 2, 0);
100
       HAL_NVIC_SetPriority(timerConfig[1].IRQ_Id, 2, 0);
101
       break;
101
       break;
102
     }
102
     }
103
-    timers_initialised[timer_num] = true;
103
+    timers_initialized[timer_num] = true;
104
   }
104
   }
105
 
105
 
106
   timerConfig[timer_num].timerdef.Init.Period = (((HAL_TIMER_RATE) / timerConfig[timer_num].timerdef.Init.Prescaler) / frequency) - 1;
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 Переглянути файл

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

+ 1
- 1
Marlin/src/HAL/shared/HAL_SPI.h Переглянути файл

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

+ 3
- 3
Marlin/src/HAL/shared/I2cEeprom.cpp Переглянути файл

75
 static uint8_t eeprom_device_address = 0x50;
75
 static uint8_t eeprom_device_address = 0x50;
76
 
76
 
77
 static void eeprom_init(void) {
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
     Wire.begin();
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 Переглянути файл

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

+ 1
- 1
Marlin/src/HAL/shared/backtrace/unwinder.cpp Переглянути файл

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

+ 4
- 4
Marlin/src/feature/I2CPositionEncoder.cpp Переглянути файл

45
   encoderAxis = axis;
45
   encoderAxis = axis;
46
   i2cAddress = address;
46
   i2cAddress = address;
47
 
47
 
48
-  initialised++;
48
+  initialized++;
49
 
49
 
50
   SERIAL_ECHOPAIR("Setting up encoder on ", axis_codes[encoderAxis]);
50
   SERIAL_ECHOPAIR("Setting up encoder on ", axis_codes[encoderAxis]);
51
   SERIAL_ECHOLNPAIR(" axis, addr = ", address);
51
   SERIAL_ECHOLNPAIR(" axis, addr = ", address);
54
 }
54
 }
55
 
55
 
56
 void I2CPositionEncoder::update() {
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
   position = get_position();
59
   position = get_position();
60
 
60
 
98
         SERIAL_ECHOLNPGM(" axis has been fault-free for set duration, reinstating error correction.");
98
         SERIAL_ECHOLNPGM(" axis has been fault-free for set duration, reinstating error correction.");
99
 
99
 
100
         //the encoder likely lost its place when the error occured, so we'll reset and use the printer's
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
         const float pos = planner.get_axis_position_mm(encoderAxis);
102
         const float pos = planner.get_axis_position_mm(encoderAxis);
103
         int32_t positionInTicks = pos * get_ticks_unit();
103
         int32_t positionInTicks = pos * get_ticks_unit();
104
 
104
 
712
   SERIAL_ECHOLNPGM("Address change successful!");
712
   SERIAL_ECHOLNPGM("Address change successful!");
713
 
713
 
714
   // Now, if this module is configured, find which encoder instance it's supposed to correspond to
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
   const int8_t idx = idx_from_addr(newaddr);
716
   const int8_t idx = idx_from_addr(newaddr);
717
   if (idx >= 0 && !encoders[idx].get_active()) {
717
   if (idx >= 0 && !encoders[idx].get_active()) {
718
     SERIAL_ECHO(axis_codes[encoders[idx].get_axis()]);
718
     SERIAL_ECHO(axis_codes[encoders[idx].get_axis()]);

+ 1
- 1
Marlin/src/feature/I2CPositionEncoder.h Переглянути файл

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

+ 1
- 1
frameworks/CMSIS/LPC1768/include/core_cm3.h Переглянути файл

1120
 
1120
 
1121
 /** \brief  System Tick Configuration
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
     Counter is in free running mode to generate periodical interrupts.
1124
     Counter is in free running mode to generate periodical interrupts.
1125
 
1125
 
1126
     \param [in]  ticks  Number of ticks between two interrupts
1126
     \param [in]  ticks  Number of ticks between two interrupts

+ 1
- 1
frameworks/CMSIS/LPC1768/lib/usb/cdcuser.cpp Переглянути файл

71
 /* end Buffer handling */
71
 /* end Buffer handling */
72
 
72
 
73
 /*----------------------------------------------------------------------------
73
 /*----------------------------------------------------------------------------
74
- CDC Initialisation
74
+ CDC Initialization
75
  Initializes the data structures and serial port
75
  Initializes the data structures and serial port
76
  Parameters:   None
76
  Parameters:   None
77
  Return Value: None
77
  Return Value: None

Завантаження…
Відмінити
Зберегти