Skip to content

Merging Arduino/Arduino upstream commits. #4209

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

Closed
wants to merge 4 commits into from
Closed

Merging Arduino/Arduino upstream commits. #4209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a2a1a47
freeRTOS shim integrated with setup() & loop(), Watchdog for scheduling.
feilipu Nov 23, 2015
df00dcb
Delete erroneous hooks.c
feilipu Nov 23, 2015
0620c41
Fixed some comment typos in wiring.c
feilipu Nov 24, 2015
fa47a64
Merge branch 'master' of https://github.com/feilipu/Arduino.git
feilipu Nov 24, 2015
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
17 changes: 14 additions & 3 deletions hardware/arduino/avr/cores/arduino/Arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,21 @@
#include <string.h>
#include <math.h>

#include <avr/pgmspace.h>
#include <avr/io.h>
#include <avr/pgmspace.h>
#include <avr/interrupt.h>

/* FreeRTOS includes. */
#include "freeRTOS/FreeRTOS.h"
#include "freeRTOS/task.h"
#include "freeRTOS/timers.h"
#include "freeRTOS/StackMacros.h"

#include "freeRTOS/croutine.h"
#include "freeRTOS/queue.h"
#include "freeRTOS/semphr.h"
#include "freeRTOS/event_groups.h"

#include "binary.h"

#ifdef __cplusplus
Expand Down Expand Up @@ -142,8 +153,8 @@ uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
void attachInterrupt(uint8_t, void (*)(void), int mode);
void detachInterrupt(uint8_t);

void setup(void);
void loop(void);
extern void setup(void);
extern void loop(void);

// Get the bit location within the hardware port of the given virtual pin.
// This comes from the pins_*.c file for the active board configuration.
Expand Down
Loading