MikroTik ccr1016 revisions (#3355)

* rename revision 2 of CCR1016-12S-1S+

* separate two revisions of CCR1016-12S-1S+; add airflow for CCR1036-8G-2S+EM

* MikroTik CCR1016-12S-1S+ - add weight and images; hide usb power outlet to comment

* add weight; hide usb to comments

* rever hide usb to comments

---------

Co-authored-by: Harry <Harry@cadby.co.uk>

device-types/MikroTik/CCR1016-12S-1S-Plus-r2.yaml

@@ -0,0 +1,65 @@
+---
+manufacturer: MikroTik
+model: CCR1016-12S-1S+-r2
+slug: mikrotik-ccr1016-12s-1s-plus-r2
+description: '[CCR1016-12S-1S+](https://mikrotik.com/product/CCR1016-12S-1Splus)'
+part_number: CCR1016-12S-1S+r2
+is_full_depth: false
+weight: 2.55
+weight_unit: kg
+u_height: 1
+comments: second revision with USB typeA and RJ-45 RS232
+airflow: front-to-rear
+console-ports:
+  - name: serial0
+    type: rj-45
+power-ports:
+  - name: power1
+    type: iec-60320-c14
+    maximum_draw: 48
+  - name: power2
+    type: iec-60320-c14
+    maximum_draw: 48
+power-outlets:
+  - name: usb
+    type: usb-a
+interfaces:
+  - name: sfp1
+    type: 1000base-x-sfp
+    label: SFP1
+  - name: sfp2
+    type: 1000base-x-sfp
+    label: SFP2
+  - name: sfp3
+    type: 1000base-x-sfp
+    label: SFP3
+  - name: sfp4
+    type: 1000base-x-sfp
+    label: SFP4
+  - name: sfp5
+    type: 1000base-x-sfp
+    label: SFP5
+  - name: sfp6
+    type: 1000base-x-sfp
+    label: SFP6
+  - name: sfp7
+    type: 1000base-x-sfp
+    label: SFP7
+  - name: sfp8
+    type: 1000base-x-sfp
+    label: SFP8
+  - name: sfp9
+    type: 1000base-x-sfp
+    label: SFP9
+  - name: sfp10
+    type: 1000base-x-sfp
+    label: SFP10
+  - name: sfp11
+    type: 1000base-x-sfp
+    label: SFP11
+  - name: sfp12
+    type: 1000base-x-sfp
+    label: SFP12
+  - name: sfp-sfpplus1
+    type: 10gbase-x-sfpp
+    label: SFP+1

device-types/MikroTik/CCR1016-12S-1S-Plus.yaml

@@ -2,38 +2,19 @@
 manufacturer: MikroTik
 model: CCR1016-12S-1S+
 slug: mikrotik-ccr1016-12s-1s-plus
+description: '[CCR1016-12S-1S+](https://mikrotik.com/product/CCR1016-12S-1Splus)'
+part_number: CCR1016-12S-1S+
 is_full_depth: false
-u_height: 1
-interfaces:
-  - name: sfp1
-    type: 1000base-x-sfp
-  - name: sfp2
-    type: 1000base-x-sfp
-  - name: sfp3
-    type: 1000base-x-sfp
-  - name: sfp4
-    type: 1000base-x-sfp
-  - name: sfp5
-    type: 1000base-x-sfp
-  - name: sfp6
-    type: 1000base-x-sfp
-  - name: sfp7
-    type: 1000base-x-sfp
-  - name: sfp8
-    type: 1000base-x-sfp
-  - name: sfp9
-    type: 1000base-x-sfp
-  - name: sfp10
-    type: 1000base-x-sfp
-  - name: sfp11
-    type: 1000base-x-sfp
-  - name: sfp12
-    type: 1000base-x-sfp
-  - name: sfp-sfpplus1
-    type: 10gbase-x-sfpp
+weight: 2.55
+weight_unit: kg
+u_height: 1.0
+comments: first revision with microUSB and DB-9 RS232
+front_image: true
+rear_image: true
+airflow: front-to-rear
 console-ports:
   - name: serial0
-    type: rj-45
+    type: de-9
 power-ports:
   - name: power1
     type: iec-60320-c14
@@ -41,3 +22,47 @@ power-ports:
   - name: power2
     type: iec-60320-c14
     maximum_draw: 48
+power-outlets:
+  - name: microUSB
+    type: usb-micro-b
+    description: OTG support
+interfaces:
+  - name: sfp1
+    type: 1000base-x-sfp
+    label: SFP1
+  - name: sfp2
+    type: 1000base-x-sfp
+    label: SFP2
+  - name: sfp3
+    type: 1000base-x-sfp
+    label: SFP3
+  - name: sfp4
+    type: 1000base-x-sfp
+    label: SFP4
+  - name: sfp5
+    type: 1000base-x-sfp
+    label: SFP5
+  - name: sfp6
+    type: 1000base-x-sfp
+    label: SFP6
+  - name: sfp7
+    type: 1000base-x-sfp
+    label: SFP7
+  - name: sfp8
+    type: 1000base-x-sfp
+    label: SFP8
+  - name: sfp9
+    type: 1000base-x-sfp
+    label: SFP9
+  - name: sfp10
+    type: 1000base-x-sfp
+    label: SFP10
+  - name: sfp11
+    type: 1000base-x-sfp
+    label: SFP11
+  - name: sfp12
+    type: 1000base-x-sfp
+    label: SFP12
+  - name: sfpplus1
+    type: 10gbase-x-sfpp
+    label: SFP+

device-types/MikroTik/CCR1036-8G-2S-Plus-EM.yaml

@@ -4,6 +4,7 @@ model: CCR1036-8G-2S+EM
 slug: mikrotik-ccr1036-8g-2s-plus-em
 is_full_depth: false
 u_height: 1
+airflow: front-to-rear
 interfaces:
   - name: ether1
     type: 1000base-t