From a4ec706c795bb98ff302264bbbad7de83fab140e Mon Sep 17 00:00:00 2001 From: Edward Li Date: Sun, 5 Nov 2023 05:13:10 +0800 Subject: [PATCH] Init `ThermalPrinter` only when cabinet type is Deluxe. nvmem: Enable printer by default for `f355twin` and `f355twn2` --- CMakeLists.txt | 4 ++-- core/hw/naomi/naomi_cart.cpp | 2 +- resources/flash/f355twin.nvmem.zip | Bin 1734 -> 1766 bytes resources/flash/f355twn2.nvmem.zip | Bin 1333 -> 1653 bytes 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d78b82e2c..9c53a521f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -978,8 +978,8 @@ cmrc_add_resources(flycast-resources resources/flash/wldkicksj.nvmem.zip # free play resources/flash/wldkicksu.nvmem.zip # free play resources/flash/f355.nvmem.zip # printer on - resources/flash/f355twin.nvmem.zip - resources/flash/f355twn2.nvmem.zip + resources/flash/f355twin.nvmem.zip # printer on + resources/flash/f355twn2.nvmem.zip # printer on resources/flash/dirtypig.nvmem.zip # 4 players resources/flash/dirtypig.nvmem2.zip resources/flash/vf4.nvmem.zip # card all day, stage select diff --git a/core/hw/naomi/naomi_cart.cpp b/core/hw/naomi/naomi_cart.cpp index 7de7a6afa..8333856cd 100644 --- a/core/hw/naomi/naomi_cart.cpp +++ b/core/hw/naomi/naomi_cart.cpp @@ -681,7 +681,7 @@ void naomi_cart_LoadRom(const std::string& path, const std::string& fileName, Lo } if (gameId == " TOUCH DE UNOH -------------" || gameId == " TOUCH DE UNOH 2 -----------" - || gameId == "F355 CHALLENGE JAPAN") + || (gameId == "F355 CHALLENGE JAPAN" && config::MultiboardSlaves == 2)) { printer::init(); } diff --git a/resources/flash/f355twin.nvmem.zip b/resources/flash/f355twin.nvmem.zip index 9393990023ccb0c3967d24560a2d983ad3478cf4..fb90cc14c425cf193173ddd38128b10797089586 100644 GIT binary patch literal 1766 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 c8|f&{lgso5V_$dw0DiwwP5=M^ diff --git a/resources/flash/f355twn2.nvmem.zip b/resources/flash/f355twn2.nvmem.zip index 6816edc24850d4895a258a59a4fabb2017316f2d..ef1d8bba0ed60680ac48e91be93617a0eec6aaa9 100644 GIT binary patch literal 1653 zcmbu9dr%Ws6vh+6%VBtEL9yW>^#S;ZLRD@w6&ZX{Oo#=ftr3_aWvoJyE)@fz5Wyje z1RdMPmNmB289S7MNNXmN1Vl=t$c>gVD8?itm8~_h>QW+2AYJTGo!b7<>A8DnzjJo> z?6+rke%xf5dmzP|T#Ixbcvmui(c4EZU;FCB zrN&b`x63;UeeSG!P)wU8@X=70#6(ZQiJ}2U!=8i&R&6D^t$7l)pG)y9ji=|lN5q$@ zW3%>Xf6};q??07&)it4X$;EW%((#6idIE^|(1>Q0$LiEAycCm)F? z_wq9W@4nhsG!d?h&DZMN$L;B#$tMQWvbvqe%W5`X8PPfSE&8<>IU*Z0qIK+p$UVkj z-TmbD@exDXO_y5M7$=8iqse&b6mRutF)}MI$9PMdrWElpN9xFG*U;>HtMbN6Lz9pK zEOsxSabooG$bMI}CT~p9?~oboEc{Ph=kr8!lGPjLOE(6Vv4b?UksU1z{@ud#N1$++dwY7C>zqXZB6QR%! z;>}Jeu>uy2nfe_Y@r4@YnDLR?KDObyV;eshDu0!v`SFYB+=} zgZV&dH5@~H;5R@yY>**Tn1CjNc@|#fzeqW=uo3Zx8gNbs%}!4&3@s6Itmx$lU-%lZ zThMN11>s@R%f<0ok0!-^cEZ=BpGPJ?mTkt@XyV2)ub1=?nKw$XwL=21s z;byUvm<@H{j9FYxM8K^e+$uhVd}6Ag0e=gtl31lbovWv!Ubl**rB%1$dbMQz0v_P- zYvspaY=E}`ZdO+lVbB4JtTs!CjwwOrUU6Uj@JM0ry&T*=6Kk$&!HUZ7u2c2G`U_B+`R+1qzM z^xrAvmb)DfrbPzOslw2JiYN47shcb!B7wVPo6c>)+>NQ7(g6AEP(P5oJnCxFKyT7= zM)V2}J1J>-Qo5hFXS5+kzanT;%DUDQv`w_9)(abk@ZF@jX@lHks#_rK8Lyvzt!ZA* u#97I-deQ$s(EIN#pMTu+JZ9pogdpelU#G)O_VAqU;6|<%^4#Pxo&5o}N(5X0 literal 1333 zcmbu9e^irI7{}km51HsdAR)&Yr-L%h1Pjr3Zq9x{Q7c4~(DKKv*U zG<}Jjm+UoCO;bdyZeRMxUJX+cg=Q80spMTlnlvA*%gR z+r&k+N>eT^9e;3!QM6W<{(664>1y`^~*6ejyoJ*v1PPOBksK>x)o6HX+RWFYIgCF6fi@(k8_{f#6`?t z3sOf7mYm|MZ4vMoZXr|by%p3flmZ;Mm>4xmDk(7}K`36>H{R*GTOld1>#Nzh@TQDg zsZrVWKNvEGn>!57;pTES#;v-*EO(cVRJ!MW*JoI}qPOv<+1!#HrjmR(=Dlm9#OaL> zrLlb_9J>MT`!k3u!o_4tA842Cy;wzspfI=<#N(PrMRo?#Y6pNtJrivON z7jCu7swoj#1kRAUHaY}71J05SZS-99Iyg%-wA23R9k7^eFw*nTJg|)vnbeVp55y#N z$SPSJhT?1by-jB!5{RdpHg$3LB#?@SOYp}2-bzXeJMcz(Zw)1cBlrqO?;dI~%*PuY znPpTMdI{7LvF$X57QzZVyf5=(iU-$%Kr+@yM<5ltl7O;-n}Gemn&6jy^qfXmEg(x4FU)uQW)|FWbj1h0!t&(|EnvU>cSh4L-xt{cNyX zaFGdcA0~7Pi8T+P9gy-v^gcH8syfyo(^9&{xOD+Q>!A1R(16YClQT@)Mt}&NMa@G= zKuPLMY7z1S;iT@eT7c9boX9rQ0#pQqgvw0w(MsSXRo~NdPz-Pq4HlY*UIAbBqE%KY z&h+c6SUH@5Gj@F~D}ru3%C6tb#zGCwIEu@tASi;bfw%B8`~Uy|