Skip to content

fix millis and micros #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bitsk merged 1 commit into from
Sep 27, 2019
Merged

fix millis and micros #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cores/arduino/Common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ int analogRead(pin_size_t pinNumber);
void analogReference(AnalogReferenceMode mode);
void analogWrite(pin_size_t pinNumber, int value);

unsigned long millis(void);
unsigned long micros(void);
uint64_t millis(void);
uint64_t micros(void);
void delay(unsigned long);
void delayMicroseconds(unsigned int us);
unsigned long pulseIn(pin_size_t pin, uint8_t state, unsigned long timeout);
Expand Down
8 changes: 4 additions & 4 deletions cores/arduino/wiring.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#include "Arduino.h"
#include "gd32vf103.h"

unsigned long millis(void){
return (unsigned long)(get_timer_value() * (SystemCoreClock/4000.0));
uint64_t millis(void){
return (uint64_t)(get_timer_value() * (4000.F / SystemCoreClock));
}

unsigned long micros(void){
return (unsigned long)(get_timer_value() * (SystemCoreClock/4000000.0));
uint64_t micros(void){
return (uint64_t)(get_timer_value() * (4000000.F / SystemCoreClock));
}

void delay(unsigned long dwMs){
Expand Down