diff --git a/clusterApp/Makefile_RK b/clusterApp/Makefile_RK new file mode 100644 index 0000000..a86f9e5 --- /dev/null +++ b/clusterApp/Makefile_RK @@ -0,0 +1,126 @@ +APPNAME = clusterApp +DESTDIR = bin +CD = make --no-print-directory +BIN = $(DESTDIR)/$(APPNAME) + +#readonly APP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +CURR_DIR = /home/huaxu/develop/cluster/clusterApp/ +PKG_DIR = /home/huaxu/develop/cluster/packages/ +ROOTFS = /home/huaxu/develop/cluster/packages/install/usr/ +#ROOTFS = ${APP_DIR}/../packages/install/ +TARGET_PATH_LIB = $(ROOTFS)/lib +TARGET_PATH_INCLUDE = $(ROOTFS)/include +#TFPT_DIR = /home/lst/workspace/rootfs/root/app/ + +CFLAGS = -fPIC -fno-strict-aliasing -fno-optimize-sibling-calls -Wall + +ifdef DEBUG +CFLAGS += -g -DDEBUG -DINST_DEBUG +else +CFLAGS += -O3 -fexpensive-optimizations +endif + +DEPS = -lpthread -lGLESv2 -lEGL -ldrm -lgbm -lfreetype -lm -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB) +## DEPS += /home/lst/workspace/jpeg/jpeg-9c/install/lib/libjpeg.a +DEPS += $(ROOTFS)/lib/libjpeg.a +DEPS += $(ROOTFS)/lib/libcjson.a +DEPS += -lz -lpng -lcjson + +#Make command to use for dependencies +CROSS_COMPILE = /opt/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu- +CC = $(CROSS_COMPILE)gcc +AR = $(CROSS_COMPILE)ar + +SUBDIR = ./src + +CFLAGS += -DLINUX \ + -DEGL_API_FB \ + -DCOMPILE_IN_UBUNTU \ + -DGLEW_NO_GLU + ##\ + ##-DCOMPILE_IN_WINDOWS + +CFLAGS += -Iinclude \ + -I$(TARGET_PATH_INCLUDE) \ + -I$(TARGET_PATH_INCLUDE)/freetype2 \ + -I$(TARGET_PATH_INCLUDE)/GL \ + -I$(TARGET_PATH_INCLUDE)/cjson \ + -I$(TARGET_PATH_INCLUDE)/libdrm \ + -I$(ROOTFS)/local/include \ + -I$(CURR_DIR)/3psw/freetype-2.9_MinGW/include/freetype2/ \ + -I$(CURR_DIR)/3psw/lpng1634/ \ +# -I/usr/include/ \ +# -I/usr/include/GL/ \ +# -I/usr/include/drm/ +# -I/home/lst/workspace/jpeg/jpeg-9c/install/include \ +# -I/home/lst/workspace/zlib/zlib_build/ \ +# -I/home/lst/workspace/libpng/libpng_build/ \ +# -I$(ROOTFS)/usr/src/linux/include + +CFLAGS += -L$(ROOTFS)/lib \ + -L/$(ROOTFS)/lib/libcjson.a + +SOURCES = $(shell find $(SUBDIR) -name "*.c") + +BIN_SOURCE = ./main.c +BIN_SOURCES = $(SOURCES) $(BIN_SOURCE) +BIN_OBJECTS = $(BIN_SOURCES:.c=.o) + +$(APPNAME): compile_tips install finish_tips + + +compile_tips: + @echo "************************" + @echo "Compile Tools" + @echo "***************" + @echo gcc + @echo "***************" + + +finish_tips: + @echo "************************" + @echo -e "make end!\n" + +%.o : %.c + @echo " CC " $@ + @$(QUIET)$(CC) $(CFLAGS) $(LDFLAGS) -MD -c $< -o $@ + + +%.o : %.cpp + @echo " CXX " $@ + @$(QUIET)$(CC) $(CFLAGS) $(LDFLAGS) -MMD -c $< -o $@ + + +$(BIN) : $(BIN_OBJECTS) + @echo " LD " $@ + @echo " LD depen " $< + @$(QUIET)$(CC) -o $(BIN) $(BIN_OBJECTS) $(DEPS) + @echo -e " BD $(BIN) Build Success!\n" + +install: $(BIN) + ##@echo " CP " $(BIN) $(TFPT_DIR) + ##@cp $(BIN) $(TFPT_DIR) + @echo " SYNC " + @sync + +help: + @echo '' + @echo '----------------' + @echo 'make [option]' + @echo 'Options:' + @echo 'DEBUG=1' + @echo ' disable print debug info' + @echo '----------------' + @echo '' + +clean: + @rm -f $(SOURCES:.c=.d) + @rm -f $(SOURCES:.c=.o) + @rm -f $(BIN_SOURCE:.c=.d) $(BIN_SOURCE:.c=.o) $(BIN) + @clear + @echo '' + @echo 'Make Clean,OK!' + @echo '' + + +-include $(BIN_OBJECTS:.o=.d) diff --git a/clusterApp/Res/image/driving_car_all_red_base.png b/clusterApp/Res/image/driving_car_all_red_base.png index 94f7985..daf9876 100644 Binary files a/clusterApp/Res/image/driving_car_all_red_base.png and b/clusterApp/Res/image/driving_car_all_red_base.png differ diff --git a/clusterApp/Res/image/driving_car_red_base.png b/clusterApp/Res/image/driving_car_red_base.png index 5187d9d..daf9876 100644 Binary files a/clusterApp/Res/image/driving_car_red_base.png and b/clusterApp/Res/image/driving_car_red_base.png differ diff --git a/clusterApp/Res/image/driving_car_white_base.png b/clusterApp/Res/image/driving_car_white_base.png index 893d936..daf9876 100644 Binary files a/clusterApp/Res/image/driving_car_white_base.png and b/clusterApp/Res/image/driving_car_white_base.png differ diff --git a/clusterApp/Res/image/logo.png b/clusterApp/Res/image/logo.png index 1621763..e78d570 100644 Binary files a/clusterApp/Res/image/logo.png and b/clusterApp/Res/image/logo.png differ diff --git a/clusterApp/Res/image/parking_car_red_base.png b/clusterApp/Res/image/parking_car_red_base.png index eab781c..7400bcc 100644 Binary files a/clusterApp/Res/image/parking_car_red_base.png and b/clusterApp/Res/image/parking_car_red_base.png differ diff --git a/clusterApp/Res/image/ui3_basic_bg_backing.png b/clusterApp/Res/image/ui3_basic_bg_backing.png index 6e8cc2d..b351ec3 100644 Binary files a/clusterApp/Res/image/ui3_basic_bg_backing.png and b/clusterApp/Res/image/ui3_basic_bg_backing.png differ diff --git a/clusterApp/Res/image/ui3_basic_bg_backing_night.png b/clusterApp/Res/image/ui3_basic_bg_backing_night.png index 48c9d6b..b351ec3 100644 Binary files a/clusterApp/Res/image/ui3_basic_bg_backing_night.png and b/clusterApp/Res/image/ui3_basic_bg_backing_night.png differ diff --git a/clusterApp/Res/image/ui3_basic_bg_driving.png b/clusterApp/Res/image/ui3_basic_bg_driving.png index 5555477..b351ec3 100644 Binary files a/clusterApp/Res/image/ui3_basic_bg_driving.png and b/clusterApp/Res/image/ui3_basic_bg_driving.png differ diff --git a/clusterApp/Res/image/ui3_basic_bg_driving_night.png b/clusterApp/Res/image/ui3_basic_bg_driving_night.png index a1e2f56..b351ec3 100644 Binary files a/clusterApp/Res/image/ui3_basic_bg_driving_night.png and b/clusterApp/Res/image/ui3_basic_bg_driving_night.png differ diff --git a/clusterApp/bin/clusterApp b/clusterApp/bin/clusterApp index 7feb7e3..ed417f3 100755 Binary files a/clusterApp/bin/clusterApp and b/clusterApp/bin/clusterApp differ diff --git a/clusterApp/include/InsCfg.h b/clusterApp/include/InsCfg.h index 28092e1..a743bb3 100644 --- a/clusterApp/include/InsCfg.h +++ b/clusterApp/include/InsCfg.h @@ -2,10 +2,10 @@ #define INSCFG_H_INCLUDED #define VERSION_MAJOR 0 -#define VERSION_MINOR 3 -#define VERSION_FIX 7 +#define VERSION_MINOR 1 +#define VERSION_FIX 0 #define VERSION_REV 1 -#define VERSION_HW 3 +#define VERSION_HW 1 enum { @@ -106,10 +106,10 @@ enum #define MAX_FT_FACE_NUM 10 -#define MAX_LOAD_THREAD_NUM 5 /* 资源加载任务最大子线程数量 */ -#define MAX_LOAD_TASK_NUM 100 /* 资源加载任务瞬时最大任务数量 */ +#define MAX_LOAD_THREAD_NUM 5 /* 锟斤拷源锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷叱锟斤拷锟斤拷锟 */ +#define MAX_LOAD_TASK_NUM 100 /* 锟斤拷源锟斤拷锟斤拷锟斤拷锟斤拷瞬时锟斤拷锟斤拷锟斤拷锟斤拷锟斤拷锟 */ #define MAX_LOAD_TASK_WAIT_NUM (MAX_LOAD_THREAD_NUM*10) -#define MAX_FILE_NAME_LEN 100 /* 资源文件名字符串的最大长度 */ +#define MAX_FILE_NAME_LEN 100 /* 锟斤拷源锟侥硷拷锟斤拷锟街凤拷锟斤拷锟斤拷锟斤拷蟪ざ锟 */ #define RENDER_DISPLAY_WIDTH 1920 #define RENDER_DISPLAY_HEIGHT 720 diff --git a/clusterApp/include/InsDbg.h b/clusterApp/include/InsDbg.h index cbc9991..5ba209b 100644 --- a/clusterApp/include/InsDbg.h +++ b/clusterApp/include/InsDbg.h @@ -15,8 +15,16 @@ #define DBG_TAG " " #endif // DBG_TAG +#include +inline unsigned long get_startup_ms(void) { + return (unsigned long)(clock() * 10000 / CLOCKS_PER_SEC); +} //#define DBG_Log(level, fmt, v...) -#define DBG_Log(level, fmt, v...) if(level >= DBG_LEVEL)printf("[ %15s ] "fmt, DBG_TAG, ##v) +#define DBG_Log(level, fmt, v...) \ + do { \ + if (level >= DBG_LEVEL) \ + printf("[%lu][ %15s ] " fmt, get_startup_ms(), DBG_TAG, ##v); \ + } while(0) #endif // NODEBUG diff --git a/clusterApp/include/Protocol/MainBoard_IIC_Sys.h b/clusterApp/include/Protocol/MainBoard_IIC_Sys.h index b8608f3..279617d 100644 --- a/clusterApp/include/Protocol/MainBoard_IIC_Sys.h +++ b/clusterApp/include/Protocol/MainBoard_IIC_Sys.h @@ -7,7 +7,7 @@ MbIicApi Un08 srcDataBuf[ID_FRAME_R_NUM][I2C_FRAMELEN-1]; MbIicApi Un08 dstDataBuf[ID_FRAME_W_NUM][I2C_FRAMELEN-1]; -#define DATA_SPEED 100// srcDataBuf[ID_FRAME_R_0x00][0].value /*杞﹂*/ +#define DATA_SPEED srcDataBuf[ID_FRAME_R_0x00][0].value /*杞﹂*/ #define DATA_BATTERY srcDataBuf[ID_FRAME_R_0x00][1].sbit07.b06 /*鐢甸噺*/ #define DATA_IND_MUTE srcDataBuf[ID_FRAME_R_0x00][1].sbit07.b7 /*闈欓煶*/ #define DATA_SPEED_WARN srcDataBuf[ID_FRAME_R_0x00][2].value /*鎶ヨ杞﹂*/ @@ -197,7 +197,7 @@ MbIicApi Un08 dstDataBuf[ID_FRAME_W_NUM][I2C_FRAMELEN-1]; //#define DATA_LANE_RR_LENGTH srcDataBuf[ID_FRAME_R_0x0B][5].sbit26.b27 /*鍙冲彸杞﹂亾绾块暱搴*/ #define DATA_BAT_LACK srcDataBuf[ID_FRAME_R_0x0B][2].sbit.b6 /* 缁埅閲岀▼鐏 */ #define DATA_RADAR_DISTANCE srcDataBuf[ID_FRAME_R_0x0B][5].value /*闆疯揪璺濈*/ -#define DATA_VEHICLE_COLOR_CFG srcDataBuf[ID_FRAME_R_0x0B][6].value /*杞﹁韩棰滆壊閰嶇疆*/ +#define DATA_VEHICLE_COLOR_CFG VehicleColor_Red // srcDataBuf[ID_FRAME_R_0x0B][6].value /*杞﹁韩棰滆壊閰嶇疆*/ #define DATA_ENGCOST_P100M srcDataBuf[ID_FRAME_R_0x0B][7].value /*鏈杩100m鑳借*/ #define DATA_TRAFFIC_LANE_PARAM_0_LL srcDataBuf[ID_FRAME_R_0x0D][0].value /*宸﹀乏杞﹂亾 甯告暟鍙傛暟 L0*/ diff --git a/clusterApp/src/InsRender/Render.c b/clusterApp/src/InsRender/Render.c index 9a78d05..7f45be9 100644 --- a/clusterApp/src/InsRender/Render.c +++ b/clusterApp/src/InsRender/Render.c @@ -158,6 +158,261 @@ static Int32 GetAssicIdx(char ch) return str_invalid_char_idx[0]; } + +/** + * 鏄剧ず鏃堕棿, + * @mintutes 涓澶╁綋涓殑鍒嗛挓鏁 [0, 24*60-1] + * @fmt 鏃堕棿鏍煎紡 0:24鏃跺埗, 1:12鏃跺埗 + */ +static void ShowTime(UInt16 minutes, UInt08 fmt); +/** + * 鏄剧ず娓╁害, + * @temperature 娓╁害鏁板 + */ +static void ShowTemprature(Int16 temperature); + +/** + * 鏄剧ず杞﹂, + * 杞﹂熸棤鏁堜负0xff鏃朵笉鏄剧ず, + * 杞﹂熷彉鍖栨椂骞虫粦杩囨浮 + * @speed 杞﹂熸暟鍊 + */ +static void ShowSpeed(UInt08 speed); + +/** + * 鏄剧ず缁埅閲岀▼ + * @range 缁埅閲岀▼鏁板 + */ +static void ShowTripRange(UInt16 range); +/** + * 鏄剧ず鐢ㄦ埛鍚 + */ +static void ShowGreeting(); + +/** + * 鍦ㄥ乏涓婅鏄剧ず甯х巼, 鍙充笂瑙掓樉绀虹増鏈俊鎭,缂栬瘧鏃ユ湡 + */ +static void ShowFPS(); +/** + * 鏄剧ず宸︽ā鍧楀垪琛 + * @cursor 鍏夋爣鍊 + * @moduleId 褰撳墠宸︽ā鍧桰D + */ +static Bool ShowLeftModuleList(UInt08 cursor, UInt08 moduleId); + +/** + * 鏄剧ず鍙虫ā鍧楀垪琛 + * @cursor 鍏夋爣鍊 + * @moduleId 褰撳墠鍙虫ā鍧桰D + */ +static Bool ShowRightModuleList(UInt08 cursor, UInt08 moduleId); + +/** + * 鏄剧ず鑳借楁ā鍧 + * 鍖呭惈鍔熺巼琛ㄧ洏,鑳借楁洸绾垮浘,骞冲潎鑳借楁暟鍊 + */ +static void ShowModuleEngCost(UInt08 type, UInt08 moduleId); + +/** + * 鏄剧ず鐭噷绋嬫ā鍧 + */ +static void ShowModuleTrip(UInt08 type, UInt08 moduleId); + +/** + * 鏄剧ず鏃堕挓妯″潡 + */ +static void ShowModuleClock(UInt08 type, UInt08 moduleId); + +/** + * 鏄剧ず杞﹀喌妯″潡 + * 鍖呭惈鑳庡帇鏁板,鑳庢俯鏁板,鍥涢棬闂ㄥ紑鐘舵 + */ +static void ShowModuleVehicleStatus(UInt08 type, UInt08 moduleId); + +/** + * 鏄剧ず濯掍綋妯″潡 + * 鍖呭惈闊充箰,鏈夊0璇荤墿,鏈湴鐢靛彴,缃戠粶鐢靛彴 + */ +static void ShowModuleMedia(UInt08 type, UInt08 moduleId); + +/** + * 鏄剧ず澶╂皵妯″潡 + */ +static void ShowModuleWeather(UInt08 type, UInt08 moduleId); + +/** + * 鏄剧ず瀵艰埅妯″潡 + */ +static void ShowModuleNav(UInt08 type, UInt08 moduleId); + +/** + * 鏄剧ず鐢佃瘽妯″潡 + * 钃濈墮鏈繛鎺,閫氳瘽鍒楄〃,鏉ョ數,鎷ㄥ嚭,閫氳瘽绛夌晫闈 + */ +static Int08 ShowModulePhone(UInt08 phoneStatus, UInt08 moduleId); + +/** + * 鏄剧ず鏅鸿兘璇煶鍔╂墜(灏廝褰㈣薄) + * 鍏ュ満,鑱嗗惉,璇嗗埆涓,鎾姤,閫鍦虹瓑浜や簰鍔ㄧ敾 + */ +static Bool ShowVoiceAssistant(UInt08 state); + +/** + * 鏄剧ず浜鸿劯璇嗗埆 + * 闈欐併佹銆佸乏銆佸彸銆佷笂銆佷笅鎵弿 + */ +static Bool ShowFaceRecognition(UInt08 state); + +/** + * 鏄剧ず鍙充晶涓婃璁块棶鐨勮彍鍗(灏忓浘鏍) + */ +static void ShowMenuNull(UInt08 menuId); + +/** + * 鏄剧ず鍙充晶鑿滃崟鍒楄〃 + */ +static Bool ShowMenuList(UInt08 menuId); + +/** + * 鏄剧ず鍙充晶浜岀骇鑿滃崟(鏁板艰缃被) + */ +static void ShowMenuValueSetting(Int08 menuId); + +/** + * 鏄剧ず鍙充晶浜岀骇鑿滃崟(濯掍綋婧愯缃) + */ +static void ShowMenuMediaSrcSelecting(UInt08 menuId); + +/** + * 鏄剧ず宸︿晶鑿滃崟 + * 濯掍綋闊抽噺璁剧疆,璇煶鍔╂墜鎾姤闊抽噺璁剧疆,鐢佃瘽澹伴煶闊抽噺璁剧疆,ACC璺熻溅璺濈绛夌骇 + */ +static Bool ShowMenuLeft(UInt08 menuID); + +/** + * 鏄剧ず鍙充晶浜岀骇鑿滃崟(鐗堟湰淇℃伅) + */ +static void ShowMenuVersion(UInt08 menuId); + +/** + * 鏄剧ず鏅鸿兘娉婅溅 + * 鍙硦鍖哄煙,鍙硦杞︿綅,涓嶅彲鐢ㄨ溅浣,鏇剧敤杞︿綅 + */ +static void ShowAiParking(); + +/** + * 鏄剧ず闄愰熷浘鏍 + */ +static void ShowSpeedLimit(UInt08 type, UInt08 limit); + +/** + * 鏄剧ず鎻愮ず淇℃伅 + * @hintID 淇℃伅ID + */ +static Bool ShowHintInfo(UInt08 hintID); + +/** + * 鏄剧ず鎶ヨ淇℃伅 + * @alarmID 淇℃伅ID + */ +static Bool ShowAlarmInfo(UInt08 alarmID); + +/** + * 鏄剧ず鍓嶆柟璺喌 + * 杞﹂亾绾,鍓嶆柟杞﹁締,鑷姩鍙橀亾鍥炬爣 + */ +static void ShowTrafficLines(); + +/** + * 鏄剧ず鍏呯數鐣岄潰 + * 鍏呯數鍑嗗,鍏呯數,蹇熷厖鐢,鍏呯數涓/瀹屾垚绛夊姩鏁 + */ +static void ShowChargineUI(Bool visible, UInt08 battery, UInt16 range); + +/** + * 鏄剧ず椹昏溅鐣岄潰 + * ON妗i┗杞︾晫闈,OFF妗i┗杞︾晫闈 + */ +static void ShowParkingCar(Bool visible, Bool isOffMode); + +/** + * 鏄剧ず鍊掕溅鐣岄潰 杞﹀浘 + * @fl (front left)宸﹀墠闆疯揪鐩稿璺濈 [0, 60] + * @fcl (front center left)宸︿腑鍓嶉浄杈剧浉瀵硅窛绂 [0, 120] + * @fcr (front center right)鍙充腑鍓嶉浄杈剧浉瀵硅窛绂 [0, 120] + * @fr (front right)鍙冲墠闆疯揪鐩稿璺濈 [0, 60] + * @bl (back left)宸﹀悗闆疯揪鐩稿璺濈 [0, 60] + * @bcl (back center left)宸︿腑鍚庨浄杈剧浉瀵硅窛绂 [0, 140] + * @bcr (back center right)鍙充腑鍚庨浄杈剧浉瀵硅窛绂 [0, 140] + * @br (back right)鍙冲悗闆疯揪鐩稿璺濈 [0, 60] + */ +static void ShowBackingCar(Bool visible, UInt08 backType, UInt08 priority); + +/** + * 鏄剧ず琛岄┒鐣岄潰 杞﹀浘 + */ +static void ShowDrivingCar(Bool visible); + +/** + * 鏄剧ず宸¤埅杞﹂熷浘鏍 + */ +static void ShowXccSpeed(UInt08 state, UInt08 speed); + +/** + * 鏄剧ず鍥哄畾浣嶇疆鎸囩ず鐏 + */ +static void ShowFixLeds(); + +/** + * 鏄剧ず浣嶇疆涓嶅浐瀹氱殑鎸囩ず鐏瓑 + * 鏍规嵁鎸囩ず鐏俊鍙风殑鍏堟潵鍚庡埌鏄剧ず鍦ㄦ湁搴忕殑浣嶇疆 + */ +static void ShowDynamicLeds(); + +/** + * 鏄剧ず鐢甸噺琛 + * 鐢甸噺杩涘害鏉¢鑹蹭笌缁埅閲岀▼(rangeTrip)鐩稿叧 + */ +static void ShowBattery(UInt08 battery, UInt16 rangeTrip); + +/** + * 鏄剧ず妗d綅淇℃伅 + * 妗d綅鍒囨崲寮圭獥鎻愮ず + */ +static void ShowGear(UInt08 gear); + +/** + * 鏄剧ず椹鹃┒妯″紡 + * ECO, SPORT, Standard + */ +static void ShowDrivingMode(UInt08 nightMode); + +/** + * 鏄剧ず涓婄數鑷鍔ㄧ敾(杞︿綋鎵弿鍔ㄧ敾) + */ +static void ShowSelfTest(Int32 duration); + +/** + * 鍗囩骇鐣岄潰: + * 鍗囩骇鍖卪d5绛惧悕鏍¢獙,鏁版嵁浼犺緭,瑙e帇淇℃伅鏄剧ず + */ +static void ShowUpgradeUI(); + +/** + * Xmart OS鍗囩骇鐣岄潰 + **/ +static void ShowXmartUpgrade(); + +/*---------------------------------------------------------------------------*/ + +static Bool Render_PwrOnBmpPlaying(); +static void Render_PwrOnState(); +static Bool Render_PwrOffBmpPlaying(); +static void Render_PwrOffState(); + +/*---------------------------------------------------------------------------*/ + + /** * 鏄剧ず鏃堕棿, * @mintutes 涓澶╁綋涓殑鍒嗛挓鏁 [0, 24*60-1] @@ -9198,8 +9453,8 @@ static Bool ShowHintInfo(UInt08 hintID) if(preHintID == 0xff) { - if(hintID == 0xff) - return INS_FALSE; + if((hintID == 0xff) || (hintID >= ID_HINT_RESERVE) || (hintID == ID_ALARM_NONE)) + return INS_FALSE; Int32 id; @@ -12233,6 +12488,9 @@ static void ShowChargineUI(Bool visible, UInt08 battery, UInt16 range) */ static void ShowParkingCar(Bool visible, Bool isOffMode) { +#ifndef SHOW_PARKINGCAR + visible = INS_FALSE; +#endif static Bool preVisible = INS_FALSE; static Flt32 scale = 1.0f; static Flt32 scaleDst = 1.0f; @@ -12558,6 +12816,9 @@ enum */ static void ShowBackingCar(Bool visible, UInt08 backType, UInt08 priority) { +#ifndef SHOW_BACKINGCAR + visible = INS_FALSE; +#endif static Bool preVisible = INS_FALSE; static Bool localInit = INS_FALSE; static UInt08 preBackType = 0xFF; @@ -13986,7 +14247,7 @@ static void ShowDrivingCar(Bool visible) // } // glUniform1f(Prgm_Simple_Texture_UNFM_Alp, durationRoad/500.0f); - +#ifdef USE_ALL_CAR_ELEMENT if(durationCar < 500/2) { if(IND_HIGH_BEAM) @@ -14002,6 +14263,7 @@ static void ShowDrivingCar(Bool visible) DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[PNG_driving_low_beam].tex); } } +#endif glUniform1f(Prgm_Simple_Texture_UNFM_Alp, durationCar/500.0f); @@ -14009,6 +14271,7 @@ static void ShowDrivingCar(Bool visible) GetImageRect(rect, pngImg[baseIdx+Driving_Idx_base]);rect.y += yOffset; DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[baseIdx+Driving_Idx_base].tex); +#ifdef USE_ALL_CAR_ELEMENT if(IND_TOPCAMERA_CFG) { GetImageRect(rect, pngImg[baseIdx+Driving_Idx_camera]);rect.y += yOffset; @@ -14053,7 +14316,7 @@ static void ShowDrivingCar(Bool visible) DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[PNG_driving_car_tail_lamp_fog].tex); } } - +#endif // Once_LoadPngData(PNG_test); // Once_GenPngTexture(PNG_test, pngImg[PNG_test].fmt, pngImg[PNG_test].fmt); // glUniform1f(Prgm_Simple_Texture_UNFM_Alp, 0.5); @@ -15821,8 +16084,14 @@ static void Render_PwrOnState() if(selfTestDuration <= SelfTest_Total_Duration) { + /*TODO: here to Move slef-check */ +#ifdef USE_SELF_CHEKCK HmiDspState = HMI_DSP_LAUNCHING; chargingUI = INS_FALSE; /*鑷鍔ㄧ敾涓,鏆傛椂灞忚斀鍏呯數鐣岄潰淇″彿*/ +#else + + selfTestDuration = SelfTest_Total_Duration; +#endif } else { @@ -15975,8 +16244,10 @@ static void Render_PwrOnState() { // if(pageType == GEAR_N) { +#ifdef SHOW_TRAFFICLINES ShowTrafficLines(); ShowAiParking(); +#endif ShowDrivingCar(INS_TRUE); } /*闆疯揪鏁版嵁鏈夋晥鏃舵墠鏄剧ず鍊掕溅鐣岄潰,鍚﹀垯绔嬪嵆鍙栨秷鏄剧ず*/ @@ -15992,8 +16263,10 @@ static void Render_PwrOnState() } else if(pageType == GEAR_D) // || pageType == GEAR_N { +#ifdef SHOW_TRAFFICLINES ShowTrafficLines(); ShowAiParking(); +#endif ShowDrivingCar(INS_TRUE); if((RadarAlarm == 1)|| (RadarAlarm == 2)) { @@ -16074,7 +16347,7 @@ static void Render_PwrOnState() { selfTestDuration += mFrameTimeMs; ShowSelfTest(selfTestDuration); - printf("selfTestDuration %d, mFrameTimeMs %d\r\n", selfTestDuration, mFrameTimeMs); + //printf("selfTestDuration %d, mFrameTimeMs %d\r\n", selfTestDuration, mFrameTimeMs); goto _End_Render_PwrOnState_0; } @@ -16238,11 +16511,13 @@ static void Render_PwrOnState() rightModuleID = 0xFF; ShowFaceRecognition(0xFF); } +#ifdef SHOW_FACE_ else if(ShowFaceRecognition(FaceRecognitionstate) == INS_TRUE) { menuID = 0xFF; rightModuleID = 0xFF; } +#endif if(menuID != 0) { @@ -16318,7 +16593,9 @@ _End_Render_PwrOnState_2: } ShowHintInfo(HintID); +#ifdef SHOW_ALARM ShowAlarmInfo(AlarmID); +#endif //_End_Render_PwrOnState_1: @@ -16427,8 +16704,9 @@ static void Render_PwrOffState() glDisableVertexAttribArray(Prgm_Simple_Font_ATTR_Txc); ShowHintInfo(HintID); +#ifdef SHOW_ALARM ShowAlarmInfo(AlarmID); - +#endif ShowFixLeds(); ShowDynamicLeds(); @@ -16439,7 +16717,7 @@ static void Render_PwrOffState() * 鍗囩骇鐣岄潰: * 鍗囩骇鍖卪d5绛惧悕鏍¢獙,鏁版嵁浼犺緭,瑙e帇淇℃伅鏄剧ず */ -void ShowUpgradeUI() +static void ShowUpgradeUI() { static Bool init = INS_FALSE; static UInt08 state = 0xFF; @@ -16659,7 +16937,7 @@ void ShowUpgradeUI() /** * Xmart OS鍗囩骇鐣岄潰 **/ -void ShowXmartUpgrade() +static void ShowXmartUpgrade() { static Bool init = INS_FALSE; Int08 invAlpha = 0; //鏄惁鍙 diff --git a/clusterApp/src/InsRender/Res_Png.h b/clusterApp/src/InsRender/Res_Png.h index 4d90a8a..c6e5f61 100644 --- a/clusterApp/src/InsRender/Res_Png.h +++ b/clusterApp/src/InsRender/Res_Png.h @@ -2129,7 +2129,7 @@ static const Vec2i pngLtp[] = {801,459},//PNG_Xmart_logo, {856,631},//PNG_Xmart_symbol, - {531,312},//PNG_logo + {0,0},//PNG_logo // {0,0}, //PNG_test, }; diff --git a/clusterApp/src/InsRender/Res_Tga.h b/clusterApp/src/InsRender/Res_Tga.h index f21655d..f5aec58 100644 --- a/clusterApp/src/InsRender/Res_Tga.h +++ b/clusterApp/src/InsRender/Res_Tga.h @@ -243,7 +243,7 @@ static const char *tgaFilePath[] = static const Vec2i tgaLtp[] = { - {531,312},//logo + {0,0},//logo {630,397},//AI_parking_available_leftarea {773,401},//AI_parking_available_leftslot1 {740,474},//AI_parking_available_leftslot2 diff --git a/clusterApp/src/Protocol/MainBoard_IIC.c b/clusterApp/src/Protocol/MainBoard_IIC.c index ef6fee8..bb76ba3 100644 --- a/clusterApp/src/Protocol/MainBoard_IIC.c +++ b/clusterApp/src/Protocol/MainBoard_IIC.c @@ -840,7 +840,7 @@ static inline void Decode_0x0B() RadarDistance = DATA_RADAR_DISTANCE; - VehicleColorCfg = DATA_VEHICLE_COLOR_CFG; + VehicleColorCfg = 0; tmp08 = DATA_ENGCOST_P100M; if(tmp08 != 0xFF && preCost == 0xFF)