arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-09 03:41:41 +03:00
Code

replease digitalPinToPort, digitalPinToBitMask, portOutputRegister, portInputRegister, portModeRegister by macros

Browse Source
This commit is contained in:
Markus Sattler 2015-05-02 15:54:45 +02:00
parent 7e6ee374a8
commit 851f07cdf5
2 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cores/esp8266/Arduino.h
View File

@ -180,12 +180,11 @@ void loop(void);
// Get the bit location within the hardware port of the given virtual pin. // 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. // This comes from the pins_*.c file for the active board configuration.
#define digitalPinToPort(pin) (0)
uint32_t digitalPinToPort(uint32_t pin); #define digitalPinToBitMask(pin) (1UL << (pin))
uint32_t digitalPinToBitMask(uint32_t pin); #define portOutputRegister(port) ((volatile uint32_t*) GPO)
volatile uint32_t* portOutputRegister(uint32_t port); #define portInputRegister(port) ((volatile uint32_t*) GPI)
volatile uint32_t* portInputRegister(uint32_t port); #define portModeRegister(port) ((volatile uint32_t*) GPE)
volatile uint32_t* portModeRegister(uint32_t port);
#define NOT_A_PIN -1 #define NOT_A_PIN -1
#define NOT_A_PORT -1 #define NOT_A_PORT -1

20
cores/esp8266/core_esp8266_wiring_digital.c
View File

@ -25,26 +25,6 @@
#include "eagle_soc.h" #include "eagle_soc.h"
#include "ets_sys.h" #include "ets_sys.h"
uint32_t digitalPinToPort(uint32_t pin) {
return 0;
}
uint32_t digitalPinToBitMask(uint32_t pin) {
return 1 << pin;
}
volatile uint32_t* portOutputRegister(uint32_t port) {
return (volatile uint32_t*)GPO;
}
volatile uint32_t* portInputRegister(uint32_t port) {
return (volatile uint32_t*)GPI;
}
volatile uint32_t* portModeRegister(uint32_t port) {
return (volatile uint32_t*)GPE;
}
extern void __pinMode(uint8_t pin, uint8_t mode) { extern void __pinMode(uint8_t pin, uint8_t mode) {
if(pin < 16){ if(pin < 16){
if(mode == SPECIAL){ if(mode == SPECIAL){