Skip to content

Commit 871f28e

Browse files
committed
'fixed' shiftin/shiftout but getting compiler complaints about two random() prototypes so commented one out
1 parent 5decd2c commit 871f28e

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

Diff for: cores/esp32/Arduino.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,10 @@ typedef bool boolean;
121121
typedef uint8_t byte;
122122
typedef unsigned int word;
123123

124+
// Shifty prototypes
125+
void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
126+
uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
127+
124128
#ifdef __cplusplus
125129
}
126130

@@ -155,8 +159,8 @@ typedef unsigned int word;
155159
#define _max(a,b) ((a)>(b)?(a):(b))
156160

157161
// WMath prototypes
158-
long random(long);
159162
long random(long, long);
163+
//long random(long);
160164
void randomSeed(unsigned long);
161165
long map(long, long, long, long, long);
162166

Diff for: cores/esp32/wiring_private.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,15 @@
2727

2828
#include <stdio.h>
2929
#include <stdarg.h>
30+
#include <inttypes.h>
31+
#include "esp32-hal.h"
3032

31-
#include "arducore.h"
33+
//#include "arducore.h"
34+
#include "Arduino.h"
3235

3336
#ifdef __cplusplus
3437
extern "C" {
38+
3539
#endif
3640

3741
typedef void (*voidFuncPtr)(void);

0 commit comments

Comments
 (0)