Selaa lähdekoodia

添加gcc的makefile并编译通过

guohui 2 vuotta sitten
vanhempi
commit
9adde989d8

+ 1 - 1
04-源码/03-核心板/output/base/etc/init.d/S90PDUStart

@@ -16,7 +16,7 @@ function run_snmp() {
 }
 
 function run_app() {
-    ./main &
+    $APPDIR/smartPDU &
 }
 
 function led_on() {

BIN
04-源码/03-核心板/output/base/root/app/main


+ 109 - 0
04-源码/03-核心板/smart_pdu/Makefile

@@ -0,0 +1,109 @@
+TARGET = smartPDU
+OUT_DIR = ../output/base/root/app
+
+SRC_DIR = .
+T113_DIR = /home/tronlong/T113
+BLD_DIR  = $(SRC_DIR)/build2
+
+BR_DIR  = $(T113_DIR)/T113-i_v1.0/out/t113_i/tlt113-evm-emmc/longan/buildroot
+SYS_DIR = $(BR_DIR)/host/arm-buildroot-linux-gnueabi/sysroot
+BIN_DIR = $(BR_DIR)/host/bin
+BIN_PRE = arm-linux-gnueabi-
+
+CC = $(BIN_DIR)/$(BIN_PRE)gcc
+CXX = $(BIN_DIR)/$(BIN_PRE)g++
+LD = $(BIN_DIR)/$(BIN_PRE)gcc
+AS = $(BIN_DIR)/$(BIN_PRE)as
+AR = $(BIN_DIR)/$(BIN_PRE)ar
+GDB = $(BIN_DIR)/$(BIN_PRE)gdb
+DUMP = $(BIN_DIR)/$(BIN_PRE)objdump
+STRIP = $(BIN_DIR)/$(BIN_PRE)strip
+READELF = $(BIN_DIR)/$(BIN_PRE)readelf
+
+CFILES += letter/src/shell_cmd_list.c \
+	      letter/src/shell_companion.c \
+	      letter/src/shell_ext.c \
+	      letter/src/shell.c \
+	      letter/os/shell_port.c \
+	      easylogger/os/port/elog_file_port.c \
+	      easylogger/os/port/elog_port.c \
+	      easylogger/plugins/file/elog_file.c \
+	      easylogger/src/elog.c \
+	      easylogger/src/elog_async.c \
+	      easylogger/src/elog_buf.c \
+	      easylogger/src/elog_utils.c  \
+	      mongoose/mongoose.c \
+	      src/websocket_handle.c \
+	      src/io.c \
+	      src/lcd_app.c \
+	      src/lcd_drv.c \
+	      src/sensor_handle.c \
+	      src/cJSON.c \
+	      src/common.c \
+	      src/app.c \
+	      src/appweb_handle.c \
+	      src/modbus_handle.c \
+	      src/sqlite_handle.c \
+	      src/switch_ctrl.c \
+	      src/json_handle.c \
+	      src/main.c \
+	      src/language_hashmap.c \
+	      src/ntpclient.c \
+	      src/pduMIB_form.c \
+	      src/pduMIB_scalar.c \
+	      src/pduMIB_trap.c
+         
+DFLAGS += -DINNER_USE
+IFLAGS += -I$(SYS_DIR)/usr/include \
+          -I$(SRC_DIR)/modbus/inc \
+          -I$(SRC_DIR)/sqlite/inc \
+          -I$(SRC_DIR)/appweb/inc \
+          -I$(SRC_DIR)/easylogger/os/inc \
+          -I$(SRC_DIR)/easylogger/inc \
+          -I$(SRC_DIR)/easylogger/plugins/file \
+          -I$(SRC_DIR)//letter/src \
+          -I$(SRC_DIR)/letter/os \
+          -I$(SRC_DIR)/mongoose \
+          -I$(SRC_DIR)/sqlite/inc \
+          -I$(SRC_DIR)/modbus/inc \
+          -I$(SRC_DIR)/snmp/include
+          
+LFLAGS += -L${SRC_DIR}/modbus/lib \
+          -L${SRC_DIR}/sqlite/lib \
+          -L${SRC_DIR}/appweb/lib \
+          -L${SRC_DIR}/snmp/lib
+
+
+OBJS = $(addprefix $(BLD_DIR)/,$(CFILES:.c=.o))
+DFILES = $(OBJS:.o=.d)
+########################################
+
+$(warning $(OBJS))
+
+
+DEPFLAGS += -MMD -MP -MF $(@:.o=.d)
+CFLAGS += $(IFLAGS) $(DFLAGS) $(DEPFLAGS)
+
+LDFLAGS += -s -lmodbus -lsqlite3 -lappweb -lesp -lhttp -lmpr -lpcre -ldl -lpthread -lm -lnetsnmp -lnetsnmpagent $(LFLAGS)
+
+########################################
+
+
+.PHONEY: all clean
+
+all: $(TARGET)
+
+$(TARGET): $(OBJS)
+	@$(LD) $(LDFLAGS) $^ -o $(BLD_DIR)/$@
+	-cp -uf $(BLD_DIR)/$@ $(OUT_DIR)/
+
+$(BLD_DIR)/%.o:$(SRC_DIR)/%.c Makefile
+	@mkdir -p $(dir $@)
+	$(CC) -c $(CFLAGS) $< -o $@
+
+clean:
+	rm -rf $(BLD_DIR) $(TARGET)
+
+
+
+-include $(DFILES)

+ 2 - 1
04-源码/03-核心板/smart_pdu/README.md

@@ -1,3 +1,4 @@
 Smart PDU项目
 
-
+快速更新
+scp ./main root@192.168.1.132:~/web_temp/main

+ 1 - 0
04-源码/03-核心板/smart_pdu/letter/src/shell.h

@@ -13,6 +13,7 @@
 #define     __SHELL_H__
 
 #include "shell_cfg.h"
+#include <stddef.h>
 
 #define     SHELL_VERSION               "3.2.3"                 /**< 版本号 */
 

+ 0 - 32
04-源码/03-核心板/smart_pdu/src/app.c

@@ -706,7 +706,6 @@ int snmp_thread(void *arg)
 
 
 #include "../../upgd/upgrade.h"
-static int upg_fifo=0;
 static int app_run_notify(void)
 {
     upgrade_msg_t msg={.evt=UPGRADE_EVT_APP_RUN};
@@ -720,37 +719,6 @@ static int app_run_notify(void)
     close(fifo);
     return 0;
 }
-static int upg_free(void)
-{
-    return close(upg_fifo);
-}
-
-static int upg_send(upgrade_msg_t *msg)
-{
-    return write(upg_fifo, msg, sizeof(upgrade_msg_t));
-}
-static int upg_recv(upgrade_msg_t *msg)
-{
-    return read(upg_fifo, msg, sizeof(upgrade_msg_t));
-}
-static void* polling_thread(void *arg)
-{
-    upgrade_msg_t msg={.evt=UPGRADE_EVT_APP_RUN};
-
-    upg_init();
-
-    upg_send(&msg);
-    while(1) {
-        if(upg_recv(&msg)>0) {
-            
-        }
-
-    }
-    upg_free();
-    
-    pthread_exit(NULL);
-}
-
 
 /// @brief 全局结构体初始化
 /// @param _globalDeviceManager 

+ 1 - 1
04-源码/03-核心板/upgd/upgrade.c

@@ -302,7 +302,7 @@ static int kill_app(void)
     int r;
     char cmd[100];
 
-    snprintf(cmd, sizeof(cmd), "killall -e main");
+    snprintf(cmd, sizeof(cmd), "killall -e smartPDU");
     r = exe_cmd2(cmd);
     if(r) {
         LOG("% failed, %d\n", cmd, r);