For ESP8266 special port register type

prampec · May 7, 2017 · e057c68 · e057c68
1 parent 0eb6860
commit e057c68
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/src/BlinkTask.cpp b/src/BlinkTask.cpp
@@ -5,7 +5,7 @@
  *
  * Author: Balazs Kelemen
  * Contact: [email protected]
- * Copyright: 2012 Balazs Kelemen
+ * Copyright: 2017 Balazs Kelemen
  * Copying permission statement:
     This file is part of SoftTimer.
 
@@ -34,8 +34,8 @@ void BlinkTask::init(byte outPin, unsigned long onMs, unsigned long offMs, byte
   this->delayMs = delayMs;
 
   pinMode(outPin, OUTPUT);
-  _bitMask = digitalPinToBitMask(outPin);
-  _portRegister = portOutputRegister(digitalPinToPort(outPin));
+  this->_bitMask = digitalPinToBitMask(outPin);
+  this->_portRegister = portOutputRegister(digitalPinToPort(outPin));
 
   this->onLevel = HIGH;
 }

diff --git a/src/BlinkTask.h b/src/BlinkTask.h
@@ -5,7 +5,7 @@
  *
  * Author: Balazs Kelemen
  * Contact: [email protected]
- * Copyright: 2012 Balazs Kelemen
+ * Copyright: 2017 Balazs Kelemen
  * Copying permission statement:
     This file is part of SoftTimer.
 
@@ -113,7 +113,11 @@ class BlinkTask : public Task
     byte _state;
 
     uint8_t _bitMask;
+#ifndef ESP8266
     volatile uint8_t *_portRegister;
+#else
+    volatile uint32_t *_portRegister;
+#endif
 };
 
 #endif
diff --git a/src/FrequencyTask.h b/src/FrequencyTask.h
@@ -5,7 +5,7 @@
  *
  * Author: Balazs Kelemen
  * Contact: [email protected]
- * Copyright: 2012 Balazs Kelemen
+ * Copyright: 2017 Balazs Kelemen
  * Copying permission statement:
     This file is part of SoftTimer.
 
@@ -50,7 +50,11 @@ class FrequencyTask : public Task
   private:
     boolean _stateOn;
     uint8_t _bitMask;
+#ifndef ESP8266
     volatile uint8_t *_portRegister;
+#else
+    volatile uint32_t *_portRegister;
+#endif
     static void step(Task* me);
 };
 

diff --git a/src/SoftPwmTask.h b/src/SoftPwmTask.h
@@ -5,7 +5,7 @@
  *
  * Author: Balazs Kelemen
  * Contact: [email protected]
- * Copyright: 2012 Balazs Kelemen
+ * Copyright: 2017 Balazs Kelemen
  * Copying permission statement:
     This file is part of SoftTimer.
 
@@ -62,7 +62,11 @@ class SoftPwmTask : public Task
     static void step(Task* me);
 
     uint8_t _bitMask;
+#ifndef ESP8266
     volatile uint8_t *_portRegister;
+#else
+    volatile uint32_t *_portRegister;
+#endif
 };
 
 #endif