Arduino service

.circleci/config.yml

@@ -66,7 +66,7 @@ jobs:
             sudo ldconfig
       - run:
           name: Install global dependencies
-          command: 'sudo npm install typescript node-gyp npm@latest -g'
+          command: "sudo npm install typescript node-gyp npm@latest -g"
       - restore_cache: # special step to restore the dependency cache
           # Read about caching dependencies: https://circleci.com/docs/2.0/caching/
           key: dependency-cache-{{ checksum "server/package.json" }}-node-12
@@ -126,7 +126,7 @@ jobs:
       - checkout
       - run:
           name: Build Front
-          command: 'cd front && npm install && npm run build'
+          command: "cd front && npm install && npm run build"
       - persist_to_workspace:
           root: ~/gladys-build
           paths:

front/src/components/app.jsx

@@ -68,6 +68,8 @@ import ZwaveEditPage from '../routes/integration/all/zwave/edit-page';
 import RtspCameraPage from '../routes/integration/all/rtsp-camera';
 import XiaomiPage from '../routes/integration/all/xiaomi';
 import EditXiaomiPage from '../routes/integration/all/xiaomi/edit-page';
+import ArduinoDevicePage from '../routes/integration/all/arduino/device-page';
+import ArduinoSetupPage from '../routes/integration/all/arduino/setup-page';
 
 // MQTT integration
 import MqttDevicePage from '../routes/integration/all/mqtt/device-page';
@@ -167,6 +169,11 @@ const AppRouter = connect(
         <PhilipsHueSetupPage path="/dashboard/integration/device/philips-hue/setup" />
         <PhilipsHueDevicePage path="/dashboard/integration/device/philips-hue/device" />
         <Redirect path="/dashboard/integration/device/zwave" to="/dashboard/integration/device/zwave/node" />
+
+        <ArduinoDevicePage path="/dashboard/integration/device/arduino/device" />
+        <ArduinoSetupPage path="/dashboard/integration/device/arduino/setup" />
+        <Redirect path="/dashboard/integration/device/arduino" to="/dashboard/integration/device/arduino/device" />
+
         <ZwaveNodePage path="/dashboard/integration/device/zwave/node" />
         <ZwaveNetworkPage path="/dashboard/integration/device/zwave/network" />
         <ZwaveSettingsPage path="/dashboard/integration/device/zwave/settings" />

front/src/components/boxs/device-in-room/DeviceRow.jsx

@@ -1,4 +1,5 @@
 import BinaryDeviceFeature from './device-features/BinaryDeviceFeature';
+import ButtonDeviceFeature from './device-features/ButtonDeviceFeature';
 import SensorDeviceFeature from './device-features/SensorDeviceFeature';
 import MultilevelDeviceFeature from './device-features/MultiLevelDeviceFeature';
 
@@ -23,6 +24,19 @@ const DeviceRow = ({ children, ...props }) => {
         updateValue={props.updateValue}
       />
     );
+  } else if (props.deviceFeature.type === 'push') {
+    return (
+      <ButtonDeviceFeature
+        x={props.x}
+        y={props.y}
+        device={props.device}
+        deviceFeature={props.deviceFeature}
+        roomIndex={props.roomIndex}
+        deviceIndex={props.deviceIndex}
+        deviceFeatureIndex={props.deviceFeatureIndex}
+        updateValue={props.updateValue}
+      />
+    );
   }
   if (props.deviceFeature.type === 'dimmer') {
     return (

front/src/components/boxs/device-in-room/device-features/ButtonDeviceFeature.jsx

@@ -0,0 +1,37 @@
+const ButtonDeviceType = ({ children, ...props }) => {
+  function updateValue() {
+    props.updateValue(
+      props.x,
+      props.y,
+      props.device,
+      props.deviceFeature,
+      props.deviceIndex,
+      props.deviceFeatureIndex,
+      props.deviceFeature.last_value === 0 ? 1 : 0
+    );
+  }
+
+  return (
+    <tr>
+      <td>
+        <i class="fe fe-circle" />
+      </td>
+      <td>{props.device.name}</td>
+      <td class="text-right">
+        <label>
+          <input
+            type="button"
+            name={props.deviceFeature.id}
+            value="1"
+            class="custom-switch-input"
+            checked={props.deviceFeature.last_value}
+            onClick={updateValue}
+          />
+          <span class="fe fe-circle" />
+        </label>
+      </td>
+    </tr>
+  );
+};
+
+export default ButtonDeviceType;

front/src/config/demo.json

@@ -1395,6 +1395,172 @@
       ]
     }
   ],
+  "get /api/v1/service/arduino": {
+    "id": "1dbaeb48-d6d2-4930-b7ca-f17d637a364b",
+    "name": "Arduino",
+    "selector": "arduino"
+  },
+  "get /api/v1/service/arduino/device": [
+    {
+      "id": "8e25bf9a-4b24-4099-a08d-f4afe323c3a7",
+      "service_id": "1dbaeb48-d6d2-4930-b7ca-f17d637a364b",
+      "room_id": "null",
+      "name": "Arduino Mega",
+      "selector": "arduino-mega",
+      "model": "card",
+      "external_id": "51bc71ad-816c-4682-9bc2-6840a5036b74",
+      "createdAt": "2020-05-25T17: 25: 45.129Z",
+      "updatedAt": "2020-05-25T17: 25: 45.129Z",
+      "features": [],
+      "params": [
+        {
+          "id": "5b6c5d6f-8756-46af-bfca-f40bb74a14b4",
+          "device_id": "8e25bf9a-4b24-4099-a08d-f4afe323c3a7",
+          "name": "ARDUINO_PATH",
+          "value": "/dev/ttyACM0",
+          "createdAt": "2020-05-25T17: 25: 45.168Z",
+          "updatedAt": "2020-05-25T17: 25: 45.168Z"
+        },
+        {
+          "id": "371e873b-b39e-4b84-a87e-e401ce3678ec",
+          "device_id": "8e25bf9a-4b24-4099-a08d-f4afe323c3a7",
+          "name": "ARDUINO_MODEL",
+          "value": "mega",
+          "createdAt": "2020-05-25T17: 25: 45.169Z",
+          "updatedAt": "2020-05-25T17: 25: 45.169Z"
+        }
+      ],
+      "room": "null",
+      "service": {
+        "id": "1dbaeb48-d6d2-4930-b7ca-f17d637a364b",
+        "pod_id": "null",
+        "name": "arduino",
+        "selector": "arduino",
+        "version": "0.1.0",
+        "enabled": "true",
+        "has_message_feature": "false",
+        "createdAt": "2020-05-25T17: 07: 00.776Z",
+        "updatedAt": "2020-05-25T17: 07: 00.776Z"
+      }
+    },
+    {
+      "id": "779fa305-bb11-4b73-aa4a-accc79743e9b",
+      "service_id": "1dbaeb48-d6d2-4930-b7ca-f17d637a364b",
+      "room_id": "cecc52c7-3e67-4b75-9b13-9a8867b0443d",
+      "name": "Lampe Salon",
+      "selector": "lampe-salon",
+      "model": "null",
+      "external_id": "9965d82b-bc80-4cb5-a60b-c5b0577559f3",
+      "should_poll": "false",
+      "poll_frequency": "null",
+      "createdAt": "2020-05-26T18: 17: 50.969Z",
+      "updatedAt": "2020-05-26T18: 17: 50.969Z",
+      "features": [
+        {
+          "id": "4412eb0f-e705-444c-aa83-b4d76d634673",
+          "device_id": "779fa305-bb11-4b73-aa4a-accc79743e9b",
+          "name": "Lampe Salon",
+          "selector": "lampe-salon",
+          "external_id": "9965d82b-bc80-4cb5-a60b-c5b0577559f3",
+          "category": "light",
+          "type": "binary",
+          "read_only": "false",
+          "keep_history": "false",
+          "has_feedback": "false",
+          "unit": "null",
+          "min": "0",
+          "max": "1",
+          "last_value": "0",
+          "last_value_string": "null",
+          "last_value_changed": "2020-05-27T01: 44: 03.922Z",
+          "createdAt": "2020-05-26T18: 17: 50.989Z",
+          "updatedAt": "2020-05-27T01: 37: 15.610Z"
+        }
+      ],
+      "params": [
+        {
+          "id": "8e316fbc-1386-4774-b7a4-90e88233c7dc",
+          "device_id": "779fa305-bb11-4b73-aa4a-accc79743e9b",
+          "name": "DATA_PIN",
+          "value": "4",
+          "createdAt": "2020-05-26T18: 17: 51.007Z",
+          "updatedAt": "2020-05-26T18: 17: 51.007Z"
+        },
+        {
+          "id": "dabb2541-2e5f-4c8e-a95d-0efd90850ea9",
+          "device_id": "779fa305-bb11-4b73-aa4a-accc79743e9b",
+          "name": "FUNCTION",
+          "value": "emit_433_chacon",
+          "createdAt": "2020-05-26T18: 17: 51.009Z",
+          "updatedAt": "2020-05-26T18: 17: 51.009Z"
+        },
+        {
+          "id": "2e6b89f6-396b-412d-bd9f-7477cdf3c9c4",
+          "device_id": "779fa305-bb11-4b73-aa4a-accc79743e9b",
+          "name": "ARDUINO_LINKED",
+          "value": "arduino-mega",
+          "createdAt": "2020-05-26T18: 17: 51.011Z",
+          "updatedAt": "2020-05-26T18: 17: 51.011Z"
+        },
+        {
+          "id": "5fdf8a00-575c-4136-ad7b-27330aea47a6",
+          "device_id": "779fa305-bb11-4b73-aa4a-accc79743e9b",
+          "name": "CODE",
+          "value": "0",
+          "createdAt": "2020-05-26T18: 17: 51.013Z",
+          "updatedAt": "2020-05-26T18: 17: 51.013Z"
+        },
+        {
+          "id": "6e53cd3e-618b-42c4-8c74-7a42e429ebb1",
+          "device_id": "779fa305-bb11-4b73-aa4a-accc79743e9b",
+          "name": "CODE_ON",
+          "value": "1536116368",
+          "createdAt": "2020-05-26T18: 17: 51.015Z",
+          "updatedAt": "2020-05-26T18: 17: 51.015Z"
+        },
+        {
+          "id": "cdbea6fc-0a49-4d82-83c4-b1849281f478",
+          "device_id": "779fa305-bb11-4b73-aa4a-accc79743e9b",
+          "name": "CODE_OFF",
+          "value": "1536116352",
+          "createdAt": "2020-05-26T18: 17: 51.017Z",
+          "updatedAt": "2020-05-26T18: 17: 51.017Z"
+        },
+        {
+          "id": "42258fdb-0f3c-4cef-889d-385f39d166d6",
+          "device_id": "779fa305-bb11-4b73-aa4a-accc79743e9b",
+          "name": "BIT_LENGTH",
+          "value": "24",
+          "createdAt": "2020-05-26T18: 17: 51.019Z",
+          "updatedAt": "2020-05-26T18: 17: 51.019Z"
+        },
+        {
+          "id": "2614bb79-be14-42c9-a47d-cfab5e8f126d",
+          "device_id": "779fa305-bb11-4b73-aa4a-accc79743e9b",
+          "name": "PULSE_LENGTH",
+          "value": "3",
+          "createdAt": "2020-05-26T18: 17: 51.021Z",
+          "updatedAt": "2020-05-26T18: 17: 51.021Z"
+        }
+      ],
+      "room": {
+        "id": "cecc52c7-3e67-4b75-9b13-9a8867b0443d",
+        "name": "Living Room",
+        "selector": "living-room"
+      },
+      "service": {
+        "id": "1dbaeb48-d6d2-4930-b7ca-f17d637a364b",
+        "pod_id": "null",
+        "name": "arduino",
+        "selector": "arduino",
+        "version": "0.1.0",
+        "enabled": "true",
+        "has_message_feature": "false",
+        "createdAt": "2020-05-25T17: 07: 00.776Z",
+        "updatedAt": "2020-05-25T17: 07: 00.776Z"
+      }
+    }
+  ],
   "get /api/v1/service/xiaomi": {
     "id": "70cb1e17-3b17-4886-83ab-45b00a9e03b1",
     "name": "Xiaomi",

front/src/config/i18n/en.json

@@ -522,6 +522,87 @@
         "disconnected": "Disconnected from MQTT broker."
       }
     },
+    "arduino": {
+      "title": "Arduino",
+      "description": "Control your Arduino devices.",
+      "deviceTab": "Devices",
+      "setupTab": "Setup",
+      "codeInstruction2": "In order to use this service, you need to use an Arduino card with the code written for. You can download this code <a href=\"https://github.com/billonalex/Gladys/blob/master/server/services/arduino/arduino-code/arduino-code.ino\" target=\"_blank\">here</a>.",
+      "codeInstruction": "In order to use this service, you need to use an Arduino card with the code written for. Please upload the code with the Upload button.",
+      "status": {
+        "notConfigured": "Arduino service is not configured, please go to ",
+        "notConnected": "Arduino card is not connected, please connect a card.",
+        "setupPageLink": "Arduino configuration page"
+      },
+      "device": {
+        "title": "Arduino Devices",
+        "arduinoDescription": "List of Arduino devices currently connected or which have been connected to Gladys.",
+        "search": "Search devices",
+        "noDevices": "No devices configured yet. Please configure your devices with the New button.",
+        "arduinoConnected": "Arduino connected",
+        "arduinoNotConnected": "Arduino card is not connected, please connect a card in the Setup page.",
+        "noNameLabel": "No name",
+        "nameLabel": "Name",
+        "roomLabel": "Room",
+        "featuresLabel": "Features",
+        "noFeatures": "No features",
+        "refreshButton": "Refresh Arduino",
+        "saveButton": "Save",
+        "deleteButton": "Delete",
+        "returnButton": "Return back",
+        "editButton": "Edit details",
+        "notFound": "Requested device not found.",
+        "backToList": "Back to device list",
+        "saveError": "Error saving or deleting device",
+        "saveConflictError": "Conflict: Are you sure all device feature external IDs are unique ?",
+        "functionLabel": "Function",
+        "dataPinLabel": "Data pin",
+        "arduinoLinkedLabel": "Arduino linked",
+        "codeLabel": "Code",
+        "codeOnLabel": "Code ON",
+        "codeOffLabel": "Code OFF",
+        "bitLengthLabel": "Length of the code",
+        "pulseLengthLabel": "Pulse length"
+      },
+      "setup": {
+        "title": "Arduino Settings",
+        "arduinoDescription": "To use this service, you need to connect an Arduino card.",
+        "refreshButton": "Refresh Arduino list",
+        "nameLabel": "Name of the card",
+        "arduinoModelLabel": "Select the model of your Arduino",
+        "arduinoUsbDriverPathLabel": "Select the USB port where your Arduino is connected",
+        "error": "No Arduino device added yet.",
+        "connecting": "Connection",
+        "connected": "Arduino connected.",
+        "connectionError": "Error while connecting, please check your configuration.",
+        "notConnected": "Arduino card is not connected, please connect a card.",
+        "noDevices": "No Arduino devices added yet. Please configure your devices with the New button.",
+        "flashing": "Flashing card...",
+        "flashingSuccess": "Flashing done !",
+        "flashingError": "Flashing failed !",
+        "connectButton": "Save",
+        "disconnectButton": "Delete",
+        "uploadButton": "Upload code"
+      },
+      "function": {
+        "recv433": "Receive in 433 MHz",
+        "emit433": "Emit in 433 MHz",
+        "emit433Chacon": "Emit in 433 MHz for Chacon outlets",
+        "emitIR": "Emit in IR",
+        "dhtTemperature": "Temperature through DHT11",
+        "dhtHumidity": "Humidity through DHT11"
+      },
+      "features": {
+        "lightButton": "Light",
+        "switchButton": "Switch",
+        "pushButton": "Push button",
+        "radioSensor": "433 MHz sensor",
+        "temperatureSensor": "Temperature sensor",
+        "humiditySensor": "Humidity sensor",
+        "motionSensor": "Motion sensor",
+        "openingSensor": "Opening sensor"
+      }
+    },
     "xiaomi": {
       "title": "Xiaomi Home",
       "description": "Display Xiaomi home devices.",