wiki: devices: Promote osprey,merlin,lux,surnia,harpia to 17.1

* Add myself as maintainer for osprey and merlin.
* Add TheImpulson for surnia
* Add jro1979,thopiekar for lux
* Add jro1979 for harpia
* We use Lineage Recovery now.

Change-Id: If9be7ab1bbfba3d792ccc020da80e22329679c9d

5 files changed, 20 insertions, 27 deletions

diff --git a/_data/devices/harpia.yml b/_data/devices/harpia.yml
index f56dfb8e..ce4ee46a 100644
--- a/_data/devices/harpia.yml
+++ b/_data/devices/harpia.yml
@@ -5,12 +5,12 @@ cameras:
 - {flash: 'LED', info: '8 MP'}
 - {flash: '', info: '5 MP'}
 carrier: U.S. Cellular, International GSM
-channels: [discontinued]
+channels: [nightly]
 codename: harpia
 cpu: Cortex-A53
 cpu_cores: '4'
 cpu_freq: 1.2 GHz
-current_branch: 14.1
+current_branch: 17.1
 depth: 9.9 mm (0.39 in)
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>.
 gpu: Adreno 306
@@ -18,7 +18,7 @@ height: 144.4 mm (5.69 in)
 image: harpia.png
 install_method: fastboot_motorola
 kernel: android_kernel_motorola_msm8916
-maintainers: []
+maintainers: [jro1979]
 models: [XT1600, XT1601, XT1602, XT1603, XT1604, XT1607]
 name: Moto G4 Play
 network: [2G GSM, 2G CDMA, 3G UMTS, 3G CDMA2000, 4G LTE]
@@ -36,9 +36,8 @@ soc: Qualcomm MSM8916 Snapdragon 410
 storage: 16 GB
 tree: android_device_motorola_harpia
 type: phone
-uses_twrp: true
 vendor: Motorola
 vendor_short: motorola
-versions: [14.1]
+versions: [14.1, 17.1]
 width: 72 mm (2.83 in)
 wifi: Wi-Fi 802.11 b/g/n, Hotspot
diff --git a/_data/devices/lux.yml b/_data/devices/lux.yml
index f4c9426f..ee65057f 100644
--- a/_data/devices/lux.yml
+++ b/_data/devices/lux.yml
@@ -4,13 +4,12 @@ bluetooth: {spec: 4.0 + LE}
 cameras:
 - {flash: 'Dual LED', info: '21 MP'}
 - {flash: '', info: '5 MP'}
-channels: [discontinued]
+channels: [nightly]
 codename: lux
 cpu: Cortex-A53
 cpu_cores: '8'
 cpu_freq: 1.7 GHz
-current_branch: 14.1
-custom_recovery_link: https://forum.xda-developers.com/showthread.php?t=3194656
+current_branch: 17.1
 depth: 10.9 mm (0.43 in)
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>.
 gpu: Adreno 405
@@ -18,7 +17,7 @@ height: 148 mm (5.83 in)
 image: lux.png
 install_method: fastboot_motorola
 kernel: android_kernel_motorola_msm8916
-maintainers: []
+maintainers: [jro1979, thopiekar]
 models: [XT1562, XT1563]
 name: Moto X Play
 peripherals: None
@@ -35,9 +34,8 @@ soc: Qualcomm MSM8939 Snapdragon 615
 storage: 16/32 GB
 tree: android_device_motorola_lux
 type: phone
-uses_twrp: true
 vendor: Motorola
 vendor_short: motorola
-versions: [14.1]
+versions: [14.1, 17.1]
 width: 75 mm (2.95 in)
 wifi: 802.11 a/g/b/n, Dual-band
diff --git a/_data/devices/merlin.yml b/_data/devices/merlin.yml
index 508fa63a..7ca21625 100644
--- a/_data/devices/merlin.yml
+++ b/_data/devices/merlin.yml
@@ -4,19 +4,18 @@ bluetooth: {spec: 4.0 + LE, profiles: [A2DP]}
 cameras:
 - {flash: 'Dual LED', info: '13 MP'}
 - {flash: '', info: '5 MP'}
-channels: [discontinued]
+channels: [nightly]
 codename: merlin
 cpu: Cortex-A53
 cpu_cores: '8'
 cpu_freq: 1.7 GHz
-current_branch: 14.1
-custom_recovery_link: https://forum.xda-developers.com/showthread.php?t=3295098
+current_branch: 17.1
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>.
 gpu: Adreno 405
 image: merlin.png
 install_method: fastboot_motorola
 kernel: android_kernel_motorola_msm8916
-maintainers: []
+maintainers: [althafvly]
 models: [XT1556, XT1557]
 name: Moto G3 Turbo
 network: [2G GSM, 3G UMTS, 4G LTE]
@@ -34,8 +33,7 @@ soc: Qualcomm MSM8939 Snapdragon 615
 storage: 16 GB
 tree: android_device_motorola_merlin
 type: phone
-uses_twrp: true
 vendor: Motorola
 vendor_short: motorola
-versions: [14.1]
+versions: [14.1, 17.1]
 wifi: 802.11 b/g/n, Hotspot
diff --git a/_data/devices/osprey.yml b/_data/devices/osprey.yml
index 596a62d0..c4dda975 100644
--- a/_data/devices/osprey.yml
+++ b/_data/devices/osprey.yml
@@ -5,19 +5,19 @@ cameras:
 - {flash: 'Dual LED', info: '13 MP'}
 - {flash: '', info: '5 MP'}
 carrier: U.S. Cellular, Virgin Mobile, International GSM
-channels: [discontinued]
+channels: [nightly]
 codename: osprey
 cpu: Cortex-A53
 cpu_cores: '4'
 cpu_freq: 1.36 GHz
-current_branch: 14.1
+current_branch: 17.1
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>.
   On the next screen use <kbd>Volume Down</kbd> and <kbd>Volume Up</kbd> to scroll and then press <kbd>Power</kbd> to select.
 gpu: Adreno 306
 image: osprey.png
 install_method: fastboot_motorola
 kernel: android_kernel_motorola_msm8916
-maintainers: []
+maintainers: [althafvly]
 models: [XT1540, XT1541, XT1542, XT1543, XT1544, XT1548, XT1550]
 name: Moto G 2015
 network: [2G GSM, 2G CDMA, 3G UMTS, 3G CDMA2000, 4G LTE]
@@ -35,8 +35,7 @@ soc: Qualcomm MSM8916 Snapdragon 410
 storage: 8/16 GB
 tree: android_device_motorola_osprey
 type: phone
-uses_twrp: true
 vendor: Motorola
 vendor_short: motorola
-versions: [14.1]
+versions: [14.1, 17.1]
 wifi: 802.11 b/g/n, Hotspot
diff --git a/_data/devices/surnia.yml b/_data/devices/surnia.yml
index 06c55827..1f198897 100644
--- a/_data/devices/surnia.yml
+++ b/_data/devices/surnia.yml
@@ -4,19 +4,19 @@ bluetooth: {spec: '4.0'}
 cameras:
 - {flash: '', info: '5 MP'}
 - {flash: '', info: 'VGA'}
-channels: [discontinued]
+channels: [nightly]
 codename: surnia
 cpu: Cortex-A53
 cpu_cores: '4'
 cpu_freq: 1.2 GHz
-current_branch: 14.1
+current_branch: 17.1
 download_boot: With the device powered off, hold <kbd>Volume Down</kbd> + <kbd>Power</kbd>.
   On the next screen use <kbd>Volume Down</kbd> to scroll and then press <kbd>Volume Up</kbd> to select.
 gpu: Adreno 306
 image: otus.png
 install_method: fastboot_motorola
 kernel: android_kernel_motorola_msm8916
-maintainers: []
+maintainers: [althafvly, theimpulson]
 models: [XT1514, XT1521, XT1523, XT1524, XT1526, XT1527]
 name: Moto E 2015 LTE
 peripherals: [Accelerometer, Proximity sensor]
@@ -33,8 +33,7 @@ soc: Qualcomm MSM8916 Snapdragon 410
 storage: 8 GB
 tree: android_device_motorola_surnia
 type: phone
-uses_twrp: true
 vendor: Motorola
 vendor_short: motorola
-versions: [14.1]
+versions: [14.1, 17.1]
 wifi: Wi-Fi 802.11 b/g/n