diff --git a/clusterApp/Makefile b/clusterApp/Makefile index a86f9e5..8799d2f 100644 --- a/clusterApp/Makefile +++ b/clusterApp/Makefile @@ -3,14 +3,10 @@ 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/ +ROOTFS = /home/lst/workspace/rootfs/ +TARGET_PATH_LIB = /usr/lib64 +TARGET_PATH_INCLUDE = /usr/include +TFPT_DIR = /home/lst/workspace/rootfs/root/app/ CFLAGS = -fPIC -fno-strict-aliasing -fno-optimize-sibling-calls -Wall @@ -20,45 +16,40 @@ 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 = -lX11 -lpthread -lEGL -lGLESv2 -ldrm -lgbm -lfreetype -lcjson -ljpeg -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 +#DEPS += /home/user/zhimin/clusterApp/3psw/jpegsr9c/jpeg-9c/libjpeg.a +#DEPS += /home/user/zhimin/packages/install/lib/libcjson.a +DEPS += -lz -lpng16 #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 +CROSS_COMPILE = /opt/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/arm-fsl-linux-gnueabi- +CC = gcc +AR = ar SUBDIR = ./src CFLAGS += -DLINUX \ -DEGL_API_FB \ - -DCOMPILE_IN_UBUNTU \ - -DGLEW_NO_GLU + -DCOMPILE_IN_UBUNTU ##\ ##-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 + -I/home/lst/workspace/jpeg/jpeg-9c/install/include \ + -I/home/lst/workspace/zlib/zlib_build/ \ + -I/home/lst/workspace/libpng/libpng_build/ \ + -I/home/user/zhimin/clusterApp/3psw/source_packages/build_install/ \ + -I/home/huaxu/develop/cluster/clusterApp/3psw/lpng1634 \ + -I/home/user/zhimin/clusterApp/3psw/source_packages/freetype-2.13.2/ \ + -I/home/huaxu/develop/ICM-SOFT/D20/icm-code/cpu/app/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/ \ + -I/usr/include/GL/ \ + -I/usr/include/drm/ \ + -I$(ROOTFS)/usr/src/linux/include -CFLAGS += -L$(ROOTFS)/lib \ - -L/$(ROOTFS)/lib/libcjson.a +CFLAGS += -L/home/user/zhimin/clusterApp/3psw/source_packages/build_install/lib/ SOURCES = $(shell find $(SUBDIR) -name "*.c") @@ -83,12 +74,12 @@ finish_tips: %.o : %.c @echo " CC " $@ - @$(QUIET)$(CC) $(CFLAGS) $(LDFLAGS) -MD -c $< -o $@ + @$(QUIET)$(CC) $(CFLAGS) -MD -c $< -o $@ %.o : %.cpp @echo " CXX " $@ - @$(QUIET)$(CC) $(CFLAGS) $(LDFLAGS) -MMD -c $< -o $@ + @$(QUIET)$(CC) $(CFLAGS) -MMD -c $< -o $@ $(BIN) : $(BIN_OBJECTS) diff --git a/clusterApp/Res/image/driving_car_all_red_base.png b/clusterApp/Res/image/driving_car_all_red_base.png index daf9876..84b9e71 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 daf9876..84b9e71 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 daf9876..84b9e71 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/eco-720_031.png b/clusterApp/Res/image/eco-720_031.png deleted file mode 100644 index b8a10ce..0000000 Binary files a/clusterApp/Res/image/eco-720_031.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_032.png b/clusterApp/Res/image/eco-720_032.png deleted file mode 100644 index 42ec75c..0000000 Binary files a/clusterApp/Res/image/eco-720_032.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_033.png b/clusterApp/Res/image/eco-720_033.png deleted file mode 100644 index 2113088..0000000 Binary files a/clusterApp/Res/image/eco-720_033.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_034.png b/clusterApp/Res/image/eco-720_034.png deleted file mode 100644 index 5bf9b9a..0000000 Binary files a/clusterApp/Res/image/eco-720_034.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_035.png b/clusterApp/Res/image/eco-720_035.png deleted file mode 100644 index 72c77a7..0000000 Binary files a/clusterApp/Res/image/eco-720_035.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_036.png b/clusterApp/Res/image/eco-720_036.png deleted file mode 100644 index fe175f0..0000000 Binary files a/clusterApp/Res/image/eco-720_036.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_037.png b/clusterApp/Res/image/eco-720_037.png deleted file mode 100644 index b0d29f9..0000000 Binary files a/clusterApp/Res/image/eco-720_037.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_038.png b/clusterApp/Res/image/eco-720_038.png deleted file mode 100644 index dc4db1a..0000000 Binary files a/clusterApp/Res/image/eco-720_038.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_039.png b/clusterApp/Res/image/eco-720_039.png deleted file mode 100644 index fd7f99c..0000000 Binary files a/clusterApp/Res/image/eco-720_039.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_040.png b/clusterApp/Res/image/eco-720_040.png deleted file mode 100644 index 1766f0e..0000000 Binary files a/clusterApp/Res/image/eco-720_040.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_041.png b/clusterApp/Res/image/eco-720_041.png deleted file mode 100644 index 943d318..0000000 Binary files a/clusterApp/Res/image/eco-720_041.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_042.png b/clusterApp/Res/image/eco-720_042.png deleted file mode 100644 index 1e467fd..0000000 Binary files a/clusterApp/Res/image/eco-720_042.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_043.png b/clusterApp/Res/image/eco-720_043.png deleted file mode 100644 index c23820d..0000000 Binary files a/clusterApp/Res/image/eco-720_043.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_044.png b/clusterApp/Res/image/eco-720_044.png deleted file mode 100644 index 36f2a06..0000000 Binary files a/clusterApp/Res/image/eco-720_044.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_045.png b/clusterApp/Res/image/eco-720_045.png deleted file mode 100644 index 655d183..0000000 Binary files a/clusterApp/Res/image/eco-720_045.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_046.png b/clusterApp/Res/image/eco-720_046.png deleted file mode 100644 index f182c11..0000000 Binary files a/clusterApp/Res/image/eco-720_046.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_047.png b/clusterApp/Res/image/eco-720_047.png deleted file mode 100644 index 47b9aeb..0000000 Binary files a/clusterApp/Res/image/eco-720_047.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_048.png b/clusterApp/Res/image/eco-720_048.png deleted file mode 100644 index 05aa790..0000000 Binary files a/clusterApp/Res/image/eco-720_048.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_049.png b/clusterApp/Res/image/eco-720_049.png deleted file mode 100644 index ca401e4..0000000 Binary files a/clusterApp/Res/image/eco-720_049.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_050.png b/clusterApp/Res/image/eco-720_050.png deleted file mode 100644 index b529cf3..0000000 Binary files a/clusterApp/Res/image/eco-720_050.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_051.png b/clusterApp/Res/image/eco-720_051.png deleted file mode 100644 index e4b786d..0000000 Binary files a/clusterApp/Res/image/eco-720_051.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_052.png b/clusterApp/Res/image/eco-720_052.png deleted file mode 100644 index fa19dbf..0000000 Binary files a/clusterApp/Res/image/eco-720_052.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_053.png b/clusterApp/Res/image/eco-720_053.png deleted file mode 100644 index 04ad0a8..0000000 Binary files a/clusterApp/Res/image/eco-720_053.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_054.png b/clusterApp/Res/image/eco-720_054.png deleted file mode 100644 index eb12fd0..0000000 Binary files a/clusterApp/Res/image/eco-720_054.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_055.png b/clusterApp/Res/image/eco-720_055.png deleted file mode 100644 index e4bfaa2..0000000 Binary files a/clusterApp/Res/image/eco-720_055.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_056.png b/clusterApp/Res/image/eco-720_056.png deleted file mode 100644 index 45c33e3..0000000 Binary files a/clusterApp/Res/image/eco-720_056.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_057.png b/clusterApp/Res/image/eco-720_057.png deleted file mode 100644 index 02df4ee..0000000 Binary files a/clusterApp/Res/image/eco-720_057.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_058.png b/clusterApp/Res/image/eco-720_058.png deleted file mode 100644 index 8239d80..0000000 Binary files a/clusterApp/Res/image/eco-720_058.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_059.png b/clusterApp/Res/image/eco-720_059.png deleted file mode 100644 index ba79188..0000000 Binary files a/clusterApp/Res/image/eco-720_059.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_060.png b/clusterApp/Res/image/eco-720_060.png deleted file mode 100644 index 0836fd4..0000000 Binary files a/clusterApp/Res/image/eco-720_060.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_061.png b/clusterApp/Res/image/eco-720_061.png deleted file mode 100644 index 6809411..0000000 Binary files a/clusterApp/Res/image/eco-720_061.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_062.png b/clusterApp/Res/image/eco-720_062.png deleted file mode 100644 index 2e2f2e6..0000000 Binary files a/clusterApp/Res/image/eco-720_062.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_063.png b/clusterApp/Res/image/eco-720_063.png deleted file mode 100644 index 00b8e2c..0000000 Binary files a/clusterApp/Res/image/eco-720_063.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_064.png b/clusterApp/Res/image/eco-720_064.png deleted file mode 100644 index e5c8bc0..0000000 Binary files a/clusterApp/Res/image/eco-720_064.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_065.png b/clusterApp/Res/image/eco-720_065.png deleted file mode 100644 index f2088af..0000000 Binary files a/clusterApp/Res/image/eco-720_065.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_066.png b/clusterApp/Res/image/eco-720_066.png deleted file mode 100644 index bcd7130..0000000 Binary files a/clusterApp/Res/image/eco-720_066.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_067.png b/clusterApp/Res/image/eco-720_067.png deleted file mode 100644 index 3e8cec3..0000000 Binary files a/clusterApp/Res/image/eco-720_067.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_068.png b/clusterApp/Res/image/eco-720_068.png deleted file mode 100644 index dc34bb1..0000000 Binary files a/clusterApp/Res/image/eco-720_068.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_069.png b/clusterApp/Res/image/eco-720_069.png deleted file mode 100644 index 85bac3f..0000000 Binary files a/clusterApp/Res/image/eco-720_069.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_070.png b/clusterApp/Res/image/eco-720_070.png deleted file mode 100644 index 542ed2c..0000000 Binary files a/clusterApp/Res/image/eco-720_070.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_071.png b/clusterApp/Res/image/eco-720_071.png deleted file mode 100644 index a269338..0000000 Binary files a/clusterApp/Res/image/eco-720_071.png and /dev/null differ diff --git a/clusterApp/Res/image/eco-720_072.png b/clusterApp/Res/image/eco-720_072.png deleted file mode 100644 index 739f8ed..0000000 Binary files a/clusterApp/Res/image/eco-720_072.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_001.png b/clusterApp/Res/image/eco_001.png deleted file mode 100644 index a8b8185..0000000 Binary files a/clusterApp/Res/image/eco_001.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_002.png b/clusterApp/Res/image/eco_002.png deleted file mode 100644 index 0516999..0000000 Binary files a/clusterApp/Res/image/eco_002.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_003.png b/clusterApp/Res/image/eco_003.png deleted file mode 100644 index 18ea70b..0000000 Binary files a/clusterApp/Res/image/eco_003.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_004.png b/clusterApp/Res/image/eco_004.png deleted file mode 100644 index 97c2b61..0000000 Binary files a/clusterApp/Res/image/eco_004.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_005.png b/clusterApp/Res/image/eco_005.png deleted file mode 100644 index 96c210f..0000000 Binary files a/clusterApp/Res/image/eco_005.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_006.png b/clusterApp/Res/image/eco_006.png deleted file mode 100644 index 4ae1134..0000000 Binary files a/clusterApp/Res/image/eco_006.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_007.png b/clusterApp/Res/image/eco_007.png deleted file mode 100644 index eb120dd..0000000 Binary files a/clusterApp/Res/image/eco_007.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_008.png b/clusterApp/Res/image/eco_008.png deleted file mode 100644 index 5742b95..0000000 Binary files a/clusterApp/Res/image/eco_008.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_009.png b/clusterApp/Res/image/eco_009.png deleted file mode 100644 index baafc47..0000000 Binary files a/clusterApp/Res/image/eco_009.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_010.png b/clusterApp/Res/image/eco_010.png deleted file mode 100644 index 32edfb4..0000000 Binary files a/clusterApp/Res/image/eco_010.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_011.png b/clusterApp/Res/image/eco_011.png deleted file mode 100644 index ce6a7a7..0000000 Binary files a/clusterApp/Res/image/eco_011.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_012.png b/clusterApp/Res/image/eco_012.png deleted file mode 100644 index ddb39c1..0000000 Binary files a/clusterApp/Res/image/eco_012.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_013.png b/clusterApp/Res/image/eco_013.png deleted file mode 100644 index f5a84ff..0000000 Binary files a/clusterApp/Res/image/eco_013.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_014.png b/clusterApp/Res/image/eco_014.png deleted file mode 100644 index 15265ff..0000000 Binary files a/clusterApp/Res/image/eco_014.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_015.png b/clusterApp/Res/image/eco_015.png deleted file mode 100644 index 065d094..0000000 Binary files a/clusterApp/Res/image/eco_015.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_016.png b/clusterApp/Res/image/eco_016.png deleted file mode 100644 index 4d7412c..0000000 Binary files a/clusterApp/Res/image/eco_016.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_017.png b/clusterApp/Res/image/eco_017.png deleted file mode 100644 index d444648..0000000 Binary files a/clusterApp/Res/image/eco_017.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_018.png b/clusterApp/Res/image/eco_018.png deleted file mode 100644 index 6565db9..0000000 Binary files a/clusterApp/Res/image/eco_018.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_019.png b/clusterApp/Res/image/eco_019.png deleted file mode 100644 index 16260b4..0000000 Binary files a/clusterApp/Res/image/eco_019.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_020.png b/clusterApp/Res/image/eco_020.png deleted file mode 100644 index 3557a1f..0000000 Binary files a/clusterApp/Res/image/eco_020.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_021.png b/clusterApp/Res/image/eco_021.png deleted file mode 100644 index 07f36cd..0000000 Binary files a/clusterApp/Res/image/eco_021.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_022.png b/clusterApp/Res/image/eco_022.png deleted file mode 100644 index b7444f2..0000000 Binary files a/clusterApp/Res/image/eco_022.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_023.png b/clusterApp/Res/image/eco_023.png deleted file mode 100644 index 72214ce..0000000 Binary files a/clusterApp/Res/image/eco_023.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_024.png b/clusterApp/Res/image/eco_024.png deleted file mode 100644 index 6739624..0000000 Binary files a/clusterApp/Res/image/eco_024.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_025.png b/clusterApp/Res/image/eco_025.png deleted file mode 100644 index 56ae2eb..0000000 Binary files a/clusterApp/Res/image/eco_025.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_026.png b/clusterApp/Res/image/eco_026.png deleted file mode 100644 index 50b930b..0000000 Binary files a/clusterApp/Res/image/eco_026.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_027.png b/clusterApp/Res/image/eco_027.png deleted file mode 100644 index 339db81..0000000 Binary files a/clusterApp/Res/image/eco_027.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_028.png b/clusterApp/Res/image/eco_028.png deleted file mode 100644 index 87a7294..0000000 Binary files a/clusterApp/Res/image/eco_028.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_029.png b/clusterApp/Res/image/eco_029.png deleted file mode 100644 index aa7d7e4..0000000 Binary files a/clusterApp/Res/image/eco_029.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_030.png b/clusterApp/Res/image/eco_030.png deleted file mode 100644 index 1464db3..0000000 Binary files a/clusterApp/Res/image/eco_030.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_031.png b/clusterApp/Res/image/eco_031.png deleted file mode 100644 index cef8faa..0000000 Binary files a/clusterApp/Res/image/eco_031.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_032.png b/clusterApp/Res/image/eco_032.png deleted file mode 100644 index e20cb75..0000000 Binary files a/clusterApp/Res/image/eco_032.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_033.png b/clusterApp/Res/image/eco_033.png deleted file mode 100644 index 923944c..0000000 Binary files a/clusterApp/Res/image/eco_033.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_034.png b/clusterApp/Res/image/eco_034.png deleted file mode 100644 index 97cb368..0000000 Binary files a/clusterApp/Res/image/eco_034.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_035.png b/clusterApp/Res/image/eco_035.png deleted file mode 100644 index e26610e..0000000 Binary files a/clusterApp/Res/image/eco_035.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_036.png b/clusterApp/Res/image/eco_036.png deleted file mode 100644 index 017635c..0000000 Binary files a/clusterApp/Res/image/eco_036.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_037.png b/clusterApp/Res/image/eco_037.png deleted file mode 100644 index c5621fc..0000000 Binary files a/clusterApp/Res/image/eco_037.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_038.png b/clusterApp/Res/image/eco_038.png deleted file mode 100644 index 6c8da43..0000000 Binary files a/clusterApp/Res/image/eco_038.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_039.png b/clusterApp/Res/image/eco_039.png deleted file mode 100644 index 95607ca..0000000 Binary files a/clusterApp/Res/image/eco_039.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_040.png b/clusterApp/Res/image/eco_040.png deleted file mode 100644 index 0af908d..0000000 Binary files a/clusterApp/Res/image/eco_040.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_041.png b/clusterApp/Res/image/eco_041.png deleted file mode 100644 index f44fd11..0000000 Binary files a/clusterApp/Res/image/eco_041.png and /dev/null differ diff --git a/clusterApp/Res/image/eco_042.png b/clusterApp/Res/image/eco_042.png deleted file mode 100644 index 2ed5df1..0000000 Binary files a/clusterApp/Res/image/eco_042.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_000.png b/clusterApp/Res/image/sampling_000.png deleted file mode 100644 index 0f196e9..0000000 Binary files a/clusterApp/Res/image/sampling_000.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_001.png b/clusterApp/Res/image/sampling_001.png deleted file mode 100644 index dae91d0..0000000 Binary files a/clusterApp/Res/image/sampling_001.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_002.png b/clusterApp/Res/image/sampling_002.png deleted file mode 100644 index 8981558..0000000 Binary files a/clusterApp/Res/image/sampling_002.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_003.png b/clusterApp/Res/image/sampling_003.png deleted file mode 100644 index d4eb7b6..0000000 Binary files a/clusterApp/Res/image/sampling_003.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_004.png b/clusterApp/Res/image/sampling_004.png deleted file mode 100644 index 56d6335..0000000 Binary files a/clusterApp/Res/image/sampling_004.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_005.png b/clusterApp/Res/image/sampling_005.png deleted file mode 100644 index c459533..0000000 Binary files a/clusterApp/Res/image/sampling_005.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_006.png b/clusterApp/Res/image/sampling_006.png deleted file mode 100644 index cdece03..0000000 Binary files a/clusterApp/Res/image/sampling_006.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_007.png b/clusterApp/Res/image/sampling_007.png deleted file mode 100644 index 2a10d03..0000000 Binary files a/clusterApp/Res/image/sampling_007.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_008.png b/clusterApp/Res/image/sampling_008.png deleted file mode 100644 index cc5552c..0000000 Binary files a/clusterApp/Res/image/sampling_008.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_009.png b/clusterApp/Res/image/sampling_009.png deleted file mode 100644 index e3c050b..0000000 Binary files a/clusterApp/Res/image/sampling_009.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_010.png b/clusterApp/Res/image/sampling_010.png deleted file mode 100644 index fc5b40b..0000000 Binary files a/clusterApp/Res/image/sampling_010.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_011.png b/clusterApp/Res/image/sampling_011.png deleted file mode 100644 index 624e778..0000000 Binary files a/clusterApp/Res/image/sampling_011.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_012.png b/clusterApp/Res/image/sampling_012.png deleted file mode 100644 index 0be0118..0000000 Binary files a/clusterApp/Res/image/sampling_012.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_013.png b/clusterApp/Res/image/sampling_013.png deleted file mode 100644 index f256f5f..0000000 Binary files a/clusterApp/Res/image/sampling_013.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_014.png b/clusterApp/Res/image/sampling_014.png deleted file mode 100644 index a8691fb..0000000 Binary files a/clusterApp/Res/image/sampling_014.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_015.png b/clusterApp/Res/image/sampling_015.png deleted file mode 100644 index cdfc90b..0000000 Binary files a/clusterApp/Res/image/sampling_015.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_016.png b/clusterApp/Res/image/sampling_016.png deleted file mode 100644 index ff14df9..0000000 Binary files a/clusterApp/Res/image/sampling_016.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_017.png b/clusterApp/Res/image/sampling_017.png deleted file mode 100644 index b174f53..0000000 Binary files a/clusterApp/Res/image/sampling_017.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_018.png b/clusterApp/Res/image/sampling_018.png deleted file mode 100644 index 54374de..0000000 Binary files a/clusterApp/Res/image/sampling_018.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_019.png b/clusterApp/Res/image/sampling_019.png deleted file mode 100644 index 26ddc41..0000000 Binary files a/clusterApp/Res/image/sampling_019.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_020.png b/clusterApp/Res/image/sampling_020.png deleted file mode 100644 index ebd53b4..0000000 Binary files a/clusterApp/Res/image/sampling_020.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_021.png b/clusterApp/Res/image/sampling_021.png deleted file mode 100644 index 36879d3..0000000 Binary files a/clusterApp/Res/image/sampling_021.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_022.png b/clusterApp/Res/image/sampling_022.png deleted file mode 100644 index bec0097..0000000 Binary files a/clusterApp/Res/image/sampling_022.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_023.png b/clusterApp/Res/image/sampling_023.png deleted file mode 100644 index 9d61be4..0000000 Binary files a/clusterApp/Res/image/sampling_023.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_024.png b/clusterApp/Res/image/sampling_024.png deleted file mode 100644 index 6a5ac18..0000000 Binary files a/clusterApp/Res/image/sampling_024.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_025.png b/clusterApp/Res/image/sampling_025.png deleted file mode 100644 index 81b15ad..0000000 Binary files a/clusterApp/Res/image/sampling_025.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_026.png b/clusterApp/Res/image/sampling_026.png deleted file mode 100644 index 5389c93..0000000 Binary files a/clusterApp/Res/image/sampling_026.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_027.png b/clusterApp/Res/image/sampling_027.png deleted file mode 100644 index 276b0a4..0000000 Binary files a/clusterApp/Res/image/sampling_027.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_028.png b/clusterApp/Res/image/sampling_028.png deleted file mode 100644 index ce211bf..0000000 Binary files a/clusterApp/Res/image/sampling_028.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_029.png b/clusterApp/Res/image/sampling_029.png deleted file mode 100644 index 9b93956..0000000 Binary files a/clusterApp/Res/image/sampling_029.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_030.png b/clusterApp/Res/image/sampling_030.png deleted file mode 100644 index 226867b..0000000 Binary files a/clusterApp/Res/image/sampling_030.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_031.png b/clusterApp/Res/image/sampling_031.png deleted file mode 100644 index c6d3a6f..0000000 Binary files a/clusterApp/Res/image/sampling_031.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_032.png b/clusterApp/Res/image/sampling_032.png deleted file mode 100644 index eb2c21b..0000000 Binary files a/clusterApp/Res/image/sampling_032.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_033.png b/clusterApp/Res/image/sampling_033.png deleted file mode 100644 index 509cbf4..0000000 Binary files a/clusterApp/Res/image/sampling_033.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_034.png b/clusterApp/Res/image/sampling_034.png deleted file mode 100644 index 4d6a1dd..0000000 Binary files a/clusterApp/Res/image/sampling_034.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_035.png b/clusterApp/Res/image/sampling_035.png deleted file mode 100644 index 9f7a832..0000000 Binary files a/clusterApp/Res/image/sampling_035.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_036.png b/clusterApp/Res/image/sampling_036.png deleted file mode 100644 index 8466f69..0000000 Binary files a/clusterApp/Res/image/sampling_036.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_037.png b/clusterApp/Res/image/sampling_037.png deleted file mode 100644 index 322c059..0000000 Binary files a/clusterApp/Res/image/sampling_037.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_038.png b/clusterApp/Res/image/sampling_038.png deleted file mode 100644 index caabd59..0000000 Binary files a/clusterApp/Res/image/sampling_038.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_039.png b/clusterApp/Res/image/sampling_039.png deleted file mode 100644 index f52984a..0000000 Binary files a/clusterApp/Res/image/sampling_039.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_040.png b/clusterApp/Res/image/sampling_040.png deleted file mode 100644 index ba3bd89..0000000 Binary files a/clusterApp/Res/image/sampling_040.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_041.png b/clusterApp/Res/image/sampling_041.png deleted file mode 100644 index eec659e..0000000 Binary files a/clusterApp/Res/image/sampling_041.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_042.png b/clusterApp/Res/image/sampling_042.png deleted file mode 100644 index dc4ed08..0000000 Binary files a/clusterApp/Res/image/sampling_042.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_043.png b/clusterApp/Res/image/sampling_043.png deleted file mode 100644 index 860b410..0000000 Binary files a/clusterApp/Res/image/sampling_043.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_044.png b/clusterApp/Res/image/sampling_044.png deleted file mode 100644 index 0c40177..0000000 Binary files a/clusterApp/Res/image/sampling_044.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_045.png b/clusterApp/Res/image/sampling_045.png deleted file mode 100644 index 8ddb557..0000000 Binary files a/clusterApp/Res/image/sampling_045.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_046.png b/clusterApp/Res/image/sampling_046.png deleted file mode 100644 index c0275e5..0000000 Binary files a/clusterApp/Res/image/sampling_046.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_047.png b/clusterApp/Res/image/sampling_047.png deleted file mode 100644 index eefd1fa..0000000 Binary files a/clusterApp/Res/image/sampling_047.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_048.png b/clusterApp/Res/image/sampling_048.png deleted file mode 100644 index f75f607..0000000 Binary files a/clusterApp/Res/image/sampling_048.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_049.png b/clusterApp/Res/image/sampling_049.png deleted file mode 100644 index eb41bae..0000000 Binary files a/clusterApp/Res/image/sampling_049.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_050.png b/clusterApp/Res/image/sampling_050.png deleted file mode 100644 index af1273e..0000000 Binary files a/clusterApp/Res/image/sampling_050.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_051.png b/clusterApp/Res/image/sampling_051.png deleted file mode 100644 index fd2370e..0000000 Binary files a/clusterApp/Res/image/sampling_051.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_052.png b/clusterApp/Res/image/sampling_052.png deleted file mode 100644 index 28d014f..0000000 Binary files a/clusterApp/Res/image/sampling_052.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_053.png b/clusterApp/Res/image/sampling_053.png deleted file mode 100644 index 9862677..0000000 Binary files a/clusterApp/Res/image/sampling_053.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_054.png b/clusterApp/Res/image/sampling_054.png deleted file mode 100644 index 2c7b26b..0000000 Binary files a/clusterApp/Res/image/sampling_054.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_055.png b/clusterApp/Res/image/sampling_055.png deleted file mode 100644 index 575af5c..0000000 Binary files a/clusterApp/Res/image/sampling_055.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_056.png b/clusterApp/Res/image/sampling_056.png deleted file mode 100644 index de97913..0000000 Binary files a/clusterApp/Res/image/sampling_056.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_057.png b/clusterApp/Res/image/sampling_057.png deleted file mode 100644 index 25cc8c2..0000000 Binary files a/clusterApp/Res/image/sampling_057.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_058.png b/clusterApp/Res/image/sampling_058.png deleted file mode 100644 index 37d66c3..0000000 Binary files a/clusterApp/Res/image/sampling_058.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_059.png b/clusterApp/Res/image/sampling_059.png deleted file mode 100644 index 38a106c..0000000 Binary files a/clusterApp/Res/image/sampling_059.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_060.png b/clusterApp/Res/image/sampling_060.png deleted file mode 100644 index e405110..0000000 Binary files a/clusterApp/Res/image/sampling_060.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_061.png b/clusterApp/Res/image/sampling_061.png deleted file mode 100644 index 5837445..0000000 Binary files a/clusterApp/Res/image/sampling_061.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_062.png b/clusterApp/Res/image/sampling_062.png deleted file mode 100644 index 258c63d..0000000 Binary files a/clusterApp/Res/image/sampling_062.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_063.png b/clusterApp/Res/image/sampling_063.png deleted file mode 100644 index 3353bb7..0000000 Binary files a/clusterApp/Res/image/sampling_063.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_064.png b/clusterApp/Res/image/sampling_064.png deleted file mode 100644 index af80775..0000000 Binary files a/clusterApp/Res/image/sampling_064.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_065.png b/clusterApp/Res/image/sampling_065.png deleted file mode 100644 index 6ce6896..0000000 Binary files a/clusterApp/Res/image/sampling_065.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_066.png b/clusterApp/Res/image/sampling_066.png deleted file mode 100644 index d7c2a46..0000000 Binary files a/clusterApp/Res/image/sampling_066.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_067.png b/clusterApp/Res/image/sampling_067.png deleted file mode 100644 index c3d9c71..0000000 Binary files a/clusterApp/Res/image/sampling_067.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_068.png b/clusterApp/Res/image/sampling_068.png deleted file mode 100644 index 66e7ba3..0000000 Binary files a/clusterApp/Res/image/sampling_068.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_069.png b/clusterApp/Res/image/sampling_069.png deleted file mode 100644 index ec8b75e..0000000 Binary files a/clusterApp/Res/image/sampling_069.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_070.png b/clusterApp/Res/image/sampling_070.png deleted file mode 100644 index 0085fc1..0000000 Binary files a/clusterApp/Res/image/sampling_070.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_071.png b/clusterApp/Res/image/sampling_071.png deleted file mode 100644 index 10a15a9..0000000 Binary files a/clusterApp/Res/image/sampling_071.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_072.png b/clusterApp/Res/image/sampling_072.png deleted file mode 100644 index 5cb0a00..0000000 Binary files a/clusterApp/Res/image/sampling_072.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_073.png b/clusterApp/Res/image/sampling_073.png deleted file mode 100644 index 185993c..0000000 Binary files a/clusterApp/Res/image/sampling_073.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_074.png b/clusterApp/Res/image/sampling_074.png deleted file mode 100644 index 5aa4ccb..0000000 Binary files a/clusterApp/Res/image/sampling_074.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_075.png b/clusterApp/Res/image/sampling_075.png deleted file mode 100644 index 2a35b9b..0000000 Binary files a/clusterApp/Res/image/sampling_075.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_076.png b/clusterApp/Res/image/sampling_076.png deleted file mode 100644 index 8b3565f..0000000 Binary files a/clusterApp/Res/image/sampling_076.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_077.png b/clusterApp/Res/image/sampling_077.png deleted file mode 100644 index 1f3a221..0000000 Binary files a/clusterApp/Res/image/sampling_077.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_078.png b/clusterApp/Res/image/sampling_078.png deleted file mode 100644 index 0eaaf84..0000000 Binary files a/clusterApp/Res/image/sampling_078.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_079.png b/clusterApp/Res/image/sampling_079.png deleted file mode 100644 index be93c55..0000000 Binary files a/clusterApp/Res/image/sampling_079.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_080.png b/clusterApp/Res/image/sampling_080.png deleted file mode 100644 index a3a8759..0000000 Binary files a/clusterApp/Res/image/sampling_080.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_081.png b/clusterApp/Res/image/sampling_081.png deleted file mode 100644 index 17d7d62..0000000 Binary files a/clusterApp/Res/image/sampling_081.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_082.png b/clusterApp/Res/image/sampling_082.png deleted file mode 100644 index 32ab246..0000000 Binary files a/clusterApp/Res/image/sampling_082.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_083.png b/clusterApp/Res/image/sampling_083.png deleted file mode 100644 index 0fbae9d..0000000 Binary files a/clusterApp/Res/image/sampling_083.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_084.png b/clusterApp/Res/image/sampling_084.png deleted file mode 100644 index 036d600..0000000 Binary files a/clusterApp/Res/image/sampling_084.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_085.png b/clusterApp/Res/image/sampling_085.png deleted file mode 100644 index c607529..0000000 Binary files a/clusterApp/Res/image/sampling_085.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_086.png b/clusterApp/Res/image/sampling_086.png deleted file mode 100644 index 28d3ee4..0000000 Binary files a/clusterApp/Res/image/sampling_086.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_087.png b/clusterApp/Res/image/sampling_087.png deleted file mode 100644 index 3d53e8a..0000000 Binary files a/clusterApp/Res/image/sampling_087.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_088.png b/clusterApp/Res/image/sampling_088.png deleted file mode 100644 index 52670f0..0000000 Binary files a/clusterApp/Res/image/sampling_088.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_089.png b/clusterApp/Res/image/sampling_089.png deleted file mode 100644 index b1f84b4..0000000 Binary files a/clusterApp/Res/image/sampling_089.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_090.png b/clusterApp/Res/image/sampling_090.png deleted file mode 100644 index 406face..0000000 Binary files a/clusterApp/Res/image/sampling_090.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_091.png b/clusterApp/Res/image/sampling_091.png deleted file mode 100644 index 691b11d..0000000 Binary files a/clusterApp/Res/image/sampling_091.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_092.png b/clusterApp/Res/image/sampling_092.png deleted file mode 100644 index f78c016..0000000 Binary files a/clusterApp/Res/image/sampling_092.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_093.png b/clusterApp/Res/image/sampling_093.png deleted file mode 100644 index 93ece58..0000000 Binary files a/clusterApp/Res/image/sampling_093.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_094.png b/clusterApp/Res/image/sampling_094.png deleted file mode 100644 index f225dc0..0000000 Binary files a/clusterApp/Res/image/sampling_094.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_095.png b/clusterApp/Res/image/sampling_095.png deleted file mode 100644 index c48d9f1..0000000 Binary files a/clusterApp/Res/image/sampling_095.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_096.png b/clusterApp/Res/image/sampling_096.png deleted file mode 100644 index 8840172..0000000 Binary files a/clusterApp/Res/image/sampling_096.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_097.png b/clusterApp/Res/image/sampling_097.png deleted file mode 100644 index 09c0a7d..0000000 Binary files a/clusterApp/Res/image/sampling_097.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_098.png b/clusterApp/Res/image/sampling_098.png deleted file mode 100644 index 158ece5..0000000 Binary files a/clusterApp/Res/image/sampling_098.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_099.png b/clusterApp/Res/image/sampling_099.png deleted file mode 100644 index a4f7229..0000000 Binary files a/clusterApp/Res/image/sampling_099.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_100.png b/clusterApp/Res/image/sampling_100.png deleted file mode 100644 index 21899a1..0000000 Binary files a/clusterApp/Res/image/sampling_100.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_101.png b/clusterApp/Res/image/sampling_101.png deleted file mode 100644 index 8da0bad..0000000 Binary files a/clusterApp/Res/image/sampling_101.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_102.png b/clusterApp/Res/image/sampling_102.png deleted file mode 100644 index 8fb7a6f..0000000 Binary files a/clusterApp/Res/image/sampling_102.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_103.png b/clusterApp/Res/image/sampling_103.png deleted file mode 100644 index 1c9128a..0000000 Binary files a/clusterApp/Res/image/sampling_103.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_104.png b/clusterApp/Res/image/sampling_104.png deleted file mode 100644 index 73dfe66..0000000 Binary files a/clusterApp/Res/image/sampling_104.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_105.png b/clusterApp/Res/image/sampling_105.png deleted file mode 100644 index 5541f58..0000000 Binary files a/clusterApp/Res/image/sampling_105.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_106.png b/clusterApp/Res/image/sampling_106.png deleted file mode 100644 index edddae0..0000000 Binary files a/clusterApp/Res/image/sampling_106.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_107.png b/clusterApp/Res/image/sampling_107.png deleted file mode 100644 index aac30b6..0000000 Binary files a/clusterApp/Res/image/sampling_107.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_108.png b/clusterApp/Res/image/sampling_108.png deleted file mode 100644 index 972f7db..0000000 Binary files a/clusterApp/Res/image/sampling_108.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_109.png b/clusterApp/Res/image/sampling_109.png deleted file mode 100644 index 454faf0..0000000 Binary files a/clusterApp/Res/image/sampling_109.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_110.png b/clusterApp/Res/image/sampling_110.png deleted file mode 100644 index 865abed..0000000 Binary files a/clusterApp/Res/image/sampling_110.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_111.png b/clusterApp/Res/image/sampling_111.png deleted file mode 100644 index 04df082..0000000 Binary files a/clusterApp/Res/image/sampling_111.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_112.png b/clusterApp/Res/image/sampling_112.png deleted file mode 100644 index 7a189ee..0000000 Binary files a/clusterApp/Res/image/sampling_112.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_113.png b/clusterApp/Res/image/sampling_113.png deleted file mode 100644 index 9c8e1be..0000000 Binary files a/clusterApp/Res/image/sampling_113.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_114.png b/clusterApp/Res/image/sampling_114.png deleted file mode 100644 index fe837fe..0000000 Binary files a/clusterApp/Res/image/sampling_114.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_115.png b/clusterApp/Res/image/sampling_115.png deleted file mode 100644 index bdb4c5d..0000000 Binary files a/clusterApp/Res/image/sampling_115.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_116.png b/clusterApp/Res/image/sampling_116.png deleted file mode 100644 index 9f2fa98..0000000 Binary files a/clusterApp/Res/image/sampling_116.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_117.png b/clusterApp/Res/image/sampling_117.png deleted file mode 100644 index 463e948..0000000 Binary files a/clusterApp/Res/image/sampling_117.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_118.png b/clusterApp/Res/image/sampling_118.png deleted file mode 100644 index 2b97fe6..0000000 Binary files a/clusterApp/Res/image/sampling_118.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_119.png b/clusterApp/Res/image/sampling_119.png deleted file mode 100644 index 44051e2..0000000 Binary files a/clusterApp/Res/image/sampling_119.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_120.png b/clusterApp/Res/image/sampling_120.png deleted file mode 100644 index 385feaa..0000000 Binary files a/clusterApp/Res/image/sampling_120.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_121.png b/clusterApp/Res/image/sampling_121.png deleted file mode 100644 index 9695fe0..0000000 Binary files a/clusterApp/Res/image/sampling_121.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_122.png b/clusterApp/Res/image/sampling_122.png deleted file mode 100644 index 941854e..0000000 Binary files a/clusterApp/Res/image/sampling_122.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_123.png b/clusterApp/Res/image/sampling_123.png deleted file mode 100644 index bc2a684..0000000 Binary files a/clusterApp/Res/image/sampling_123.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_124.png b/clusterApp/Res/image/sampling_124.png deleted file mode 100644 index 3966c27..0000000 Binary files a/clusterApp/Res/image/sampling_124.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_125.png b/clusterApp/Res/image/sampling_125.png deleted file mode 100644 index 62d42ff..0000000 Binary files a/clusterApp/Res/image/sampling_125.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_126.png b/clusterApp/Res/image/sampling_126.png deleted file mode 100644 index 96b76c7..0000000 Binary files a/clusterApp/Res/image/sampling_126.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_127.png b/clusterApp/Res/image/sampling_127.png deleted file mode 100644 index eea89f4..0000000 Binary files a/clusterApp/Res/image/sampling_127.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_128.png b/clusterApp/Res/image/sampling_128.png deleted file mode 100644 index fe3723e..0000000 Binary files a/clusterApp/Res/image/sampling_128.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_129.png b/clusterApp/Res/image/sampling_129.png deleted file mode 100644 index cb45a9b..0000000 Binary files a/clusterApp/Res/image/sampling_129.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_130.png b/clusterApp/Res/image/sampling_130.png deleted file mode 100644 index 98b9cdb..0000000 Binary files a/clusterApp/Res/image/sampling_130.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_131.png b/clusterApp/Res/image/sampling_131.png deleted file mode 100644 index 427ebbc..0000000 Binary files a/clusterApp/Res/image/sampling_131.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_132.png b/clusterApp/Res/image/sampling_132.png deleted file mode 100644 index ab5ce4d..0000000 Binary files a/clusterApp/Res/image/sampling_132.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_133.png b/clusterApp/Res/image/sampling_133.png deleted file mode 100644 index 9fade69..0000000 Binary files a/clusterApp/Res/image/sampling_133.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_134.png b/clusterApp/Res/image/sampling_134.png deleted file mode 100644 index b90b60e..0000000 Binary files a/clusterApp/Res/image/sampling_134.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_135.png b/clusterApp/Res/image/sampling_135.png deleted file mode 100644 index d363e75..0000000 Binary files a/clusterApp/Res/image/sampling_135.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_136.png b/clusterApp/Res/image/sampling_136.png deleted file mode 100644 index 267a291..0000000 Binary files a/clusterApp/Res/image/sampling_136.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_137.png b/clusterApp/Res/image/sampling_137.png deleted file mode 100644 index f4c1701..0000000 Binary files a/clusterApp/Res/image/sampling_137.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_138.png b/clusterApp/Res/image/sampling_138.png deleted file mode 100644 index 8eefed4..0000000 Binary files a/clusterApp/Res/image/sampling_138.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_139.png b/clusterApp/Res/image/sampling_139.png deleted file mode 100644 index 348f3ac..0000000 Binary files a/clusterApp/Res/image/sampling_139.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_140.png b/clusterApp/Res/image/sampling_140.png deleted file mode 100644 index 8ae5b56..0000000 Binary files a/clusterApp/Res/image/sampling_140.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_141.png b/clusterApp/Res/image/sampling_141.png deleted file mode 100644 index 14f1212..0000000 Binary files a/clusterApp/Res/image/sampling_141.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_142.png b/clusterApp/Res/image/sampling_142.png deleted file mode 100644 index b09d508..0000000 Binary files a/clusterApp/Res/image/sampling_142.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_143.png b/clusterApp/Res/image/sampling_143.png deleted file mode 100644 index 802f8ae..0000000 Binary files a/clusterApp/Res/image/sampling_143.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_144.png b/clusterApp/Res/image/sampling_144.png deleted file mode 100644 index 841017e..0000000 Binary files a/clusterApp/Res/image/sampling_144.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_145.png b/clusterApp/Res/image/sampling_145.png deleted file mode 100644 index 75e1549..0000000 Binary files a/clusterApp/Res/image/sampling_145.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_146.png b/clusterApp/Res/image/sampling_146.png deleted file mode 100644 index 084f4e3..0000000 Binary files a/clusterApp/Res/image/sampling_146.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_147.png b/clusterApp/Res/image/sampling_147.png deleted file mode 100644 index c23ba77..0000000 Binary files a/clusterApp/Res/image/sampling_147.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_148.png b/clusterApp/Res/image/sampling_148.png deleted file mode 100644 index af51f88..0000000 Binary files a/clusterApp/Res/image/sampling_148.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_149.png b/clusterApp/Res/image/sampling_149.png deleted file mode 100644 index fe67d44..0000000 Binary files a/clusterApp/Res/image/sampling_149.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_250.png b/clusterApp/Res/image/sampling_250.png deleted file mode 100644 index 3678a78..0000000 Binary files a/clusterApp/Res/image/sampling_250.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_251.png b/clusterApp/Res/image/sampling_251.png deleted file mode 100644 index 9477fa9..0000000 Binary files a/clusterApp/Res/image/sampling_251.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_252.png b/clusterApp/Res/image/sampling_252.png deleted file mode 100644 index 0ee8869..0000000 Binary files a/clusterApp/Res/image/sampling_252.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_253.png b/clusterApp/Res/image/sampling_253.png deleted file mode 100644 index 5accbc3..0000000 Binary files a/clusterApp/Res/image/sampling_253.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_254.png b/clusterApp/Res/image/sampling_254.png deleted file mode 100644 index 640d498..0000000 Binary files a/clusterApp/Res/image/sampling_254.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_255.png b/clusterApp/Res/image/sampling_255.png deleted file mode 100644 index e0e9bf2..0000000 Binary files a/clusterApp/Res/image/sampling_255.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_256.png b/clusterApp/Res/image/sampling_256.png deleted file mode 100644 index dcfe75b..0000000 Binary files a/clusterApp/Res/image/sampling_256.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_257.png b/clusterApp/Res/image/sampling_257.png deleted file mode 100644 index b07cc9b..0000000 Binary files a/clusterApp/Res/image/sampling_257.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_258.png b/clusterApp/Res/image/sampling_258.png deleted file mode 100644 index 14e2d6f..0000000 Binary files a/clusterApp/Res/image/sampling_258.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_259.png b/clusterApp/Res/image/sampling_259.png deleted file mode 100644 index 7540b4b..0000000 Binary files a/clusterApp/Res/image/sampling_259.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_260.png b/clusterApp/Res/image/sampling_260.png deleted file mode 100644 index 4526803..0000000 Binary files a/clusterApp/Res/image/sampling_260.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_261.png b/clusterApp/Res/image/sampling_261.png deleted file mode 100644 index 4526803..0000000 Binary files a/clusterApp/Res/image/sampling_261.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_262.png b/clusterApp/Res/image/sampling_262.png deleted file mode 100644 index 4526803..0000000 Binary files a/clusterApp/Res/image/sampling_262.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_263.png b/clusterApp/Res/image/sampling_263.png deleted file mode 100644 index 4526803..0000000 Binary files a/clusterApp/Res/image/sampling_263.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_264.png b/clusterApp/Res/image/sampling_264.png deleted file mode 100644 index 4526803..0000000 Binary files a/clusterApp/Res/image/sampling_264.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_265.png b/clusterApp/Res/image/sampling_265.png deleted file mode 100644 index 4526803..0000000 Binary files a/clusterApp/Res/image/sampling_265.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_266.png b/clusterApp/Res/image/sampling_266.png deleted file mode 100644 index 4526803..0000000 Binary files a/clusterApp/Res/image/sampling_266.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_267.png b/clusterApp/Res/image/sampling_267.png deleted file mode 100644 index 4526803..0000000 Binary files a/clusterApp/Res/image/sampling_267.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_268.png b/clusterApp/Res/image/sampling_268.png deleted file mode 100644 index 4526803..0000000 Binary files a/clusterApp/Res/image/sampling_268.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_269.png b/clusterApp/Res/image/sampling_269.png deleted file mode 100644 index 4526803..0000000 Binary files a/clusterApp/Res/image/sampling_269.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_cover.png b/clusterApp/Res/image/sampling_cover.png deleted file mode 100644 index 22ad186..0000000 Binary files a/clusterApp/Res/image/sampling_cover.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_error.png b/clusterApp/Res/image/sampling_error.png deleted file mode 100644 index ac06b90..0000000 Binary files a/clusterApp/Res/image/sampling_error.png and /dev/null differ diff --git a/clusterApp/Res/image/sampling_wait.png b/clusterApp/Res/image/sampling_wait.png deleted file mode 100644 index fc8d6e1..0000000 Binary files a/clusterApp/Res/image/sampling_wait.png and /dev/null differ diff --git a/clusterApp/Res/image/ui3_basic_bg_backing.png b/clusterApp/Res/image/ui3_basic_bg_backing.png index 4c50cc1..3438e66 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 4c50cc1..3438e66 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 4c50cc1..3438e66 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 4c50cc1..3438e66 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/Res/image/ui3_basic_bg_parking.png b/clusterApp/Res/image/ui3_basic_bg_parking.png index d595dcd..3438e66 100644 Binary files a/clusterApp/Res/image/ui3_basic_bg_parking.png and b/clusterApp/Res/image/ui3_basic_bg_parking.png differ diff --git a/clusterApp/Res/image/ui3_basic_bg_parking_night.png b/clusterApp/Res/image/ui3_basic_bg_parking_night.png index 5387dca..3438e66 100644 Binary files a/clusterApp/Res/image/ui3_basic_bg_parking_night.png and b/clusterApp/Res/image/ui3_basic_bg_parking_night.png differ diff --git a/clusterApp/bin/clusterApp b/clusterApp/bin/clusterApp index cce4729..6e676e2 100755 Binary files a/clusterApp/bin/clusterApp and b/clusterApp/bin/clusterApp differ diff --git a/clusterApp/include/Protocol/MainBoard_IIC_App.h b/clusterApp/include/Protocol/MainBoard_IIC_App.h index 1fae594..56a3706 100644 --- a/clusterApp/include/Protocol/MainBoard_IIC_App.h +++ b/clusterApp/include/Protocol/MainBoard_IIC_App.h @@ -310,7 +310,7 @@ MbIicApi Un08 Indicator[8]; /*指示灯状态*/ #define IND_BRAKE_ERR Indicator[0].sbit.b3 /*制动系统故障指示灯*/ #define IND_ABS Indicator[0].sbit.b4 /*防抱死制动系统(ABS)指示灯*/ #define IND_SCRUBBING_LACK Indicator[0].sbit.b5 /*洗涤液位低指示灯*/ -#define IND_LIMIT_SCALE Indicator[0].sbit.b6 /*限速图标放大标记*/ +#define IND_LIMIT_SCALE 0 //Indicator[0].sbit.b6 /*限速图标放大标记*/ #define IND_TOPCAMERA_CFG Indicator[0].sbit.b7 /*车顶摄像头配置*/ #define IND_ESP Indicator[1].sbit.b0 /*ESP指示灯*/ @@ -338,8 +338,8 @@ MbIicApi Un08 Indicator[8]; /*指示灯状态*/ #define IND_WHEEL_STATE Indicator[4].sbit03.b02 /*前轮转向状态*/ #define IND_NIGHT_MODE Indicator[4].sbit.b3 /*夜间模式*/ #define IND_POWER_LIMIT Indicator[4].sbit.b4 /*驱动功率限制*/ -#define IND_ACC_HOLD Indicator[4].sbit.b5 /*Acc Hold*/ -#define IND_POWER_MODE Indicator[4].sbit03.b67 /*经济模式指示灯*/ +#define IND_ACC_HOLD 0 //Indicator[4].sbit.b5 /*Acc Hold*/ +#define IND_POWER_MODE 2 //Indicator[4].sbit03.b67 /*经济模式指示灯*/ #define IND_DOOR_LF Indicator[5].sbit.b0 /*左前门指示灯*/ #define IND_DOOR_LB Indicator[5].sbit.b1 /*左后门指示灯*/ diff --git a/clusterApp/src/InsRender/Render.c b/clusterApp/src/InsRender/Render.c index 65fa428..215e21d 100644 --- a/clusterApp/src/InsRender/Render.c +++ b/clusterApp/src/InsRender/Render.c @@ -257,11 +257,6 @@ static Int08 ShowModulePhone(UInt08 phoneStatus, UInt08 moduleId); */ static Bool ShowVoiceAssistant(UInt08 state); -/** - * 显示人脸识别 - * 静态、正、左、右、上、下扫描 - */ -static Bool ShowFaceRecognition(UInt08 state); /** * 显示右侧上次访问的菜单(小图标) @@ -698,11 +693,11 @@ static void ShowSpeed(UInt08 speed) } else { - GetImageRect(rect, pngImg[PNG_ui3_speed_invalid]);rect.x = (RENDER_DISPLAY_WIDTH-rect.w)/2; + GetImageRect(rect, pngImg[PNG_ui3_speed_invalid]);//rect.x = (RENDER_DISPLAY_WIDTH-rect.w)/2; DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[PNG_ui3_speed_invalid].tex); } - GetImageRect(rect, pngImg[PNG_ui3_speed_unit_kmph]);rect.x = (RENDER_DISPLAY_WIDTH-rect.w)/2; + GetImageRect(rect, pngImg[PNG_ui3_speed_unit_kmph]);//rect.x = (RENDER_DISPLAY_WIDTH-rect.w)/2; DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[PNG_ui3_speed_unit_kmph].tex); glEnableVertexAttribArray(Prgm_Simple_Texture_ATTR_Vtx); @@ -7396,336 +7391,6 @@ static Bool ShowVoiceAssistant(UInt08 state) #undef FRAME_MS } -/** - * 显示人脸识别 - * 静态、正、左、右、上、下扫描 - */ -static Bool ShowFaceRecognition(UInt08 state) -{ -#define TXT_FACE_GLYPH_W 23 -#define TXT_FACE_LENGTH 30 -#define TXT_FACE_PIXEL_W ((TXT_FACE_GLYPH_W)*(TXT_FACE_LENGTH)) -#define TXT_FACE_PIXEL_H 29 -#define MAX_FACE_INFO_DSP_WIDTH 410 -#define TXT_FACE_MAX_LINE_CNT 2 -#define FRAME_MS 50 - enum - { - State_BEGIN=0, - State_LOOP, - State_END, - }; - - static UInt32 Idx = 0; //动画绘画序列号 - static UInt32 Idx0 = 0; //动画绘制起始序列号 - static UInt32 Idxn = 0; //动画绘制结束序列号 - static Int32 duration = 0; //动画绘制持续时间 - static Int08 animation_state = State_BEGIN; //动画播放状态 - static UInt08 preState = 0xFF; - static Int08 InAlp = 1; //是否可见 - const UInt32 *infoStr[TXT_FACE_MAX_LINE_CNT] = {NULL};//保存字符串 - UInt32 str[TXT_FACE_LENGTH]; //保存字符串 - static const Int32* Txt; //字符大小 - static UInt16 pos[2]; //字符位置 - Recti rect; - static Int32 poolTxtFaceIdx[TXT_FACE_MAX_LINE_CNT] = {INS_INVALID_RES_ID,INS_INVALID_RES_ID}; - static Int32 txtWidth[TXT_FACE_MAX_LINE_CNT] = {0}, txtHeight[TXT_FACE_MAX_LINE_CNT] = {0}; - int i,j; - - if(fontMapStatus[Style_SiYuan_R] != Ftm_TexGen) - return; - - if (state <= FACE_RCN_NULL || state >=FACE_END || state == FACE_RCN_UP || state == FACE_RCN_DOWN || state == 0xFF) - { - preState = state; - return INS_FALSE; - } - - for(i = 0; i <= TXT_FACE_MAX_LINE_CNT; i++) - { - if(poolTxtFaceIdx[i] == INS_INVALID_RES_ID) /*未初始化?*/ - { - poolTxtFaceIdx[i] = GrabAvailableBmpPoolIdx(); /*获取可用内存(池)id*/ - if(poolTxtFaceIdx[i] != INS_INVALID_RES_ID) - { - bmpPool[poolTxtFaceIdx[i]] = malloc(TXT_FACE_PIXEL_W*TXT_FACE_PIXEL_H); - glGenTextures(1, &texPool[poolTxtFaceIdx[i]]); - } - Once_LoadShaderProgram(Prgm_AttrAlpha_Font); - } - } - - if( preState != state) - { - InAlp = 0; - - //文字显示 - switch(state) - { - case FACE_RCN_IDENTIFICATION_1: - pos[0] = txtPos[CTP_Facergnidentification_1].x; - pos[1] = txtPos[CTP_Facergnidentification_1].y; - infoStr[0] = str_face_recognition_identification_1_idx; - break; - case FACE_RCN_IDENTIFICATION_2: - pos[0] = txtPos[CTP_Facergnidentification_2].x; - pos[1] = txtPos[CTP_Facergnidentification_2].y; - infoStr[0] = str_face_recognition_identification_2_idx; - break; - case FACE_RCN_FRONT: - pos[0] = txtPos[CTP_Facergnfront].x; - pos[1] = txtPos[CTP_Facergnfront].y; - infoStr[0] = str_face_recognition_front_idx; - break; - case FACE_RCN_LEFT: - pos[0] = txtPos[CTP_Facergnleft].x; - pos[1] = txtPos[CTP_Facergnleft].y; - infoStr[0] = str_face_recognition_left_idx; - break; - case FACE_RCN_RIGHT: - pos[0] = txtPos[CTP_Facergnright].x; - pos[1] = txtPos[CTP_Facergnright].y; - infoStr[0] = str_face_recognition_right_idx; - break; -// case FACE_RCN_UP: -// pos[0] = txtPos[CTP_Facergnup].x; -// pos[1] = txtPos[CTP_Facergnup].y; -// break; -// case FACE_RCN_DOWN: -// pos[0] = txtPos[CTP_Facergndown].x; -// pos[1] = txtPos[CTP_Facergndown].y; -// break; - case FACE_RCN_COVER: - pos[0] = txtPos[CTP_Facergncover].x; - pos[1] = txtPos[CTP_Facergncover].y; - infoStr[0] = str_face_recognition_cover_1_idx; - infoStr[1] = str_face_recognition_cover_2_idx; - break; - case FACE_RCN_SUCCESS_1: - pos[0] = txtPos[CTP_Facergnsuccess_1].x; - pos[1] = txtPos[CTP_Facergnsuccess_1].y; - infoStr[0] = str_face_recognition_success_1_1_idx; - infoStr[1] = str_face_recognition_success_1_2_idx; - break; - case FACE_RCN_SUCCESS_2: - pos[0] = txtPos[CTP_Facergnsuccess_2].x; - pos[1] = txtPos[CTP_Facergnsuccess_2].y; - infoStr[0] = str_face_recognition_success_2_idx; - break; - default: - break; - } - //Txt = fs_facergnidentificationTipsTxt ; - - for(i = 0; i < TXT_FACE_MAX_LINE_CNT; i++) - { - if(infoStr[i] == NULL) - { - txtWidth[i] = 0; - txtHeight[i] = 0; - break; - } - else - { - for(j = 0; j < TXT_FACE_LENGTH-1 && infoStr[i][j] != 0; j++) - { - str[j] = HintAlarm_FONT_CODE[infoStr[i][j]]; - } - str[j] = 0; - } - - txtWidth[i] = TXT_FACE_PIXEL_W; - txtHeight[i] = TXT_FACE_PIXEL_H; - memset(bmpPool[poolTxtFaceIdx[i]], 0, TXT_FACE_PIXEL_W*TXT_FACE_PIXEL_H); - if(DrawSingleLineTxtBmp(fontLibId[Style_SiYuan_M], TXT_FACE_GLYPH_W, &txtWidth[i], &txtHeight[i], str, bmpPool[poolTxtFaceIdx[i]], INS_TRUE, NULL) == INS_TRUE) - { - GLenum err; - glBindTexture(GL_TEXTURE_2D, texPool[poolTxtFaceIdx[i]]); - if(err != GL_NO_ERROR) - DBG_Log(DBG_WARN, "glBindTexture failed, gl error:0x%x\n", err); - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - err = glGetError(); - if(err != GL_NO_ERROR) - DBG_Log(DBG_WARN, "1.hint txt before glTexImage2D, gl error:0x%x\n", err); - glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, txtWidth[i], txtHeight[i], 0, GL_ALPHA, GL_UNSIGNED_BYTE, bmpPool[poolTxtFaceIdx[i]]); - err = glGetError(); - if(err != GL_NO_ERROR) - { - DBG_Log(DBG_WARN, "upload hint txt picture rgb data fail.[err_0x%x]\n", err); - } - } - else - { - txtWidth[i] = 0; - txtHeight[i] = 0; - } - } - - //图片、动画显示 - switch(state) - { - case FACE_RCN_IDENTIFICATION_1: - case FACE_RCN_IDENTIFICATION_2: - animation_state = State_BEGIN; - preState = state; - Idx = PNG_sampling_wait; - break; - case FACE_RCN_FRONT: - case FACE_RCN_LEFT: - case FACE_RCN_RIGHT: -// case FACE_RCN_UP: -// case FACE_RCN_DOWN: - animation_state = State_LOOP; - preState = state; - duration = 0; - Idx = PNG_sampling_000 + (state - 2) * 50; - Idx0 = PNG_sampling_000 + (state - 2) * 50; - Idxn = PNG_sampling_049 + (state - 2) * 50; - break; - case FACE_RCN_COVER: - animation_state = State_BEGIN; - preState = state; - Idx = PNG_sampling_cover; - break; - case FACE_RCN_SUCCESS_1: - case FACE_RCN_SUCCESS_2: - animation_state = State_LOOP; - preState = state; - duration = 0; - Idx = PNG_sampling_250 ; - Idx0 = PNG_sampling_250; - Idxn = PNG_sampling_269; - break; - case FACE_RCN_ERROR: - animation_state = State_BEGIN; - preState = state; - Idx = PNG_sampling_error; - break; - default: - InAlp = 1; - break; - } - } - - //播放状态选择 - switch(animation_state) - { - case State_BEGIN: - break; - case State_LOOP: - if (Idx < Idxn) - Idx = Idx0 + duration / FRAME_MS; - else - animation_state = State_END; - break; - case State_END: - if (Idx < PNG_sampling_269) - Idx = PNG_sampling_049 + ( state - 2 ) * 50; - else - Idx = PNG_sampling_269; - break; - } - - //绘制图片 - if(Idx < PNG_NUM && pngStatus[Idx] != Png_TexGen) - { - Once_LoadPngData(Idx); - Once_GenPngTexture(Idx, pngImg[Idx].fmt, pngImg[Idx].fmt); - } - - glUseProgram(shader[Prgm_Simple_Texture]); - glUniformMatrix4fv(Prgm_Simple_Texture_UNFM_Mdv, 1, GL_FALSE, StackMat(mMdvMatStack)); - glUniformMatrix4fv(Prgm_Simple_Texture_UNFM_Prj, 1, GL_FALSE, StackMat(mPrjMatStack)); - - glEnableVertexAttribArray(Prgm_Simple_Texture_ATTR_Vtx); - glEnableVertexAttribArray(Prgm_Simple_Texture_ATTR_Txc); - - glUniform1f(Prgm_Simple_Texture_UNFM_Alp, InAlp); - - GetImageRect(rect, pngImg[Idx]); - DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[Idx].tex); - -// Once_LoadPngData(PNG_test); -// Once_GenPngTexture(PNG_test, pngImg[PNG_test].fmt, pngImg[PNG_test].fmt); -// glUniform1f(Prgm_Simple_Texture_UNFM_Alp, 0.5); -// GetImageRect(rect, pngImg[PNG_test]); -// DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[PNG_test].tex); - - glDisableVertexAttribArray(Prgm_Simple_Texture_ATTR_Vtx); - glDisableVertexAttribArray(Prgm_Simple_Texture_ATTR_Txc); - - //绘制文字 - if(state >= FACE_RCN_IDENTIFICATION_1 && state <= FACE_RCN_SUCCESS_2) - { - glUseProgram(shader[Prgm_Simple_Font]); - glUniformMatrix4fv(Prgm_Simple_Font_UNFM_Prj, 1, GL_FALSE, StackMat(mPrjMatStack)); - glUniformMatrix4fv(Prgm_Simple_Font_UNFM_Mdv, 1, GL_FALSE, StackMat(mMdvMatStack)); - - glEnableVertexAttribArray(Prgm_Simple_Font_ATTR_Vtx); - glEnableVertexAttribArray(Prgm_Simple_Font_ATTR_Txc); - -// if(len > 0) - { - if( state == FACE_RCN_ERROR) - glUniform1f(Prgm_Simple_Font_UNFM_Alp, 1.0f); - else - glUniform1f(Prgm_Simple_Font_UNFM_Alp, InAlp); - glUniform3fv(Prgm_Simple_Font_UNFM_Clr, 1, colorDarkGray); - if(state == FACE_RCN_COVER) - { - rect.x = 1383+46; - rect.y = 483+37; - rect.w = txtWidth[0]; - rect.h = txtHeight[0]; - DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Font_ATTR_Vtx, Prgm_Simple_Font_ATTR_Txc, QuadTexCoords, texPool[poolTxtFaceIdx[0]]); - - rect.x = pos[0]; - rect.y = pos[1]; - rect.w = txtWidth[1]; - rect.h = txtHeight[1]; - DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Font_ATTR_Vtx, Prgm_Simple_Font_ATTR_Txc, QuadTexCoords, texPool[poolTxtFaceIdx[1]]); - } - else if(state == FACE_RCN_SUCCESS_1) - { - rect.x = 1407+50; - rect.y = 482; - rect.w = txtWidth[0]; - rect.h = txtHeight[0]; - DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Font_ATTR_Vtx, Prgm_Simple_Font_ATTR_Txc, QuadTexCoords, texPool[poolTxtFaceIdx[0]]); - - rect.x = pos[0]; - rect.y = pos[1]; - rect.w = txtWidth[1]; - rect.h = txtHeight[1]; - DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Font_ATTR_Vtx, Prgm_Simple_Font_ATTR_Txc, QuadTexCoords, texPool[poolTxtFaceIdx[1]]); - } - else - { - rect.x = pos[0]; - rect.y = pos[1]; - rect.w = txtWidth[0]; - rect.h = txtHeight[0]; - DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Font_ATTR_Vtx, Prgm_Simple_Font_ATTR_Txc, QuadTexCoords, texPool[poolTxtFaceIdx[0]]); - } - } - glDisableVertexAttribArray(Prgm_Simple_Font_ATTR_Vtx); - glDisableVertexAttribArray(Prgm_Simple_Font_ATTR_Txc); - } - - duration += mFrameTimeMs; - - return INS_TRUE; - -#undef FRAME_MS -#undef TXT_FACE_GLYPH_W 23 -#undef TXT_FACE_LENGTH 30 -#undef TXT_FACE_PIXEL_W ((TXT_FACE_GLYPH_W)*(TXT_FACE_LENGTH)) -#undef TXT_FACE_PIXEL_H 29 -#undef MAX_FACE_INFO_DSP_WIDTH 410 -#undef TXT_FACE_MAX_LINE_CNT 2 -} /** * 显示右侧上次访问的菜单(小图标) @@ -15663,6 +15328,8 @@ static void ShowGear(UInt08 gear) */ static void ShowDrivingMode(UInt08 nightMode) { + +#ifdef SHOW_DRIVINGMODE_ANIMAL static Int32 modeAnimId = 0; static Int32 modeDuration = 0; static Flt32 modeIconAlpha = 0.0f; @@ -15878,6 +15545,103 @@ static void ShowDrivingMode(UInt08 nightMode) glDisableVertexAttribArray(Prgm_Simple_Color_ATTR_Vtx); glDisableVertexAttribArray(Prgm_Simple_Color_ATTR_Clr); +#else + static Int32 modeAnimId = 0; + static Int32 modeDuration = 0; + static Flt32 modeIconAlpha = 0.0f; + static Flt32 modeBarInvAlpha = 1.0f; + Recti rect, rect0, rect1; + + glUseProgram(shader[Prgm_Simple_Texture]); + glUniformMatrix4fv(Prgm_Simple_Texture_UNFM_Prj, 1, GL_FALSE, StackMat(mPrjMatStack)); + glUniformMatrix4fv(Prgm_Simple_Texture_UNFM_Mdv, 1, GL_FALSE, StackMat(mMdvMatStack)); + glUniform1f(Prgm_Simple_Texture_UNFM_Alp, 0.0f); + + glEnableVertexAttribArray(Prgm_Simple_Texture_ATTR_Vtx); + glEnableVertexAttribArray(Prgm_Simple_Texture_ATTR_Txc); + + if(IND_POWER_MODE == 1) /** SPORT mode **/ + { + if(modeAnimId == 0) + { + modeBarInvAlpha = 1.0f; + modeIconAlpha = 1.0f; + modeDuration = 0; + } + } + else if(IND_POWER_MODE == 2) /** ECO mode **/ + { + if(modeAnimId == 0) + { + modeBarInvAlpha = 1.0f; + modeIconAlpha = 1.0f; + modeDuration = 0; + } + } + else if(nightMode) /** Standard Night mode **/ + { + modeAnimId = 0; + GetImageRect(rect, tgaImg[TGA_ui3_basic_bg_bottom_night]);rect.w *= 2; + DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, tgaImg[TGA_ui3_basic_bg_bottom_night].tex); + } + else /** Standard Day mode **/ + { + modeAnimId = 0; + GetImageRect(rect, tgaImg[TGA_ui3_basic_bg_bottom_night]);rect.w *= 2; + DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, tgaImg[TGA_ui3_basic_bg_bottom].tex); + } + + if(modeAnimId != 0) + { + if(pngStatus[modeAnimId] == Png_Unload) + { + Once_LoadPngData(modeAnimId); + Once_GenPngTexture(modeAnimId, pngImg[modeAnimId].fmt, pngImg[modeAnimId].fmt); + } + + glUniform1f(Prgm_Simple_Texture_UNFM_Alp, 0.8f*(1-modeBarInvAlpha)); + GetImageRect(rect, pngImg[modeAnimId]); + DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[modeAnimId].tex); + + if(1) + { + + if(IND_POWER_MODE == 2) /** ECO mode **/ + { + + glUniform1f(Prgm_Simple_Texture_UNFM_Alp, modeIconAlpha); + GetImageRect(rect, pngImg[PNG_style_led_eco]); + DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[PNG_style_led_eco].tex); + } + } + else if(IND_POWER_MODE == 1) + { + + glUniform1f(Prgm_Simple_Texture_UNFM_Alp, modeIconAlpha); + GetImageRect(rect, pngImg[PNG_style_led_sport]); + DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[PNG_style_led_sport].tex); + + } + } + + glDisableVertexAttribArray(Prgm_Simple_Texture_ATTR_Vtx); + glDisableVertexAttribArray(Prgm_Simple_Texture_ATTR_Txc); + + glUseProgram(shader[Prgm_Simple_Color]); + glUniformMatrix4fv(Prgm_Simple_Color_UNFM_Prj, 1, GL_FALSE, StackMat(mPrjMatStack)); + glUniformMatrix4fv(Prgm_Simple_Color_UNFM_Mdv, 1, GL_FALSE, StackMat(mMdvMatStack)); + glUniform1f(Prgm_Simple_Color_UNFM_Alp, modeIconAlpha); + + glEnableVertexAttribArray(Prgm_Simple_Color_ATTR_Vtx); + glEnableVertexAttribArray(Prgm_Simple_Color_ATTR_Clr); + + SetRecti(rect0, 0, 0, 1920, 440); + //SetRecti(rect1, 0, 440, 1920, pngImg[PNG_eco_006].lty-440); + + glDisableVertexAttribArray(Prgm_Simple_Color_ATTR_Vtx); + glDisableVertexAttribArray(Prgm_Simple_Color_ATTR_Clr); + +#endif } enum /*自检动画时刻值*/ @@ -16291,7 +16055,7 @@ static void Render_PwrOnState() glClearColor(12.0f/255.0f, 13.0f/255.0f, 17.5f/255.0f, 1.0f); //GetImageRect(rect, tgaImg[TGA_ui3_basic_bg_backing_night]);rect.w = rect.w*4/3;rect.h = rect.h*4/3; //DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, tgaImg[TGA_ui3_basic_bg_backing_night].tex); - GetImageRect(rect, pngImg[PNG_ui3_basic_bg_backing_night]);rect.w = rect.w*4/3;rect.h = rect.h*4/3; + GetImageRect(rect, pngImg[PNG_ui3_basic_bg_backing_night]);//rect.w = rect.w*4/3;rect.h = rect.h*4/3; DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[PNG_ui3_basic_bg_backing_night].tex); } else @@ -16299,7 +16063,7 @@ static void Render_PwrOnState() glClearColor(24.0f/255.0f, 26.0f/255.0f, 35.0f/255.0f, 1.0f); // GetImageRect(rect, tgaImg[TGA_ui3_basic_bg_backing]);rect.w = rect.w*4/3;rect.h = rect.h*4/3; // DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, tgaImg[TGA_ui3_basic_bg_backing].tex); - GetImageRect(rect, pngImg[PNG_ui3_basic_bg_backing]);rect.w = rect.w*4/3;rect.h = rect.h*4/3; + GetImageRect(rect, pngImg[PNG_ui3_basic_bg_backing]);//rect.w = rect.w*4/3;rect.h = rect.h*4/3; DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[PNG_ui3_basic_bg_backing].tex); } } @@ -16310,14 +16074,14 @@ static void Render_PwrOnState() { // GetImageRect(rect, tgaImg[TGA_ui3_basic_bg_parking_night]);rect.w = rect.w*4/3;rect.h = rect.h*4/3; // DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, tgaImg[TGA_ui3_basic_bg_parking_night].tex); - GetImageRect(rect, pngImg[PNG_ui3_basic_bg_driving_night]);rect.w = rect.w*4/3;rect.h = rect.h*4/3; + GetImageRect(rect, pngImg[PNG_ui3_basic_bg_driving_night]);//rect.w = rect.w*4/3;rect.h = rect.h*4/3; DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[PNG_ui3_basic_bg_driving_night].tex); } else { // GetImageRect(rect, tgaImg[TGA_ui3_basic_bg_parking]);rect.w = rect.w*4/3;rect.h = rect.h*4/3; // DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, tgaImg[TGA_ui3_basic_bg_parking].tex); - GetImageRect(rect, pngImg[PNG_ui3_basic_bg_driving]);rect.w = rect.w*4/3;rect.h = rect.h*4/3; + GetImageRect(rect, pngImg[PNG_ui3_basic_bg_driving]);//rect.w = rect.w*4/3;rect.h = rect.h*4/3; DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[PNG_ui3_basic_bg_driving].tex); } } @@ -16328,14 +16092,14 @@ static void Render_PwrOnState() { // GetImageRect(rect, tgaImg[TGA_ui3_basic_bg_parking_night]);rect.w = rect.w*4/3;rect.h = rect.h*4/3; // DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, tgaImg[TGA_ui3_basic_bg_parking_night].tex); - GetImageRect(rect, pngImg[PNG_ui3_basic_bg_parking_night]);rect.w = rect.w*4/3;rect.h = rect.h*4/3; + GetImageRect(rect, pngImg[PNG_ui3_basic_bg_parking_night]);//rect.w = rect.w*4/3;rect.h = rect.h*4/3; DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[PNG_ui3_basic_bg_parking_night].tex); } else { // GetImageRect(rect, tgaImg[TGA_ui3_basic_bg_parking]);rect.w = rect.w*4/3;rect.h = rect.h*4/3; // DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, tgaImg[TGA_ui3_basic_bg_parking].tex); - GetImageRect(rect, pngImg[PNG_ui3_basic_bg_parking]);rect.w = rect.w*4/3;rect.h = rect.h*4/3; + GetImageRect(rect, pngImg[PNG_ui3_basic_bg_parking]);//rect.w = rect.w*4/3;rect.h = rect.h*4/3; DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[PNG_ui3_basic_bg_parking].tex); } } @@ -16346,14 +16110,14 @@ static void Render_PwrOnState() { // GetImageRect(rect, tgaImg[TGA_ui3_basic_bg_backing_night]);rect.w = rect.w*4/3;rect.h = rect.h*4/3; // DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, tgaImg[TGA_ui3_basic_bg_backing_night].tex); - GetImageRect(rect, pngImg[PNG_ui3_basic_bg_backing_night]);rect.w = rect.w*4/3;rect.h = rect.h*4/3; + GetImageRect(rect, pngImg[PNG_ui3_basic_bg_backing_night]);//rect.w = rect.w*4/3;rect.h = rect.h*4/3; DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[PNG_ui3_basic_bg_backing_night].tex); } else { // GetImageRect(rect, tgaImg[TGA_ui3_basic_bg_backing]);rect.w = rect.w*4/3;rect.h = rect.h*4/3; // DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, tgaImg[TGA_ui3_basic_bg_backing].tex); - GetImageRect(rect, pngImg[PNG_ui3_basic_bg_backing]);rect.w = rect.w*4/3;rect.h = rect.h*4/3; + GetImageRect(rect, pngImg[PNG_ui3_basic_bg_backing]);//rect.w = rect.w*4/3;rect.h = rect.h*4/3; DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[PNG_ui3_basic_bg_backing].tex); } } @@ -16409,7 +16173,9 @@ static void Render_PwrOnState() if(chargingUI == INS_FALSE && selfTestDuration > SelfTest_Total_Duration) { +#ifdef SHOW_DRIVINGMODE ShowDrivingMode(nightMode); +#endif } if(chargingUI == INS_TRUE) @@ -16465,7 +16231,6 @@ static void Render_PwrOnState() ShowMenuWindyModeSelecting(0xFF); ShowMenuVersion(0xFF); ShowVoiceAssistant(0xFF); - ShowFaceRecognition(0xFF); } if(selfTestDuration <= SelfTest_Total_Duration) @@ -16529,7 +16294,7 @@ static void Render_PwrOnState() PhoneStatus = PHONE_InCall; } } -#ifndef SHOW_MENULEFT +#ifdef SHOW_MENULEFT if(RadarAlarm == 0 || (pageType != GEAR_R && pageType != GEAR_N && pageType != GEAR_D)) /*只有在非倒车界面才显示左侧菜单,左侧模块*/ { if(ShowMenuLeft(MenuLeftId) == INS_TRUE) @@ -16625,7 +16390,6 @@ static void Render_PwrOnState() } ShowModulePhone(phoneStatus, MODULE_R_PHONE); ShowVoiceAssistant(0xFF); - ShowFaceRecognition(0xFF); menuID = 0xFF; rightModuleID = 0xFF; @@ -16635,15 +16399,7 @@ static void Render_PwrOnState() rightSideState = RightSide_VOICE_AI; menuID = 0xFF; rightModuleID = 0xFF; - ShowFaceRecognition(0xFF); } -#ifdef SHOW_FACE_ - else if(ShowFaceRecognition(FaceRecognitionstate) == INS_TRUE) - { - menuID = 0xFF; - rightModuleID = 0xFF; - } -#endif if(menuID != 0) { diff --git a/clusterApp/src/InsRender/Res_Font.h b/clusterApp/src/InsRender/Res_Font.h index 1938f1c..560e8cf 100644 --- a/clusterApp/src/InsRender/Res_Font.h +++ b/clusterApp/src/InsRender/Res_Font.h @@ -85,7 +85,7 @@ static const Vec2i txtPos[] = {859, 89}, //CTP_Speed_XXX 三位车速位置 {960, 89}, //CTP_Speed_Invalid 无效车速位置 {926, 212}, //CTP_Speed_Unit - {850, 318}, //CTP_Speed_Limit + {597, 241}, //CTP_Speed_Limit {960, 603}, //CTP_ChargingBat {1004, 662+5}, //CTP_TripRange {200, 201}, //CTP_ChargeStatus diff --git a/clusterApp/src/InsRender/Res_Png.h b/clusterApp/src/InsRender/Res_Png.h index c6e5f61..ff040a6 100644 --- a/clusterApp/src/InsRender/Res_Png.h +++ b/clusterApp/src/InsRender/Res_Png.h @@ -299,48 +299,6 @@ static const char *pngFilePath[] = "./Res/image/driving_high_beam.png", "./Res/image/driving_low_beam.png", - "./Res/image/eco-720_031.png", - "./Res/image/eco-720_032.png", - "./Res/image/eco-720_033.png", - "./Res/image/eco-720_034.png", - "./Res/image/eco-720_035.png", - "./Res/image/eco-720_036.png", - "./Res/image/eco-720_037.png", - "./Res/image/eco-720_038.png", - "./Res/image/eco-720_039.png", - "./Res/image/eco-720_040.png", - "./Res/image/eco-720_041.png", - "./Res/image/eco-720_042.png", - "./Res/image/eco-720_043.png", - "./Res/image/eco-720_044.png", - "./Res/image/eco-720_045.png", - "./Res/image/eco-720_046.png", - "./Res/image/eco-720_047.png", - "./Res/image/eco-720_048.png", - "./Res/image/eco-720_049.png", - "./Res/image/eco-720_050.png", - "./Res/image/eco-720_051.png", - "./Res/image/eco-720_052.png", - "./Res/image/eco-720_053.png", - "./Res/image/eco-720_054.png", - "./Res/image/eco-720_055.png", - "./Res/image/eco-720_056.png", - "./Res/image/eco-720_057.png", - "./Res/image/eco-720_058.png", - "./Res/image/eco-720_059.png", - "./Res/image/eco-720_060.png", - "./Res/image/eco-720_061.png", - "./Res/image/eco-720_062.png", - "./Res/image/eco-720_063.png", - "./Res/image/eco-720_064.png", - "./Res/image/eco-720_065.png", - "./Res/image/eco-720_066.png", - "./Res/image/eco-720_067.png", - "./Res/image/eco-720_068.png", - "./Res/image/eco-720_069.png", - "./Res/image/eco-720_070.png", - "./Res/image/eco-720_071.png", - "./Res/image/eco-720_072.png", "./Res/image/sport_720_030.png", "./Res/image/sport_720_031.png", @@ -854,183 +812,6 @@ static const char *pngFilePath[] = "./Res/model3d/Bicycle_Simple_Model_red.png", "./Res/model3d/Bicycle_Simple_Model_yellow.png", - "./Res/image/sampling_000.png", - "./Res/image/sampling_001.png", - "./Res/image/sampling_002.png", - "./Res/image/sampling_003.png", - "./Res/image/sampling_004.png", - "./Res/image/sampling_005.png", - "./Res/image/sampling_006.png", - "./Res/image/sampling_007.png", - "./Res/image/sampling_008.png", - "./Res/image/sampling_009.png", - "./Res/image/sampling_010.png", - "./Res/image/sampling_011.png", - "./Res/image/sampling_012.png", - "./Res/image/sampling_013.png", - "./Res/image/sampling_014.png", - "./Res/image/sampling_015.png", - "./Res/image/sampling_016.png", - "./Res/image/sampling_017.png", - "./Res/image/sampling_018.png", - "./Res/image/sampling_019.png", - "./Res/image/sampling_020.png", - "./Res/image/sampling_021.png", - "./Res/image/sampling_022.png", - "./Res/image/sampling_023.png", - "./Res/image/sampling_024.png", - "./Res/image/sampling_025.png", - "./Res/image/sampling_026.png", - "./Res/image/sampling_027.png", - "./Res/image/sampling_028.png", - "./Res/image/sampling_029.png", - "./Res/image/sampling_030.png", - "./Res/image/sampling_031.png", - "./Res/image/sampling_032.png", - "./Res/image/sampling_033.png", - "./Res/image/sampling_034.png", - "./Res/image/sampling_035.png", - "./Res/image/sampling_036.png", - "./Res/image/sampling_037.png", - "./Res/image/sampling_038.png", - "./Res/image/sampling_039.png", - "./Res/image/sampling_040.png", - "./Res/image/sampling_041.png", - "./Res/image/sampling_042.png", - "./Res/image/sampling_043.png", - "./Res/image/sampling_044.png", - "./Res/image/sampling_045.png", - "./Res/image/sampling_046.png", - "./Res/image/sampling_047.png", - "./Res/image/sampling_048.png", - "./Res/image/sampling_049.png", - - "./Res/image/sampling_050.png", - "./Res/image/sampling_051.png", - "./Res/image/sampling_052.png", - "./Res/image/sampling_053.png", - "./Res/image/sampling_054.png", - "./Res/image/sampling_055.png", - "./Res/image/sampling_056.png", - "./Res/image/sampling_057.png", - "./Res/image/sampling_058.png", - "./Res/image/sampling_059.png", - "./Res/image/sampling_060.png", - "./Res/image/sampling_061.png", - "./Res/image/sampling_062.png", - "./Res/image/sampling_063.png", - "./Res/image/sampling_064.png", - "./Res/image/sampling_065.png", - "./Res/image/sampling_066.png", - "./Res/image/sampling_067.png", - "./Res/image/sampling_068.png", - "./Res/image/sampling_069.png", - "./Res/image/sampling_070.png", - "./Res/image/sampling_071.png", - "./Res/image/sampling_072.png", - "./Res/image/sampling_073.png", - "./Res/image/sampling_074.png", - "./Res/image/sampling_075.png", - "./Res/image/sampling_076.png", - "./Res/image/sampling_077.png", - "./Res/image/sampling_078.png", - "./Res/image/sampling_079.png", - "./Res/image/sampling_080.png", - "./Res/image/sampling_081.png", - "./Res/image/sampling_082.png", - "./Res/image/sampling_083.png", - "./Res/image/sampling_084.png", - "./Res/image/sampling_085.png", - "./Res/image/sampling_086.png", - "./Res/image/sampling_087.png", - "./Res/image/sampling_088.png", - "./Res/image/sampling_089.png", - "./Res/image/sampling_090.png", - "./Res/image/sampling_091.png", - "./Res/image/sampling_092.png", - "./Res/image/sampling_093.png", - "./Res/image/sampling_094.png", - "./Res/image/sampling_095.png", - "./Res/image/sampling_096.png", - "./Res/image/sampling_097.png", - "./Res/image/sampling_098.png", - "./Res/image/sampling_099.png", - - "./Res/image/sampling_100.png", - "./Res/image/sampling_101.png", - "./Res/image/sampling_102.png", - "./Res/image/sampling_103.png", - "./Res/image/sampling_104.png", - "./Res/image/sampling_105.png", - "./Res/image/sampling_106.png", - "./Res/image/sampling_107.png", - "./Res/image/sampling_108.png", - "./Res/image/sampling_109.png", - "./Res/image/sampling_110.png", - "./Res/image/sampling_111.png", - "./Res/image/sampling_112.png", - "./Res/image/sampling_113.png", - "./Res/image/sampling_114.png", - "./Res/image/sampling_115.png", - "./Res/image/sampling_116.png", - "./Res/image/sampling_117.png", - "./Res/image/sampling_118.png", - "./Res/image/sampling_119.png", - "./Res/image/sampling_120.png", - "./Res/image/sampling_121.png", - "./Res/image/sampling_122.png", - "./Res/image/sampling_123.png", - "./Res/image/sampling_124.png", - "./Res/image/sampling_125.png", - "./Res/image/sampling_126.png", - "./Res/image/sampling_127.png", - "./Res/image/sampling_128.png", - "./Res/image/sampling_129.png", - "./Res/image/sampling_130.png", - "./Res/image/sampling_131.png", - "./Res/image/sampling_132.png", - "./Res/image/sampling_133.png", - "./Res/image/sampling_134.png", - "./Res/image/sampling_135.png", - "./Res/image/sampling_136.png", - "./Res/image/sampling_137.png", - "./Res/image/sampling_138.png", - "./Res/image/sampling_139.png", - "./Res/image/sampling_140.png", - "./Res/image/sampling_141.png", - "./Res/image/sampling_142.png", - "./Res/image/sampling_143.png", - "./Res/image/sampling_144.png", - "./Res/image/sampling_145.png", - "./Res/image/sampling_146.png", - "./Res/image/sampling_147.png", - "./Res/image/sampling_148.png", - "./Res/image/sampling_149.png", - - "./Res/image/sampling_250.png", - "./Res/image/sampling_251.png", - "./Res/image/sampling_252.png", - "./Res/image/sampling_253.png", - "./Res/image/sampling_254.png", - "./Res/image/sampling_255.png", - "./Res/image/sampling_256.png", - "./Res/image/sampling_257.png", - "./Res/image/sampling_258.png", - "./Res/image/sampling_259.png", - "./Res/image/sampling_260.png", - "./Res/image/sampling_261.png", - "./Res/image/sampling_262.png", - "./Res/image/sampling_263.png", - "./Res/image/sampling_264.png", - "./Res/image/sampling_265.png", - "./Res/image/sampling_266.png", - "./Res/image/sampling_267.png", - "./Res/image/sampling_268.png", - "./Res/image/sampling_269.png", - - "./Res/image/sampling_wait.png", - "./Res/image/sampling_cover.png", - "./Res/image/sampling_error.png", "./Res/image/alert_dialog_confirm_single_change.png", "./Res/image/alert_dialog_confirm_single_retry.png", @@ -1318,8 +1099,8 @@ static const Vec2i pngLtp[] = {360,364},//check_091 {360,364},//check_092 - #define RES_PNG_DRIVING_CAR_X 886 - #define RES_PNG_DRIVING_CAR_Y 500 + #define RES_PNG_DRIVING_CAR_X 854 + #define RES_PNG_DRIVING_CAR_Y 388 {0+RES_PNG_DRIVING_CAR_X,0+RES_PNG_DRIVING_CAR_Y},//driving_car_blue_base {64+RES_PNG_DRIVING_CAR_X,2+RES_PNG_DRIVING_CAR_Y},//driving_car_blue_camera {0+RES_PNG_DRIVING_CAR_X,0+RES_PNG_DRIVING_CAR_Y},//driving_car_darkgray_base @@ -1354,48 +1135,6 @@ static const Vec2i pngLtp[] = {0+RES_PNG_DRIVING_CAR_BEAM_X,0+RES_PNG_DRIVING_CAR_BEAM_Y},//driving_high_beam {0+RES_PNG_DRIVING_CAR_BEAM_X,0+RES_PNG_DRIVING_CAR_BEAM_Y},//driving_low_beam - {0,626+4},//eco_001 - {0,626+4},//eco_002 - {0,626+4},//eco_003 - {0,626+4},//eco_004 - {0,626+4},//eco_005 - {0,626+4},//eco_006 - {0,626+4},//eco_007 - {0,626+4},//eco_008 - {0,626+4},//eco_009 - {0,626+4},//eco_010 - {0,626+4},//eco_011 - {0,626+4},//eco_012 - {0,626+4},//eco_013 - {0,626+4},//eco_014 - {0,626+4},//eco_015 - {0,626+4},//eco_016 - {0,626+4},//eco_017 - {0,626+4},//eco_018 - {0,626+4},//eco_019 - {0,626+4},//eco_020 - {0,626+4},//eco_021 - {0,626+4},//eco_022 - {0,626+4},//eco_023 - {0,626+4},//eco_024 - {0,626+4},//eco_025 - {0,626+4},//eco_026 - {0,626+4},//eco_027 - {0,626+4},//eco_028 - {0,626+4},//eco_029 - {0,626+4},//eco_030 - {0,626+4},//eco_031 - {0,626+4},//eco_032 - {0,626+4},//eco_033 - {0,626+4},//eco_034 - {0,626+4},//eco_035 - {0,626+4},//eco_036 - {0,626+4},//eco_037 - {0,626+4},//eco_038 - {0,626+4},//eco_039 - {0,626+4},//eco_040 - {0,626+4},//eco_041 - {0,626+4},//eco_042 {0,626+4},//sport_000 {0,626+4},//sport_001 @@ -1826,32 +1565,32 @@ static const Vec2i pngLtp[] = {165,221},//vai_shadow - {932,104},//ui3_speed_digit_0 - {946,106},//ui3_speed_digit_1 - {932,104},//ui3_speed_digit_2 - {933,104},//ui3_speed_digit_3 - {932,104},//ui3_speed_digit_4 - {933,106},//ui3_speed_digit_5 - {937,104},//ui3_speed_digit_6 - {937,106},//ui3_speed_digit_7 - {932,104},//ui3_speed_digit_8 - {934,104},//ui3_speed_digit_9 - {956,179},//ui3_speed_digit_dot - {932,104},//ui3_speed_digit_red_0 - {946,106},//ui3_speed_digit_red_1 - {932,104},//ui3_speed_digit_red_2 - {933,104},//ui3_speed_digit_red_3 - {932,104},//ui3_speed_digit_red_4 - {933,106},//ui3_speed_digit_red_5 - {937,104},//ui3_speed_digit_red_6 - {937,106},//ui3_speed_digit_red_7 - {932,104},//ui3_speed_digit_red_8 - {934,104},//ui3_speed_digit_red_9 - {956,179},//ui3_speed_digit_red_dot - {942,104},//ui3_speed_digit_degree - {946,156},//ui3_speed_digit_negative - {926,156},//ui3_speed_invalid - {935,198+5},//ui3_speed_unit_kmph + {233, 263},//ui3_speed_digit_0 + {233+14,263+2},//ui3_speed_digit_1 + {233, 263},//ui3_speed_digit_2 + {233+1, 263},//ui3_speed_digit_3 + {233, 263},//ui3_speed_digit_4 + {233+1, 263+2},//ui3_speed_digit_5 + {233+5, 263},//ui3_speed_digit_6 + {233+5, 263+2},//ui3_speed_digit_7 + {233, 263},//ui3_speed_digit_8 + {233+1, 263},//ui3_speed_digit_9 + {233+24,263+75},//ui3_speed_digit_dot + {233, 263},//ui3_speed_digit_red_0 + {233+14,263+2},//ui3_speed_digit_red_1 + {233, 263},//ui3_speed_digit_red_2 + {233, 263},//ui3_speed_digit_red_3 + {233, 263},//ui3_speed_digit_red_4 + {233+1, 263+2},//ui3_speed_digit_red_5 + {233+5, 263},//ui3_speed_digit_red_6 + {233+5, 263+2},//ui3_speed_digit_red_7 + {233, 263},//ui3_speed_digit_red_8 + {233+2, 263},//ui3_speed_digit_red_9 + {233+24,263+75},//ui3_speed_digit_red_dot + {233+10,263},//ui3_speed_digit_degree + {233+24,263+52},//ui3_speed_digit_negative + {233-6, 263+52},//ui3_speed_invalid + {233+3, 263+99},//ui3_speed_unit_kmph {1167,475},//upgrade_icon_waiting {678,273},//upgrade_logo @@ -1911,183 +1650,6 @@ static const Vec2i pngLtp[] = {0,0},//uv_TexCarSmall_red {0,0},//uv_TexCarSmall_yellow - {1317,167},//sampling_000 - {1317,167},//sampling_001 - {1317,167},//sampling_002 - {1317,167},//sampling_003 - {1317,167},//sampling_004 - {1317,167},//sampling_005 - {1317,167},//sampling_006 - {1317,167},//sampling_007 - {1317,167},//sampling_008 - {1317,167},//sampling_009 - {1317,167},//sampling_010 - {1317,167},//sampling_011 - {1317,167},//sampling_012 - {1317,167},//sampling_013 - {1317,167},//sampling_014 - {1317,167},//sampling_015 - {1317,167},//sampling_016 - {1317,167},//sampling_017 - {1317,167},//sampling_018 - {1317,167},//sampling_019 - {1317,167},//sampling_020 - {1317,167},//sampling_021 - {1317,167},//sampling_022 - {1317,167},//sampling_023 - {1317,167},//sampling_024 - {1317,167},//sampling_025 - {1317,167},//sampling_026 - {1317,167},//sampling_027 - {1317,167},//sampling_028 - {1317,167},//sampling_029 - {1317,167},//sampling_030 - {1317,167},//sampling_031 - {1317,167},//sampling_032 - {1317,167},//sampling_033 - {1317,167},//sampling_034 - {1317,167},//sampling_035 - {1317,167},//sampling_036 - {1317,167},//sampling_037 - {1317,167},//sampling_038 - {1317,167},//sampling_039 - {1317,167},//sampling_040 - {1317,167},//sampling_041 - {1317,167},//sampling_042 - {1317,167},//sampling_043 - {1317,167},//sampling_044 - {1317,167},//sampling_045 - {1317,167},//sampling_046 - {1317,167},//sampling_047 - {1317,167},//sampling_048 - {1317,167},//sampling_049 - - {1317,167},//sampling_050 - {1317,167},//sampling_051 - {1317,167},//sampling_052 - {1317,167},//sampling_053 - {1317,167},//sampling_054 - {1317,167},//sampling_055 - {1317,167},//sampling_056 - {1317,167},//sampling_057 - {1317,167},//sampling_058 - {1317,167},//sampling_059 - {1317,167},//sampling_060 - {1317,167},//sampling_061 - {1317,167},//sampling_062 - {1317,167},//sampling_063 - {1317,167},//sampling_064 - {1317,167},//sampling_065 - {1317,167},//sampling_066 - {1317,167},//sampling_067 - {1317,167},//sampling_068 - {1317,167},//sampling_069 - {1317,167},//sampling_070 - {1317,167},//sampling_071 - {1317,167},//sampling_072 - {1317,167},//sampling_073 - {1317,167},//sampling_074 - {1317,167},//sampling_075 - {1317,167},//sampling_076 - {1317,167},//sampling_077 - {1317,167},//sampling_078 - {1317,167},//sampling_079 - {1317,167},//sampling_080 - {1317,167},//sampling_081 - {1317,167},//sampling_082 - {1317,167},//sampling_083 - {1317,167},//sampling_084 - {1317,167},//sampling_085 - {1317,167},//sampling_086 - {1317,167},//sampling_087 - {1317,167},//sampling_088 - {1317,167},//sampling_089 - {1317,167},//sampling_090 - {1317,167},//sampling_091 - {1317,167},//sampling_092 - {1317,167},//sampling_093 - {1317,167},//sampling_094 - {1317,167},//sampling_095 - {1317,167},//sampling_096 - {1317,167},//sampling_097 - {1317,167},//sampling_098 - {1317,167},//sampling_099 - - {1317,167},//sampling_100 - {1317,167},//sampling_101 - {1317,167},//sampling_102 - {1317,167},//sampling_103 - {1317,167},//sampling_104 - {1317,167},//sampling_105 - {1317,167},//sampling_106 - {1317,167},//sampling_107 - {1317,167},//sampling_108 - {1317,167},//sampling_109 - {1317,167},//sampling_110 - {1317,167},//sampling_111 - {1317,167},//sampling_112 - {1317,167},//sampling_113 - {1317,167},//sampling_114 - {1317,167},//sampling_115 - {1317,167},//sampling_116 - {1317,167},//sampling_117 - {1317,167},//sampling_118 - {1317,167},//sampling_119 - {1317,167},//sampling_120 - {1317,167},//sampling_121 - {1317,167},//sampling_122 - {1317,167},//sampling_123 - {1317,167},//sampling_124 - {1317,167},//sampling_125 - {1317,167},//sampling_126 - {1317,167},//sampling_127 - {1317,167},//sampling_128 - {1317,167},//sampling_128 - {1317,167},//sampling_130 - {1317,167},//sampling_131 - {1317,167},//sampling_132 - {1317,167},//sampling_133 - {1317,167},//sampling_134 - {1317,167},//sampling_135 - {1317,167},//sampling_136 - {1317,167},//sampling_137 - {1317,167},//sampling_138 - {1317,167},//sampling_139 - {1317,167},//sampling_140 - {1317,167},//sampling_141 - {1317,167},//sampling_142 - {1317,167},//sampling_143 - {1317,167},//sampling_144 - {1317,167},//sampling_145 - {1317,167},//sampling_146 - {1317,167},//sampling_147 - {1317,167},//sampling_148 - {1317,167},//sampling_149 - - {1317,167},//sampling_250 - {1317,167},//sampling_251 - {1317,167},//sampling_252 - {1317,167},//sampling_253 - {1317,167},//sampling_254 - {1317,167},//sampling_255 - {1317,167},//sampling_256 - {1317,167},//sampling_257 - {1317,167},//sampling_258 - {1317,167},//sampling_259 - {1317,167},//sampling_260 - {1317,167},//sampling_261 - {1317,167},//sampling_262 - {1317,167},//sampling_263 - {1317,167},//sampling_264 - {1317,167},//sampling_265 - {1317,167},//sampling_266 - {1317,167},//sampling_267 - {1317,167},//sampling_268 - {1317,167},//sampling_269 - - {1317,167},//sampling_wait - {1317,167},//sampling_cover - {1317,167},//sampling_error {840,546}, //PNG_alert_dialog_confirm_single_change {840,546}, //PNG_alert_dialog_confirm_single_retry @@ -2418,48 +1980,6 @@ enum PNG_driving_high_beam, PNG_driving_low_beam, - PNG_eco_001, - PNG_eco_002, - PNG_eco_003, - PNG_eco_004, - PNG_eco_005, - PNG_eco_006, - PNG_eco_007, - PNG_eco_008, - PNG_eco_009, - PNG_eco_010, - PNG_eco_011, - PNG_eco_012, - PNG_eco_013, - PNG_eco_014, - PNG_eco_015, - PNG_eco_016, - PNG_eco_017, - PNG_eco_018, - PNG_eco_019, - PNG_eco_020, - PNG_eco_021, - PNG_eco_022, - PNG_eco_023, - PNG_eco_024, - PNG_eco_025, - PNG_eco_026, - PNG_eco_027, - PNG_eco_028, - PNG_eco_029, - PNG_eco_030, - PNG_eco_031, - PNG_eco_032, - PNG_eco_033, - PNG_eco_034, - PNG_eco_035, - PNG_eco_036, - PNG_eco_037, - PNG_eco_038, - PNG_eco_039, - PNG_eco_040, - PNG_eco_041, - PNG_eco_042, PNG_sport_000, PNG_sport_001, @@ -2973,183 +2493,6 @@ enum PNG_uv_TexCarSmall_Red, PNG_uv_TexCarSmall_Yellow, - PNG_sampling_000, - PNG_sampling_001, - PNG_sampling_002, - PNG_sampling_003, - PNG_sampling_004, - PNG_sampling_005, - PNG_sampling_006, - PNG_sampling_007, - PNG_sampling_008, - PNG_sampling_009, - PNG_sampling_010, - PNG_sampling_011, - PNG_sampling_012, - PNG_sampling_013, - PNG_sampling_014, - PNG_sampling_015, - PNG_sampling_016, - PNG_sampling_017, - PNG_sampling_018, - PNG_sampling_019, - PNG_sampling_020, - PNG_sampling_021, - PNG_sampling_022, - PNG_sampling_023, - PNG_sampling_024, - PNG_sampling_025, - PNG_sampling_026, - PNG_sampling_027, - PNG_sampling_028, - PNG_sampling_029, - PNG_sampling_030, - PNG_sampling_031, - PNG_sampling_032, - PNG_sampling_033, - PNG_sampling_034, - PNG_sampling_035, - PNG_sampling_036, - PNG_sampling_037, - PNG_sampling_038, - PNG_sampling_039, - PNG_sampling_040, - PNG_sampling_041, - PNG_sampling_042, - PNG_sampling_043, - PNG_sampling_044, - PNG_sampling_045, - PNG_sampling_046, - PNG_sampling_047, - PNG_sampling_048, - PNG_sampling_049, - - PNG_sampling_050, - PNG_sampling_051, - PNG_sampling_052, - PNG_sampling_053, - PNG_sampling_054, - PNG_sampling_055, - PNG_sampling_056, - PNG_sampling_057, - PNG_sampling_058, - PNG_sampling_059, - PNG_sampling_060, - PNG_sampling_061, - PNG_sampling_062, - PNG_sampling_063, - PNG_sampling_064, - PNG_sampling_065, - PNG_sampling_066, - PNG_sampling_067, - PNG_sampling_068, - PNG_sampling_069, - PNG_sampling_070, - PNG_sampling_071, - PNG_sampling_072, - PNG_sampling_073, - PNG_sampling_074, - PNG_sampling_075, - PNG_sampling_076, - PNG_sampling_077, - PNG_sampling_078, - PNG_sampling_079, - PNG_sampling_080, - PNG_sampling_081, - PNG_sampling_082, - PNG_sampling_083, - PNG_sampling_084, - PNG_sampling_085, - PNG_sampling_086, - PNG_sampling_087, - PNG_sampling_088, - PNG_sampling_089, - PNG_sampling_090, - PNG_sampling_091, - PNG_sampling_092, - PNG_sampling_093, - PNG_sampling_094, - PNG_sampling_095, - PNG_sampling_096, - PNG_sampling_097, - PNG_sampling_098, - PNG_sampling_099, - - PNG_sampling_100, - PNG_sampling_101, - PNG_sampling_102, - PNG_sampling_103, - PNG_sampling_104, - PNG_sampling_105, - PNG_sampling_106, - PNG_sampling_107, - PNG_sampling_108, - PNG_sampling_109, - PNG_sampling_110, - PNG_sampling_111, - PNG_sampling_112, - PNG_sampling_113, - PNG_sampling_114, - PNG_sampling_115, - PNG_sampling_116, - PNG_sampling_117, - PNG_sampling_118, - PNG_sampling_119, - PNG_sampling_120, - PNG_sampling_121, - PNG_sampling_122, - PNG_sampling_123, - PNG_sampling_124, - PNG_sampling_125, - PNG_sampling_126, - PNG_sampling_127, - PNG_sampling_128, - PNG_sampling_129, - PNG_sampling_130, - PNG_sampling_131, - PNG_sampling_132, - PNG_sampling_133, - PNG_sampling_134, - PNG_sampling_135, - PNG_sampling_136, - PNG_sampling_137, - PNG_sampling_138, - PNG_sampling_139, - PNG_sampling_140, - PNG_sampling_141, - PNG_sampling_142, - PNG_sampling_143, - PNG_sampling_144, - PNG_sampling_145, - PNG_sampling_146, - PNG_sampling_147, - PNG_sampling_148, - PNG_sampling_149, - - PNG_sampling_250, - PNG_sampling_251, - PNG_sampling_252, - PNG_sampling_253, - PNG_sampling_254, - PNG_sampling_255, - PNG_sampling_256, - PNG_sampling_257, - PNG_sampling_258, - PNG_sampling_259, - PNG_sampling_260, - PNG_sampling_261, - PNG_sampling_262, - PNG_sampling_263, - PNG_sampling_264, - PNG_sampling_265, - PNG_sampling_266, - PNG_sampling_267, - PNG_sampling_268, - PNG_sampling_269, - - PNG_sampling_wait, - PNG_sampling_cover, - PNG_sampling_error, PNG_alert_dialog_confirm_single_change, PNG_alert_dialog_confirm_single_retry, diff --git a/clusterApp/src/InsRender/Res_Tga.h b/clusterApp/src/InsRender/Res_Tga.h index f5aec58..8d4b363 100644 --- a/clusterApp/src/InsRender/Res_Tga.h +++ b/clusterApp/src/InsRender/Res_Tga.h @@ -340,7 +340,7 @@ static const Vec2i tgaLtp[] = {752,662},//led_ac_overcost {959,225+7},//led_acc_hold {753,662},//led_battery_cold - {849,313},//led_speed_limit_bg + {596,236},//led_speed_limit_bg {1068,313},//led_traffic_camera {732,202},//led_turn_left {1188,202},//led_turn_right