mirror of
https://github.com/eclipse/upm.git
synced 2025-07-01 01:11:10 +03:00
ANDROID: Treat utilities as its own library
Since src/utilities now builds a C/C++ library, other targets which were using symbols from utilities now need to include the correct target dependency. This is mainly for upm_delay* functions. Added utilities-c target to all sensor library CMakeLists.txt which require it. Moved macro for __FILENAME__ from upm_utilities.h to upm_fti.h since ONLY the FTI headers used this. Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
@ -26,6 +26,7 @@
|
||||
#include <iostream>
|
||||
#include <signal.h>
|
||||
#include "buzzer.hpp"
|
||||
#include "upm_utilities.h"
|
||||
|
||||
|
||||
int
|
||||
|
@ -23,6 +23,7 @@
|
||||
*/
|
||||
|
||||
#include "lcm1602.hpp"
|
||||
#include "upm_utilities.h"
|
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
@ -32,16 +33,16 @@ main(int argc, char **argv)
|
||||
lcd->setCursor(0,0);
|
||||
lcd->write("Hello World");
|
||||
//! [Interesting]
|
||||
sleep(3);
|
||||
upm_delay(3);
|
||||
lcd->setCursor(1,2);
|
||||
lcd->write("Hello World");
|
||||
sleep(3);
|
||||
upm_delay(3);
|
||||
lcd->setCursor(2,4);
|
||||
lcd->write("Hello World");
|
||||
sleep(3);
|
||||
upm_delay(3);
|
||||
lcd->setCursor(3,6);
|
||||
lcd->write("Hello World");
|
||||
sleep(3);
|
||||
upm_delay(3);
|
||||
delete lcd;
|
||||
|
||||
return 0;
|
||||
|
@ -23,7 +23,8 @@
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <lcm1602.hpp>
|
||||
#include "lcm1602.hpp"
|
||||
#include "upm_utilities.h"
|
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
@ -47,7 +48,7 @@ main(int argc, char **argv)
|
||||
lcd->write("Hello World");
|
||||
|
||||
printf("Sleeping for 5 seconds\n");
|
||||
sleep(5);
|
||||
upm_delay(5);
|
||||
delete lcd;
|
||||
//! [Interesting]
|
||||
return 0;
|
||||
|
@ -27,6 +27,7 @@
|
||||
#include <signal.h>
|
||||
|
||||
#include "max30100.hpp"
|
||||
#include "upm_utilities.h"
|
||||
|
||||
using namespace upm;
|
||||
|
||||
|
Reference in New Issue
Block a user