v1.12

-Uncompressed(raw video) support
-Video info icon added
-misc

Author: Tonsuke

Makefile

@@ -114,6 +114,7 @@ MATH_LIB = #-lm
 #    --cref:    add cross reference to  map file
 LDFLAGS = -T stm32_flash.ld
 #LDFLAGS += -Wl,-Map=$(TARGET).map,--cref
+LDFLAGS += -Map=$(TARGET).map
 LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB) $(GCC_LIB) $(patsubst %,-L%,$(DIRLIB)) -lcm4 -lstd -ldsp -lc -laac -lmp3
 
 # ---------------------------------------------------------------------------

aac.c

@@ -606,7 +606,7 @@ int PlayAAC(int id)
 	/* Enable the TIM1 gloabal Interrupt */
 	NVIC_InitStructure.NVIC_IRQChannel = TIM1_UP_TIM10_IRQn;
 	NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 0;
-	NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
+	NVIC_InitStructure.NVIC_IRQChannelSubPriority = 3;
 	NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
 	NVIC_Init(&NVIC_InitStructure);
 

icon.h

@@ -81,6 +81,11 @@ extern void Update_Reverb_Effect_Icon(uint8_t index);
 extern void Update_Vocal_Canceler_Icon(uint8_t index);
 
 
+extern const uint16_t video_info_26x24[],_sizeof_video_info_26x24[];
+extern const uint8_t video_info_26x24_alpha[],_sizeof_video_info_26x24_alpha[];
+
+extern const uint16_t video_info_board_170x170[],_sizeof_video_info_board_170x170[];
+extern const uint8_t video_info_board_170x170_alpha[],_sizeof_video_info_board_170x170_alpha[];
 
 extern const uint16_t music_underbar_320x80[],_sizeof_music_underbar_320x80[];
 extern const uint8_t music_underbar_320x80_alpha[],_sizeof_music_underbar_320x80_alpha[];

images.s

@@ -7,6 +7,34 @@ internal_flash_pcf_font:
 .global _sizeof_internal_flash_pcf_font
 .set _sizeof_internal_flash_pcf_font, . - internal_flash_pcf_font
 
+.balign 2
+.global video_info_board_170x170
+video_info_board_170x170:
+.incbin "video_info_board_170x170.bin"
+.global _sizeof_video_info_board_170x170
+.set _sizeof_video_info_board_170x170, . - video_info_board_170x170
+
+.balign 2
+.global video_info_board_170x170_alpha
+video_info_board_170x170_alpha:
+.incbin "video_info_board_170x170_alpha.bin"
+.global _sizeof_video_info_board_170x170_alpha
+.set _sizeof_video_info_board_170x170_alpha, . - video_info_board_170x170_alpha
+
+
+.balign 2
+.global video_info_26x24
+video_info_26x24:
+.incbin "video_info_26x24.bin"
+.global _sizeof_video_info_26x24
+.set _sizeof_video_info_26x24, . - video_info_26x24
+
+.balign 2
+.global video_info_26x24_alpha
+video_info_26x24_alpha:
+.incbin "video_info_26x24_alpha.bin"
+.global _sizeof_video_info_26x24_alpha
+.set _sizeof_video_info_26x24_alpha, . - video_info_26x24_alpha
 
 .balign 2
 .global music_underbar_320x80

lcd.c

@@ -1144,6 +1144,7 @@ void LCDPrintFileList()
 {
 //	TOUCH_PINIRQ_DISABLE;
 	touch.func = LCDTouchPoint;
+	USART_IRQ_DISABLE;
 
 	int i;
 	uint32_t var32;
@@ -1289,13 +1290,14 @@ void LCDPrintFileList()
 	LCDBackLightTimerInit();
 //	TOUCH_PINIRQ_ENABLE;
 //	TouchPenIRQ_Enable();
+	USART_IRQ_ENABLE;
 	touch.repeat = 1;
 }
 
 void LCDPrintSettingsList(char type, int select_id, settings_item_typedef *item)
 {
 //	TOUCH_PINIRQ_DISABLE;
-	USART_IRQ_DISABLE;
+//	USART_IRQ_DISABLE;
 	touch.func = LCDTouchPoint;
 
 	int i, selected_entry;
@@ -1384,7 +1386,7 @@ void LCDPrintSettingsList(char type, int select_id, settings_item_typedef *item)
 */
 	LCDStoreCursorBar(cursor.pos);
 	LCDSelectCursorBar(cursor.pos);
-	USART_IRQ_ENABLE;
+//	USART_IRQ_ENABLE;
 	LCDBackLightTimerInit();
 //	TOUCH_PINIRQ_ENABLE;
 	touch.repeat = 1;

main.c

@@ -2,8 +2,8 @@
  *		STM32F4-Discovery Motion Player Project
  *		by Tonsuke
  *
- *		v1.11
- *		2014/02/20
+ *		v1.12
+ *		2014/03/07
  *
  *		WIKI
  *		http://motionplayer.wiki.fc2.com