Skip to content

Commit 80740b7

Browse files
committed
Convert pinMode, analogReference, analogReadResolution, & analogWriteResolution from macro to function
1 parent 6926ecb commit 80740b7

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

Diff for: CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
3434
- Now using the recommended "stable" URL for the `esp32` board family
3535
- `esp8266:huzzah` options updated as per upstream
3636
- Errors about `'_NOP' was not declared in this scope` (test added)
37+
- `pinMode()` and `analogReference()` are now functions (no longer macros), because that conflicted with actual function names in the wild
38+
- `analogReadResolution()` and `analogWriteResolution()` are also no longer macros
3739

3840
### Security
3941

Diff for: SampleProjects/TestSomething/test/godmode.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -283,10 +283,10 @@ unittest(shift_out) {
283283
}
284284

285285
unittest(no_ops) {
286-
pinMode();
287-
analogReference();
288-
analogReadResolution();
289-
analogWriteResolution();
286+
pinMode(1, INPUT);
287+
analogReference(3);
288+
analogReadResolution(4);
289+
analogWriteResolution(5);
290290
}
291291

292292
#ifdef HAVE_HWSERIAL0

Diff for: cpp/arduino/Godmode.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,15 @@ class GodmodeState {
160160
};
161161

162162
// io pins
163-
#define pinMode(...) _NOP()
164-
#define analogReference(...) _NOP()
163+
inline void pinMode(uint8_t pin, uint8_t mode) { _NOP(); }
164+
inline void analogReference(uint8_t mode) { _NOP(); }
165165

166166
void digitalWrite(uint8_t, uint8_t);
167167
int digitalRead(uint8_t);
168168
int analogRead(uint8_t);
169169
void analogWrite(uint8_t, int);
170-
#define analogReadResolution(...) _NOP()
171-
#define analogWriteResolution(...) _NOP()
170+
inline void analogReadResolution(uint8_t bits) { _NOP(); }
171+
inline void analogWriteResolution(uint8_t bits) { _NOP(); }
172172
void attachInterrupt(uint8_t interrupt, void ISR(void), uint8_t mode);
173173
void detachInterrupt(uint8_t interrupt);
174174

0 commit comments

Comments
 (0)