diff --git a/Tools/px4params/.gitignore b/Tools/px4params/.gitignore
index 5d0378b4a2..d78b71a6e8 100644
--- a/Tools/px4params/.gitignore
+++ b/Tools/px4params/.gitignore
@@ -1,3 +1,4 @@
parameters.wiki
parameters.xml
+parameters.wikirpc.xml
cookies.txt
\ No newline at end of file
diff --git a/Tools/px4params/output.py b/Tools/px4params/output.py
deleted file mode 100644
index c092468713..0000000000
--- a/Tools/px4params/output.py
+++ /dev/null
@@ -1,5 +0,0 @@
-class Output(object):
- def Save(self, groups, fn):
- data = self.Generate(groups)
- with open(fn, 'w') as f:
- f.write(data)
diff --git a/Tools/px4params/dokuwikiout_listings.py b/Tools/px4params/output_dokuwiki_listings.py
similarity index 84%
rename from Tools/px4params/dokuwikiout_listings.py
rename to Tools/px4params/output_dokuwiki_listings.py
index 33f76b415e..117f4edf43 100644
--- a/Tools/px4params/dokuwikiout_listings.py
+++ b/Tools/px4params/output_dokuwiki_listings.py
@@ -1,7 +1,6 @@
-import output
-class DokuWikiOutput(output.Output):
- def Generate(self, groups):
+class DokuWikiListingsOutput():
+ def __init__(self, groups):
result = ""
for group in groups:
result += "==== %s ====\n\n" % group.GetName()
@@ -24,4 +23,8 @@ class DokuWikiOutput(output.Output):
if def_val is not None:
result += "* Default value: %s\n" % def_val
result += "\n"
- return result
+ self.output = result
+
+ def Save(self, filename):
+ with open(filename, 'w') as f:
+ f.write(self.output)
diff --git a/Tools/px4params/dokuwikiout.py b/Tools/px4params/output_dokuwiki_tables.py
similarity index 62%
rename from Tools/px4params/dokuwikiout.py
rename to Tools/px4params/output_dokuwiki_tables.py
index e02035423d..dca3fd92d7 100644
--- a/Tools/px4params/dokuwikiout.py
+++ b/Tools/px4params/output_dokuwiki_tables.py
@@ -1,21 +1,8 @@
-import output
from xml.sax.saxutils import escape
-class DokuWikiOutput(output.Output):
- def Generate(self, groups):
- pre_text = """
-
- wiki.putPage
-
-
-
- :firmware:parameters
-
-
-
-
- """
- result = "====== Parameter Reference ======\nThis list is auto-generated every few minutes and contains the most recent parameter names and default values."
+class DokuWikiTablesOutput():
+ def __init__(self, groups):
+ result = "====== Parameter Reference ======\nThis list is auto-generated every few minutes and contains the most recent parameter names and default values.\n\n"
for group in groups:
result += "==== %s ====\n\n" % group.GetName()
result += "|< 100% 20% 20% 10% 10% 10% 30%>|\n"
@@ -54,15 +41,35 @@ class DokuWikiOutput(output.Output):
result += "\n"
result += "\n"
- post_text = """
-
-
-
-
- sum
- Updated parameters automagically from code.
-
-
-
- """
- return pre_text + escape(result) + post_text
+ self.output = result;
+
+ def Save(self, filename):
+ with open(filename, 'w') as f:
+ f.write(self.output)
+
+ def SaveRpc(self, filename):
+ with open(filename, 'w') as f:
+ f.write("""
+
+ wiki.putPage
+
+
+
+ :firmware:parameters
+
+
+
+
+ """)
+ f.write(escape(self.output))
+ f.write("""
+
+
+
+
+ sum
+ Updated parameters automagically from code.
+
+
+
+""")
diff --git a/Tools/px4params/xmlout.py b/Tools/px4params/output_xml.py
similarity index 78%
rename from Tools/px4params/xmlout.py
rename to Tools/px4params/output_xml.py
index d56802b158..5576954c09 100644
--- a/Tools/px4params/xmlout.py
+++ b/Tools/px4params/output_xml.py
@@ -1,8 +1,7 @@
-import output
from xml.dom.minidom import getDOMImplementation
-class XMLOutput(output.Output):
- def Generate(self, groups):
+class XMLOutput():
+ def __init__(self, groups):
impl = getDOMImplementation()
xml_document = impl.createDocument(None, "parameters", None)
xml_parameters = xml_document.documentElement
@@ -19,4 +18,8 @@ class XMLOutput(output.Output):
xml_param.appendChild(xml_field)
xml_value = xml_document.createTextNode(value)
xml_field.appendChild(xml_value)
- return xml_document.toprettyxml(indent=" ", newl="\n", encoding="utf-8")
+ self.output = xml_document.toprettyxml(indent=" ", newl="\n", encoding="utf-8")
+
+ def Save(self, filename):
+ with open(filename, 'wb') as f:
+ f.write(self.output)
diff --git a/Tools/px4params/px_process_params.py b/Tools/px4params/px_process_params.py
index 4f498026fa..7799f63484 100755
--- a/Tools/px4params/px_process_params.py
+++ b/Tools/px4params/px_process_params.py
@@ -41,8 +41,9 @@
import scanner
import srcparser
-import xmlout
-import dokuwikiout
+import output_xml
+import output_dokuwiki_tables
+import output_dokuwiki_listings
# Initialize parser
prs = srcparser.Parser()
@@ -50,12 +51,17 @@ prs = srcparser.Parser()
# Scan directories, and parse the files
sc = scanner.Scanner()
sc.ScanDir("../../src", prs)
-output = prs.GetParamGroups()
+groups = prs.GetParamGroups()
# Output into XML
-out = xmlout.XMLOutput()
-out.Save(output, "parameters.xml")
+out = output_xml.XMLOutput(groups)
+out.Save("parameters.xml")
-# Output into DokuWiki
-out = dokuwikiout.DokuWikiOutput()
-out.Save(output, "parameters.wiki")
+# Output to DokuWiki listings
+#out = output_dokuwiki_listings.DokuWikiListingsOutput(groups)
+#out.Save("parameters.wiki")
+
+# Output to DokuWiki tables
+out = output_dokuwiki_tables.DokuWikiTablesOutput(groups)
+out.Save("parameters.wiki")
+out.SaveRpc("parameters.wikirpc.xml")
diff --git a/Tools/px4params/xmlrpc.sh b/Tools/px4params/xmlrpc.sh
index 36c52ff714..efd177f46a 100644
--- a/Tools/px4params/xmlrpc.sh
+++ b/Tools/px4params/xmlrpc.sh
@@ -2,4 +2,4 @@ python px_process_params.py
rm cookies.txt
curl --cookie cookies.txt --cookie-jar cookies.txt --user-agent Mozilla/4.0 --data "u=$XMLRPCUSER&p=$XMLRPCPASS" https://pixhawk.org/start?do=login
-curl -k --cookie cookies.txt -H "Content-Type: application/xml" -X POST --data-binary @parameters.wiki "https://pixhawk.org/lib/exe/xmlrpc.php"
+curl -k --cookie cookies.txt -H "Content-Type: application/xml" -X POST --data-binary @parameters.wikirpc.xml "https://pixhawk.org/lib/exe/xmlrpc.php"