Merge pull request #2 from ken-nakamura/main

Change HAL ID

Author: ken-nakamura

examples/BALA2/BALA2.ino

@@ -80,25 +80,25 @@ void setup() {
   Blynk.begin(auth);
 
   HALId halid1, halid2, halid3, halid4;
-  halid1.deviceKindId = 1;
-  halid1.vendorId = 9;
-  halid1.productId = 1;
-  halid1.instanceId = 1;
-
-  halid2.deviceKindId = 1;
-  halid2.vendorId = 9;
-  halid2.productId = 1;
-  halid2.instanceId = 2;
-
-  halid3.deviceKindId = 2;
-  halid3.vendorId = 9;
-  halid3.productId = 2;
-  halid3.instanceId = 1;
-
-  halid4.deviceKindId = 2;
-  halid4.vendorId = 9;
-  halid4.productId = 3;
-  halid4.instanceId = 1;
+  halid1.deviceKindId = 0x1;
+  halid1.vendorId = 0xA;
+  halid1.productId = 0x1;
+  halid1.instanceId = 0x1;
+
+  halid2.deviceKindId = 0x1;
+  halid2.vendorId = 0xA;
+  halid2.productId = 0x1;
+  halid2.instanceId = 0x2;
+
+  halid3.deviceKindId = 0x2;
+  halid3.vendorId = 0xA;
+  halid3.productId = 0x1;
+  halid3.instanceId = 0x1;
+
+  halid4.deviceKindId = 0xD;
+  halid4.vendorId = 0xA;
+  halid4.productId = 0x1;
+  halid4.instanceId = 0x1;
 
   motor_l = new Actuator(halid1);
   motor_r = new Actuator(halid2);

src/Actuator.cpp

@@ -36,7 +36,7 @@
 Actuator::Actuator(HALId halId)
 {
     hALId = halId;
-    hALComponent = HalCreate(hALId.vendorId, hALId.productId, hALId.instanceId);
+    hALComponent = HalCreate(hALId.deviceKindId, hALId.vendorId, hALId.productId, hALId.instanceId);
 }
 
 Actuator::~Actuator()

src/Sensor.cpp

@@ -36,7 +36,7 @@
 Sensor::Sensor(HALId halId)
 {
     hALId = halId;
-    hALComponent = HalCreate(hALId.vendorId, hALId.productId, hALId.instanceId);
+    hALComponent = HalCreate(hALId.deviceKindId, hALId.vendorId, hALId.productId, hALId.instanceId);
 }
 
 Sensor::~Sensor()

src/openEL.cpp

@@ -3,7 +3,7 @@
 HAL_HANDLER_T HalHandlerTbl[HAL_SZ_HANDLER_TBL];
 static int32_t HalIdxHandlerTbl;
 
-HALComponent* HalCreate(int32_t vendorID, int32_t productID, int32_t instanceID)
+HALComponent* HalCreate(int32_t deviceKindID, int32_t vendorID, int32_t productID, int32_t instanceID)
 {
     int32_t i;
     int32_t idx = -1;
@@ -26,7 +26,7 @@ HALComponent* HalCreate(int32_t vendorID, int32_t productID, int32_t instanceID)
     idx = -1;
     for (i = 0; i < hal_szRegTbl; i++)
     {
-	if ((vendorID == HalRegTbl[i].vendorID) && (productID == HalRegTbl[i].productID))
+	if ((deviceKindID == HalRegTbl[i].deviceKindID && vendorID == HalRegTbl[i].vendorID) && (productID == HalRegTbl[i].productID))
 	{
 	    idx = i;
 	    break;
@@ -37,7 +37,7 @@ HALComponent* HalCreate(int32_t vendorID, int32_t productID, int32_t instanceID)
 
     pHalComponent = new HALComponent;
     pHalComponent->handle = HalIdxHandlerTbl;
-    pHalComponent->hALId.deviceKindId = pReg->deviceKindID;
+    pHalComponent->hALId.deviceKindId = deviceKindID;
     pHalComponent->hALId.vendorId = vendorID;
     pHalComponent->hALId.productId = productID;
     pHalComponent->hALId.instanceId = instanceID;

src/openEL.hpp

@@ -87,7 +87,7 @@ typedef struct HalFncTbl_st
     /* 0x1F */ ReturnCode (*pFncDeviceVendor1F)(HALComponent*, HAL_ARGUMENT_T*,HAL_ARGUMENT_DEVICE_T *); /**< Device Vendor Function */
 } HAL_FNCTBL_T;
 
-HALComponent* HalCreate(int32_t vendorID, int32_t productID, int32_t instanceID);
+HALComponent* HalCreate(int32_t deviceKindId, int32_t vendorID, int32_t productID, int32_t instanceID);
 void HalDestroy(HALComponent *halComponent);
 
 ReturnCode HalInit(HALComponent *halComponent);

src/openEL_registryConfig.cpp

@@ -38,9 +38,9 @@
 #include "openEL_SensorM5StackGrayBMM150.hpp"
 
 const HAL_REG_T HalRegTbl[] = {
-    {0x0001, 0x00000009, 0x00000001, &HalActuatorM5StackGrayBMM150Tbl, sizeof(Actuator) },
-    {0x0002, 0x00000009, 0x00000002, &HalSensorM5StackGrayMPU6886Tbl,  sizeof(Sensor)   },
-    {0x0002, 0x00000009, 0x00000003, &HalSensorM5StackGrayBMM150Tbl,   sizeof(Sensor)   },
+    {0x0001, 0x0000000A, 0x00000001, &HalActuatorM5StackGrayBMM150Tbl, sizeof(Actuator) },
+    {0x0002, 0x0000000A, 0x00000001, &HalSensorM5StackGrayMPU6886Tbl,  sizeof(Sensor)   },
+    {0x000D, 0x0000000A, 0x00000001, &HalSensorM5StackGrayBMM150Tbl,   sizeof(Sensor)   },
 };
 
 const int32_t hal_szRegTbl = sizeof(HalRegTbl)/sizeof(HAL_REG_T);