Enable RainMaker on all chips

libraries/RainMaker/src/RMaker.cpp

@@ -1,11 +1,10 @@
 #include "RMaker.h"
-#if ESP_IDF_VERSION_MAJOR >= 4 && CONFIG_ESP_RMAKER_TASK_STACK && CONFIG_IDF_TARGET_ESP32
 #include <esp_rmaker_schedule.h>
 #include <esp_rmaker_utils.h>
 bool wifiLowLevelInit(bool persistent);
 static esp_err_t err;
 
-static void event_handler(void *arg, esp_event_base_t event_base, int event_id, void *event_data)
+static void event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data)
 {
     if (event_base == RMAKER_EVENT) {
         switch (event_id) {
@@ -113,4 +112,3 @@ esp_err_t RMakerClass::enableOTA(ota_type_t type, const char *cert)
 }
 
 RMakerClass RMaker;
-#endif

libraries/RainMaker/src/RMaker.h

@@ -1,6 +1,18 @@
+// Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#pragma once
 #include "esp_system.h"
-#if ESP_IDF_VERSION_MAJOR >= 4 && CONFIG_ESP_RMAKER_TASK_STACK && CONFIG_IDF_TARGET_ESP32
-
 #include "Arduino.h"
 #include "RMakerNode.h"
 #include "RMakerQR.h"
@@ -26,5 +38,3 @@ class RMakerClass
 };
 
 extern RMakerClass RMaker;
-
-#endif

libraries/RainMaker/src/RMakerDevice.cpp

@@ -1,5 +1,4 @@
 #include "RMakerDevice.h"
-#if ESP_IDF_VERSION_MAJOR >= 4 && CONFIG_ESP_RMAKER_TASK_STACK && CONFIG_IDF_TARGET_ESP32
 
 static esp_err_t err;
 typedef void (*deviceWriteCb)(Device*, Param*, const param_val_t val, void *priv_data, write_ctx_t *ctx);
@@ -205,5 +204,3 @@ esp_err_t Device::updateAndReportParam(const char *param_name, const char *my_va
     }
     return ESP_OK;
 }
-
-#endif

libraries/RainMaker/src/RMakerDevice.h

@@ -1,6 +1,18 @@
+// Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#pragma once
 #include "esp_system.h"
-#if ESP_IDF_VERSION_MAJOR >= 4 && CONFIG_ESP_RMAKER_TASK_STACK && CONFIG_IDF_TARGET_ESP32
-
 #include "RMakerParam.h"
 #include <esp_rmaker_standard_devices.h>
 #include <esp_rmaker_standard_params.h>
@@ -150,5 +162,3 @@ class TemperatureSensor : public Device
             }
         }
 };
-
-#endif

libraries/RainMaker/src/RMakerNode.cpp

@@ -1,5 +1,4 @@
 #include "RMakerNode.h"
-#if ESP_IDF_VERSION_MAJOR >= 4 && CONFIG_ESP_RMAKER_TASK_STACK && CONFIG_IDF_TARGET_ESP32
 static esp_err_t err;
 
 esp_err_t Node::addDevice(Device device)
@@ -38,4 +37,3 @@ esp_err_t Node::addNodeAttr(const char *attr_name, const char *val)
     }   
     return err;
 }
-#endif

libraries/RainMaker/src/RMakerNode.h

@@ -1,6 +1,18 @@
+// Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#pragma once
 #include "esp_system.h"
-#if ESP_IDF_VERSION_MAJOR >= 4 && CONFIG_ESP_RMAKER_TASK_STACK && CONFIG_IDF_TARGET_ESP32
-
 #include "RMakerDevice.h"
 
 class Node
@@ -29,5 +41,3 @@ class Node
         node_info_t *getNodeInfo();
         esp_err_t addNodeAttr(const char *attr_name, const char *val);
 };
-
-#endif

libraries/RainMaker/src/RMakerParam.cpp

@@ -1,5 +1,4 @@
 #include "RMakerParam.h"
-#if ESP_IDF_VERSION_MAJOR >= 4 && CONFIG_ESP_RMAKER_TASK_STACK && CONFIG_IDF_TARGET_ESP32
 
 static esp_err_t err;
 
@@ -29,5 +28,3 @@ esp_err_t Param::updateAndReport(param_val_t val)
     }
     return err;
 }
-
-#endif

libraries/RainMaker/src/RMakerParam.h

@@ -1,6 +1,18 @@
+// Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#pragma once
 #include "esp_system.h"
-#if ESP_IDF_VERSION_MAJOR >= 4 && CONFIG_ESP_RMAKER_TASK_STACK && CONFIG_IDF_TARGET_ESP32
-
 #include "RMakerType.h"
 
 class Param
@@ -34,5 +46,3 @@ class Param
         esp_err_t addBounds(param_val_t min, param_val_t max, param_val_t step);
         esp_err_t updateAndReport(param_val_t val);
 };
-
-#endif

libraries/RainMaker/src/RMakerQR.h

@@ -1,6 +1,18 @@
+// Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#pragma once
 #include "esp_system.h"
-#if ESP_IDF_VERSION_MAJOR >= 4 && CONFIG_ESP_RMAKER_TASK_STACK && CONFIG_IDF_TARGET_ESP32
-
 #include <qrcode.h>
 
 #define PROV_QR_VERSION "v1"
@@ -20,5 +32,3 @@ static void printQR(const char *name, const char *pop, const char *transport)
     qrcode_display(payload);
     Serial.printf("If QR code is not visible, copy paste the below URL in a browser.\n%s?data=%s\n", QRCODE_BASE_URL, payload);
 }
-
-#endif

libraries/RainMaker/src/RMakerType.cpp

@@ -1,5 +1,4 @@
 #include "RMakerType.h"
-#if ESP_IDF_VERSION_MAJOR >= 4 && CONFIG_ESP_RMAKER_TASK_STACK && CONFIG_IDF_TARGET_ESP32
 
 param_val_t value(int ival)
 {
@@ -20,5 +19,3 @@ param_val_t value(float fval)
 {
     return esp_rmaker_float(fval);
 }
-
-#endif

libraries/RainMaker/src/RMakerType.h

@@ -1,6 +1,18 @@
+// Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#pragma once
 #include "esp_system.h"
-#if ESP_IDF_VERSION_MAJOR >= 4 && CONFIG_ESP_RMAKER_TASK_STACK && CONFIG_IDF_TARGET_ESP32
-
 #include <esp_rmaker_core.h>
 #include <esp_rmaker_ota.h>
 #include <esp_err.h>
@@ -19,5 +31,3 @@ param_val_t value(int);
 param_val_t value(bool);
 param_val_t value(char *);
 param_val_t value(float);
-
-#endif

libraries/RainMaker/src/RMakerUtils.h

@@ -1,16 +1,26 @@
+// Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#pragma once
 #include "esp_system.h"
-#if ESP_IDF_VERSION_MAJOR >= 4 && CONFIG_ESP_RMAKER_TASK_STACK && CONFIG_IDF_TARGET_ESP32
-
 #include <esp_rmaker_utils.h>
 
 static void RMakerFactoryReset(int seconds)
 {
-    esp_rmaker_factory_reset(seconds);
+    esp_rmaker_factory_reset(0, seconds);
 }
 
 static void RMakerWiFiReset(int seconds)
 {
-    esp_rmaker_wifi_reset(seconds);
+    esp_rmaker_wifi_reset(0, seconds);
 }
-
-#endif