Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rflink with tests #1204

Open
wants to merge 312 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 199 commits
Commits
Show all changes
312 commits
Select commit Hold shift + click to select a range
54c7cda
migrations upd
mTondenier Mar 21, 2020
a7d7ecd
api upd
mTondenier Mar 21, 2020
c7905a5
seeders upd
mTondenier Mar 21, 2020
524fefb
Add files via upload
mTondenier Mar 21, 2020
f18dc24
Add files via upload
mTondenier Mar 21, 2020
869856f
Add files via upload
mTondenier Mar 21, 2020
beb5073
scene lib update fix
mTondenier Mar 21, 2020
0a5316c
tests fixes
mTondenier Mar 21, 2020
a497f01
create a device when a message is received
mTondenier Feb 6, 2020
f69959e
fix controllers object is undefined
mTondenier Feb 7, 2020
1e0c023
rebase
mathistdn Mar 22, 2020
b8947f7
new commit for rebase
mathistdn Mar 22, 2020
8a44a6a
prettier
mTondenier Mar 19, 2020
3b701d6
Merge branch 'rflink' of https://github.com/mTondenier/Gladys into rf…
mathistdn Mar 23, 2020
800b6b7
prettier
mathistdn Mar 23, 2020
99c63d8
eslint
mathistdn Mar 23, 2020
7102c6a
prettier
mathistdn Mar 23, 2020
cbb0bbc
Add files via upload
mTondenier Mar 23, 2020
a5cff15
Add files via upload
mTondenier Mar 23, 2020
693969e
Update constants.js
mathistdn Mar 24, 2020
6ec3e0b
Merge branch 'rflink' of https://github.com/mTondenier/Gladys into rf…
mathistdn Mar 24, 2020
2fd9b6d
Revert "Merge branch 'rflink' of https://github.com/mTondenier/Gladys…
mathistdn Mar 24, 2020
aa84c7b
add multiples logger.log
mathistdn Mar 24, 2020
d8327ba
Read only check box
mathistdn Mar 25, 2020
379edb7
prettier and console remove
mathistdn Mar 25, 2020
4de0bde
Devices filtering
mathistdn Mar 27, 2020
3c53e21
bug fix
mathistdn Mar 27, 2020
860b9f4
bug fixes
mathistdn Apr 11, 2020
1248b04
bug fixes
mathistdn Apr 12, 2020
4700f8a
bug fix
mathistdn Apr 30, 2020
4e0c24f
auto refresh when message received
mathistdn May 1, 2020
1ca46f4
prettier
mathistdn May 1, 2020
4b03b7a
prettier bug
mathistdn May 1, 2020
e3f3140
jsx prettier
mathistdn May 1, 2020
3d612c2
no console
mathistdn May 1, 2020
a065b93
Update index.js
mathistdn May 1, 2020
baaa8c4
pressure and light sensors
mathistdn May 2, 2020
913a3ad
auto refresh settings page
mathistdn May 2, 2020
a1f78a3
name of switches
mathistdn May 2, 2020
573d958
bug fixes
mathistdn May 10, 2020
0f2fc0d
Update rflink.controller.js
mathistdn May 10, 2020
3513a8d
prettier fix
mathistdn May 10, 2020
bb9c8ef
moving devices filtering from server to front
mathistdn May 11, 2020
8e03a4b
merge and update rflink/gladys
ngeissel Jun 10, 2020
c0696e4
minor changes : typo + using a variable for feature
ngeissel Jul 2, 2020
c4f2da6
update serial version from 8.0.6 to 9.0.0
ngeissel Jul 16, 2020
57e7a2f
Minor change : Correct api annotation
ngeissel Jul 17, 2020
e08d027
Correction on Milight : command has to be ON or OFF, Message requires…
ngeissel Jul 17, 2020
96fc8dd
Launch test : correct, and adapt
ngeissel Jul 19, 2020
a85a7f4
Merge branch master into rflink
ngeissel Oct 30, 2020
b815812
FR Translation + typo in EN
ngeissel Oct 30, 2020
6ea8382
Merge from Gladys v4.0.3dev
ngeissel Jan 6, 2021
a24bf61
merge gladys 4.0.7
ngeissel Feb 14, 2021
17ef780
merge gladys 4.0.7
ngeissel Feb 15, 2021
be2c73b
Improve tests : fix newDevices
ngeissel Feb 18, 2021
8c0317d
Try to fix these damn tests
ngeissel Feb 23, 2021
7e68e01
Add more test coverage
ngeissel Feb 25, 2021
597652a
Go on on the road of testing : long & hard but mandatory
ngeissel Feb 26, 2021
ea3830f
Add test to listen and RFtoObject
ngeissel Mar 3, 2021
0f4c2e9
More test on unpair milight
ngeissel Mar 4, 2021
81d11f0
More test on newValue
ngeissel Mar 4, 2021
4a4c986
More test on newValue
ngeissel Mar 4, 2021
95f62f5
Improved test on RflinkService and Rflinkmanager
ngeissel Mar 5, 2021
bf4ba1f
Merge remote-tracking branch 'upstream/master' into rflink
ngeissel Mar 5, 2021
55e4058
Improving message tests
ngeissel Mar 7, 2021
4be16c5
Merge remote-tracking branch 'upstream/master' into rflink
ngeissel Apr 21, 2021
1a5f956
Listen 100% tested
ngeissel May 5, 2021
47ee9e1
Merge remote-tracking branch 'upstream/master' into rflink
ngeissel May 18, 2021
e904582
Improved test on port connect
ngeissel May 18, 2021
e438f4c
Test ObjToRF
ngeissel May 18, 2021
b0bdd6d
improved newValue and setValue tests
ngeissel May 24, 2021
d3ba41f
improved message testing
ngeissel May 25, 2021
4af63b4
remove console log
ngeissel May 25, 2021
5f3db96
Improved controller testing
ngeissel May 26, 2021
35b8130
Fix a mess on the merging with package.json to clean the PR
ngeissel May 27, 2021
674c69c
Auto change from prettyfier
ngeissel May 27, 2021
48535e0
Cleanup for PR
ngeissel May 27, 2021
d3366c6
Prettier
ngeissel May 28, 2021
eddbe32
eslint correction
ngeissel May 28, 2021
ff1f490
Modification of prettier
ngeissel May 31, 2021
73c6961
Minor changes after eslint
ngeissel Jun 3, 2021
9d243f4
Merge remote-tracking branch 'upstream/master' into rflink
ngeissel Jun 3, 2021
523fc93
remove remaining sonoff
ngeissel Jun 8, 2021
cc84f76
Upgrade serialport version from 9.0.0 to 9.1.0 and serialport/parser-…
ngeissel Jun 8, 2021
3a564bc
Use debug logger
ngeissel Jun 8, 2021
80fbd1c
Merge remote-tracking branch 'upstream/master' into rflink
ngeissel Jun 14, 2021
710a7a4
Package lock version changes
ngeissel Jun 17, 2021
224b725
Merge remote-tracking branch 'upstream/master' into rflink
Jul 19, 2021
f725fd8
Merge remote-tracking branch 'upstream/master' into rflink
Aug 4, 2021
ca3eac8
Handle milight with color and brightness
Aug 4, 2021
10eb08d
Handle milight with color and brightness
Aug 4, 2021
d1f0abe
Reactivate xiaomi module
Aug 4, 2021
69aee96
Correct eslint
Aug 4, 2021
a9fe298
Make eslint happy
Aug 4, 2021
610f227
Correct tests
Aug 5, 2021
f8e5875
audit fix
Aug 5, 2021
4b3c385
Audit fix
Aug 5, 2021
63b409a
Audit fix
Aug 6, 2021
b871f61
Get package from master
Aug 6, 2021
315081f
Get package from master
Aug 6, 2021
8984126
Taking package version from a passing build
Aug 6, 2021
e4e97b6
Following npm audit, fix tar version ...
Aug 7, 2021
5a55307
Still trying to fix PR, now having this message : 7:30 error Unable…
Aug 7, 2021
9bfb18c
Still trying to fix PR, now having this message : 7:30 error Unable…
Aug 7, 2021
b4c404f
This has nothing to do with rflink
Aug 9, 2021
fc1a428
Test if connect is called and a json returned
Aug 11, 2021
8cc0b83
Test if device is remove from list
Aug 11, 2021
e962249
Remove duplicate writing
Aug 11, 2021
5cb67b3
tried to fix api : connect entry point is working, but not the test
Aug 12, 2021
a42891e
Rflink color converter test
Aug 16, 2021
7c06d83
Rflink color converter test
Aug 16, 2021
d2122ad
Test milight brightness when a previous color was set
Aug 16, 2021
dc47151
prettier run
Aug 16, 2021
3fac647
remove 'only' to run all tests
Aug 16, 2021
f90886c
From Zigbee service : improve selection list of usb port
Aug 19, 2021
3cc839c
prettier
Aug 20, 2021
e5fb7b4
Corrections : milight mode feature icon display, edit milight device…
Aug 26, 2021
0747906
Merge remote-tracking branch 'upstream/master' into rflink
Sep 13, 2021
cdc2cc2
Merge remote-tracking branch 'upstream/master' into rflink
Oct 11, 2021
5917acb
Merge remote-tracking branch 'upstream/master' into rflink
Oct 18, 2021
c9bd10d
Fix: display selected usb path
Oct 18, 2021
2077570
fix : edit devices features
Oct 19, 2021
209860f
prettier & eslint
Oct 19, 2021
edddbd7
Merge from 4.6.0
Oct 29, 2021
82681f4
Merge branch 'master' into rflink
Nov 16, 2021
659ad34
Merge remote-tracking branch 'upstream/master' into rflink
Nov 27, 2021
328f606
No reason to update date-fns
Nov 27, 2021
d1c7285
Regroup RFLink lines
Nov 27, 2021
089328a
use log debug level instead of info
Nov 28, 2021
f87cd33
Minor test correction
Nov 28, 2021
a633719
Typo correction
Nov 28, 2021
d407da4
Use correct const for milight effect mode
Nov 28, 2021
f20bf96
Remove useless unit translations
Nov 28, 2021
96bbb12
Update demo with rflink
Nov 28, 2021
67c1a7c
Minor change : usefull device name placeholder
Nov 28, 2021
4a17dd4
before push
Nov 28, 2021
b13541a
prettier little things
Nov 28, 2021
4f352fd
Merge remote-tracking branch 'upstream/master' into rflink
Dec 2, 2021
210db6e
merging and new tests
Jan 11, 2022
0735c56
Merge remote-tracking branch 'upstream/master' into rflink
Jan 11, 2022
3853a7a
improve tests
Jan 20, 2022
e4ed6f2
Fix features edition
Jan 27, 2022
e145c3b
typo
Jan 27, 2022
0f134f6
Better Mighlight sample
Jan 27, 2022
03e31aa
typo
Jan 27, 2022
424093a
typo
Jan 27, 2022
fa06dcb
Better milight sample for test
Jan 27, 2022
714ea8e
fix value for tests
Jan 28, 2022
3903f79
Merge remote-tracking branch 'upstream/master' into rflink
Feb 9, 2022
1de7cc8
API description
Feb 9, 2022
5735f5d
Do a real disconnection on usb port open by serialport lib
Feb 9, 2022
fb15112
testing cleanup
Feb 20, 2022
b12527a
Add cypress test to rflink
Feb 20, 2022
845b0ed
merge & correction
Feb 20, 2022
8d905b0
correct version overide
Feb 20, 2022
bb08767
Fix Cypress test (device edition)
Feb 21, 2022
f5a5ee6
Minor improvment : tests&coverage
Feb 22, 2022
6d09f54
prettier
Feb 22, 2022
501beb6
Do not add a new discovered device if already in the added devices list
Mar 1, 2022
8fc1f9e
remove only from test
Mar 1, 2022
0921819
Merge remote-tracking branch 'upstream/master' into rflink
Mar 8, 2022
6caa0f1
change personnal ip config for cypress
Mar 8, 2022
edf8dad
Merge remote-tracking branch 'upstream/master' into rflink
Mar 17, 2022
7b52c53
Merge 4.8.1
Mar 22, 2022
a13f71c
Correct previous merge
Mar 22, 2022
1030769
Correct merge error
Mar 23, 2022
e7ed93b
merge 4.8.3
Apr 2, 2022
d98e59d
merge 4.8.4
May 4, 2022
09b4a2e
merge 4.8.7
May 17, 2022
b3e0e07
Fix eslint
May 19, 2022
af89759
Fix problem between chair and keyboard (I deleted the content of the …
May 19, 2022
c0be028
prettier
May 19, 2022
3d2433e
merge 4.8.10
May 23, 2022
7d823bb
prettier after the merge
May 23, 2022
253d7e1
Merge branch 'master' into rflink
Jul 23, 2022
82e7b78
Merge branch 'master' into rflink
Jul 28, 2022
b14e3f0
merge 4.10.1
Sep 19, 2022
5b3d24e
Merge remote-tracking branch 'upstream/master' into rflink
Oct 2, 2022
bcc3a51
Take into consideration review notes
Oct 2, 2022
ece35c5
handle milight color in a more accurate way
Oct 18, 2022
0a72631
Merge remote-tracking branch 'upstream/master' into rflink
Oct 18, 2022
17849af
pretty
Oct 19, 2022
0612808
prettier
Oct 19, 2022
55ac962
Minor changes (typo ...)
Oct 19, 2022
df61162
Display read only button in a similar way as in MQTT service
Oct 19, 2022
5145911
Correct display of the read only button in a similar way as in MQTT s…
Oct 19, 2022
2a70e0f
Do not translate zone integer
Oct 19, 2022
c0d9b54
prettier
Oct 19, 2022
2f65491
Respect camelcase
Oct 19, 2022
fdb787f
simplify the way to display new devices
Oct 19, 2022
e094509
Use the correct prefix
Oct 19, 2022
588e8f8
Code refactoring
Oct 19, 2022
e8321aa
prettier
Oct 19, 2022
a2b0981
merge 4.12.2
Nov 17, 2022
af6480b
checkout package-lock
Nov 20, 2022
63460fb
Merge remote-tracking branch 'upstream/master' into rflink
Nov 22, 2022
27ac3c7
update serialport package
Nov 29, 2022
79d2c21
update serialport package
Nov 29, 2022
dc15ee9
merge 4.13.0
Dec 10, 2022
d56a4f4
eslint clean up
Dec 10, 2022
f55392b
Rollback to serialport 9.x
Dec 11, 2022
3372725
prettier
Dec 11, 2022
433822a
Update app.jsx
ngeissel Dec 11, 2022
14ebb5e
Merge remote-tracking branch 'upstream/master' into rflink
Dec 12, 2022
ffe196c
Merge branch 'rflink' of https://github.com/ngeissel/Gladys into rflink
Dec 12, 2022
a2a0802
Merge remote-tracking branch 'upstream/master' into rflink
Dec 19, 2022
85c9f27
Merge remote-tracking branch 'upstream/master' into rflink
Jan 16, 2023
9d53efe
Merge remote-tracking branch 'upstream/master' into rflink
Jan 25, 2023
c40e131
4.16 merge
Feb 12, 2023
2b6609c
Merge branch 'master' into rflink
ngeissel Feb 13, 2023
a918d84
Merge with 4.20.0
Apr 14, 2023
59ef84a
Merge branch 'rflink' of https://github.com/ngeissel/Gladys into rflink
Apr 15, 2023
8e483ce
merge v4.23.0
May 12, 2023
320f874
fix eslint major errors
May 12, 2023
eab7b01
fix eslint major errors
May 12, 2023
5bd753b
prettier after file rework
May 12, 2023
86c620f
merge v4.23.2
May 16, 2023
52ec897
Improve test coverage
May 16, 2023
98b4b19
Handle eslint warnings
May 16, 2023
2ffcb56
Go for serialport 11.x
May 16, 2023
e63e006
Merge v4.23.4
May 22, 2023
b157efd
Merge v4.25.0
Jun 18, 2023
e97a39a
Rename files
Jun 20, 2023
a6f6fe8
Merge v4.26.1
Aug 25, 2023
98ff4f2
prettier
Aug 25, 2023
9ad90d1
Merge branch 'master' into rflink
ngeissel Aug 25, 2023
fc8ecce
merge gladys v4.28.0
Sep 6, 2023
f3f2bc1
Merge branch 'rflink' of https://github.com/ngeissel/Gladys into rflink
Sep 6, 2023
28009d9
Merge remote-tracking branch 'upstream/master' into rflink
Sep 30, 2023
9ae9328
Merge from gladys 4.29.0
ngeissel Oct 24, 2023
1199e49
Merge gladys 4.28.0
ngeissel Nov 2, 2023
7be721e
Merge Gladys v4.31.0
ngeissel Nov 20, 2023
517ebf5
merge v4.33.0
ngeissel Dec 18, 2023
59488b3
Remove duplicate key
ngeissel Dec 18, 2023
95912ff
Merge Gladys 4.36.0
ngeissel Feb 6, 2024
3d8f185
Translate in german through ChatGPT
ngeissel Feb 8, 2024
8064c61
Merge Gladys 3.6.0dev
ngeissel Feb 8, 2024
8d3e7a1
prettier
ngeissel Feb 8, 2024
7341334
Merge from Gladys v4.37.0
ngeissel Feb 20, 2024
a85b01b
Merge Gladys 4.38.1
ngeissel Apr 2, 2024
af6f63d
Merge Gladys v4.38.3
ngeissel Apr 12, 2024
80e035e
Merge with Gladys 4.40.0
ngeissel May 12, 2024
a5abacd
Merge with Gladys 4.41.0
ngeissel May 14, 2024
04b4aa4
Merge from v4.42.0
ngeissel May 21, 2024
329b8fb
Merge from Gladys 4.43.0
Jul 12, 2024
9984783
Merge Gladys 4.44.0
ngeissel Aug 28, 2024
0b77be5
Merge gladys 4.47.0
ngeissel Oct 29, 2024
5b500fa
Merge gladys 4.48.0
ngeissel Nov 7, 2024
ef146c6
Merge gladys 4.49.0
ngeissel Nov 12, 2024
734226d
Merge 4.49.0
ngeissel Nov 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
225 changes: 112 additions & 113 deletions front/package-lock.json

Large diffs are not rendered by default.

Binary file added front/src/assets/integrations/cover/rflink.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 8 additions & 3 deletions front/src/components/app.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ 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 RflinkDevicePage from '../routes/integration/all/rflink/device-page';
import RflinkSettingsPage from '../routes/integration/all/rflink/settings-page';
import RflinkEditPage from '../routes/integration/all/rflink/device-page/setup';

// MQTT integration
import MqttDevicePage from '../routes/integration/all/mqtt/device-page';
Expand Down Expand Up @@ -221,19 +224,21 @@ const AppRouter = connect(
<TasmotaEditPage path="/dashboard/integration/device/tasmota/edit/:deviceSelector" />
<TasmotaMqttDiscoverPage path="/dashboard/integration/device/tasmota/mqtt" />
<TasmotaHttpDiscoverPage path="/dashboard/integration/device/tasmota/http" />
<Redirect path="/dashboard/integration/device/rflink" to="/dashboard/integration/device/rflink/device" />
<RflinkDevicePage path="/dashboard/integration/device/rflink/device" />
<RflinkSettingsPage path="/dashboard/integration/device/rflink/settings" />
<RflinkEditPage path="/dashboard/integration/device/rflink/edit/" />
<RflinkEditPage path="/dashboard/integration/device/rflink/edit/:deviceSelector" />
<EweLinkPage path="/dashboard/integration/device/ewelink" />
<EweLinkEditPage path="/dashboard/integration/device/ewelink/edit/:deviceSelector" />
<EweLinkDiscoverPage path="/dashboard/integration/device/ewelink/discover" />
<EweLinkSetupPage path="/dashboard/integration/device/ewelink/setup" />

<BluetoothDevicePage path="/dashboard/integration/device/bluetooth" />
<BluetoothEditDevicePage path="/dashboard/integration/device/bluetooth/:deviceSelector" />
<BluetoothSetupPage path="/dashboard/integration/device/bluetooth/setup" />
<BluetoothSetupPeripheralPage path="/dashboard/integration/device/bluetooth/setup/:uuid" />
<BluetoothSettingsPage path="/dashboard/integration/device/bluetooth/config" />

ngeissel marked this conversation as resolved.
Show resolved Hide resolved
<GoogleHomeGateway path="/dashboard/integration/device/google-home/authorize" />

<ChatPage path="/dashboard/chat" />
<MapPage path="/dashboard/maps" />
<MapNewAreaPage path="/dashboard/maps/area/new" />
Expand Down
76 changes: 76 additions & 0 deletions front/src/config/demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -837,6 +837,82 @@ const data = {
]
}
],
'get /api/v1/service/rflink/device': [
{
id: '86aa70',
switch: 'switch',
service_id: 'a810b8db-6d04-4697-bed3-c4b72c996279',
room_id: 'f99ab22a-e6a8-4756-b1fe-4d19dc8c8620',
name: `Coffea machine power switch`,
selector: `rflink:86aa70:10`,
external_id: `rflink:86aa70:10`,
model: 'Tristate',
should_poll: false,
features: [
{
name: 'switch',
selector: `rflink:86aa70:switch:10`,
external_id: `rflink:86aa70:switch:10`,
rfcode: 'CMD',
category: 'switch',
type: 'binary',
read_only: false,
keep_history: true,
has_feedback: false,
min: 0,
max: 1
}
]
}
],
'get /api/v1/service/rflink/variable/RFLINK_PATH': {},
'get /api/v1/service/rflink': {},
'get /api/v1/device/rflink:86aa70:10': {
name: 'Switch',
external_id: 'rflink:86aa6:switch:10',
selector: 'rflink:1234',
room_id: 'f99ab22a-e6a8-4756-b1fe-4d19dc8c8620',
model: '',
features: [
{
name: 'switch',
selector: `rflink:86aa70:switch:10`,
external_id: `rflink:86aa70:switch:10`,
rfcode: 'CMD',
category: 'switch',
type: 'binary'
}
]
},
'get /api/v1/service/rflink/newDevices': [
{
id: 'fbedb47f-4d25-4381-8923-2633b23192a0',
service_id: 'a810b8db-6d04-4697-bed3-c4b72c996279',
room_id: 'cecc52c7-3e67-4b75-9b13-9a8867b0443d',
name: 'PC bureau',
selector: 'rflink:1234',
external_id: 'rflink:86aa6:switch:10',
should_poll: false,
poll_frequency: null,
created_at: '2019-02-12T07:49:07.556Z',
updated_at: '2019-02-12T07:49:07.556Z',
features: [
{
name: 'power',
selector: 'switch-test',
category: 'switch',
type: 'binary'
}
]
}
],
'get /api/v1/service/rflink/status': {
currentMilightGateway: '9076',
lastCommand: '20;OK',
connected: true,
scanInProgress: false,
ready: true
},
'get /api/v1/service/zwave/device': [
{
id: 'fbedb47f-4d25-4381-8923-2633b23192a0',
Expand Down
89 changes: 87 additions & 2 deletions front/src/config/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,91 @@
"navigation": "navigation"
}
},
"rflink": {
"title": "RFLink",
"description": "Connect to RFLink gateway.",
"settingsTab": "Settings",
"deviceTab": "Devices",
"roomLabel": "Room",
"namePlaceholder": "Enter the name of your device",
"settings": {
"title": "RFLink Usb Settings",
"description": "To use RFLink in Gladys, you need to have a RFLink gateway connected to your Gladys instance.",
"zwaveUsbDriverPathLabel": "Select the USB port where your RFLink is connected",
"connectButton": "Connect",
"disconnectButton": "Disconnect",
"refreshButton": "Refresh USB list",
"notConnected": "Gladys is not connected to any Rflink Gateway.",
"connectedWithSuccess": "RFLink Gateway connected with success.",
"connecting": "Trying to connect to RFLink Gateway...",
"driverFailedError": "An error occured while trying to connect to RFLink Gateway.",
"rflinkUsbDriverPathLabel": "Select the rflink gateway usb path :",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No space before : in english :)

"zone1": "1",
"zone2": "2",
"zone3": "3",
"zone4": "4",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"debug": {
"title": "RFLink debug console",
"info": "Here you can see the last command that RFLink sent to Gladys it's in this form : 20;02;MODEL;ID;LABEL=data;LABEL1=data1; ...",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"placeholder": "message to send",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"sendButton": "Send"
},
"milight": {
"title": "RFLink Milight settings",
"gatewayBarinfo": "Gateway number: ",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"zoneInfo": "Gateway zone: ",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"about": " You can use your actual milight bridge id or if you don't have a gateway , use a new one (F746 by default) the id is just a code to identify the gateway. You can use unlimited milight but each bridge has 4 zones",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"pairButton": "Pair",
"unpairButton": "Unpair"
}
},
"feature": {
"nameLabel": "Name",
"read_only_label": "read only : ",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"model": "Model",
"message": "You can only create actuators , sensors are automatically detected and added in the device tab when they send messages",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"namePlaceholder": "Enter feature name",
"switchIdLabel": "ID ",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"switchIdMessage": "The feature external ID is an unique ID which is used to control the device, it is always in the form : 'rflink:id:type:channel'.Read the documentation here : not online for the moment",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"switchIdPlaceholder": "RFLink device ID",
"switchNumberLabel": "Channel",
"switchNumberMessage": "The feature external ID is an unique ID which is used to control the device, it is always in the form : 'rflink:id:type:channel'.Read the documentation here : not online for the moment",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"switchNumberPlaceholder": "value of SWITCH in debug console (settings tab) ",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"unitLabel": "Unit",
"minLabel": "Minimum value",
"minPlaceholder": "Enter feature minimum value",
"maxLabel": "Maximum value",
"maxPlaceholder": "Enter feature maximum value",
"addButton": "Add feature",
"deleteLabel": "Delete feature"
},
"device": {
"title": "Devices in Gladys",
"devicesInfo": "Cheap 433mhz devices are detected by default as sensors , you can change it by editing a device 's read only property",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"deviceOnNetworkTitle": "Devices detected by the gateway",
"connectButton": "Connect/Reconnect",
"search": "Search devices",
"deviceNotHandled": "Device not handled yet, please contact us to help us connect it in Gladys!",
"noDevices": "No devices , you can add devices with the new device tab",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"scanButton": "Scan",
"noDevicesFound": "No devices found . Make sure you have a connected RFLink Gateway in the settings Tab",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"found": "All detected devices will appear here",
"nameLabel": "Name",
"featuresLabel": "Features",
"noFeatures": "No features",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to new DeviceFeatures UI component, you will be able to remove it.

This will be linked to another comment, I will use "device-feature-component" to identify it.

"newButton": "New",
"saveButton": "Save",
"deleteButton": "Delete",
"editButton": "Edit",
"noNameLabel": "No name",
"roomLabel": "Room",
"returnButton": "Return back",
"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 ?"
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
}
},
"telegram": {
"title": "Telegram",
"description": "Talk to Gladys through Telegram.",
Expand Down Expand Up @@ -925,12 +1010,12 @@
"selectTriggerLabel": "Select a trigger type",
"newAction": "New action",
"selectActionType": "Select an action type",
"addActionButton": "Add action",
"addActionButton": "Add new action",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure you want to change this?
This is not linked to you feature.

"noTriggersYet": "No trigger added yet. It's not mandatory to have a trigger in a scene.",
"noActionsYet": "No actions added yet. Click on the + button to add an action to this scene.",
"triggersDescription": "Every trigger is independent. When any of those triggers are triggered, the scene will run.",
"actionsDescription": "All actions in this block will run in parallel. To make a sequence of actions, add actions to the next block.",
"addNewTriggerButton": "Add trigger",
"addNewTriggerButton": "Add new trigger",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure you want to change this?
This is not linked to you feature.

"saveSceneError": "There was an error saving your scene. Please check that all actions/triggers are filled and correct.",
"triggerCard": {
"title": "Triggers",
Expand Down
85 changes: 85 additions & 0 deletions front/src/config/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,91 @@
"saveLabel": "Enregistrer"
}
},
"rflink": {
"title": "RFLink",
"description": "Connection à une passerelle RFLink.",
"settingsTab": "Paramètres",
"deviceTab": "Appareils",
"roomLabel": "Pièce",
"namePlaceholder": "Entrez le nom de votre appareil",
"settings": {
"title": "Configurations USB",
"description": "Pour utiliser le module RFLink dans Gladys, vous devez avoir une passerelle RFLink connectée à votre instance Gladys.",
"zwaveUsbDriverPathLabel": "Sélectionnez le port USB sur lequel votre passerelle RFLink est connecté",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"connectButton": "Connecter",
"disconnectButton": "Déconnecter",
"refreshButton": "Actualiser la liste des ports USB",
"notConnected": "Gladys n'est connectée à aucune passerelle RFLink.",
"connectedWithSuccess": "Passerelle RFLink connectée avec succès..",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"connecting": "Tentative de connexion à la passerelle RFLink ...",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"driverFailedError": "Une erreur s'est produite lors de la tentative de connexion à la passerelle RFLink.",
"rflinkUsbDriverPathLabel": "Sélectionner le chemin usb de la gateway rflink :",
"zone1": "1",
"zone2": "2",
"zone3": "3",
"zone4": "4",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"debug": {
"title": "RFLink debug console",
"info": "Ici vous pouvez voir la dernière commande envoyée par la passerelle RFLink à Gladys. Sous la forme : 20;02;MODEL;ID;LABEL=data;LABEL1=data1; ...",
"placeholder": "Message à envoyer",
"sendButton": "Envoyer"
},
"milight": {
"title": "Paramètres Milight",
"gatewayBarinfo": "Numéro de passerelle : ",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please no ending space.

"zoneInfo": "Zone de passerelle : ",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please no ending space.

"about": " Vous pouvez utiliser votre véritable identifiant de pont milight ou si vous n'avez pas de passerelle, utilisez-en un nouveau (F746 par défaut), l'identifiant est juste un code pour identifier la passerelle. Le nombre d'appareils MiLight est illimité mais chaque pont n'a que 4 zones",
"pairButton": "Appairage",
"unpairButton": "Dissocier"
}
},
"feature": {
"nameLabel": "Nom",
"read_only_label": "lecture seule : ",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Capitalize + no ending space.

"model": "Modèle",
"message": "Vous ne pouvez uniquement créer que des actionneurs. Les capteurs sont automatiquement détectés et ajoutés dans l'onglet appareil lorsqu'ils envoient des messages",
"namePlaceholder": "Entrez le nom de la fonction",
"switchIdLabel": "ID ",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No ending space :)

"switchIdMessage": "L'ID externe de la fonctionnalité est un ID unique qui est utilisé pour contrôler l'appareil, il est toujours sous cette forme : 'rflink:id:type:channel'.Read the documentation here : not online for the moment",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is really FrEnglish :p
The end is still in english Read the documentation here : not online for the moment

"switchIdPlaceholder": "ID appareil RFLink",
"switchNumberLabel": "Canal",
"switchNumberMessage": "L'ID externe de la fonctionnalité est un ID unique qui est utilisé pour contrôler l'appareil, il est toujours sous cette forme: 'rflink:id:type:channel'.Read the documentation here : not online for the moment",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This message is exactly the same as switchIdMessage.
Did you fail the copy/paste? Or this one can be removed?
(same as english part)

"switchNumberPlaceholder": " valeur de SWITCH dans la console de débogage (onglet Paramètres) ",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Avoid start and spaces, and capitalize placeholder please.

"unitLabel": "Unité",
"minLabel": "Valeur minimum",
"minPlaceholder": "Entrez la valeur minimale de la fonction",
"maxLabel": "Valeur maximale",
"maxPlaceholder": "Entrez la valeur maximale de la fonction",
"addButton": "Ajouter une fonctionnalité",
"deleteLabel": "Supprimer la fonction"
},
"device": {
"title": "Appareils dans Gladys",
"devicesInfo": "Les appareils 433 Mhz bon marché sont détectés par défaut en tant que capteurs, vous pouvez le modifier en modifiant la propriété <lecture seule> d'un appareil",
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
"deviceOnNetworkTitle": "Appareils détectés par la passerelle",
"connectButton": "Connecter / Reconnecter",
"search": "Rechercher des appareils",
"deviceNotHandled": "Appareil non géré, veuillez nous contacter pour nous aider à le connecter dans Gladys !",
"noDevices": "Aucun appareil, vous pouvez ajouter des appareils avec l'onglet <Appareils>",
"scanButton": "Scanner",
"noDevicesFound": "Aucun périphérique trouvé. Assurez-vous que vous avez une passerelle RFLink connectée dans l'onglet <Paramètres>",
"found": "Tous les appareils détectés apparaîtront ici",
"nameLabel": "Nom",
"featuresLabel": "Fonctionnalités",
"noFeatures": "Aucune fonctionnalité",
"newButton": "Nouveau",
"saveButton": "Sauvegarder",
"deleteButton": "Supprimer",
"editButton": "Editer",
"noNameLabel": "Sans nom",
"roomLabel": "Pièce",
"returnButton": "Retour en arrière",
"notFound": "Appareil demandé introuvable.",
"backToList": "Retour à la liste des appareils",
"saveError": "Erreur lors de l'enregistrement ou de la suppression de l'appareil",
"saveConflictError": "Conflit: êtes-vous sûr que tous les ID externes des fonctionnalités de l'appareil sont uniques?"
}
},
"telegram": {
"title": "Telegram",
"description": "Parlez à Gladys grâce à Telegram.",
Expand Down
44 changes: 44 additions & 0 deletions front/src/config/integrations/device.en.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
[
ngeissel marked this conversation as resolved.
Show resolved Hide resolved
{
"key": "zwave",
"name": "Z-Wave",
"description": "Control your Z-Wave devices.",
"img": "/assets/integrations/cover/zwave.jpg"
},
{
"key": "rtsp-camera",
"name": "Camera",
"description": "HTTP/RTSP cameras in Gladys.",
"img": "/assets/integrations/cover/rtsp-camera.jpg"
},
{
"key": "xiaomi",
"name": "Xiaomi Home",
"description": "Display Xiaomi home devices.",
"img": "/assets/integrations/cover/xiaomi.jpg"
},
{
"key": "mqtt",
"name": "MQTT",
"description": "Connect to MQTT server.",
"img": "/assets/integrations/cover/mqtt.jpg"
},
{
"key": "philips-hue",
"name": "Philips Hue",
"description": "Control Philips Hue Lights.",
"img": "/assets/integrations/cover/philips-hue.jpg"
},
{
"key": "sonoff",
"name": "Sonoff",
"description": "Control your Sonoff devices.",
"img": "/assets/integrations/cover/sonoff.jpg"
},
{
"key": "rflink",
"name": "rflink",
"description": "Control your rflink devices.",
"img": "/assets/integrations/cover/rflink.png"
}
]
4 changes: 4 additions & 0 deletions front/src/config/integrations/devices.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
"key": "tasmota",
"img": "/assets/integrations/cover/tasmota.jpg"
},
{
"key": "rflink",
"img": "/assets/integrations/cover/rflink.png"
},
{
"key": "tpLink",
"link": "tp-link",
Expand Down
Loading