From a8f818954303c3eb4150fa68f28db9a411bf4494 Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Sat, 25 Feb 2023 18:27:43 +0100 Subject: [PATCH] Keep the html folder on a flast structure (no subfolders). Else the OTA fails until >15.0.x because it does not create the needed subfolders (#2080) Co-authored-by: CaCO3 --- .gitignore | 1 - sd-card/html/edit_config_param.html | 6 +++--- sd-card/html/{param_tooltips => }/github.min.css | 0 sd-card/html/{param_tooltips/theme.css => mkdocs_theme.css} | 0 .../theme_extra.css => mkdocs_theme_extra.css} | 0 sd-card/html/param_tooltips/readme.md | 1 - .../generate-param-doc-tooltips.py | 5 ++--- 7 files changed, 5 insertions(+), 8 deletions(-) rename sd-card/html/{param_tooltips => }/github.min.css (100%) rename sd-card/html/{param_tooltips/theme.css => mkdocs_theme.css} (100%) rename sd-card/html/{param_tooltips/theme_extra.css => mkdocs_theme_extra.css} (100%) delete mode 100644 sd-card/html/param_tooltips/readme.md diff --git a/.gitignore b/.gitignore index f9165b4b..2e3ae032 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,3 @@ code/edgeAI.code-workspace .DS_Store tools/parameter-tooltip-generator/html tools/parameter-tooltip-generator/AI-on-the-edge-device-docs -sd-card/html/param_tooltips diff --git a/sd-card/html/edit_config_param.html b/sd-card/html/edit_config_param.html index 8d1e97e9..0082dbe3 100644 --- a/sd-card/html/edit_config_param.html +++ b/sd-card/html/edit_config_param.html @@ -105,9 +105,9 @@ textarea { } - - - + + + diff --git a/sd-card/html/param_tooltips/github.min.css b/sd-card/html/github.min.css similarity index 100% rename from sd-card/html/param_tooltips/github.min.css rename to sd-card/html/github.min.css diff --git a/sd-card/html/param_tooltips/theme.css b/sd-card/html/mkdocs_theme.css similarity index 100% rename from sd-card/html/param_tooltips/theme.css rename to sd-card/html/mkdocs_theme.css diff --git a/sd-card/html/param_tooltips/theme_extra.css b/sd-card/html/mkdocs_theme_extra.css similarity index 100% rename from sd-card/html/param_tooltips/theme_extra.css rename to sd-card/html/mkdocs_theme_extra.css diff --git a/sd-card/html/param_tooltips/readme.md b/sd-card/html/param_tooltips/readme.md deleted file mode 100644 index d8b8dcad..00000000 --- a/sd-card/html/param_tooltips/readme.md +++ /dev/null @@ -1 +0,0 @@ -The files in this folder are directly copied from the generated mkdocs site folder. diff --git a/tools/parameter-tooltip-generator/generate-param-doc-tooltips.py b/tools/parameter-tooltip-generator/generate-param-doc-tooltips.py index 11b6f98e..bad166e5 100644 --- a/tools/parameter-tooltip-generator/generate-param-doc-tooltips.py +++ b/tools/parameter-tooltip-generator/generate-param-doc-tooltips.py @@ -9,7 +9,6 @@ import markdown parameterDocsFolder = "AI-on-the-edge-device-docs/param-docs/parameter-pages" docsMainFolder = "../../sd-card/html" configPage = "edit_config_param.html" -imagesFolder = "param_tooltips" htmlTooltipPrefix = """
@@ -42,7 +41,7 @@ def generateHtmlTooltip(section, parameter, markdownFile): # Update image paths and copy images to right folder if "../img/" in htmlTooltip: - htmlTooltip = htmlTooltip.replace("../img/", imagesFolder + "/") + htmlTooltip = htmlTooltip.replace("../img/", "/") htmlTooltip = htmlTooltipPrefix + htmlTooltip + htmlTooltipSuffix @@ -77,4 +76,4 @@ for folder in folders: """ Copy images to main folder """ -os.system("cp " + parameterDocsFolder + "/img/* " + docsMainFolder + "/" + imagesFolder) \ No newline at end of file +os.system("cp " + parameterDocsFolder + "/img/* " + docsMainFolder + "/") \ No newline at end of file