Skip to content

Commit 1cf196d

Browse files
committed
Updated esp8266 platform files
1 parent 6f5b8e2 commit 1cf196d

7 files changed

+29
-338
lines changed

AslFastPin/src/utility/avr/fastpin_platform_avr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ _DEFPIN_AVR(28, 64, B); _DEFPIN_AVR(29, 64, D); _DEFPIN_AVR(30, 32, D);
323323

324324
#endif
325325

326-
#endif // FASTLED_FORCE_SOFTWARE_PINS
326+
#endif // FASTPIN_FORCE_SOFTWARE_PINS
327327

328328
FASTPIN_NAMESPACE_END
329329

AslFastPin/src/utility/esp/8266/clockless_block_esp8266.h

Lines changed: 0 additions & 167 deletions
This file was deleted.

AslFastPin/src/utility/esp/8266/clockless_esp8266.h

Lines changed: 0 additions & 117 deletions
This file was deleted.

AslFastPin/src/utility/esp/8266/fastled_esp8266.h

Lines changed: 0 additions & 7 deletions
This file was deleted.

AslFastPin/src/utility/esp/8266/fastpin_esp8266.h renamed to AslFastPin/src/utility/esp/8266/fastpin_platform_esp8266.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#pragma once
22

3-
FASTLED_NAMESPACE_BEGIN
3+
FASTPIN_NAMESPACE_BEGIN
44

5-
struct FASTLED_ESP_IO {
5+
struct FASTPIN_ESP_IO {
66
volatile uint32_t _GPO;
77
volatile uint32_t _GPOS;
88
volatile uint32_t _GPOC;
99
};
1010

11-
#define _GPB (*(FASTLED_ESP_IO*)(0x60000000+(0x300)))
11+
#define _GPB (*(FASTPIN_ESP_IO*)(0x60000000+(0x300)))
1212

1313

1414
template<uint8_t PIN, uint32_t MASK> class _ESPPIN {
@@ -45,7 +45,7 @@ template<uint8_t PIN, uint32_t MASK> class _ESPPIN {
4545
#define _DEFPIN_ESP8266(PIN, REAL_PIN) template<> class FastPin<PIN> : public _ESPPIN<REAL_PIN, (1<<(REAL_PIN & 0xFF))> {};
4646

4747

48-
#ifdef FASTLED_ESP8266_RAW_PIN_ORDER
48+
#ifdef FASTPIN_ESP8266_RAW_PIN_ORDER
4949
#define MAX_PIN 16
5050
_DEFPIN_ESP8266(0,0); _DEFPIN_ESP8266(1,1); _DEFPIN_ESP8266(2,2); _DEFPIN_ESP8266(3,3);
5151
_DEFPIN_ESP8266(4,4); _DEFPIN_ESP8266(5,5);
@@ -58,7 +58,7 @@ _DEFPIN_ESP8266(12,12); _DEFPIN_ESP8266(13,13); _DEFPIN_ESP8266(14,14); _DEFPIN_
5858
_DEFPIN_ESP8266(16,16);
5959

6060
#define PORTA_FIRST_PIN 12
61-
#elif defined(FASTLED_ESP8266_D1_PIN_ORDER)
61+
#elif defined(FASTPIN_ESP8266_D1_PIN_ORDER)
6262
#define MAX_PIN 15
6363
_DEFPIN_ESP8266(0,3);
6464
_DEFPIN_ESP8266(1,1);
@@ -79,7 +79,7 @@ _DEFPIN_ESP8266(15,5);
7979

8080
#define PORTA_FIRST_PIN 12
8181

82-
#else // if defined(FASTLED_ESP8266_NODEMCU_PIN_ORDER)
82+
#else // if defined(FASTPIN_ESP8266_NODEMCU_PIN_ORDER)
8383
#define MAX_PIN 10
8484

8585
// This seems to be the standard Dxx pin mapping on most of the esp boards that i've found
@@ -98,4 +98,4 @@ _DEFPIN_ESP8266(8,15); _DEFPIN_ESP8266(9,3); _DEFPIN_ESP8266(10,1);
9898

9999
#define HAS_HARDWARE_PIN_SUPPORT
100100

101-
#define FASTLED_NAMESPACE_END
101+
FASTPIN_NAMESPACE_END
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#pragma once
2+
3+
#ifndef ESP8266
4+
#define ESP8266
5+
#endif
6+
7+
#define FASTPIN_ESP8266
8+
9+
typedef volatile uint32_t RoReg;
10+
typedef volatile uint32_t RwReg;
11+
typedef uint32_t prog_uint32_t;
12+
typedef uint8_t boolean;
13+
14+
// These can be overridden
15+
#if !defined(FASTPIN_ESP8266_RAW_PIN_ORDER) && !defined(FASTPIN_ESP8266_NODEMCU_PIN_ORDER) && !defined(FASTPIN_ESP8266_D1_PIN_ORDER)
16+
# ifdef ARDUINO_ESP8266_NODEMCU
17+
# define FASTPIN_ESP8266_NODEMCU_PIN_ORDER
18+
# else
19+
# define FASTPIN_ESP8266_RAW_PIN_ORDER
20+
# endif
21+
#endif

0 commit comments

Comments
 (0)