Some refactoring of Infrared4Arduino export. Improves on #476.

bengtmartensson · Feb 3, 2023 · 718a267 · 718a267
1 parent 6935b2a
commit 718a267
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 53 deletions.
diff --git a/src/main/config/exportformats.d/C_raw_utils.xsl b/src/main/config/exportformats.d/C_raw_utils.xsl
@@ -20,10 +20,34 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:java="http://xml.apache.org/xalan/java"
                 xmlns:cidentifierfactory="http://xml.apache.org/xalan/java/org.harctoolbox.irscrutinizer.exporter.CIdentifierFactory"
                 version="1.0">
+
     <xsl:variable name="cIdentifierFactory" select="cidentifierfactory:new()"/>
 
-    <xsl:template match="girr:remote" mode="using">
-        <xsl:apply-templates select="//girr:command" mode="using"/>
+    <xsl:template name="loop">
+        <xsl:text><![CDATA[
+// A pretty silly main loop; just intended as an example.
+void loop() {
+    Serial.print(F("Enter number of signal to send (1 .. ]]></xsl:text>
+    <xsl:value-of select="count(//girr:command)"/>
+    <xsl:text>): "));
+    long commandno = Serial.parseInt();
+    Serial.println(commandno);
+#ifdef NUMBER_OF_SENDS
+    unsigned int times = NUMBER_OF_SENDS;
+#else // ! NUMBER_OF_SENDS
+    Serial.println(F("Enter number of times to send it: "));
+    unsigned int times = (unsigned int) Serial.parseInt();
+    Serial.println(times);
+#endif // ! NUMBER_OF_SENDS
+    switch (commandno) {
+</xsl:text>
+        <xsl:apply-templates select="//girr:remote" mode="using"/>
+        <xsl:text>    default:
+        Serial.println(F("Invalid number entered, try again"));
+        break;
+    }
+}
+</xsl:text>
     </xsl:template>
 
     <xsl:template match="girr:command" mode="definition">
@@ -103,8 +127,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 </xsl:text>
     <xsl:text>        sendRaw(</xsl:text>
         <xsl:apply-templates select="girr:raw[1]" mode="arg"/>
-        <xsl:value-of select="girr:raw[1]/@frequency"/>
-        <xsl:text>UL, times);
+        <xsl:apply-templates select="girr:raw[1]/@frequency"/>
+        <xsl:text>, times);
         break;
 </xsl:text>
     </xsl:template>

diff --git a/src/main/config/exportformats.d/Infrared4Arduino.xml b/src/main/config/exportformats.d/Infrared4Arduino.xml
@@ -98,7 +98,7 @@ static IrSender *irsend = IrSenderPwm::getInstance(true);
 
 //////////////////// Command data ////////////////////////
 ]]></xsl:text>
-<xsl:apply-templates select="//girr:remote//girr:command" mode="definition"/>
+<xsl:apply-templates select="//girr:command" mode="definition"/>
 <xsl:apply-templates select="//girr:remote[//girr:parameters[translate(@protocol, $uppercase, $lowercase) = 'nec1']]" mode="definitionNec1"/>
 <xsl:text>
 </xsl:text>
@@ -141,30 +141,13 @@ void setup() {
     Serial.println(F("Running " __FILE__));
     Serial.println(F("using Infrared4Arduino version " VERSION));
 }
+]]></xsl:text>
+        <xsl:call-template name="loop"/>
+    </xsl:template>
 
-// A pretty silly main loop; just intended as an example.
-void loop() {
-    Serial.print(F("Enter number of signal to send (1 .. ]]></xsl:text>
-    <xsl:value-of select="count(//girr:command)"/>
-    <xsl:text>): "));
-    int commandno = (int) Serial.parseInt();
-    Serial.println(commandno);
-#ifdef NUMBER_OF_SENDS
-    unsigned int times = NUMBER_OF_SENDS;
-#else // ! NUMBER_OF_SENDS
-    Serial.print(F("Enter number of times to send it: "));
-    unsigned int times = (unsigned int) Serial.parseInt();
-    Serial.println(times);
-#endif // ! NUMBER_OF_SENDS
-    switch (commandno) {
-</xsl:text>
-        <xsl:apply-templates select="//girr:remote" mode="using"/>
-        <xsl:text>    default:
-        Serial.println(F("Invalid number entered, try again"));
-        break;
-    }
-}
-</xsl:text>
+    <xsl:template match="@frequency">
+        <xsl:value-of select="."/>
+        <xsl:text>UL</xsl:text>
     </xsl:template>
 
     <xsl:template match="girr:remote[//girr:parameters[translate(@protocol, $uppercase, $lowercase) = 'nec1']]" mode="includeNec1">

diff --git a/src/main/config/exportformats.d/Infrared4Arduino_raw.xml b/src/main/config/exportformats.d/Infrared4Arduino_raw.xml
@@ -86,9 +86,9 @@ static IrSender *irsend = IrSenderPwm::getInstance(true);
 //////////////////// Command data ////////////////////////
 
 ]]></xsl:text>
-<xsl:apply-templates select="//girr:command" mode="definition"/>
+    <xsl:apply-templates select="//girr:command" mode="definition"/>
 
-<xsl:text><![CDATA[
+    <xsl:text><![CDATA[
 static void sendRaw
 #if HAS_FLASH_READ
 (const microseconds_t intro_P[], size_t lengthIntro, const microseconds_t repeat_P[],
@@ -125,30 +125,13 @@ void setup() {
     Serial.println(F("Running " __FILE__));
     Serial.println(F("using Infrared4Arduino version " VERSION));
 }
+    ]]></xsl:text>
+        <xsl:call-template name="loop"/>
+    </xsl:template>
 
-// A pretty silly main loop; just intended as an example.
-void loop() {
-    Serial.print(F("Enter number of signal to send (1 .. ]]></xsl:text>
-    <xsl:value-of select="count(//girr:command)"/>
-    <xsl:text>): "));
-    long commandno = Serial.parseInt();
-    Serial.println(commandno);
-#ifdef NUMBER_OF_SENDS
-    unsigned int times = NUMBER_OF_SENDS;
-#else // ! NUMBER_OF_SENDS
-    Serial.print(F("Enter number of times to send it: "));
-    unsigned int times = (unsigned int) Serial.parseInt();
-    Serial.println(times);
-#endif // ! NUMBER_OF_SENDS
-    switch (commandno) {
-</xsl:text>
-        <xsl:apply-templates select="//girr:remote" mode="using"/>
-        <xsl:text>    default:
-        Serial.println(F("Invalid number entered, try again"));
-        break;
-    }
-}
-</xsl:text>
+    <xsl:template match="@frequency">
+        <xsl:value-of select="."/>
+        <xsl:text>UL</xsl:text>
     </xsl:template>
 
 </xsl:stylesheet>