Skip to content

Commit 252dfbb

Browse files
authored
Merge pull request sipeed#11 from ReinForce-II/fix_millis_and_micros
fix millis and micros
2 parents 2a37154 + ab9a86f commit 252dfbb

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

cores/arduino/Common.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ int analogRead(pin_size_t pinNumber);
122122
void analogReference(AnalogReferenceMode mode);
123123
void analogWrite(pin_size_t pinNumber, int value);
124124

125-
unsigned long millis(void);
126-
unsigned long micros(void);
125+
uint64_t millis(void);
126+
uint64_t micros(void);
127127
void delay(unsigned long);
128128
void delayMicroseconds(unsigned int us);
129129
unsigned long pulseIn(pin_size_t pin, uint8_t state, unsigned long timeout);

cores/arduino/wiring.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#include "Arduino.h"
22
#include "gd32vf103.h"
33

4-
unsigned long millis(void){
5-
return (unsigned long)(get_timer_value() * (SystemCoreClock/4000.0));
4+
uint64_t millis(void){
5+
return (uint64_t)(get_timer_value() * (4000.F / SystemCoreClock));
66
}
77

8-
unsigned long micros(void){
9-
return (unsigned long)(get_timer_value() * (SystemCoreClock/4000000.0));
8+
uint64_t micros(void){
9+
return (uint64_t)(get_timer_value() * (4000000.F / SystemCoreClock));
1010
}
1111

1212
void delay(unsigned long dwMs){

0 commit comments

Comments
 (0)