diff --git a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt index 596c5dc..8f94043 100644 --- a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt +++ b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt @@ -173,7 +173,7 @@ set(APP_COMPILER_FLAGS_f3_fps_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 -DMIN_FREQ=48000 -DMAX_FREQ=48000 -DUSE_EX3D=1 - -DF3_F4_FPS_UAC2=1 + -DF3_FPS_UAC2=1 -DMIXER=0 -DUAC2_MODE=1 -ldnr_50ms @@ -202,7 +202,7 @@ set(APP_COMPILER_FLAGS_f4_fps_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 -DMIN_FREQ=48000 -DMAX_FREQ=48000 -DUSE_EX3D=1 - -DF3_F4_FPS_UAC2=1 + -DF4_FPS_UAC2=1 -DMIXER=0 -DUAC2_MODE=1 -ldnr_50ms @@ -268,17 +268,19 @@ XMOS_REGISTER_APP() ###=========================================================================### # Flash image generation # Slot assignment (matches MODE_Fxx flag values in audiohw.xc): -# slot 1 = f3_f4_fps_uac2 (COAX_IN_FLAG = MODE_F3_F4_FPS_UAC2) -# slot 2 = f5_music_uac1 (UAC1_IN_FLAG = MODE_F5_MUSIC_UAC1) <- factory base +# slot 1 = f3_fps_uac2 (COAX_IN_FLAG = MODE_F3_FPS_UAC2) Game +# slot 2 = f5_music_uac1 (USB_IN_FLAG = MODE_F5_MUSIC_UAC1) <- factory base # slot 3 = f1_music_uac2 (OPT_IN_FLAG = MODE_F1_MUSIC_UAC2) -# slot 4 = f6_f7_fps_uac1 (USB_IN_FLAG = MODE_F6_F7_FPS_UAC1) +# slot 4 = f6_f7_fps_uac1 (UAC1_IN_FLAG = MODE_F6_F7_FPS_UAC1) +# slot 5 = f4_fps_uac2 (BT_IN_FLAG = MODE_F4_FPS_UAC2) AI7.1 ###=========================================================================### set(APP_BIN_DIR ${CMAKE_CURRENT_LIST_DIR}/bin) set(APP_BASE ${PROJECT_NAME}) set(XE_FACT ${APP_BIN_DIR}/fact/${APP_BASE}_fact.xe) set(XE_F1 ${APP_BIN_DIR}/f1_music_uac2/${APP_BASE}_f1_music_uac2.xe) -set(XE_F3F4 ${APP_BIN_DIR}/f3_f4_fps_uac2/${APP_BASE}_f3_f4_fps_uac2.xe) +set(XE_F3 ${APP_BIN_DIR}/f3_fps_uac2/${APP_BASE}_f3_fps_uac2.xe) +set(XE_F4 ${APP_BIN_DIR}/f4_fps_uac2/${APP_BASE}_f4_fps_uac2.xe) set(XE_F5 ${APP_BIN_DIR}/f5_music_uac1/${APP_BASE}_f5_music_uac1.xe) set(XE_F6F7 ${APP_BIN_DIR}/f6_f7_fps_uac1/${APP_BASE}_f6_f7_fps_uac1.xe) set(LOADER_OBJ ${CMAKE_CURRENT_LIST_DIR}/loader.o) @@ -286,12 +288,13 @@ set(TARGET_XN ${CMAKE_CURRENT_LIST_DIR}/src/core/synido.xn) # factory__.bin — full factory image (base + 4 upgrade slots) add_custom_target(factory_bin - COMMAND ${CMAKE_COMMAND} -E echo "xflash ${XE_FACT} --loader ${LOADER_OBJ} --upgrade 1 ${XE_F3F4} --upgrade 2 ${XE_F5} --upgrade 3 ${XE_F1} --upgrade 4 ${XE_F6F7} -o ${CMAKE_CURRENT_LIST_DIR}/factory_${APP_BASE}_${FW_VERSION}.bin" + COMMAND ${CMAKE_COMMAND} -E echo "xflash ${XE_FACT} --loader ${LOADER_OBJ} --upgrade 1 ${XE_F3} --upgrade 5 ${XE_F4} --upgrade 2 ${XE_F5} --upgrade 3 ${XE_F1} --upgrade 4 ${XE_F6F7} -o ${CMAKE_CURRENT_LIST_DIR}/factory_${APP_BASE}_${FW_VERSION}.bin" COMMAND xflash ${XE_FACT} --loader ${LOADER_OBJ} --upgrade 2 ${XE_F5} --upgrade 3 ${XE_F1} - --upgrade 1 ${XE_F3F4} + --upgrade 1 ${XE_F3} --upgrade 4 ${XE_F6F7} + --upgrade 5 ${XE_F4} -o ${CMAKE_CURRENT_LIST_DIR}/factory_${APP_BASE}_${FW_VERSION}.bin #DEPENDS f1_music_uac2 f3_f4_fps_uac2 f5_music_uac1 f6_f7_fps_uac1 COMMENT "Generating factory image: factory_${APP_BASE}_${FW_VERSION}.bin" @@ -300,12 +303,13 @@ add_custom_target(factory_bin # update__.bin — DFU upgrade package (upgrade slots only) add_custom_target(update_bin - COMMAND ${CMAKE_COMMAND} -E echo "xflash --factory-version 15.2 --target-file ${TARGET_XN} --upgrade 1 ${XE_F3F4} --upgrade 2 ${XE_F5} --upgrade 3 ${XE_F1} --upgrade 4 ${XE_F6F7} -o ${CMAKE_CURRENT_LIST_DIR}/update_${APP_BASE}_${FW_VERSION}.bin" + COMMAND ${CMAKE_COMMAND} -E echo "xflash --factory-version 15.2 --target-file ${TARGET_XN} --upgrade 1 ${XE_F3} --upgrade 5 ${XE_F4} --upgrade 2 ${XE_F5} --upgrade 3 ${XE_F1} --upgrade 4 ${XE_F6F7} -o ${CMAKE_CURRENT_LIST_DIR}/update_${APP_BASE}_${FW_VERSION}.bin" COMMAND xflash --factory-version 15.2 --target-file ${TARGET_XN} --upgrade 2 ${XE_F5} --upgrade 3 ${XE_F1} - --upgrade 1 ${XE_F3F4} + --upgrade 1 ${XE_F3} --upgrade 4 ${XE_F6F7} + --upgrade 5 ${XE_F4} -o ${CMAKE_CURRENT_LIST_DIR}/update_${APP_BASE}_${FW_VERSION}.bin #DEPENDS f1_music_uac2 f3_f4_fps_uac2 f5_music_uac1 f6_f7_fps_uac1 COMMENT "Generating update image: update_${APP_BASE}_${FW_VERSION}.bin"