for sync

app/goahead-3.6.5/src/goahead.h

@@ -8,7 +8,7 @@
 #define _h_GOAHEAD 1
 
 /*************** jimbo test IPMC ***************/
-#define TEST_INDEX   1
+#define TEST_INDEX   0
  /******************* end  *********************/
 
 /************************************ Overrides *******************************/

app/goahead-3.6.5/src/libipmi/src/libipmi_StorDevice.c

@@ -1190,7 +1190,7 @@ uint8_t IPMC_GetSELTime(IPMI20_UDS_SESSION_T *pUDSSession, uint8_t IpmbAddr,
 							timeout);
 	if ((wRet != 0) || (Res[6] != 0))
 	{
-		printf("Error getting SEL Time::%x\n",wRet);
+		printf("IPMC Error getting SEL Time::%x\n",wRet);
 		pGetSELTimeRes->CompletionCode = Res[6];
 		pGetSELTimeRes->Time = 0;
 		return wRet;

app/goahead-3.6.5/src/web_interface/src/dashboard.c

@@ -35,7 +35,7 @@ void getDeviceInfo(Webs *wp){
     //Create session
     LIBIPMI_CreateSession(&UDSSession, DEFAULT_TIMEOUT);
 
-//    wp->index = TEST_INDEX;
+    wp->index = TEST_INDEX;
     target_addr = gIPMBAddr[wp->index];
     if(target_addr == 0x20)
     {
@@ -161,7 +161,7 @@ void getSysInfo(Webs *wp){
     //Create session
     LIBIPMI_CreateSession(&UDSSession, DEFAULT_TIMEOUT);
     
-//    wp->index = TEST_INDEX;
+    wp->index = TEST_INDEX;
     target_addr = gIPMBAddr[wp->index];
     if(target_addr == 0x20)
     {
@@ -242,7 +242,7 @@ void getSensorInfo(Webs *wp){
     //Create session
     LIBIPMI_CreateSession(&UDSSession, 10000);
      
-//    wp->index = TEST_INDEX;
+    wp->index = TEST_INDEX;
     target_addr = gIPMBAddr[wp->index];
     if(target_addr == 0x20)
     {

app/goahead-3.6.5/src/web_interface/src/sel.c

@@ -187,17 +187,29 @@ void GetAllSELEntriesSorted(Webs *wp)
                 {
                     break;
                 }
-                cJSON_AddNumberToObject(pJsonsub, "1", SELEventData.hdr.ID);
-                cJSON_AddNumberToObject(pJsonsub, "2", SELEventData.hdr.Type);
-                cJSON_AddNumberToObject(pJsonsub, "3", SELEventData.hdr.TimeStamp);
-                cJSON_AddNumberToObject(pJsonsub, "4", SELEventData.GenID[0]);
-                cJSON_AddNumberToObject(pJsonsub, "5", SELEventData.GenID[1]);
-                cJSON_AddNumberToObject(pJsonsub, "6", SELEventData.EvMRev);
-                cJSON_AddNumberToObject(pJsonsub, "7", SELEventData.SensorType);
-                cJSON_AddNumberToObject(pJsonsub, "8", SELEventData.EvtDirType);
-                cJSON_AddNumberToObject(pJsonsub, "9", SELEventData.EvtData1);
-                cJSON_AddNumberToObject(pJsonsub, "a", SELEventData.EvtData2);
-                cJSON_AddNumberToObject(pJsonsub, "b", SELEventData.EvtData3);
+                // cJSON_AddNumberToObject(pJsonsub, "1", SELEventData.hdr.ID);
+                // cJSON_AddNumberToObject(pJsonsub, "2", SELEventData.hdr.Type);
+                // cJSON_AddNumberToObject(pJsonsub, "3", SELEventData.hdr.TimeStamp);
+                // cJSON_AddNumberToObject(pJsonsub, "4", SELEventData.GenID[0]);
+                // cJSON_AddNumberToObject(pJsonsub, "5", SELEventData.GenID[1]);
+                // cJSON_AddNumberToObject(pJsonsub, "6", SELEventData.EvMRev);
+                // cJSON_AddNumberToObject(pJsonsub, "7", SELEventData.SensorType);
+                // cJSON_AddNumberToObject(pJsonsub, "8", SELEventData.EvtDirType);
+                // cJSON_AddNumberToObject(pJsonsub, "9", SELEventData.EvtData1);
+                // cJSON_AddNumberToObject(pJsonsub, "a", SELEventData.EvtData2);
+                // cJSON_AddNumberToObject(pJsonsub, "b", SELEventData.EvtData3);
+
+                cJSON_AddNumberToObject(pJsonsub, "RecordID", SELEventData.hdr.ID);
+                cJSON_AddNumberToObject(pJsonsub, "RecordType", SELEventData.hdr.Type);
+                cJSON_AddNumberToObject(pJsonsub, "TimeStamp", SELEventData.hdr.TimeStamp);
+                cJSON_AddNumberToObject(pJsonsub, "GenID1", SELEventData.GenID[0]);
+                cJSON_AddNumberToObject(pJsonsub, "GenID2", SELEventData.GenID[1]);
+                cJSON_AddNumberToObject(pJsonsub, "EvmRev", SELEventData.EvMRev);
+                cJSON_AddNumberToObject(pJsonsub, "SensorType", SELEventData.SensorType);
+                cJSON_AddNumberToObject(pJsonsub, "EventDirType", SELEventData.EvtDirType);
+                cJSON_AddNumberToObject(pJsonsub, "EventData1", SELEventData.EvtData1);
+                cJSON_AddNumberToObject(pJsonsub, "EventData2", SELEventData.EvtData2);
+                cJSON_AddNumberToObject(pJsonsub, "EventData3", SELEventData.EvtData3);
                 //获取传感器名称
                 //printf("sensor number %d\n", SELEventData.SensorNum);
                 if((SELEventData.SensorNum != 0xff) && (SELEventData.hdr.Type == 0x02))
@@ -209,9 +221,9 @@ void GetAllSELEntriesSorted(Webs *wp)
                             break;
 
                         if(senNumNameTab[i].sensor_number == SELEventData.SensorNum)
-                        {
-                            //printf("---> get sensor name from cache: %s\n", senNumNameTab[i].sensor_name);
-                            cJSON_AddStringToObject(pJsonsub, "c", senNumNameTab[i].sensor_name);
+                        {                        
+                            //cJSON_AddStringToObject(pJsonsub, "c", senNumNameTab[i].sensor_name);
+                            cJSON_AddStringToObject(pJsonsub, "SensorName", senNumNameTab[i].sensor_name);
                             found_flag = 1;
                             break;
                         }
@@ -228,7 +240,8 @@ void GetAllSELEntriesSorted(Webs *wp)
                         {
                             wRet = IPMC_GetSensorName(&UDSSession, target_addr,SELEventData.SensorNum, sensorName, DEFAULT_TIMEOUT);
                         }
-                        cJSON_AddStringToObject(pJsonsub, "c", sensorName);
+                        //cJSON_AddStringToObject(pJsonsub, "c", sensorName);
+                        cJSON_AddStringToObject(pJsonsub, "SensorName", senNumNameTab[i].sensor_name);
                         if(wRet == 0)
                         {
                             //将得到的传感器名称保存到缓存中