Skip to content

Commit

Permalink
* New feature: Using RapidAssist 0.9.1
Browse files Browse the repository at this point in the history
  • Loading branch information
end2endzone committed Apr 5, 2021
1 parent a4210d3 commit 2cc8fc5
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Changes for 2.4.0:

* Fixed issue #38: Change api functions to match officials signatures of Arduino.h
* New feature: Using RapidAssist 0.9.1


Changes for 2.3.1:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ include_directories(${WIN32ARDUINO_INCLUDE_DIR} # public header files, for sou
# Dependencies
##############################################################################################################################################
find_package(GTest REQUIRED) #rapidassist requires GTest
find_package(rapidassist 0.5.0 REQUIRED)
find_package(rapidassist 0.9.1 REQUIRED)

##############################################################################################################################################
# Subprojects
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This section explains how to compile and build the software and how to get a dev
The following software must be installed on the system for compiling source code:

* [Google C++ Testing Framework v1.8.0](https://github.com/google/googletest/tree/release-1.8.0)
* [RapidAssist v0.5.0](https://github.com/end2endzone/RapidAssist/tree/0.5.0)
* [RapidAssist v0.9.1](https://github.com/end2endzone/RapidAssist/tree/0.9.1)
* [CMake](http://www.cmake.org/) v3.4.3 (or newer)


Expand Down
4 changes: 2 additions & 2 deletions ci/appveyor/install_rapidassist.bat
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ git clone "https://github.com/end2endzone/RapidAssist.git"
cd RapidAssist
echo.

echo Checking out version v0.5.0...
git checkout 0.5.0
echo Checking out version v0.9.1...
git checkout 0.9.1
echo.

echo ============================================================================
Expand Down
4 changes: 2 additions & 2 deletions ci/travis/install_rapidassist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ git clone "https://github.com/end2endzone/RapidAssist.git"
cd RapidAssist
echo

echo Checking out version v0.5.0...
git checkout 0.5.0
echo Checking out version v0.9.1...
git checkout 0.9.1
echo

echo ============================================================================
Expand Down
6 changes: 3 additions & 3 deletions src/win32arduino/RealtimeClockStrategy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include "RealtimeClockStrategy.h"

#include "rapidassist/time_.h"
#include "rapidassist/timing.h"

namespace testarduino
{
Expand All @@ -47,14 +47,14 @@ namespace testarduino

uint32_t RealtimeClockStrategy::millis()
{
double seconds = ra::time::getMillisecondsTimer();
double seconds = ra::timing::GetMillisecondsTimer();
uint32_t milliseconds = (uint32_t)seconds*1000;
return milliseconds;
}

uint32_t RealtimeClockStrategy::micros()
{
double seconds = ra::time::getMicrosecondsTimer();
double seconds = ra::timing::GetMicrosecondsTimer();
uint32_t microseconds = (uint32_t)seconds*1000*1000;
return microseconds;
}
Expand Down

0 comments on commit 2cc8fc5

Please sign in to comment.