Merge pull request #154 from rust-embedded/htmlcompare

Integrate svd2html, add htmlcompare

Author: adamgreig

Cargo.toml

@@ -28,7 +28,7 @@ clap = { version = "4.1", features = ["derive", "cargo", "color"] }
 serde = { version = "1.0", features = ["derive"] }
 quick-xml = { version = "0.28", features = ["serialize"] }
 svd-rs = { version = "0.14.2", features = ["serde", "derive-from"] }
-svd-parser = { version = "0.14.1", features = ["expand"] }
+svd-parser = { version = "0.14.2", features = ["expand"] }
 svd-encoder = "0.14.3"
 yaml-rust = "0.4"
 # serde_yaml 0.9.x looks broken
@@ -42,6 +42,10 @@ commands = "0.0.5"
 env_logger = "0.10"
 log = { version = "~0.4", features = ["std"] }
 normpath = "1.1.0"
+liquid = "0.26.0"
+once_cell = "1.18.0"
+rayon = "1.7.0"
+regex = "1.9.1"
 
 [dev-dependencies]
 tempfile = "3.3"

src/cli.rs

@@ -3,8 +3,8 @@ use clap::Parser;
 use std::path::PathBuf;
 
 use svdtools::{
-    convert::convert_cli, interrupts::interrupts_cli, makedeps::makedeps_cli, mmap::mmap_cli,
-    patch::patch_cli,
+    convert::convert_cli, html::html_cli, html::htmlcompare_cli, interrupts::interrupts_cli,
+    makedeps::makedeps_cli, mmap::mmap_cli, patch::patch_cli,
 };
 
 #[derive(Parser, Debug)]
@@ -82,6 +82,23 @@ enum Command {
         #[clap(long)]
         format_config: Option<PathBuf>,
     },
+    /// Generates webpage with tables of existing peripherals
+    Htmlcompare {
+        /// Path to write HTML files to
+        htmldir: PathBuf,
+
+        /// Input SVD XML files
+        svdfiles: Vec<PathBuf>,
+    },
+    /// Generates a webpage for a given SVD file containing details on every
+    /// peripheral and register and their level of coverage.
+    Html {
+        /// Path to write HTML files to
+        htmldir: PathBuf,
+
+        /// Path to patched SVD files
+        svdfiles: Vec<PathBuf>,
+    },
 }
 
 impl Command {
@@ -123,6 +140,12 @@ impl Command {
                 },
                 format_config.as_ref().map(|p| p.as_path()),
             )?,
+            Self::Htmlcompare { htmldir, svdfiles } => {
+                htmlcompare_cli::htmlcompare(htmldir, svdfiles)?;
+            }
+            Self::Html { htmldir, svdfiles } => {
+                html_cli::svd2html(htmldir, svdfiles)?;
+            }
         }
         Ok(())
     }