Skip to content

Commit 220470c

Browse files
author
Arto Kinnunen
committed
Merge commit '99c2f61463ded19baa49346f6210f9eb3e62161f'
* commit '99c2f61463ded19baa49346f6210f9eb3e62161f': Squashed 'features/nanostack/sal-stack-nanostack-eventloop/' changes from 778c4db..b8b664b
2 parents 5f38878 + 99c2f61 commit 220470c

File tree

3 files changed

+2
-82
lines changed

3 files changed

+2
-82
lines changed
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
*.a
22
output/*
33
build
4-
yotta_modules
5-
yotta_targets
64
*.lib

features/nanostack/sal-stack-nanostack-eventloop/nanostack-event-loop/platform/eventloop_config.h

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#define EVENTLOOP_CONFIG_H_
1818

1919
/*
20-
* Options can be picked up from mbed-cli JSON configuration, or from
21-
* Yotta JSON configuration, or from a user configuration file - see below.
20+
* Options can be picked up from mbed-cli JSON configuration or from
21+
* a user configuration file - see below.
2222
*
2323
* Undefine all internal flags before evaluating the configuration.
2424
*/
@@ -39,13 +39,6 @@
3939
#define NS_EXCLUDE_HIGHRES_TIMER 1
4040
#endif
4141

42-
/*
43-
* For mbedOS 3 and minar use platform tick timer by default, highres timers should come from eventloop adaptor
44-
*/
45-
#ifdef YOTTA_CFG_MINAR
46-
#define NS_EVENTLOOP_USE_TICK_TIMER 1
47-
#endif
48-
4942
/*
5043
* Include the user config file if defined
5144
*/

features/nanostack/sal-stack-nanostack-eventloop/source/minar_hal_timer.cpp

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)