Skip to content

Commit 91a87f4

Browse files
committed
πŸ§‘β€πŸ’» Some millis() 'unsigned long'
1 parent 363f324 commit 91a87f4

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

β€ŽMarlin/src/HAL/LINUX/arduino.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ void sei() { } // Enable
3333
// Time functions
3434
void _delay_ms(const int ms) { delay(ms); }
3535

36-
uint32_t millis() {
37-
return (uint32_t)Clock::millis();
36+
unsigned long millis() {
37+
return (unsigned long)Clock::millis();
3838
}
3939

4040
// This is required for some Arduino libraries we are using

β€ŽMarlin/src/HAL/LINUX/include/Arduino.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ extern "C" {
7676
extern "C" void delay(const int ms);
7777
void _delay_ms(const int ms);
7878
void delayMicroseconds(unsigned long);
79-
uint32_t millis();
79+
unsigned long millis();
8080

81-
//IO functions
81+
// IO functions
8282
void pinMode(const pin_t, const uint8_t);
8383
void digitalWrite(pin_t, uint8_t);
8484
bool digitalRead(pin_t);

β€ŽMarlin/src/HAL/LPC1768/u8g/LCD_I2C_routines.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "../include/i2c_util.h"
2929
#include "../../../core/millis_t.h"
3030

31-
extern int millis();
31+
uint32_t millis();
3232

3333
#ifdef __cplusplus
3434
extern "C" {

β€ŽMarlin/src/HAL/STM32F1/sdio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ bool SDIO_ReadBlock(uint32_t blockAddress, uint8_t *data) {
145145
return false;
146146
}
147147

148-
uint32_t millis();
148+
unsigned long millis();
149149

150150
bool SDIO_WriteBlock(uint32_t blockAddress, const uint8_t *data) {
151151
if (SDIO_GetCardState() != SDIO_CARD_TRANSFER) return false;

0 commit comments

Comments
Β (0)