浏览代码

Merge branch 'dev' of https://gogs.storlead.com/lusa/gd32450i-eval into dev

lusa 5 年之前
父节点
当前提交
2f32012a6e

+ 3 - 1
app/Makefile

@@ -14,12 +14,14 @@ all	:
 	make -C ./test_app
 	make -C ./ipmitool-1.8.18
 	make -C ./UpdateFirmware
+	#make -C ./FlexRay_app
 clean	: 
 	make -C ./goahead-3.6.5 clean
 	make -C ./bmc clean
 	make -C ./test_app clean
 	make -C ./ipmitool-1.8.18 clean
 	make -C ./UpdateFirmware clean
+	#make -C ./FlexRay_app clean
 
 	make -C ./driver/Platform clean
 	make -C ./driver/GPIO clean
@@ -27,4 +29,4 @@ clean	:
 	make -C ./driver/ADC clean
 	make -C ./driver/I2C clean
 	make -C ./driver/SPI clean
-	make -C ./driver/GPIO_I2C clean
+	make -C ./driver/GPIO_I2C clean

二进制
app/bmc/bmc_app


+ 1 - 1
app/bmc/msghndlr/Chassis/ChassisDevice.c

@@ -283,7 +283,7 @@ ChassisControl (  uint8_t* pReq, uint8_t ReqLen,  uint8_t* pRes )
         break;
     }
     UpdateFlash();
-    return sizeof (ChassisControlRes_T);
+    return sizeof(ChassisControlRes_T);
 }
 
 

+ 1 - 1
app/bmc/msghndlr/Storlead/Storlead.c

@@ -12,7 +12,7 @@
 int  Storlead_GetSysInfo(uint8_t* pReq, uint8_t ReqLen,  uint8_t* pRes)
 {
 	char Title[] = "系统信息";
-	char Text[] = "CPU型号:FT1500;主频:1 GHZ;内存:8 GB;简介:太神奇了,竟然可以传汉字。哈哈哈。。。";
+	char Text[] = "CPU型号:FT1500;主频:1 GHZ;内存:8 GB;CPU使用率:5%;内存使用率:20%;系统状态:正常;简介:大容量数据存储模块";
 	int len = 0,remainLen = 0;
 	uint16_t offset = (pReq[1]<<8) | pReq[2];
 	int totalLen = 0;

+ 1 - 1
app/goahead-3.6.5/src/libipmi/src/libipmi_Chassis.c

@@ -35,7 +35,7 @@
 
    @retval Returns LIBIPMI_STATUS_SUCCESS on success and error codes on failure
 */
-uint16_t	IPMICMD_ChassisControl( IPMI20_UDS_SESSION_T *pUDSSession, int timeout, char cmd)
+uint16_t IPMICMD_ChassisControl( IPMI20_UDS_SESSION_T *pUDSSession, int timeout, char cmd)
 {
 
     uint32_t		dwResLen;

+ 2 - 2
app/goahead-3.6.5/src/web_interface/src/remote_control.c

@@ -81,8 +81,8 @@ void chassisPwrCtrl(Webs *wp){
   	printf("websFlush ret = %d\n", ret);
     websDone(wp);
 
-    if(pwrAction)
-    	wfree(pwrAction);
+    // if(pwrAction)
+    // 	wfree(pwrAction);
     if(pStr)
         wfree(pStr);
     if(root)