Startseite Erkunden Hilfe
Registrieren Anmelden
lusa
/
gd32450i-eval
1
0
Fork 0
Dateien Issues 0 Pull-Requests 0 Wiki
Quellcode durchsuchen

Resolve sensor reading return 0

zhangbo vor 5 Jahren
Ursprung
9e321a58ea
Commit
2471afb971
11 geänderte Dateien mit 70 neuen und 73 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 1 0
      app/bmc/Api.c
  2. 1 1
      app/bmc/Makefile
  3. BIN
      app/bmc/bmc_app
  4. 4 0
      app/bmc/msghndlr/SensorEvent/SensorDevice/Sensor.c
  5. 1 1
      app/bmc/msghndlr/SensorEvent/SensorDevice/SensorMonitor.c
  6. 3 2
      app/bmc/sensor_tbl.h
  7. 0 9
      app/goahead-3.6.5/src/route.txt
  8. 2 3
      app/goahead-3.6.5/src/web/index.html
  9. 48 48
      gd32450i-eval.busybox
  10. 9 8
      gd32450i-eval.initramfs
  11. 1 1
      local/rc

+ 1 - 0
app/bmc/Api.c
Datei anzeigen 

@@ -94,6 +94,7 @@ int PlatformInit(void)
 
 	g_BMCInfo.ChassisID		=	PDK_GetChassisID();

 

 	g_BMCInfo.ChassisIdentify		=	FALSE;

+	g_BMCInfo.PowerGoodFlag =  	1;

 	

 	//init DevGUID

 	g_BMCInfo.DeviceGUID[0]	=	0x01;

+ 1 - 1
app/bmc/Makefile
Datei anzeigen 

@@ -117,7 +117,7 @@ CFLAGS	+= -I ./encryption
 
 

 

 $(EXEC): $(SRC)

-	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS) -lpthread

+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS) -lpthread -lm -lc

BIN
app/bmc/bmc_app
Datei anzeigen


+ 4 - 0
app/bmc/msghndlr/SensorEvent/SensorDevice/Sensor.c
Datei anzeigen 

@@ -1514,10 +1514,12 @@ GetSensorReading ( uint8_t* pReq, uint8_t ReqLen,  uint8_t* pRes)
 
 	SensorInfo_T *			pSensorInfo	=	NULL;
 
 	pSensorInfo	=	getSensorInfo(pSensorReadReq->SensorNum);
 
 
+    //printf("---> pSensorInfo %p, reading: %#x\n", pSensorInfo, pSensorInfo->SensorReading);
 
     pSensorReadRes->Flags = pSensorInfo->EventFlags & 0xe0;
 
 
     if (0 != (pSensorInfo->EventFlags & BIT5))
 
     {
 
+        //printf("---> log 1\n");
 
         pSensorReadRes->SensorReading = 0;
 
         pSensorReadRes->CompletionCode = CC_NORMAL;
 
         pSensorReadRes->ComparisonStatus = (((uint8_t) (pSensorReadRes->SensorReading & 0x00FF)) & ((uint8_t) (pSensorInfo->SettableThreshMask & 0x00FF)) );
 
@@ -1538,6 +1540,7 @@ GetSensorReading ( uint8_t* pReq, uint8_t ReqLen,  uint8_t* pRes)
 
 
     if (THRESHOLD_SENSOR_CLASS  == pSensorInfo->EventTypeCode)
 
     {
 
+        //printf("---> log2\n");
 
         pSensorReadRes->SensorReading = (SensorReading & 0x00FF);		//notice
 
         pSensorReadRes->ComparisonStatus = 0x00;
 
         if((pSensorInfo->DeassertionEventEnablesByte2 & BIT6) == BIT6 )
 
@@ -1597,6 +1600,7 @@ GetSensorReading ( uint8_t* pReq, uint8_t ReqLen,  uint8_t* pRes)
 
     }
 
     else
 
     {
 
+        //printf("---> log3\n");
 
         pSensorReadRes->ComparisonStatus = (((uint8_t) (SensorReading & 0x00FF)) & ((uint8_t) (pSensorInfo->SettableThreshMask & 0x00FF)) );
 
         pSensorReadRes->OptionalStatus   = (((uint8_t) (SensorReading >> 8)) & ((uint8_t)(pSensorInfo->SettableThreshMask >> 8)) );
 
         // For Discrete sensor, [7] - reserved. Returned as 1b. Ignore on read.

+ 1 - 1
app/bmc/msghndlr/SensorEvent/SensorDevice/SensorMonitor.c
Datei anzeigen 

@@ -941,7 +941,7 @@ int get_sensor_reading (uint8_t sensor_num, uint8_t *preading)
 
     }
 
      
 
-//    sensor_dbg_printf ("sensor number %x  reading = %x\r\n", sensor_num, *preading);
 
+    //printf ("sensor number %x  reading = %x\r\n", sensor_num, *preading);
 
     return 0;
 
 }

+ 3 - 2
app/bmc/sensor_tbl.h
Datei anzeigen 

@@ -4,8 +4,9 @@
 
 #include <stdint.h>

 

 typedef enum {

-	MonitorOnStandby,

-	NotMonitorOnStandby

+	NotMonitorOnStandby = 0,

+	MonitorOnStandby = 1,

+	

 }monit_sta_t;

 

 /**

+ 0 - 9
app/goahead-3.6.5/src/route.txt
Datei anzeigen 

@@ -36,15 +36,6 @@ route uri=/action handler=action
 
 route uri=/ extensions=jst handler=jst
 
 route uri=/ methods=OPTIONS|TRACE handler=options
 
 
-############################### User code ##########################
 
-route uri=/index.html
 
-#route uri=/ redirect=*@/index.html
 
-
 
-
 
-
 
-
 
-
 
-
 
 #   For legacy GoAhead applications using /goform
 
 route uri=/goform handler=action

+ 2 - 3
app/goahead-3.6.5/src/web/index.html
Datei anzeigen 

@@ -1,3 +1,2 @@
 
-<html><head><title>index.html</title></head>

-<body>Hello /index.html</body>

-</html>
 
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>bmcui</title><link href=/static/css/dashbord.css rel=prefetch><link href=/static/css/fan.css rel=prefetch><link href=/static/css/index.css rel=prefetch><link href=/static/css/login.css rel=prefetch><link href=/static/css/sensor_history.css rel=prefetch><link href=/static/css/set_proctrol.css rel=prefetch><link href=/static/css/system_logs.css rel=prefetch><link href=/static/js/BSODScreen.js rel=prefetch><link href=/static/js/dashbord.js rel=prefetch><link href=/static/js/dashbord~index~login~sensor_history.js rel=prefetch><link href=/static/js/event_logs.js rel=prefetch><link href=/static/js/fan.js rel=prefetch><link href=/static/js/index.js rel=prefetch><link href=/static/js/login.js rel=prefetch><link href=/static/js/sensor_history.js rel=prefetch><link href=/static/js/set_proctrol.js rel=prefetch><link href=/static/js/system_logs.js rel=prefetch><link href=/static/css/app.css rel=preload as=style><link href=/static/css/chunk-vendors.css rel=preload as=style><link href=/static/js/app.js rel=preload as=script><link href=/static/js/chunk-vendors.js rel=preload as=script><link href=/static/css/chunk-vendors.css rel=stylesheet><link href=/static/css/app.css rel=stylesheet></head><body><div id=app></div><script src=/static/js/chunk-vendors.js></script><script src=/static/js/app.js></script></body></html>

+

+ 48 - 48
gd32450i-eval.busybox
Datei anzeigen 

@@ -1,7 +1,7 @@
 
 #
 
 # Automatically generated make config: don't edit
 
 # Busybox version: 1.17.0
 
-# Sat Mar  7 03:15:40 2020
 
+# Thu Mar 26 00:29:42 2020
 
 #
 
 CONFIG_HAVE_DOT_CONFIG=y
 
 
@@ -91,7 +91,7 @@ CONFIG_PREFIX="./_install"
 
 CONFIG_PASSWORD_MINLEN=6
 
 CONFIG_MD5_SIZE_VS_SPEED=2
 
 # CONFIG_FEATURE_FAST_TOP is not set
 
-# CONFIG_FEATURE_ETC_NETWORKS is not set
 
+CONFIG_FEATURE_ETC_NETWORKS=y
 
 CONFIG_FEATURE_EDITING=y
 
 CONFIG_FEATURE_EDITING_MAX_LEN=256
 
 # CONFIG_FEATURE_EDITING_VI is not set
 
@@ -175,8 +175,8 @@ CONFIG_TEST=y
 
 # CONFIG_CAL is not set
 
 # CONFIG_CATV is not set
 
 # CONFIG_CHGRP is not set
 
-CONFIG_CHMOD=y
 
-CONFIG_CHOWN=y
 
+# CONFIG_CHMOD is not set
 
+# CONFIG_CHOWN is not set
 
 # CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
 
 # CONFIG_CHROOT is not set
 
 # CONFIG_CKSUM is not set
 
@@ -213,7 +213,7 @@ CONFIG_FEATURE_FANCY_ECHO=y
 
 # CONFIG_INSTALL is not set
 
 # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
 
 # CONFIG_LENGTH is not set
 
-CONFIG_LN=y
 
+# CONFIG_LN is not set
 
 # CONFIG_LOGNAME is not set
 
 CONFIG_LS=y
 
 CONFIG_FEATURE_LS_FILETYPES=y
 
@@ -274,8 +274,8 @@ CONFIG_SLEEP=y
 
 # CONFIG_USLEEP is not set
 
 # CONFIG_UUDECODE is not set
 
 # CONFIG_UUENCODE is not set
 
-CONFIG_WC=y
 
-CONFIG_FEATURE_WC_LARGE=y
 
+# CONFIG_WC is not set
 
+# CONFIG_FEATURE_WC_LARGE is not set
 
 # CONFIG_WHO is not set
 
 # CONFIG_WHOAMI is not set
 
 # CONFIG_YES is not set
 
@@ -537,43 +537,43 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 
 # CONFIG_LOSETUP is not set
 
 # CONFIG_LSPCI is not set
 
 # CONFIG_LSUSB is not set
 
-CONFIG_MDEV=y
 
-CONFIG_FEATURE_MDEV_CONF=y
 
-CONFIG_FEATURE_MDEV_RENAME=y
 
-CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
 
-CONFIG_FEATURE_MDEV_EXEC=y
 
-CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
 
+# CONFIG_MDEV is not set
 
+# CONFIG_FEATURE_MDEV_CONF is not set
 
+# CONFIG_FEATURE_MDEV_RENAME is not set
 
+# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
 
+# CONFIG_FEATURE_MDEV_EXEC is not set
 
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
 
 # CONFIG_MKSWAP is not set
 
 # CONFIG_FEATURE_MKSWAP_UUID is not set
 
 # CONFIG_MORE is not set
 
 CONFIG_FEATURE_USE_TERMIOS=y
 
-# CONFIG_VOLUMEID is not set
 
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
 
-# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
 
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
 
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
 
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
 
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
 
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
 
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
 
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
 
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
 
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
 
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
 
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
 
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
 
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
 
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
 
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
 
+CONFIG_VOLUMEID=y
 
+CONFIG_FEATURE_VOLUMEID_EXT=y
 
+CONFIG_FEATURE_VOLUMEID_BTRFS=y
 
+CONFIG_FEATURE_VOLUMEID_REISERFS=y
 
+CONFIG_FEATURE_VOLUMEID_FAT=y
 
+CONFIG_FEATURE_VOLUMEID_HFS=y
 
+CONFIG_FEATURE_VOLUMEID_JFS=y
 
+CONFIG_FEATURE_VOLUMEID_XFS=y
 
+CONFIG_FEATURE_VOLUMEID_NTFS=y
 
+CONFIG_FEATURE_VOLUMEID_ISO9660=y
 
+CONFIG_FEATURE_VOLUMEID_UDF=y
 
+CONFIG_FEATURE_VOLUMEID_LUKS=y
 
+CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
 
+CONFIG_FEATURE_VOLUMEID_CRAMFS=y
 
+CONFIG_FEATURE_VOLUMEID_ROMFS=y
 
+CONFIG_FEATURE_VOLUMEID_SYSV=y
 
+CONFIG_FEATURE_VOLUMEID_OCFS2=y
 
+CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
 
 CONFIG_MOUNT=y
 
-# CONFIG_FEATURE_MOUNT_FAKE is not set
 
-# CONFIG_FEATURE_MOUNT_VERBOSE is not set
 
+CONFIG_FEATURE_MOUNT_FAKE=y
 
+CONFIG_FEATURE_MOUNT_VERBOSE=y
 
 # CONFIG_FEATURE_MOUNT_HELPERS is not set
 
-# CONFIG_FEATURE_MOUNT_LABEL is not set
 
+CONFIG_FEATURE_MOUNT_LABEL=y
 
 CONFIG_FEATURE_MOUNT_NFS=y
 
-# CONFIG_FEATURE_MOUNT_CIFS is not set
 
-# CONFIG_FEATURE_MOUNT_FLAGS is not set
 
-# CONFIG_FEATURE_MOUNT_FSTAB is not set
 
+CONFIG_FEATURE_MOUNT_CIFS=y
 
+CONFIG_FEATURE_MOUNT_FLAGS=y
 
+CONFIG_FEATURE_MOUNT_FSTAB=y
 
 # CONFIG_PIVOT_ROOT is not set
 
 # CONFIG_RDATE is not set
 
 # CONFIG_RDEV is not set
 
@@ -586,13 +586,13 @@ CONFIG_FEATURE_MOUNT_NFS=y
 
 # CONFIG_FEATURE_SWAPON_PRI is not set
 
 # CONFIG_SWITCH_ROOT is not set
 
 CONFIG_UMOUNT=y
 
-# CONFIG_FEATURE_UMOUNT_ALL is not set
 
+CONFIG_FEATURE_UMOUNT_ALL=y
 
 
 #
 
 # Common options for mount/umount
 
 #
 
-# CONFIG_FEATURE_MOUNT_LOOP is not set
 
-# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set
 
+CONFIG_FEATURE_MOUNT_LOOP=y
 
+CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
 
 # CONFIG_FEATURE_MTAB_SUPPORT is not set
 
 
 #
 
@@ -687,7 +687,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0
 
 # CONFIG_NC_EXTRA is not set
 
 # CONFIG_NC_110_COMPAT is not set
 
 # CONFIG_FEATURE_IPV6 is not set
 
-# CONFIG_FEATURE_UNIX_LOCAL is not set
 
+CONFIG_FEATURE_UNIX_LOCAL=y
 
 # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
 
 # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
 
 # CONFIG_ARP is not set
 
@@ -772,9 +772,9 @@ CONFIG_FEATURE_FANCY_PING=y
 
 CONFIG_ROUTE=y
 
 # CONFIG_SLATTACH is not set
 
 # CONFIG_TCPSVD is not set
 
-CONFIG_TELNET=y
 
-CONFIG_FEATURE_TELNET_TTYPE=y
 
-CONFIG_FEATURE_TELNET_AUTOLOGIN=y
 
+# CONFIG_TELNET is not set
 
+# CONFIG_FEATURE_TELNET_TTYPE is not set
 
+# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
 
 CONFIG_TELNETD=y
 
 CONFIG_FEATURE_TELNETD_STANDALONE=y
 
 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
 
@@ -811,9 +811,9 @@ CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
 
 # CONFIG_UDPSVD is not set
 
 # CONFIG_VCONFIG is not set
 
-CONFIG_WGET=y
 
-CONFIG_FEATURE_WGET_STATUSBAR=y
 
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
 
+# CONFIG_WGET is not set
 
+# CONFIG_FEATURE_WGET_STATUSBAR is not set
 
+# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
 
 # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
 
 # CONFIG_ZCIP is not set
 
 
@@ -839,7 +839,7 @@ CONFIG_FEATURE_MIME_CHARSET=""
 
 # Process Utilities
 
 #
 
 # CONFIG_SMEMCAP is not set
 
-# CONFIG_FREE is not set
 
+CONFIG_FREE=y
 
 # CONFIG_FUSER is not set
 
 CONFIG_KILL=y
 
 # CONFIG_KILLALL is not set

+ 9 - 8
gd32450i-eval.initramfs
Datei anzeigen 

@@ -55,14 +55,14 @@ slink /bin/lsmod busybox 777 0 0
 
 slink /bin/hostname busybox 777 0 0
 
 slink /bin/cat busybox 777 0 0
 
 slink /bin/cp busybox 777 0 0
 
-slink /bin/chmod busybox 777 0 0
 
-slink /bin/chown busybox 777 0 0
 
+#slink /bin/chmod busybox 777 0 0
 
+#slink /bin/chown busybox 777 0 0
 
 slink /bin/date busybox 777 0 0
 
-slink /bin/dd busybox 777 0 0
 
+#slink /bin/dd busybox 777 0 0
 
 slink /bin/echo busybox 777 0 0
 
 slink /bin/hush busybox 777 0 0
 
 slink /bin/kill busybox 777 0 0
 
-slink /bin/ln busybox 777 0 0
 
+#slink /bin/ln busybox 777 0 0
 
 slink /bin/login /bin/busybox 777 0 0
 
 slink /bin/ls busybox 777 0 0
 
 slink /bin/mkdir busybox 777 0 0
 
@@ -79,16 +79,17 @@ slink /bin/umount busybox 777 0 0
 
 slink /bin/ping busybox 777 0 0
 
 slink /bin/ifconfig busybox 777 0 0
 
 slink /bin/telnetd busybox 777 0 0
 
-slink /bin/wc busybox 777 0 0
 
+#slink /bin/wc busybox 777 0 0
 
 slink /bin/netstat busybox 777 0 0
 
 slink /bin/nslookup busybox 777 0 0
 
 slink /bin/ntpd busybox 777 0 0
 
 slink /bin/route busybox 777 0 0
 
-slink /bin/telnet busybox 777 0 0
 
+#slink /bin/telnet busybox 777 0 0
 
 slink /bin/traceroute busybox 777 0 0
 
-slink /bin/wget busybox 777 0 0
 
+#slink /bin/wget busybox 777 0 0
 
 slink /bin/vi busybox 777 0 0
 
-slink /bin/udhcpc busybox 777 0 0
 
+slink /bin/top busybox 777 0 0
 
+slink /bin/free busybox 777 0 0
 
 ifarch A2F file /bin/iap_tool ${INSTALL_ROOT}/A2F/root/usr/bin/iap_tool 755 0 0
 
 
 dir /usr 755 0 0

+ 1 - 1
local/rc
Datei anzeigen 

@@ -32,7 +32,7 @@ mknod /dev/adc1 c 105 0
 
 #mknod /dev/spi5 c 104 4
 
 
 ################### run app ####################
 
-/bin/telnetd
 
+#/bin/telnetd
 
 /usr/bin/bmc_app & 
 sleep 3
 
 #/usr/bin/test_app