Merge rmProtocols.xml version rm2023-06-03.

Corresponding changes to tests.
bengtmartensson · Jan 6, 2024 · a2800b9 · a2800b9
1 parent 56b5ba3
commit a2800b9
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 17 deletions.
diff --git a/src/main/resources/IrpProtocols.xml b/src/main/resources/IrpProtocols.xml
@@ -180,7 +180,7 @@ ordering is not required but it improves the readability of the entry.
                xmlns:rm="https://sourceforge.net/projects/controlremote/files/RemoteMaster"
                xmlns:xi="http://www.w3.org/2001/XInclude"
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               version="2023-10-10"
+               version="2024-01-06"
                xsi:schemaLocation="http://www.harctoolbox.org/irp-protocols http://www.harctoolbox.org/schemas/irp-protocols.xsd"
                xmlns:irp="http://www.harctoolbox.org/irp-protocols">
 
@@ -1701,8 +1701,9 @@ C3=D:1:2 + #(F&44) + #(D&2)
 
     <irp:protocol name="NECx1">
         <irp:irp>
-            <![CDATA[{38.4k,564}<1,-1|1,-3>(8,-8,D:8,S:8,F:8,~F:8,1,^108m,(8,-8,D:1,1,^108m)*) [D:0..255,S:0..255=255-D,F:0..255]]]>
+            <![CDATA[{38.4k,564}<1,-1|1,-3>(8,-8,D:8,S:8,F:8,~F:8,1,^108m,(8,-8,~D:1,1,^108m)*) [D:0..255,S:0..255=255-D,F:0..255]]]>
         </irp:irp>
+        <irp:documentation>See <a href="http://www.hifi-remote.com/forums/viewtopic.php?p=146187">this thread</a> for a recent discussion.</irp:documentation>
         <irp:parameter name="reject-repeatless">true</irp:parameter>
         <irp:parameter name="prefer-over">NECx1-f16</irp:parameter>
         <irp:parameter name="uei-executor">005A</irp:parameter>
@@ -1713,7 +1714,7 @@ C3=D:1:2 + #(F&44) + #(D&2)
 
     <irp:protocol name="NECx1-f16">
         <irp:irp>
-            <![CDATA[{38.4k,564}<1,-1|1,-3>(8,-8,D:8,S:8,F:8,E:8,1,^108m,(8,-8,D:1,1,^108m)*) [D:0..255,S:0..255=255-D,F:0..255,E:0..255=255-F]]]>
+            <![CDATA[{38.4k,564}<1,-1|1,-3>(8,-8,D:8,S:8,F:8,E:8,1,^108m,(8,-8,~D:1,1,^108m)*) [D:0..255,S:0..255=255-D,F:0..255,E:0..255=255-F]]]>
         </irp:irp>
         <irp:documentation xml:space="preserve">A relaxed form (but used in some real devices) of the <a href="#NECx1">NECx1</a> protocol. Byte 3 and byte 4 are independent.
 	    NECx1-Yamaha is a special case of this, in which bytes 3 and 4 are related but in a different manner than in a standard
@@ -2001,29 +2002,32 @@ C3=D:1:2 + #(F&44) + #(D&2)
         <irp:parameter name="uei-executor">006A(;D==~S:8)[D?0,D?1,D?2;??,F,F]</irp:parameter>
         <irp:parameter name="uei-executor">006A:JP1(;D==~S:8)[D?0,D?1,D?2,D?3;??,F,F]</irp:parameter>
         <irp:parameter name="uei-executor">006A:4(;D==~S:8)[D?0,D?1,D?2,D?3;??,F,F]</irp:parameter>
+        <irp:parameter name="uei-executor">017C:JP1[;D,F,D,F]</irp:parameter>
         <irp:parameter name="prefer-over">(160&lt;=D &amp;&amp; D&lt;=165) || D==168 || D==170 || D==171 || D==173 || D==175 ; NEC2</irp:parameter>
         <irp:parameter name="frequency-lower">39700</irp:parameter>
         <irp:parameter name="frequency-upper">42000</irp:parameter>
     </irp:protocol>
 
-    <irp:protocol name="Pioneer-Mix">
+    <irp:protocol name="Pioneer-2Part">
         <irp:irp>
-            <![CDATA[{40k,564}<1,-1|1,-3>(16,-8,D0:8,~D0:8,F0:8,~F0:8,1,^108m,(16,-8,D:8,~D:8,F:8,~F:8,1,^108m)+) [D0:0..255,F0:0..255,D:0..255=D0,F:0..255=F0]]]>
+            <![CDATA[{40k,564}<1,-1|1,-3>(16,-8,D0:8,~D0:8,F0:8,~F0:8,1,^90m,(16,-8,D:8,~D:8,F:8,~F:8,1,^90m)+) [D0:0..255,F0:0..255,D:0..255=D0,F:0..255=F0]]]>
         </irp:irp>
+        <irp:parameter name="alt_name">Pioneer-Mix</irp:parameter>
         <irp:documentation xml:space="preserve">Two-signal version of the <a href="#Pioneer">Pioneer</a> protocol.
             First sends the "normal" signal (parameters D0 and F0) as <a href="#intro">intro</a>, then,
-            as <a href="#repeat">repeat</a>, the one determined by D and F.
+            as <a href="#repeat">repeat</a>, the one determined by D (Device) and F (OBC).
         </irp:documentation>
         <irp:parameter name="uei-executor">007E(;F:1:5==1)[D0,D,F0;1,1,1,F]</irp:parameter>
         <irp:parameter name="uei-executor">007E:2(Pioneer DVD2;F:1:5==1)[D0,D,F0;F]</irp:parameter>
         <irp:parameter name="uei-executor">007E:2(Pioneer MIX)[D0,D,F0?1,F0?2;1,??,1,F]</irp:parameter>
         <irp:parameter name="uei-executor">007E:3[D0,D,F0?1,F0?2,F0?3,F0?4;1,??,1,F]</irp:parameter>
-        <irp:parameter name="uei-executor">007E:4[D0,F0?1,F0?2,F0?3,F0?4,D;1,??,4,F]</irp:parameter>
-        <irp:parameter name="uei-executor">007E:5(;;D.F=3.3,..)[D0,D?1D|||F0?1F,D?2D|||F0?2F,D?3D|||F0?3F,F0?4F,D?4D;1,??F,??D,F]</irp:parameter>
+        <irp:parameter name="uei-executor">007E:4[D0,F0?1,F0?2,F0?3,F0?4,D;1,??,5,F]</irp:parameter>
+        <irp:parameter name="uei-executor">007E:5(;;D.F=3.3,..)[D0,D?1D|||F0?1F,D?2D|||F0?2F,D?3D|||F0?3F,D?4D|||F0?4F,D?5D;1,??F,??D,F]</irp:parameter>
         <irp:parameter name="uei-executor">005F(;D0==D)[D;F0,F]</irp:parameter>
         <irp:parameter name="uei-executor">006A(;D0==D)[D?0,D?1,D?2;??,F0,F]</irp:parameter>
         <irp:parameter name="uei-executor">006A:JP1(;D0==D)[D?0,D?1,D?2,D?3;??,F0,F]</irp:parameter>
         <irp:parameter name="uei-executor">006A:4(;D0==D)[D?0,D?1,D?2,D?3;??,F0,F]</irp:parameter>
+        <irp:parameter name="uei-executor">017C:JP1[;D0,F0,D,F]</irp:parameter>
         <irp:parameter name="prefer-over">(162&lt;=D &amp;&amp; D&lt;=165) || D==168 || D==170 || D==173 || D==175 ; NEC2</irp:parameter>
         <irp:parameter name="prefer-over">(D0 != D) || (F0 != F) ; Pioneer</irp:parameter>
         <irp:parameter name="frequency-lower">39700</irp:parameter>

diff --git a/src/test/teaserfiles/NECx2_NECx1.exp b/src/test/teaserfiles/NECx2_NECx1.exp
@@ -6,8 +6,8 @@ Down:		NECx2: {D=67,S=83,F=21},	beg=0, end=271, reps=4
 Left:		NECx-f16: {D=67,S=83,F=37},	beg=0, end=67
 Right:		NECx-f16: {D=67,S=83,F=29},	beg=0, end=67
 OK:		NECx2: {D=67,S=83,F=5},	beg=0, end=203, reps=3
-Play:		NECx-f16: {D=44,S=44,F=4},	beg=0, end=67	{UNDECODED. length=18}
-Pause:		NECx-f16: {D=44,S=44,F=79},	beg=0, end=67	{UNDECODED. length=18}
-Rewind:		NECx-f16: {D=44,S=44,F=6},	beg=0, end=67	{UNDECODED. length=18}
-FFWD:		NECx-f16: {D=44,S=44,F=7},	beg=0, end=67	{UNDECODED. length=18}
-Stop:		NECx-f16: {D=44,S=44,F=5},	beg=0, end=67	{UNDECODED. length=6}
+Play:		NECx1: {D=44,S=44,F=4},	beg=0, end=85, reps=3
+Pause:		NECx1: {D=44,S=44,F=79},	beg=0, end=85, reps=3
+Rewind:		NECx1: {D=44,S=44,F=6},	beg=0, end=85, reps=3
+FFWD:		NECx1: {D=44,S=44,F=7},	beg=0, end=85, reps=3
+Stop:		NECx1: {D=44,S=44,F=5},	beg=0, end=73, reps=1
diff --git a/src/test/teaserfiles/PioneerMix.exp b/src/test/teaserfiles/PioneerMix.exp
@@ -1,19 +1,28 @@
 Volume-:		Pioneer: {D=173,F=11},	beg=0, end=135, reps=2
+	Pioneer-2Part: {D0=173,F0=11},	beg=0, end=135
 Volume+:		Pioneer: {D=173,F=10},	beg=0, end=135, reps=2
+	Pioneer-2Part: {D0=173,F0=10},	beg=0, end=135
 Mute1:		Pioneer: {D=173,F=25},	beg=0, end=67, reps=1
 Mute2:		Pioneer: {D=175,F=48},	beg=0, end=67, reps=1
 'Answer 1:		Pioneer: {D=173,F=151},	beg=0, end=67, reps=1
 Answer 2:		Pioneer: {D=175,F=50},	beg=0, end=67, reps=1
 Hangup 1:		Pioneer: {D=173,F=151},	beg=0, end=67, reps=1
 Hangup2:		Pioneer: {D=175,F=51},	beg=0, end=67, reps=1
 source:		Pioneer: {D=173,F=26},	beg=0, end=135, reps=2
+	Pioneer-2Part: {D0=173,F0=26},	beg=0, end=135
 Pause:		Pioneer: {D=173,F=88},	beg=0, end=407, reps=6
+	Pioneer-2Part: {D0=173,F0=88},	beg=0, end=407, reps=4
 display1:		Pioneer: {D=173,F=25},	beg=0, end=67, reps=1
 display2:		Pioneer: {D=175,F=109},	beg=0, end=67, reps=1
 left:		Pioneer: {D=173,F=66},	beg=0, end=271, reps=4
+	Pioneer-2Part: {D0=173,F0=66},	beg=0, end=271, reps=2
 List/enter1:		Pioneer: {D=173,F=25},	beg=0, end=67, reps=1
 List/Enter2:		Pioneer: {D=175,F=44},	beg=0, end=67, reps=1
 right:		Pioneer: {D=173,F=67},	beg=0, end=271, reps=4
+	Pioneer-2Part: {D0=173,F0=67},	beg=0, end=271, reps=2
 up:		Pioneer: {D=173,F=64},	beg=0, end=543, reps=8
+	Pioneer-2Part: {D0=173,F0=64},	beg=0, end=543, reps=6
 down:		Pioneer: {D=173,F=65},	beg=0, end=271, reps=4
+	Pioneer-2Part: {D0=173,F0=65},	beg=0, end=271, reps=2
 Band Esc:		Pioneer: {D=173,F=18},	beg=0, end=203, reps=3
+	Pioneer-2Part: {D0=173,F0=18},	beg=0, end=203, reps=1
diff --git a/src/test/teaserfiles/PioneerMix2.exp b/src/test/teaserfiles/PioneerMix2.exp
@@ -1,7 +1,12 @@
-Setup 170_91 175_36:		Pioneer: {D=170,F=91},	beg=0, end=67, reps=1	{Pioneer: {D=175,F=36},	beg=68, end=135, reps=1	{Pioneer: {D=170,F=91},	beg=136, end=203, reps=1	{Pioneer: {D=175,F=36},	beg=204, end=271, reps=1	{Pioneer: {D=170,F=91},	beg=272, end=339, reps=1	{Pioneer: {D=175,F=36},	beg=340, end=407, reps=1}}}}}
-Return 170_91 175_34:		Pioneer: {D=170,F=91},	beg=0, end=67, reps=1	{Pioneer: {D=175,F=34},	beg=68, end=135, reps=1	{Pioneer: {D=170,F=91},	beg=136, end=203, reps=1	{Pioneer: {D=175,F=34},	beg=204, end=271, reps=1	{Pioneer: {D=170,F=91},	beg=272, end=339, reps=1	{Pioneer: {D=175,F=34},	beg=340, end=407, reps=1}}}}}
+Setup 170_91 175_36:		Pioneer-2Part: {D0=170,F0=91,D=175,F=36},	beg=0, end=135	{Pioneer-2Part: {D0=170,F0=91,D=175,F=36},	beg=136, end=271	{Pioneer-2Part: {D0=170,F0=91,D=175,F=36},	beg=272, end=407}}
+Return 170_91 175_34:		Pioneer-2Part: {D0=170,F0=91,D=175,F=34},	beg=0, end=135	{Pioneer-2Part: {D0=170,F0=91,D=175,F=34},	beg=136, end=271	{Pioneer-2Part: {D0=170,F0=91,D=175,F=34},	beg=272, end=407}}
 Tune down 179_39:		Pioneer: {D=170,F=39},	beg=0, end=475, reps=7
+	Pioneer-2Part: {D0=170,F0=39},	beg=0, end=475, reps=5
 Right 170_36:		Pioneer: {D=170,F=36},	beg=0, end=679, reps=10
+	Pioneer-2Part: {D0=170,F0=36},	beg=0, end=679, reps=8
 Play 170_69:		Pioneer: {D=170,F=69},	beg=0, end=611, reps=9
-Dialog 165_159 165_ 222:		Pioneer: {D=165,F=159},	beg=0, end=67, reps=1	{Pioneer: {D=165,F=222},	beg=68, end=135, reps=1	{Pioneer: {D=165,F=159},	beg=136, end=203, reps=1	{Pioneer: {D=165,F=222},	beg=204, end=271, reps=1	{Pioneer: {D=165,F=159},	beg=272, end=339, reps=1	{Pioneer: {D=165,F=222},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=159},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}}}}}}}
-Phase 165_90 165_203:		Pioneer: {D=165,F=90},	beg=0, end=67, reps=1	{Pioneer: {D=165,F=203},	beg=68, end=135, reps=1	{Pioneer: {D=165,F=90},	beg=136, end=203, reps=1	{Pioneer: {D=165,F=203},	beg=204, end=271, reps=1	{Pioneer: {D=165,F=90},	beg=272, end=339, reps=1	{Pioneer: {D=165,F=203},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=90},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}}}}}}}
+	Pioneer-2Part: {D0=170,F0=69},	beg=0, end=611, reps=7
+Dialog 165_159 165_ 222:		Pioneer: {D=165,F=159},	beg=0, end=67, reps=1	{Pioneer: {D=165,F=222},	beg=68, end=135, reps=1	{Pioneer: {D=165,F=159},	beg=136, end=203, reps=1	{Pioneer: {D=165,F=222},	beg=204, end=271, reps=1	{Pioneer: {D=165,F=159},	beg=272, end=339, reps=1	{Pioneer: {D=165,F=222},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=159},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=408, end=543}	Pioneer-2Part: {D0=165,F0=222,F=159},	beg=340, end=475	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=272, end=407	{Pioneer: {D=165,F=159},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=408, end=543}}	Pioneer-2Part: {D0=165,F0=222,F=159},	beg=204, end=339	{Pioneer: {D=165,F=222},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=159},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=408, end=543}	Pioneer-2Part: {D0=165,F0=222,F=159},	beg=340, end=475	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}}}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=136, end=271	{Pioneer: {D=165,F=159},	beg=272, end=339, reps=1	{Pioneer: {D=165,F=222},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=159},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=408, end=543}	Pioneer-2Part: {D0=165,F0=222,F=159},	beg=340, end=475	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=272, end=407	{Pioneer: {D=165,F=159},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=408, end=543}}}	Pioneer-2Part: {D0=165,F0=222,F=159},	beg=68, end=203	{Pioneer: {D=165,F=222},	beg=204, end=271, reps=1	{Pioneer: {D=165,F=159},	beg=272, end=339, reps=1	{Pioneer: {D=165,F=222},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=159},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=408, end=543}	Pioneer-2Part: {D0=165,F0=222,F=159},	beg=340, end=475	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=272, end=407	{Pioneer: {D=165,F=159},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=408, end=543}}	Pioneer-2Part: {D0=165,F0=222,F=159},	beg=204, end=339	{Pioneer: {D=165,F=222},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=159},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=408, end=543}	Pioneer-2Part: {D0=165,F0=222,F=159},	beg=340, end=475	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}}}}
+	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=0, end=135	{Pioneer: {D=165,F=159},	beg=136, end=203, reps=1	{Pioneer: {D=165,F=222},	beg=204, end=271, reps=1	{Pioneer: {D=165,F=159},	beg=272, end=339, reps=1	{Pioneer: {D=165,F=222},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=159},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=408, end=543}	Pioneer-2Part: {D0=165,F0=222,F=159},	beg=340, end=475	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=272, end=407	{Pioneer: {D=165,F=159},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=408, end=543}}	Pioneer-2Part: {D0=165,F0=222,F=159},	beg=204, end=339	{Pioneer: {D=165,F=222},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=159},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=408, end=543}	Pioneer-2Part: {D0=165,F0=222,F=159},	beg=340, end=475	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}}}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=136, end=271	{Pioneer: {D=165,F=159},	beg=272, end=339, reps=1	{Pioneer: {D=165,F=222},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=159},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=408, end=543}	Pioneer-2Part: {D0=165,F0=222,F=159},	beg=340, end=475	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=272, end=407	{Pioneer: {D=165,F=159},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=222},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=159,F=222},	beg=408, end=543}}}
+Phase 165_90 165_203:		Pioneer: {D=165,F=90},	beg=0, end=67, reps=1	{Pioneer: {D=165,F=203},	beg=68, end=135, reps=1	{Pioneer: {D=165,F=90},	beg=136, end=203, reps=1	{Pioneer: {D=165,F=203},	beg=204, end=271, reps=1	{Pioneer: {D=165,F=90},	beg=272, end=339, reps=1	{Pioneer: {D=165,F=203},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=90},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=408, end=543}	Pioneer-2Part: {D0=165,F0=203,F=90},	beg=340, end=475	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=272, end=407	{Pioneer: {D=165,F=90},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=408, end=543}}	Pioneer-2Part: {D0=165,F0=203,F=90},	beg=204, end=339	{Pioneer: {D=165,F=203},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=90},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=408, end=543}	Pioneer-2Part: {D0=165,F0=203,F=90},	beg=340, end=475	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}}}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=136, end=271	{Pioneer: {D=165,F=90},	beg=272, end=339, reps=1	{Pioneer: {D=165,F=203},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=90},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=408, end=543}	Pioneer-2Part: {D0=165,F0=203,F=90},	beg=340, end=475	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=272, end=407	{Pioneer: {D=165,F=90},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=408, end=543}}}	Pioneer-2Part: {D0=165,F0=203,F=90},	beg=68, end=203	{Pioneer: {D=165,F=203},	beg=204, end=271, reps=1	{Pioneer: {D=165,F=90},	beg=272, end=339, reps=1	{Pioneer: {D=165,F=203},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=90},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=408, end=543}	Pioneer-2Part: {D0=165,F0=203,F=90},	beg=340, end=475	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=272, end=407	{Pioneer: {D=165,F=90},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=408, end=543}}	Pioneer-2Part: {D0=165,F0=203,F=90},	beg=204, end=339	{Pioneer: {D=165,F=203},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=90},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=408, end=543}	Pioneer-2Part: {D0=165,F0=203,F=90},	beg=340, end=475	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}}}}
+	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=0, end=135	{Pioneer: {D=165,F=90},	beg=136, end=203, reps=1	{Pioneer: {D=165,F=203},	beg=204, end=271, reps=1	{Pioneer: {D=165,F=90},	beg=272, end=339, reps=1	{Pioneer: {D=165,F=203},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=90},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=408, end=543}	Pioneer-2Part: {D0=165,F0=203,F=90},	beg=340, end=475	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=272, end=407	{Pioneer: {D=165,F=90},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=408, end=543}}	Pioneer-2Part: {D0=165,F0=203,F=90},	beg=204, end=339	{Pioneer: {D=165,F=203},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=90},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=408, end=543}	Pioneer-2Part: {D0=165,F0=203,F=90},	beg=340, end=475	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}}}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=136, end=271	{Pioneer: {D=165,F=90},	beg=272, end=339, reps=1	{Pioneer: {D=165,F=203},	beg=340, end=407, reps=1	{Pioneer: {D=165,F=90},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=408, end=543}	Pioneer-2Part: {D0=165,F0=203,F=90},	beg=340, end=475	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=272, end=407	{Pioneer: {D=165,F=90},	beg=408, end=475, reps=1	{Pioneer: {D=165,F=203},	beg=476, end=543, reps=1}	Pioneer-2Part: {D0=165,F0=90,F=203},	beg=408, end=543}}}