arjo, use updated easy-soc-libs, map-controller depends on libwifi

easy-soc-libs/Makefile

@@ -13,7 +13,7 @@ PKG_RELEASE:=1
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ce5f796233824b955259a4e12d95209f332ddcee
+PKG_SOURCE_VERSION:=740b6e4f2c51ecc1efa496170fe1e98caa06fd7b
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

map-controller/Makefile

@@ -26,7 +26,7 @@ define Package/map-controller
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
-  DEPENDS:=+libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 +map-plugin
+  DEPENDS:=+libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 +map-plugin +libwifi
 endef
 
 define Package/map-controller/description

ponmngr/files/etc/bbfdm/json/xpon.json

@@ -3,6 +3,7 @@
 	"Device.XPON.": {
 		"type": "object",
 		"protocols": [
+			"cwmp",
 			"usp"
 		],
 		"access": false,
@@ -13,6 +14,7 @@
 			"read": true,
 			"write": false,
 			"protocols": [
+				"cwmp",
 				"usp"
 			],
 			"datatype": "unsignedInt",
@@ -31,6 +33,7 @@
 		"Device.XPON.ONU.{i}.": {
 			"type": "object",
 			"protocols": [
+				"cwmp",
 				"usp"
 			],
 			"access": false,
@@ -51,6 +54,7 @@
 				"read": true,
 				"write": false,
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"datatype": "boolean",
@@ -67,6 +71,7 @@
 				"read": true,
 				"write": false,
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"datatype": "string",
@@ -88,6 +93,7 @@
 				"read": true,
 				"write": false,
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"datatype": "string",
@@ -109,6 +115,7 @@
 				"read": true,
 				"write": false,
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"datatype": "unsignedInt",
@@ -129,6 +136,7 @@
 				"read": true,
 				"write": false,
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"datatype": "unsignedInt",
@@ -149,6 +157,7 @@
 				"read": true,
 				"write": false,
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"datatype": "unsignedInt",
@@ -164,9 +173,31 @@
 					}
 				]
 			},
+			"TransceiverNumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "unsignedInt",
+				"mapping": [
+					{
+						"type": "ubus",
+						"ubus": {
+							"object": "xpon",
+							"method": "status",
+							"args": {},
+							"key": "ONU[@index].Transceiver.@Count"
+						}
+					}
+				]
+			},
 			"Device.XPON.ONU.{i}.SoftwareImage.{i}.": {
 				"type": "object",
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"access": false,
@@ -187,6 +218,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "unsignedInt",
@@ -209,6 +241,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -230,6 +263,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "boolean",
@@ -246,6 +280,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "boolean",
@@ -262,6 +297,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "boolean",
@@ -277,6 +313,7 @@
 			"Device.XPON.ONU.{i}.EthernetUNI.{i}.": {
 				"type": "object",
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"access": false,
@@ -297,6 +334,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "boolean",
@@ -313,6 +351,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -338,6 +377,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -359,6 +399,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -380,6 +421,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -399,6 +441,7 @@
 				"Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.": {
 					"type": "object",
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"access": false,
@@ -415,6 +458,7 @@
 						"read": true,
 						"write": false,
 						"protocols": [
+							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -431,6 +475,7 @@
 						"read": true,
 						"write": false,
 						"protocols": [
+							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -447,6 +492,7 @@
 						"read": true,
 						"write": false,
 						"protocols": [
+							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -463,6 +509,7 @@
 						"read": true,
 						"write": false,
 						"protocols": [
+							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -479,6 +526,7 @@
 			"Device.XPON.ONU.{i}.ANI.{i}.": {
 				"type": "object",
 				"protocols": [
+					"cwmp",
 					"usp"
 				],
 				"access": false,
@@ -499,6 +547,7 @@
 					"read": true,
 					"write": true,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "boolean",
@@ -529,6 +578,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -553,6 +603,7 @@
 					"read": true,
 					"write": false,
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"datatype": "string",
@@ -573,6 +624,7 @@
 				"Device.XPON.ONU.{i}.ANI.{i}.Stats.": {
 					"type": "object",
 					"protocols": [
+						"cwmp",
 						"usp"
 					],
 					"access": false,
@@ -589,6 +641,7 @@
 						"read": true,
 						"write": false,
 						"protocols": [
+							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -605,6 +658,7 @@
 						"read": true,
 						"write": false,
 						"protocols": [
+							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -621,6 +675,7 @@
 						"read": true,
 						"write": false,
 						"protocols": [
+							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -637,6 +692,7 @@
 						"read": true,
 						"write": false,
 						"protocols": [
+							"cwmp",
 							"usp"
 						],
 						"datatype": "unsignedLong",
@@ -649,6 +705,111 @@
 						]
 					}
 				}
+			},
+			"Device.XPON.ONU.{i}.Transceiver.{i}.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"access": false,
+				"array": true,
+				"mapping": [
+					{
+						"type": "ubus",
+						"ubus": {
+							"object": "xpon",
+							"method": "status",
+							"args": {},
+							"key": "ONU[@index].Transceiver"
+						}
+					}
+				],
+				"RxPower": {
+					"type": "int",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "int",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "RxPower"
+						}
+					]
+				},
+				"TxPower": {
+					"type": "int",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "int",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "TxPower"
+						}
+					]
+				},
+				"Voltage": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "unsignedInt",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "Voltage"
+						}
+					]
+				},
+				"Bias": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "unsignedInt",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "Bias"
+						}
+					]
+				},
+				"Temperature": {
+					"type": "int",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "int",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "Temperature"
+						}
+					]
+				}
 			}
 		}
 	}