From 76085baec95497c1b6a8720ac1f849727419d998 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sat, 5 Jun 2021 18:03:32 +0200
Subject: [PATCH] Test custom function play.name

---
 .../conversions/conversions_219_220.cpp       |   6 ------
 radio/src/tests/conversions.cpp               |   2 ++
 radio/src/tests/eeprom_23_x9d+.bin            | Bin 32768 -> 32768 bytes
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/radio/src/storage/conversions/conversions_219_220.cpp b/radio/src/storage/conversions/conversions_219_220.cpp
index 105f8bfe5..d6f99cb36 100644
--- a/radio/src/storage/conversions/conversions_219_220.cpp
+++ b/radio/src/storage/conversions/conversions_219_220.cpp
@@ -117,12 +117,6 @@ void convertModelData_219_to_220(ModelData &model)
   }
 
   // CustomFunctionData::play.name
-  for (uint8_t i = 0; i < MAX_SPECIAL_FUNCTIONS_219; ++i) {
-    CustomFunctionData* cfn = &(model.customFn[i]);
-    if (cfn->func == FUNC_PLAY_TRACK || cfn->func == FUNC_BACKGND_MUSIC) {
-      convertToStr(cfn->play.name, LEN_FUNCTION_NAME_219);
-    }
-  }
 
   // GVarData::name ?
   for (uint8_t i=0; i<MAX_GVARS_219; ++i) {
diff --git a/radio/src/tests/conversions.cpp b/radio/src/tests/conversions.cpp
index 0f33f22c5..7151ceb6a 100644
--- a/radio/src/tests/conversions.cpp
+++ b/radio/src/tests/conversions.cpp
@@ -77,6 +77,8 @@ TEST(Conversions, ConversionX9DPFrom23)
   EXPECT_EQ(10, g_model.telemetrySensors[0].id);
   EXPECT_EQ(10, g_model.telemetrySensors[0].frskyInstance.physID);
   EXPECT_EQ(MIXSRC_FIRST_TELEM, g_model.logicalSw[0].v1);
+
+  EXPECT_STREQ("abc.wav", g_model.customFn[1].play.name);
 }
 #endif
 
diff --git a/radio/src/tests/eeprom_23_x9d+.bin b/radio/src/tests/eeprom_23_x9d+.bin
index 902b22010056919d0d54f41462de67829ee8eb94..1738c866ad2285d7080cf27433e43289da6cf8d9 100644
GIT binary patch
delta 397
zcmbV`y-EX75QWdo-n*MM>L$8T5&T(fQt1+~SS%8367dJLwFs-Nh?Sy(yPY5iUZ%6l
zGx!4PD_G_QYy=BC3*C#7fTc6c$C*<cPM&j~bErX8v;ab<;@~D4!ChpczKN?YgZdYa
zl=RYUHk=N}`sM4AB>a2>uH;_TO<W@-MD6_za?F;YUc-uQ!#`rjIK9R&;jikl<KlJT
z?)mOwdT_XWmYxp0Ec=joo?{QP%PVrC11>>KA&)ume2^+uo;hJaZq=%ZeJU4?n(Lz|
znruGR|J!T~;&I~Hd^HZ~>PU`sSe(xRB-IPQZ<#BQwo2rkwJmY2))asV6E$hlBDAPk
POj%4@%oKQdbX(`&eZ+CM

delta 578
zcmZo@U}|V!5@BUv6lQQ>U=U=85@2L#RpextsyI>c{zL;#R%V760j9}~jPCUx87DGN
z^qI)G&<M=(oyY`b`AuX7vFdRE76!)K6|DdNGfFy6WcJ`_NNG%IN@-5n$hDAZW5Z;Q
zM>i(vGG0l|QxMqPs3GFX$mE5J>KPco20MVrM+U5y|5r0k7Ww_QjzfU`*|+D<o;{mL
zzyWMP1Hze@Cm&+AWMXHSEXblic>xnY69>cOKp^u2Ge466!{p;kmTX{qxPYFucjsnc
zWS;1KP=j1g^B~#Di?EXqZYMiG0}CS%PHtkcWCwb&f{|;=<U=ghs$fUd*B8OP2NeKP
z2(ifuERq~T(14xH#;9z9CE)5|L5CyUo=r|*Qs7_|L2{}n!l_~ir-~yvRRZo*%gqPa
G94Y~F=Eg1n