Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit445594a

Browse files
committed
Fix some cross-stuff
1 parent4986a66 commit445594a

File tree

2 files changed

+14
-19
lines changed

2 files changed

+14
-19
lines changed

‎api/Common.h‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@ extern "C"{
77
voidyield(void);
88

99
typedefenum {
10-
LOW=0x0,
11-
HIGH=0x1,
10+
LOW=0,
11+
HIGH=1,
12+
CHANGE=2,
13+
FALLING=3,
14+
RISING=4,
1215
}PinStatus;
1316

14-
typedefenum {
15-
IRQ_LOW=0,
16-
IRQ_HIGH=1,
17-
CHANGE=2,
18-
FALLING=3,
19-
RISING=4,
20-
}InterruptMode;
21-
2217
typedefenum {
2318
INPUT=0x0,
2419
OUTPUT=0x1,
2520
INPUT_PULLUP=0x2,
2621
INPUT_PULLDOWN=0x3,
2722
}PinMode;
2823

24+
typedefenum {
25+
LSBFIRST=0,
26+
MSBFIRST=1,
27+
}BitMode;
28+
2929
#definePI 3.1415926535897932384626433832795
3030
#defineHALF_PI 1.5707963267948966192313216916398
3131
#defineTWO_PI 6.283185307179586476925286766559
@@ -36,11 +36,6 @@ typedef enum {
3636
#defineSERIAL 0x0
3737
#defineDISPLAY 0x1
3838

39-
typedefenum {
40-
LSBFIRST=0,
41-
MSBFIRST=1,
42-
}BitMode;
43-
4439
#ifndefmin
4540
#definemin(a,b) \
4641
({ __typeof__ (a) _a = (a); \
@@ -119,10 +114,10 @@ void delayMicroseconds(unsigned int us);
119114
unsigned longpulseIn(pin_size_tpin,uint8_tstate,unsigned longtimeout);
120115
unsigned longpulseInLong(pin_size_tpin,uint8_tstate,unsigned longtimeout);
121116

122-
voidshiftOut(pin_size_tdataPin,pin_size_tclockPin,uint8_tbitOrder,uint8_tval);
123-
pin_size_tshiftIn(pin_size_tdataPin,pin_size_tclockPin,uint8_tbitOrder);
117+
voidshiftOut(pin_size_tdataPin,pin_size_tclockPin,BitModebitOrder,uint8_tval);
118+
pin_size_tshiftIn(pin_size_tdataPin,pin_size_tclockPin,BitModebitOrder);
124119

125-
voidattachInterrupt(pin_size_tinterruptNumber,voidFuncPtrcallback,InterruptModemode);
120+
voidattachInterrupt(pin_size_tinterruptNumber,voidFuncPtrcallback,PinStatusmode);
126121
voiddetachInterrupt(pin_size_tinterruptNumber);
127122

128123
voidsetup(void);

‎api/Stream.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
findMulti/findUntil routines written by Jim Leonard/Xuth
2323
*/
2424

25-
#include"Arduino.h"
25+
#include"Common.h"
2626
#include"Stream.h"
2727

2828
#definePARSE_TIMEOUT1000// default number of milli-seconds to wait

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp