Skip to content

Provide digitalPinToPort and related functions #197

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.

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

Merged
merged 3 commits into from
Nov 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased]
### Added
- Add `__AVR__` to defines when compiling
- Add support for `diditalPinToPort()`, `digitalPinToBitMask()`, and `portOutputRegister()`

### Changed
- Move repository from https://github.com/ianfixes/arduino_ci to https://github.com/Arduino-CI/arduino_ci
Expand Down
26 changes: 26 additions & 0 deletions SampleProjects/TestSomething/test/outputRegister.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#include <ArduinoUnitTests.h>
#include <Arduino.h>

// added to fix https://github.com/Arduino-CI/arduino_ci/issues/193
// https://github.com/arduino-libraries/Ethernet/blob/master/src/utility/w5100.h#L337

#if defined(__AVR__)
unittest(portOutputRegister)
{
uint8_t ss_pin = 12;
uint8_t ss_port = digitalPinToPort(ss_pin);
assertEqual(12, ss_port);
uint8_t *ss_pin_reg = portOutputRegister(ss_port);
assertEqual(GODMODE()->pMmapPort(ss_port), ss_pin_reg);
uint8_t ss_pin_mask = digitalPinToBitMask(ss_pin);
assertEqual(1, ss_pin_mask);

assertEqual((int) 1, (int) *ss_pin_reg); // verify initial value
*(ss_pin_reg) &= ~ss_pin_mask; // set SS
assertEqual((int) 0, (int) *ss_pin_reg); // verify value
*(ss_pin_reg) |= ss_pin_mask; // clear SS
assertEqual((int) 1, (int) *ss_pin_reg); // verify value
}
#endif

unittest_main()
23 changes: 23 additions & 0 deletions cpp/arduino/Godmode.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ class GodmodeState {
uint8_t mode;
};

uint8_t mmapPorts[MOCK_PINS_COUNT];

static GodmodeState* instance;

public:
Expand Down Expand Up @@ -87,12 +89,19 @@ class GodmodeState {
spi.readDelayMicros = 0;
}

void resetMmapPorts() {
for (int i = 0; i < MOCK_PINS_COUNT; ++i) {
mmapPorts[i] = 1;
}
}

void reset() {
resetClock();
resetPins();
resetInterrupts();
resetPorts();
resetSPI();
resetMmapPorts();
seed = 1;
}

Expand All @@ -112,6 +121,9 @@ class GodmodeState {
return instance->micros;
}

uint8_t* pMmapPort(uint8_t port) { return &mmapPorts[port]; }
uint8_t mmapPortValue(uint8_t port) { return mmapPorts[port]; }

// C++ 11, declare as public for better compiler error messages
GodmodeState(GodmodeState const&) = delete;
void operator=(GodmodeState const&) = delete;
Expand Down Expand Up @@ -139,5 +151,16 @@ void detachInterrupt(uint8_t interrupt);
inline void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0) {}
inline void noTone(uint8_t _pin) {}

// These definitions allow the following to compile (see issue #193):
// https://github.com/arduino-libraries/Ethernet/blob/master/src/utility/w5100.h:341
// we allow one byte per port which "wastes" 224 bytes, but makes the code easier
#if defined(__AVR__)
#define digitalPinToBitMask(pin) (1)
#define digitalPinToPort(pin) (pin)
#define portOutputRegister(port) (GODMODE()->pMmapPort(port))
#else
// we don't (yet) support other boards
#endif


GodmodeState* GODMODE();