sns: ICACHE_RAM_ATTR -> IRAM_ATTR

3.0.0 now uses macro from esp-idf
avoid deprecation warnings for the source here
(still shows it with the libs though, when building without -w)

code/espurna/libs/Encoder.h

@@ -97,7 +97,7 @@ namespace EncoderLibrary {
 
     // update() is not meant to be called from outside Encoder,
     // but it is public to allow static interrupt routines.
-    void ICACHE_RAM_ATTR update(encoder_values_t *target) {
+    void IRAM_ATTR update(encoder_values_t *target) {
         uint8_t p1val = GPIP(target->pin1);
         uint8_t p2val = GPIP(target->pin2);
         uint8_t state = target->state & 3;
@@ -121,11 +121,11 @@ namespace EncoderLibrary {
     }
 
     // 2 pins per encoder, 1 isr per encoder
-    void ICACHE_RAM_ATTR isr0() { update(EncoderValues[0]); }
-    void ICACHE_RAM_ATTR isr1() { update(EncoderValues[1]); }
-    void ICACHE_RAM_ATTR isr2() { update(EncoderValues[2]); }
-    void ICACHE_RAM_ATTR isr3() { update(EncoderValues[3]); }
-    void ICACHE_RAM_ATTR isr4() { update(EncoderValues[4]); }
+    void IRAM_ATTR isr0() { update(EncoderValues[0]); }
+    void IRAM_ATTR isr1() { update(EncoderValues[1]); }
+    void IRAM_ATTR isr2() { update(EncoderValues[2]); }
+    void IRAM_ATTR isr3() { update(EncoderValues[3]); }
+    void IRAM_ATTR isr4() { update(EncoderValues[4]); }
 
     constexpr void (*_isr_funcs[5])() = {
         isr0, isr1, isr2, isr3, isr4

code/espurna/pwm.c

@@ -111,7 +111,7 @@ struct timer_regs {
 };
 static struct timer_regs* timer = (struct timer_regs*)(0x60000600);
 
-static void ICACHE_RAM_ATTR
+static void IRAM_ATTR
 pwm_intr_handler(void)
 {
 	if ((pwm_state.current_set[pwm_state.current_phase].off_mask == 0) &&

code/espurna/sensors/ECH1560Sensor.h

@@ -119,7 +119,7 @@ class ECH1560Sensor : public BaseEmonSensor {
             return 0;
         }
 
-        void ICACHE_RAM_ATTR handleInterrupt(unsigned char) {
+        void IRAM_ATTR handleInterrupt(unsigned char) {
             // if we are trying to find the sync-time (CLK goes high for 1-2ms)
             if (_dosync == false) {
 
@@ -305,23 +305,23 @@ class ECH1560Sensor : public BaseEmonSensor {
 
 ECH1560Sensor * _ech1560_sensor_instance[10] = {NULL};
 
-void ICACHE_RAM_ATTR _ech1560_sensor_isr(unsigned char gpio) {
+void IRAM_ATTR _ech1560_sensor_isr(unsigned char gpio) {
     unsigned char index = gpio > 5 ? gpio-6 : gpio;
     if (_ech1560_sensor_instance[index]) {
         _ech1560_sensor_instance[index]->handleInterrupt(gpio);
     }
 }
 
-void ICACHE_RAM_ATTR _ech1560_sensor_isr_0() { _ech1560_sensor_isr(0); }
-void ICACHE_RAM_ATTR _ech1560_sensor_isr_1() { _ech1560_sensor_isr(1); }
-void ICACHE_RAM_ATTR _ech1560_sensor_isr_2() { _ech1560_sensor_isr(2); }
-void ICACHE_RAM_ATTR _ech1560_sensor_isr_3() { _ech1560_sensor_isr(3); }
-void ICACHE_RAM_ATTR _ech1560_sensor_isr_4() { _ech1560_sensor_isr(4); }
-void ICACHE_RAM_ATTR _ech1560_sensor_isr_5() { _ech1560_sensor_isr(5); }
-void ICACHE_RAM_ATTR _ech1560_sensor_isr_12() { _ech1560_sensor_isr(12); }
-void ICACHE_RAM_ATTR _ech1560_sensor_isr_13() { _ech1560_sensor_isr(13); }
-void ICACHE_RAM_ATTR _ech1560_sensor_isr_14() { _ech1560_sensor_isr(14); }
-void ICACHE_RAM_ATTR _ech1560_sensor_isr_15() { _ech1560_sensor_isr(15); }
+void IRAM_ATTR _ech1560_sensor_isr_0() { _ech1560_sensor_isr(0); }
+void IRAM_ATTR _ech1560_sensor_isr_1() { _ech1560_sensor_isr(1); }
+void IRAM_ATTR _ech1560_sensor_isr_2() { _ech1560_sensor_isr(2); }
+void IRAM_ATTR _ech1560_sensor_isr_3() { _ech1560_sensor_isr(3); }
+void IRAM_ATTR _ech1560_sensor_isr_4() { _ech1560_sensor_isr(4); }
+void IRAM_ATTR _ech1560_sensor_isr_5() { _ech1560_sensor_isr(5); }
+void IRAM_ATTR _ech1560_sensor_isr_12() { _ech1560_sensor_isr(12); }
+void IRAM_ATTR _ech1560_sensor_isr_13() { _ech1560_sensor_isr(13); }
+void IRAM_ATTR _ech1560_sensor_isr_14() { _ech1560_sensor_isr(14); }
+void IRAM_ATTR _ech1560_sensor_isr_15() { _ech1560_sensor_isr(15); }
 
 static void (*_ech1560_sensor_isr_list[10])() = {
     _ech1560_sensor_isr_0, _ech1560_sensor_isr_1, _ech1560_sensor_isr_2,

code/espurna/sensors/EventSensor.h

@@ -120,7 +120,7 @@ class EventSensor : public BaseSensor {
         // Handle interrupt calls from isr[GPIO] functions
         // Cannot be nested, since the esp8266/Arduino Core already masks all GPIO handlers before calling this function
 
-        void ICACHE_RAM_ATTR handleDebouncedInterrupt() {
+        void IRAM_ATTR handleDebouncedInterrupt() {
             // Debounce is based around ccount (32bit value), overflowing every:
             // ~53s when F_CPU is 80MHz
             // ~26s when F_CPU is 160MHz
@@ -138,7 +138,7 @@ class EventSensor : public BaseSensor {
             }
         }
 
-        void ICACHE_RAM_ATTR handleInterrupt() {
+        void IRAM_ATTR handleInterrupt() {
             ++_counter;
         }
 
@@ -184,7 +184,7 @@ class EventSensor : public BaseSensor {
 
 EventSensor * _event_sensor_instance[EVENTS_SENSORS_MAX] = {nullptr};
 
-void ICACHE_RAM_ATTR _event_sensor_isr(EventSensor* instance) {
+void IRAM_ATTR _event_sensor_isr(EventSensor* instance) {
     if (instance->getDebounceTime()) {
         instance->handleDebouncedInterrupt();
     } else {
@@ -192,16 +192,16 @@ void ICACHE_RAM_ATTR _event_sensor_isr(EventSensor* instance) {
     }
 }
 
-void ICACHE_RAM_ATTR _event_sensor_isr_0() { _event_sensor_isr(_event_sensor_instance[0]); }
-void ICACHE_RAM_ATTR _event_sensor_isr_1() { _event_sensor_isr(_event_sensor_instance[1]); }
-void ICACHE_RAM_ATTR _event_sensor_isr_2() { _event_sensor_isr(_event_sensor_instance[2]); }
-void ICACHE_RAM_ATTR _event_sensor_isr_3() { _event_sensor_isr(_event_sensor_instance[3]); }
-void ICACHE_RAM_ATTR _event_sensor_isr_4() { _event_sensor_isr(_event_sensor_instance[4]); }
-void ICACHE_RAM_ATTR _event_sensor_isr_5() { _event_sensor_isr(_event_sensor_instance[5]); }
-void ICACHE_RAM_ATTR _event_sensor_isr_12() { _event_sensor_isr(_event_sensor_instance[6]); }
-void ICACHE_RAM_ATTR _event_sensor_isr_13() { _event_sensor_isr(_event_sensor_instance[7]); }
-void ICACHE_RAM_ATTR _event_sensor_isr_14() { _event_sensor_isr(_event_sensor_instance[8]); }
-void ICACHE_RAM_ATTR _event_sensor_isr_15() { _event_sensor_isr(_event_sensor_instance[9]); }
+void IRAM_ATTR _event_sensor_isr_0() { _event_sensor_isr(_event_sensor_instance[0]); }
+void IRAM_ATTR _event_sensor_isr_1() { _event_sensor_isr(_event_sensor_instance[1]); }
+void IRAM_ATTR _event_sensor_isr_2() { _event_sensor_isr(_event_sensor_instance[2]); }
+void IRAM_ATTR _event_sensor_isr_3() { _event_sensor_isr(_event_sensor_instance[3]); }
+void IRAM_ATTR _event_sensor_isr_4() { _event_sensor_isr(_event_sensor_instance[4]); }
+void IRAM_ATTR _event_sensor_isr_5() { _event_sensor_isr(_event_sensor_instance[5]); }
+void IRAM_ATTR _event_sensor_isr_12() { _event_sensor_isr(_event_sensor_instance[6]); }
+void IRAM_ATTR _event_sensor_isr_13() { _event_sensor_isr(_event_sensor_instance[7]); }
+void IRAM_ATTR _event_sensor_isr_14() { _event_sensor_isr(_event_sensor_instance[8]); }
+void IRAM_ATTR _event_sensor_isr_15() { _event_sensor_isr(_event_sensor_instance[9]); }
 
 static void (*_event_sensor_isr_list[10])() = {
     _event_sensor_isr_0, _event_sensor_isr_1, _event_sensor_isr_2,

code/espurna/sensors/GeigerSensor.h

@@ -224,41 +224,41 @@ unsigned long _lastreport_sv = _lastreport_cpm;
 
 GeigerSensor * _geiger_sensor_instance[10] = {NULL};
 
-void ICACHE_RAM_ATTR _geiger_sensor_isr(unsigned char gpio) {
+void IRAM_ATTR _geiger_sensor_isr(unsigned char gpio) {
         unsigned char index = gpio > 5 ? gpio-6 : gpio;
         if (_geiger_sensor_instance[index]) {
                 _geiger_sensor_instance[index]->handleInterrupt(gpio);
         }
 }
 
-void ICACHE_RAM_ATTR _geiger_sensor_isr_0() {
+void IRAM_ATTR _geiger_sensor_isr_0() {
         _geiger_sensor_isr(0);
 }
-void ICACHE_RAM_ATTR _geiger_sensor_isr_1() {
+void IRAM_ATTR _geiger_sensor_isr_1() {
         _geiger_sensor_isr(1);
 }
-void ICACHE_RAM_ATTR _geiger_sensor_isr_2() {
+void IRAM_ATTR _geiger_sensor_isr_2() {
         _geiger_sensor_isr(2);
 }
-void ICACHE_RAM_ATTR _geiger_sensor_isr_3() {
+void IRAM_ATTR _geiger_sensor_isr_3() {
         _geiger_sensor_isr(3);
 }
-void ICACHE_RAM_ATTR _geiger_sensor_isr_4() {
+void IRAM_ATTR _geiger_sensor_isr_4() {
         _geiger_sensor_isr(4);
 }
-void ICACHE_RAM_ATTR _geiger_sensor_isr_5() {
+void IRAM_ATTR _geiger_sensor_isr_5() {
         _geiger_sensor_isr(5);
 }
-void ICACHE_RAM_ATTR _geiger_sensor_isr_12() {
+void IRAM_ATTR _geiger_sensor_isr_12() {
         _geiger_sensor_isr(12);
 }
-void ICACHE_RAM_ATTR _geiger_sensor_isr_13() {
+void IRAM_ATTR _geiger_sensor_isr_13() {
         _geiger_sensor_isr(13);
 }
-void ICACHE_RAM_ATTR _geiger_sensor_isr_14() {
+void IRAM_ATTR _geiger_sensor_isr_14() {
         _geiger_sensor_isr(14);
 }
-void ICACHE_RAM_ATTR _geiger_sensor_isr_15() {
+void IRAM_ATTR _geiger_sensor_isr_15() {
         _geiger_sensor_isr(15);
 }
 

code/espurna/sensors/HLW8012Sensor.h

@@ -283,7 +283,7 @@ class HLW8012Sensor : public BaseEmonSensor {
         #endif // HLW8012_USE_INTERRUPTS == 0
 
         // Handle interrupt calls
-        void ICACHE_RAM_ATTR handleInterrupt(unsigned char gpio) {
+        void IRAM_ATTR handleInterrupt(unsigned char gpio) {
             if (gpio == _cf) _hlw8012->cf_interrupt();
             if (gpio == _cf1) _hlw8012->cf1_interrupt();
         }
@@ -361,23 +361,23 @@ class HLW8012Sensor : public BaseEmonSensor {
 
 HLW8012Sensor * _hlw8012_sensor_instance[10] = {NULL};
 
-void ICACHE_RAM_ATTR _hlw8012_sensor_isr(unsigned char gpio) {
+void IRAM_ATTR _hlw8012_sensor_isr(unsigned char gpio) {
     unsigned char index = gpio > 5 ? gpio-6 : gpio;
     if (_hlw8012_sensor_instance[index]) {
         _hlw8012_sensor_instance[index]->handleInterrupt(gpio);
     }
 }
 
-void ICACHE_RAM_ATTR _hlw8012_sensor_isr_0() { _hlw8012_sensor_isr(0); }
-void ICACHE_RAM_ATTR _hlw8012_sensor_isr_1() { _hlw8012_sensor_isr(1); }
-void ICACHE_RAM_ATTR _hlw8012_sensor_isr_2() { _hlw8012_sensor_isr(2); }
-void ICACHE_RAM_ATTR _hlw8012_sensor_isr_3() { _hlw8012_sensor_isr(3); }
-void ICACHE_RAM_ATTR _hlw8012_sensor_isr_4() { _hlw8012_sensor_isr(4); }
-void ICACHE_RAM_ATTR _hlw8012_sensor_isr_5() { _hlw8012_sensor_isr(5); }
-void ICACHE_RAM_ATTR _hlw8012_sensor_isr_12() { _hlw8012_sensor_isr(12); }
-void ICACHE_RAM_ATTR _hlw8012_sensor_isr_13() { _hlw8012_sensor_isr(13); }
-void ICACHE_RAM_ATTR _hlw8012_sensor_isr_14() { _hlw8012_sensor_isr(14); }
-void ICACHE_RAM_ATTR _hlw8012_sensor_isr_15() { _hlw8012_sensor_isr(15); }
+void IRAM_ATTR _hlw8012_sensor_isr_0() { _hlw8012_sensor_isr(0); }
+void IRAM_ATTR _hlw8012_sensor_isr_1() { _hlw8012_sensor_isr(1); }
+void IRAM_ATTR _hlw8012_sensor_isr_2() { _hlw8012_sensor_isr(2); }
+void IRAM_ATTR _hlw8012_sensor_isr_3() { _hlw8012_sensor_isr(3); }
+void IRAM_ATTR _hlw8012_sensor_isr_4() { _hlw8012_sensor_isr(4); }
+void IRAM_ATTR _hlw8012_sensor_isr_5() { _hlw8012_sensor_isr(5); }
+void IRAM_ATTR _hlw8012_sensor_isr_12() { _hlw8012_sensor_isr(12); }
+void IRAM_ATTR _hlw8012_sensor_isr_13() { _hlw8012_sensor_isr(13); }
+void IRAM_ATTR _hlw8012_sensor_isr_14() { _hlw8012_sensor_isr(14); }
+void IRAM_ATTR _hlw8012_sensor_isr_15() { _hlw8012_sensor_isr(15); }
 
 static void (*_hlw8012_sensor_isr_list[10])() = {
     _hlw8012_sensor_isr_0, _hlw8012_sensor_isr_1, _hlw8012_sensor_isr_2,

code/espurna/sensors/PulseMeterSensor.h

@@ -116,7 +116,7 @@ class PulseMeterSensor : public BaseEmonSensor {
         }
 
         // Handle interrupt calls
-        void ICACHE_RAM_ATTR handleInterrupt(unsigned char gpio) {
+        void IRAM_ATTR handleInterrupt(unsigned char gpio) {
             static unsigned long last = 0;
 
             if (millis() - last > _debounce) {
@@ -176,23 +176,23 @@ class PulseMeterSensor : public BaseEmonSensor {
 
 PulseMeterSensor * _pulsemeter_sensor_instance[10] = {NULL};
 
-void ICACHE_RAM_ATTR _pulsemeter_sensor_isr(unsigned char gpio) {
+void IRAM_ATTR _pulsemeter_sensor_isr(unsigned char gpio) {
     unsigned char index = gpio > 5 ? gpio-6 : gpio;
     if (_pulsemeter_sensor_instance[index]) {
         _pulsemeter_sensor_instance[index]->handleInterrupt(gpio);
     }
 }
 
-void ICACHE_RAM_ATTR _pulsemeter_sensor_isr_0() { _pulsemeter_sensor_isr(0); }
-void ICACHE_RAM_ATTR _pulsemeter_sensor_isr_1() { _pulsemeter_sensor_isr(1); }
-void ICACHE_RAM_ATTR _pulsemeter_sensor_isr_2() { _pulsemeter_sensor_isr(2); }
-void ICACHE_RAM_ATTR _pulsemeter_sensor_isr_3() { _pulsemeter_sensor_isr(3); }
-void ICACHE_RAM_ATTR _pulsemeter_sensor_isr_4() { _pulsemeter_sensor_isr(4); }
-void ICACHE_RAM_ATTR _pulsemeter_sensor_isr_5() { _pulsemeter_sensor_isr(5); }
-void ICACHE_RAM_ATTR _pulsemeter_sensor_isr_12() { _pulsemeter_sensor_isr(12); }
-void ICACHE_RAM_ATTR _pulsemeter_sensor_isr_13() { _pulsemeter_sensor_isr(13); }
-void ICACHE_RAM_ATTR _pulsemeter_sensor_isr_14() { _pulsemeter_sensor_isr(14); }
-void ICACHE_RAM_ATTR _pulsemeter_sensor_isr_15() { _pulsemeter_sensor_isr(15); }
+void IRAM_ATTR _pulsemeter_sensor_isr_0() { _pulsemeter_sensor_isr(0); }
+void IRAM_ATTR _pulsemeter_sensor_isr_1() { _pulsemeter_sensor_isr(1); }
+void IRAM_ATTR _pulsemeter_sensor_isr_2() { _pulsemeter_sensor_isr(2); }
+void IRAM_ATTR _pulsemeter_sensor_isr_3() { _pulsemeter_sensor_isr(3); }
+void IRAM_ATTR _pulsemeter_sensor_isr_4() { _pulsemeter_sensor_isr(4); }
+void IRAM_ATTR _pulsemeter_sensor_isr_5() { _pulsemeter_sensor_isr(5); }
+void IRAM_ATTR _pulsemeter_sensor_isr_12() { _pulsemeter_sensor_isr(12); }
+void IRAM_ATTR _pulsemeter_sensor_isr_13() { _pulsemeter_sensor_isr(13); }
+void IRAM_ATTR _pulsemeter_sensor_isr_14() { _pulsemeter_sensor_isr(14); }
+void IRAM_ATTR _pulsemeter_sensor_isr_15() { _pulsemeter_sensor_isr(15); }
 
 static void (*_pulsemeter_sensor_isr_list[10])() = {
     _pulsemeter_sensor_isr_0, _pulsemeter_sensor_isr_1, _pulsemeter_sensor_isr_2,