39 files changed, 356 insertions, 101 deletions

diff --git a/404.md b/404.md
index 51ec26c..e8be9b6 100644
--- a/404.md
+++ b/404.md
@@ -8,4 +8,15 @@ description: Opps. The page you are looking for got lost.
 
 ---
 
-<p>The page you requested could not be found. Try using the navigation {% if site.search_enabled != false %}or search {% endif %}to find what you're looking for or go to this <a href="{{ '/' | relative_url }}">site's home page</a>.</p>
+<p>Those are not the ONT you are looking for. Try using the navigation {% if site.search_enabled != false %}or search {% endif %}to find what you're looking for or go to this <a href="{{ '/' | relative_url }}">site's home page</a>.</p>
+
+<div class="ont-404 mt-9">
+    <svg width="116.52087mm" height="36.783329mm" viewBox="0 0 116.52087 36.783329" version="1.1" id="svg28164"   xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+        <path id="path31930" d="m 0,11.403492 v 6.35 c 0,0.584491 0.473832,1.058334 1.058334,1.058334 0.102211,0 0.19827,0 0.290938,0 h 2.8840618 v 1.058333 c 0,0.264583 0.529166,0.529167 1.058333,0.529167 l 12.4286992,0.517789 c 0.49499,0.684954 1.162822,1.069287 1.858801,1.069711 H 32.808333 V 20.928492 H 34.925 v -1.058333 c 1.169003,0 2.116666,-0.71075 2.116666,-1.5875 0,-0.87675 -0.947663,-1.5875 -2.116666,-1.5875 V 15.636826 H 32.808333 V 14.578492 H 19.579167 c -0.67963,0.01667 -1.328582,0.399071 -1.812293,1.067647 L 5.2916668,16.165992 c -0.529167,0 -1.058333,0.264584 -1.058333,0.529167 v 1.058333 H 1.490348 c -0.131088,-0.0042 -0.276807,0 -0.432014,0 v -6.35 z m 19.579167,4.233334 h 1.5875 v 2.645833 2.645833 h -1.5875 c -0.876753,0 -1.5875,-1.184592 -1.5875,-2.645833 0,-1.461241 0.710747,-2.645833 1.5875,-2.645833 z m 2.645833,0 h 1.058333 v 5.291666 H 22.225 Z m 2.116667,0 H 25.4 v 5.291666 h -1.058333 z m 2.116666,0 H 31.75 v 5.291666 H 26.458333 Z M 15.875,16.695159 h 1.058333 v 3.175 h -3.175 V 17.753492 H 12.7 v 1.852084 H 9.5249998 v -1.5875 h -1.058333 v 1.322916 h -3.175 v -2.116666 h 1.058333 v 1.058333 h 1.058333 v -1.058333 h 3.1750002 v 1.322916 h 1.058334 v -1.5875 h 3.175 v 1.852084 H 15.875 Z m 16.933333,0 h 1.058334 v 3.175 h -1.058334 z m 2.091862,1.058333 c 0.587095,0 1.083138,0.236908 1.083138,0.529167 0,0.292259 -0.496043,0.529167 -1.083138,0.529167 z"></path>
+        <path d="M 44.906979,27.034723 H 116.52088 V 9.7486096 H 44.906979 Z m 11.641664,-1.058334 h -10.58333 v -1.940278 h 8.11389 V 12.410555 h -8.11389 v -1.603611 h 10.58333 z m 43.744457,0 H 57.606983 V 10.806944 H 100.2931 Z m 15.16945,0 h -14.11112 v -1.940278 h 12.02973 l -0.0353,-11.1125 h -11.99445 v -2.116667 h 14.11112 z M 53.020873,13.276388 v 9.877779 h -7.05556 v -9.877779 h 3.81 z M 109.46532,14.6875 v 0.705555 h -1.76389 v 0.705556 h 1.76389 v 0.705555 h -1.76389 v 0.705556 h 1.76389 v 0.705556 h -1.76389 v 0.705555 h 1.76389 v 0.705556 h -1.76389 v 0.705555 h 1.76389 V 21.0375 h -1.76389 v 0.705556 h 1.76389 v 1.411111 h -8.11389 l 0.0706,-4.198056 -0.0706,-4.974167 h 8.11389 z m 2.82223,8.466667 h -1.76389 v -9.172223 l 1.75727,-0.01654" id="path2"></path>
+        <rect id="rect13056" height="8.8194437" x="33.669872" y="20.397436" width="1.058" transform="rotate(-30.427871)"></rect>
+        <rect id="rect13056-0" height="8.8194437" x="19.819189" y="29.127432" width="1.058" transform="rotate(-47.800842)"></rect>
+        <rect id="rect13056-3" height="8.8194437" x="52.298908" y="-11.319631" width="1.058" transform="matrix(0.86226741,0.50645327,0.50645327,-0.86226741,0,0)"></rect>
+        <rect id="rect13056-0-9" height="8.8194437" x="47.068806" y="4.4197102" width="1.058" transform="matrix(0.6717097,0.74081447,0.74081447,-0.6717097,0,0)"></rect>
+    </svg>
+</div>
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index a25f480..40b2909 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,4 +3,6 @@ gemspec
 

 gem "webrick" 

 gem "jekyll-last-modified-at"

-gem "jekyll-redirect-from"
\ No newline at end of file
+gem "jekyll-redirect-from"

+gem "jekyll-webp"

+gem "jekyll-remote-theme"
\ No newline at end of file
diff --git a/_config.yml b/_config.yml
index 5bbf58c..f015238 100644
--- a/_config.yml
+++ b/_config.yml
@@ -57,4 +57,61 @@ gh_owner_name: hack-gpon
 gh_repository_name: hack-gpon.github.io

 

 whitelist:

-  - jekyll-redirect-from
\ No newline at end of file
+  - jekyll-redirect-from

+

+mermaid_enabled: true

+mermaid:

+  # Version of mermaid library

+  # Pick an available version from https://cdn.jsdelivr.net/npm/mermaid/

+  version: "9.1.3"

+  # Configured theme of mermaid diagrams

+  # Pick an avaiable theme from https://mermaid-js.github.io/mermaid/#/theming

+  theme: "default"

+  # Additional configuration available matching pattern as defined in https://mermaid-js.github.io/mermaid/#/./Setup.

+  # For example,

+  # logLevel: 'fatal',

+  # sequence:

+  #   diagramMarginX: 50

+  #   actorMargin: 50

+  # gantt:

+  #   barGap: 4

+  #   topPadding: 50

+

+############################################################

+# Site configuration for the WebP Generator Plugin

+# The values here represent the defaults if nothing is set

+webp:

+  enabled: true

+  

+  # The quality of the webp conversion 0 to 100 (where 100 is least lossy)

+  quality: 80

+

+  # List of directories containing images to optimize, nested directories will only be checked if `nested` is true

+  # By default the generator will search for a folder called `/img` under the site root and process all jpg, png and tiff image files found there.

+  img_dir: ["/img","/assets/img/"]

+

+  # Whether to search in nested directories or not

+  nested: false

+

+  # add ".gif" to the format list to generate webp for animated gifs as well

+  formats: [".jpeg", ".jpg", ".png", ".tiff"]

+

+  # File extensions for animated gif files 

+  gifs: [".gif"]

+

+  # Set to true to always regenerate existing webp files

+  regenerate: false

+

+  # Local path to the WebP utilities to use (relative or absolute)

+  # Omit or leave as nil to use the utilities shipped with the gem, override only to use your local install

+  # Eg : "/usr/local/bin/cwebp"

+  webp_path: nil

+

+  # List of files or directories to exclude

+  # e.g. custom or hand generated webp conversion files

+  exclude: []

+

+  # append '.webp' to filename after original extension rather than replacing it.

+  # Default transforms `image.png` to `image.webp`, while changing to true transforms `image.png` to `image.png.webp`

+  append_ext: false

+############################################################
\ No newline at end of file
diff --git a/_includes/image.html b/_includes/image.html
index 6389d3a..19149b3 100644
--- a/_includes/image.html
+++ b/_includes/image.html
@@ -1 +1,12 @@
-<figure>{% if {{include.url}} %}<a class="no_icon" target="_blank" rel="noopener" href="{{include.url}}">{% endif %}<img class="docimage" src="../assets/img/{{include.file}}" alt="{{include.alt}}" {% if {{include.max-width}} %}style="max-width: {{include.max-width}}px"{% endif %} />{% if {{include.url}} %}</a>{% endif %}{% if {{include.caption}} %}<figcaption>{{include.caption}}</figcaption>{% endif %}</figure>
+<figure>
+    {% if {{include.url}} %}
+        <a class="no_icon" target="_blank" rel="noopener" href="{{include.url}}">
+    {% endif %}
+    <source srcset='../assets/img/{{include.file | remove: ".jpg" | remove: ".png" | remove: ".jpeg" | remove: ".tiff" | remove: ".gif" }}.webp' type="image/webp">
+    <img class="docimage" src="../assets/img/{{include.file}}" alt="{{include.alt}}" {% if {{include.max-width}} %}style="max-width: {{include.max-width}}px"{% endif %} />
+    {% if {{include.url}} %}</a>{% endif %}{% if {{include.caption}} %}
+    <figcaption>
+        {{include.caption}}
+    </figcaption>
+    {% endif %}
+</figure>
diff --git a/_layouts/default.html b/_layouts/default.html
index 0e1273a..cd4cfbb 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -149,6 +149,9 @@ layout: table_wrappers
                     <a class="site-button github-edit" href="{{ site.gh_edit_repository }}/{{ site.gh_edit_view_mode }}/{{ site.gh_edit_branch }}{% if site.gh_edit_source %}/{{ site.gh_edit_source }}{% endif %}/{{ page.path }}" id="edit-this-page" title="{{ site.gh_edit_link_text }}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M20.71 7.04c.39-.39.39-1.04 0-1.41l-2.34-2.34c-.37-.39-1.02-.39-1.41 0l-1.84 1.83 3.75 3.75M3 17.25V21h3.75L17.81 9.93l-3.75-3.75L3 17.25z"></path></svg></a>

                     {% endif %}

                     <h1 class="fs-9">{{ page.title | default: site.title | default: site.github.repository_name }}</h1>

+                    {% if page.alias %}

+                        <h2 class="fmt-0"><span class="fw-300">Also sold as: </span> {{ page.alias }}</h2>

+                    {% endif %}

                     {% if site.last_edit_timestamp_script == true %}

                     <ul class="metadata text-small">

                         <li id="last-modified">Last Modified</li>

diff --git a/_sass/custom/custom.scss b/_sass/custom/custom.scss
index 4f18f08..274bfdb 100644
--- a/_sass/custom/custom.scss
+++ b/_sass/custom/custom.scss
@@ -185,4 +185,9 @@ figure {
         border-top-left-radius: $border-radius;
         border-top-right-radius: $border-radius;
     }
+}
+
+.ont-404 svg {
+    fill: $body-text-color;
+    width: 100%;
 }
\ No newline at end of file
diff --git a/assets/img/afm0002fwb.jpg b/assets/img/afm0002fwb.jpg
index 1b8bd5a..db66b35 100644
--- a/assets/img/afm0002fwb.jpg
+++ b/assets/img/afm0002fwb.jpg
diff --git a/assets/img/f601_v1.jpg b/assets/img/f601_v1.jpg
deleted file mode 100644
index 3b608e0..0000000
--- a/assets/img/f601_v1.jpg
+++ /dev/null
diff --git a/assets/img/f601_v1_1.jpg b/assets/img/f601_v6_1.jpg
index eb35b6d..eb35b6d 100644
--- a/assets/img/f601_v1_1.jpg
+++ b/assets/img/f601_v6_1.jpg
diff --git a/assets/img/f601_v1_2.jpg b/assets/img/f601_v6_2.jpg
index 607a296..607a296 100644
--- a/assets/img/f601_v1_2.jpg
+++ b/assets/img/f601_v6_2.jpg
diff --git a/assets/img/f601_v1_Teardown_1.jpg b/assets/img/f601_v6_Teardown_1.jpg
index fd75002..fd75002 100644
--- a/assets/img/f601_v1_Teardown_1.jpg
+++ b/assets/img/f601_v6_Teardown_1.jpg
diff --git a/assets/img/f601_v1_Teardown_2.jpg b/assets/img/f601_v6_Teardown_2.jpg
index a3ef20e..a3ef20e 100644
--- a/assets/img/f601_v1_Teardown_2.jpg
+++ b/assets/img/f601_v6_Teardown_2.jpg
diff --git a/assets/img/f601_v1_Teardown_3.jpg b/assets/img/f601_v6_Teardown_3.jpg
index 6a5fc29..6a5fc29 100644
--- a/assets/img/f601_v1_Teardown_3.jpg
+++ b/assets/img/f601_v6_Teardown_3.jpg
diff --git a/assets/img/f601_v2.jpg b/assets/img/f601_v7.jpg
index 0c23c04..0c23c04 100644
--- a/assets/img/f601_v2.jpg
+++ b/assets/img/f601_v7.jpg
diff --git a/assets/img/f601_v2_1.jpg b/assets/img/f601_v7_1.jpg
index 5a24b8f..5a24b8f 100644
--- a/assets/img/f601_v2_1.jpg
+++ b/assets/img/f601_v7_1.jpg
diff --git a/assets/img/f601_v2_2.jpg b/assets/img/f601_v7_Teardown.jpg
index c6b9ea8..c6b9ea8 100644
--- a/assets/img/f601_v2_2.jpg
+++ b/assets/img/f601_v7_Teardown.jpg
diff --git a/assets/img/f601_v2_Teardown_1.jpg b/assets/img/f601_v7_Teardown_1.jpg
index 13c9db1..13c9db1 100644
--- a/assets/img/f601_v2_Teardown_1.jpg
+++ b/assets/img/f601_v7_Teardown_1.jpg
diff --git a/assets/img/f601_v2_Teardown_2.jpg b/assets/img/f601_v7_Teardown_2.jpg
index e25e835..e25e835 100644
--- a/assets/img/f601_v2_Teardown_2.jpg
+++ b/assets/img/f601_v7_Teardown_2.jpg
diff --git a/assets/img/f601_v2_Teardown_3.jpg b/assets/img/f601_v7_Teardown_3.jpg
index eb35347..eb35347 100644
--- a/assets/img/f601_v2_Teardown_3.jpg
+++ b/assets/img/f601_v7_Teardown_3.jpg
diff --git a/assets/img/f601_v2_Teardown_4.jpg b/assets/img/f601_v7_Teardown_4.jpg
index 4a79009..4a79009 100644
--- a/assets/img/f601_v2_Teardown_4.jpg
+++ b/assets/img/f601_v7_Teardown_4.jpg
diff --git a/assets/img/f601_v3.jpg b/assets/img/f601_v8.jpg
index a9ec6cd..a9ec6cd 100644
--- a/assets/img/f601_v3.jpg
+++ b/assets/img/f601_v8.jpg
diff --git a/assets/img/g-010g-q-serial-pinout.jpg b/assets/img/g-010g-q-serial-pinout.jpg
new file mode 100644
index 0000000..a405cec
--- /dev/null
+++ b/assets/img/g-010g-q-serial-pinout.jpg
diff --git a/assets/img/g-010g-q-serial-pinout.png b/assets/img/g-010g-q-serial-pinout.png
deleted file mode 100644
index 97570ad..0000000
--- a/assets/img/g-010g-q-serial-pinout.png
+++ /dev/null
diff --git a/assets/img/ont-not-found.svg b/assets/img/ont-not-found.svg
new file mode 100644
index 0000000..9d09bef
--- /dev/null
+++ b/assets/img/ont-not-found.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="116.52087mm"
+   height="36.783329mm"
+   viewBox="0 0 116.52087 36.783329"
+   version="1.1"
+   id="svg28164"
+   sodipodi:docname="ont-not-found.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview9"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.77771465"
+     inkscape:cx="366.45832"
+     inkscape:cy="437.82125"
+     inkscape:window-width="2560"
+     inkscape:window-height="1351"
+     inkscape:window-x="2551"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg28164" />
+  <path
+     id="path31930"
+     d="m 0,11.403492 v 6.35 c 0,0.584491 0.473832,1.058334 1.058334,1.058334 0.102211,0 0.19827,0 0.290938,0 h 2.8840618 v 1.058333 c 0,0.264583 0.529166,0.529167 1.058333,0.529167 l 12.4286992,0.517789 c 0.49499,0.684954 1.162822,1.069287 1.858801,1.069711 H 32.808333 V 20.928492 H 34.925 v -1.058333 c 1.169003,0 2.116666,-0.71075 2.116666,-1.5875 0,-0.87675 -0.947663,-1.5875 -2.116666,-1.5875 V 15.636826 H 32.808333 V 14.578492 H 19.579167 c -0.67963,0.01667 -1.328582,0.399071 -1.812293,1.067647 L 5.2916668,16.165992 c -0.529167,0 -1.058333,0.264584 -1.058333,0.529167 v 1.058333 H 1.490348 c -0.131088,-0.0042 -0.276807,0 -0.432014,0 v -6.35 z m 19.579167,4.233334 h 1.5875 v 2.645833 2.645833 h -1.5875 c -0.876753,0 -1.5875,-1.184592 -1.5875,-2.645833 0,-1.461241 0.710747,-2.645833 1.5875,-2.645833 z m 2.645833,0 h 1.058333 v 5.291666 H 22.225 Z m 2.116667,0 H 25.4 v 5.291666 h -1.058333 z m 2.116666,0 H 31.75 v 5.291666 H 26.458333 Z M 15.875,16.695159 h 1.058333 v 3.175 h -3.175 V 17.753492 H 12.7 v 1.852084 H 9.5249998 v -1.5875 h -1.058333 v 1.322916 h -3.175 v -2.116666 h 1.058333 v 1.058333 h 1.058333 v -1.058333 h 3.1750002 v 1.322916 h 1.058334 v -1.5875 h 3.175 v 1.852084 H 15.875 Z m 16.933333,0 h 1.058334 v 3.175 h -1.058334 z m 2.091862,1.058333 c 0.587095,0 1.083138,0.236908 1.083138,0.529167 0,0.292259 -0.496043,0.529167 -1.083138,0.529167 z" />
+  <path
+     d="M 44.906979,27.034723 H 116.52088 V 9.7486096 H 44.906979 Z m 11.641664,-1.058334 h -10.58333 v -1.940278 h 8.11389 V 12.410555 h -8.11389 v -1.603611 h 10.58333 z m 43.744457,0 H 57.606983 V 10.806944 H 100.2931 Z m 15.16945,0 h -14.11112 v -1.940278 h 12.02973 l -0.0353,-11.1125 h -11.99445 v -2.116667 h 14.11112 z M 53.020873,13.276388 v 9.877779 h -7.05556 v -9.877779 h 3.81 z M 109.46532,14.6875 v 0.705555 h -1.76389 v 0.705556 h 1.76389 v 0.705555 h -1.76389 v 0.705556 h 1.76389 v 0.705556 h -1.76389 v 0.705555 h 1.76389 v 0.705556 h -1.76389 v 0.705555 h 1.76389 V 21.0375 h -1.76389 v 0.705556 h 1.76389 v 1.411111 h -8.11389 l 0.0706,-4.198056 -0.0706,-4.974167 h 8.11389 z m 2.82223,8.466667 h -1.76389 v -9.172223 l 1.75727,-0.01654"
+     id="path2" />
+  <rect
+     id="rect13056"
+     height="8.8194437"
+     x="33.669872"
+     y="20.397436"
+     width="1.058"
+     transform="rotate(-30.427871)" />
+  <rect
+     id="rect13056-0"
+     height="8.8194437"
+     x="19.819189"
+     y="29.127432"
+     width="1.058"
+     transform="rotate(-47.800842)" />
+  <rect
+     id="rect13056-3"
+     height="8.8194437"
+     x="52.298908"
+     y="-11.319631"
+     width="1.058"
+     transform="matrix(0.86226741,0.50645327,0.50645327,-0.86226741,0,0)" />
+  <rect
+     id="rect13056-0-9"
+     height="8.8194437"
+     x="47.068806"
+     y="4.4197102"
+     width="1.058"
+     transform="matrix(0.6717097,0.74081447,0.74081447,-0.6717097,0,0)" />
+</svg>
diff --git a/just-the-docs.gemspec b/just-the-docs.gemspec
index cd073de..5b1fb52 100644
--- a/just-the-docs.gemspec
+++ b/just-the-docs.gemspec
@@ -17,5 +17,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "jekyll", ">= 3.8.5"

   spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.0"

   spec.add_runtime_dependency "rake", ">= 12.3.1", "< 13.1.0"

-

+  spec.add_runtime_dependency "jekyll-webp"

+  spec.add_runtime_dependency "jekyll-remote-theme"

 end
\ No newline at end of file
diff --git a/ont-CarlitoxxPro-CPGOS03-0490-v1 copy.md b/ont-CarlitoxxPro-CPGOS03-0490-v1.md
index ef52bd9..ef52bd9 100644
--- a/ont-CarlitoxxPro-CPGOS03-0490-v1 copy.md
+++ b/ont-CarlitoxxPro-CPGOS03-0490-v1.md
diff --git a/ont-Hilink-HL23446.md b/ont-Hilink-HL23446.md
index 871230d..206bdae 100644
--- a/ont-Hilink-HL23446.md
+++ b/ont-Hilink-HL23446.md
@@ -1,6 +1,7 @@
 ---

 title: Hilink HL23446

 has_children: false

+alias: CarlitoxxPro CPGOS03-0490 v1

 parent: ONT

 ---

 

@@ -30,6 +31,8 @@ parent: ONT
 - [Nokia G-010S-P](ont-nokia-g-s010s-p)

 - [SourcePhotonics SPS-34-24T-HP-TDFO](ont-SourcePhotonics-SPS-34-24T-HP-TDFO)

 - [Hilink HL23446](ont-Hilink-HL23446)

+- Dasan H650SFP {: .text-red-200 }

+- DpOptics D23446 {: .text-red-200 }

 

 ## List of software versions

 ## List of partitions

diff --git a/ont-Huawei-HG8010H.md b/ont-Huawei-HG8010H.md
index 755d114..05261f2 100644
--- a/ont-Huawei-HG8010H.md
+++ b/ont-Huawei-HG8010H.md
@@ -26,10 +26,6 @@ parent: ONT
 {% include image.html file="HG8010H.jpg"  alt="HG8010H" caption="HG8010H: Horizontal PON port (left, middle); vertical PON port (right)" %}
 {% include image.html file="HG8010Hvorr.jpg"  alt="HG8010Hv3/4/5" caption="Bottom of the HG8010Hv3/4/5" %}
 {% include image.html file="HG8010Hv6.jpg"  alt="HG8010Hv6" caption="Bottom of the HG8010Hv6" %}
-{% include image.html file="HG8010H_Teardown_1.jpg"  alt="HG8010Hv1/2 Teardown" caption="HG8010Hv1/2: Teardown" %}
-{% include image.html file="HG8010H_Teardown_2.jpg"  alt="HG8010Hv1/2 Teardown" caption="HG8010Hv1/2: Teardown" %}
-{% include image.html file="HG8010H_Teardown_1_v6.jpg"  alt="HG8010Hv6 Teardown" caption="HG8010Hv6: Teardown" %}
-{% include image.html file="HG8010H_Teardown_2_v6.jpg"  alt="HG8010Hv6 Teardown" caption="HG8010Hv6: Teardown" %}
 
 ## Enabling telnet
 
@@ -52,7 +48,10 @@ Now that this is done, the modified configuration file can be uploaded via the w
 ## List of software versions
 
 - HWTCA31610003
+- V3R015C10S106
 - V3R016C10S003 (V300R016C10SPC003B010)
+- V3R017C00S100
+- V3R017C10S201
 - V5R020C10S020 (V500R020C10SPC020A2011020049)
 - V5R020C10S024 (V500R020C10SPC024B001)
 - V5R020C10S020 (V500R020C10SPC020B014)
@@ -67,3 +66,16 @@ Now that this is done, the modified configuration file can be uploaded via the w
 - [Notes on a Huawei HG810H (N.B. SSL error)](https://umbriel.fr/blog/Notes_on_a_Huawei_HG8010H.html)
 
 
+# Theardown and other photos
+
+## v1-2
+
+{% include image.html file="HG8010H_Teardown_1.jpg"  alt="HG8010Hv1/2 Teardown" caption="HG8010Hv1/2: Teardown" %}
+{% include image.html file="HG8010H_Teardown_2.jpg"  alt="HG8010Hv1/2 Teardown" caption="HG8010Hv1/2: Teardown" %}
+
+## v6
+
+{% include image.html file="HG8010H_Teardown_1_v6.jpg"  alt="HG8010Hv6 Teardown" caption="HG8010Hv6: Teardown" %}
+{% include image.html file="HG8010H_Teardown_2_v6.jpg"  alt="HG8010Hv6 Teardown" caption="HG8010Hv6: Teardown" %}
+
+
diff --git a/ont-Nokia-g-010g-q.md b/ont-Nokia-g-010g-q.md
index 0828a2d..365bb1b 100644
--- a/ont-Nokia-g-010g-q.md
+++ b/ont-Nokia-g-010g-q.md
@@ -25,7 +25,7 @@ parent: ONT
 

 ## Hardware revisions

 

-{% include image.html file="g-010g-q.png"  alt="G-010G-Q " caption="Nokia G-010G-Q" %}

+{% include image.html file="g-010g-q.jpg"  alt="G-010G-Q " caption="Nokia G-010G-Q" %}

 

 ## List of software versions

 ## List of partitions

diff --git a/ont-ODI-DFP-34X-C2C.md b/ont-ODI-DFP-34X-C2C.md
deleted file mode 100644
index f6d8a43..0000000
--- a/ont-ODI-DFP-34X-C2C.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: ODI DFP-34X-C2C
-has_children: false
-parent: ONT
-redirect_to: ont-ODI-DFP-34X-2C2
-nav_exclude: true
----
\ No newline at end of file
diff --git a/ont-SourcePhotonics-SPS-34-24T-HP-TDFO.md b/ont-SourcePhotonics-SPS-34-24T-HP-TDFO.md
index 2060158..524ae2a 100644
--- a/ont-SourcePhotonics-SPS-34-24T-HP-TDFO.md
+++ b/ont-SourcePhotonics-SPS-34-24T-HP-TDFO.md
@@ -2,43 +2,5 @@
 title: SourcePhotonics SPS-34-24T-HP-TDFO

 has_children: false

 parent: ONT

----

-

-# Hardware Specifications

-

-|             |                                            |

-| ----------- | ------------------------------------------ |

-| Vendor      | SourcePhotonics                            |

-| Model       | SPS-34-24T-HP-TDFO                         |

-| Chipset     | Lantiq PEB98035                            |

-| Flash       | 16 MB                                      |

-| RAM         | 64 MB                                      |

-| System      | OpenWRT                                    |

-| HSGMII      | Yes                                        |

-| Optics      | SC/APC                                     |

-| IP address  | 192.168.1.10                               |

-| Web Gui     |                                            |

-| SSH         | ✅ user `ONTUSER`, password `7sp!lwUBz1.` |

-| Form Factor | miniONT SFP                                |

-

-## Possible clones

-

-- FS.com GPON ONU Stick with MAC (P/N #133619)

-

-## Firmware is interchangeable with:

-

-- [Huawei MA5671A](ont-huawei-ma5671a)

-- [Nokia G-010S-P](ont-nokia-g-s010s-p)

-- [SourcePhotonics SPS-34-24T-HP-TDFO](ont-SourcePhotonics-SPS-34-24T-HP-TDFO)

-- [Hilink HL23446](ont-Hilink-HL23446)

-

-## List of software versions

-## List of partitions

-## List of firmwares and files

-# Known Bugs

-# Miscellaneous Links

-

-- [FS.com](https://www.fs.com/it/products/133619.html)

-

-

-

+redirect_to: ont-fs-com-gpon-onu-stick-with-mac

+---
\ No newline at end of file
diff --git a/ont-ZTE-F6005.md b/ont-ZTE-F6005.md
index 43ee0a4..577f0eb 100644
--- a/ont-ZTE-F6005.md
+++ b/ont-ZTE-F6005.md
@@ -20,8 +20,8 @@ parent: ONT
 | Web Gui     | ✅ user `admin`, password `admin` |

 | SSH         |                                   |

 | Form Factor | ONT                               |

-

-{% include image.html file="f6005_of.jpg" alt="F601 v1" caption="F6005 with Open Fiber branding" %}

+ 

+{% include image.html file="f6005_of.jpg" alt="F601 v1" caption="F6005 with Open Fiber branding <a href='https://forum.fibra.click/u/mirko991'>@mirko991</a>" %}

 {% include image.html file="f6005_tim.jpg" alt="F601 v3" caption="F6005 with ZTE branding, like the ones used by TIM" %}

 

 

diff --git a/ont-ZTE-F601.md b/ont-ZTE-F601.md
index 48080bc..63806f1 100644
--- a/ont-ZTE-F601.md
+++ b/ont-ZTE-F601.md
@@ -22,9 +22,9 @@ parent: ONT
 | SSH         |                                                                   |

 | Form Factor | ONT                                                               |

 

-{% include image.html file="f601_v1.jpg" alt="F601 v6" caption="F601 v6" %}

-{% include image.html file="f601_v2.jpg" alt="F601 v7" caption="A wall made out of broken F601 v7s" %}

-{% include image.html file="f601_v3.jpg" alt="F601 v8" caption="F601 v8" %}

+{% include image.html file="f601_v6_1.jpg" alt="F601 v6" caption="F601 v6" %}

+{% include image.html file="f601_v7.jpg" alt="F601 v7" caption="A wall made out of broken F601 v7s" %}

+{% include image.html file="f601_v8.jpg" alt="F601 v8" caption="F601 v8 <a href='https://forum.fibra.click/u/ftthless'>@ftthless</a>" %}

 

 

 ## Hardware revisions

@@ -39,7 +39,15 @@ parent: ONT
 - v8: small, Huawei HG8010H-like exterior

 

 ## List of software versions

-- V6.0.10P6N7

+### HW V6.0

+- V6.0.10P6T1 

+- V6.0.10P6T4 

+- V6.0.10P6N7 

+

+### HW V7.0

+- V7.0.10P6N7

+

+### HW V8.0

 

 ## List of partitions

 ## List of firmwares and files

@@ -50,3 +58,21 @@ parent: ONT
 - F601v7 turns on and runs even with 5 V input

 # Miscellaneous Links

 

+

+# Theardown and other photos

+

+## HW V6.0

+

+{% include image.html file="f601_v6_2.jpg"  alt="Bottom of the F601 v6" caption="Bottom of the F601 v6 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

+{% include image.html file="f601_v6_Teardown_1.jpg"  alt="Teardown of the F601 v6" caption="Teardown of the F601 v6  <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

+{% include image.html file="f601_v6_Teardown_2.jpg"  alt="Teardown of the F601 v6" caption="Teardown of the F601 v6 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

+{% include image.html file="f601_v6_Teardown_3.jpg"  alt="Teardown of the F601 v6" caption="Teardown of the F601 v6 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

+

+## HW V7.0

+

+{% include image.html file="f601_v7_1.jpg"  alt="Bottom of the F601 v7" caption="Bottom of the F601 v6 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

+{% include image.html file="f601_v7_Teardown.jpg"  alt="Bottom of the F601 v7" caption="Teardown of the F601 v7 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

+{% include image.html file="f601_v7_Teardown_1.jpg"  alt="Teardown of the F601 v7" caption="Teardown of the F601 v7  <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

+{% include image.html file="f601_v7_Teardown_2.jpg"  alt="Teardown of the F601 v7" caption="Teardown of the F601 v7 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

+{% include image.html file="f601_v7_Teardown_3.jpg"  alt="Teardown of the F601 v7" caption="Teardown of the F601 v7 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

+{% include image.html file="f601_v7_Teardown_4.jpg"  alt="Teardown of the F601 v7" caption="Teardown of the F601 v7 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

diff --git a/ont-Zyxel-PMG3000-D20B.md b/ont-Zyxel-PMG3000-D20B.md
index adb0e60..7e63b2d 100644
--- a/ont-Zyxel-PMG3000-D20B.md
+++ b/ont-Zyxel-PMG3000-D20B.md
@@ -1,6 +1,7 @@
 ---

 title: Zyxel PMG3000-D20B

 has_children: false

+alias: Halny HL-GSFP, D-LINK DPN-100-Rev-A, Ziza OP151S, T&W TW2362H-CDEL

 parent: ONT

 ---

 

diff --git a/ont-fs-com-gpon-onu-stick-with-mac.md b/ont-fs-com-gpon-onu-stick-with-mac.md
index d5930b8..6fd25e5 100644
--- a/ont-fs-com-gpon-onu-stick-with-mac.md
+++ b/ont-fs-com-gpon-onu-stick-with-mac.md
@@ -2,5 +2,106 @@
 title: ONT FS.com GPON ONU Stick with MAC
 has_children: false
 parent: ONT
-redirect_to: ont-SourcePhotonics-SPS-34-24T-HP-TDFO
----
\ No newline at end of file
+alias: SourcePhotonics SPS-34-24T-HP-TDFO
+---
+
+# Hardware Specifications
+
+|             |                                            |
+| ----------- | ------------------------------------------ |
+| Vendor      | SourcePhotonics                            |
+| Model       | SPS-34-24T-HP-TDFO                         |
+| Chipset     | Lantiq PEB98035                            |
+| Flash       | 16 MB                                      |
+| RAM         | 64 MB                                      |
+| System      | OpenWRT                                    |
+| HSGMII      | Yes                                        |
+| Optics      | SC/APC                                     |
+| IP address  | 192.168.1.10                               |
+| Web Gui     |                                            |
+| SSH         | ✅ user `ONTUSER`, password `7sp!lwUBz1.` |
+| Form Factor | miniONT SFP                                |
+
+## Possible clones
+
+- SourcePhotonics SPS-34-24T-HP-TDFO
+
+## Firmware is interchangeable with:
+
+- [Huawei MA5671A](ont-huawei-ma5671a)
+- [Nokia G-010S-P](ont-nokia-g-s010s-p)
+- [SourcePhotonics SPS-34-24T-HP-TDFO](ont-SourcePhotonics-SPS-34-24T-HP-TDFO)
+- [Hilink HL23446](ont-Hilink-HL23446)
+- Dasan H650SFP {: .text-red-200 }
+- DpOptics D23446 {: .text-red-200 }
+
+# General setting
+
+
+## Setting S/N
+```sh
+set_serial_number ABCD12345678
+```
+
+## Setting PLOAM Password
+Software 6BA1896SPLQA41 and before:
+```sh
+fw_setenv nPassword "0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38 0x39"
+```
+
+Software 6BA1896SPLQA41 and after:
+```sh
+sfp_i2c -i11 -s "0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38 0x39"
+```
+
+## Setting LOID and Checkcode Password
+Software 6BA1896SPLQA41 and before:
+```sh
+fw_setenv omci_loid 1234567890
+fw_setenv omci_lpwd password01
+```
+
+Software 6BA1896SPLQA41 and after:
+```sh
+sfp_i2c -i9 -s "1234567890"
+sfp_i2c -i10 -s "password01"
+```
+
+## Setting eqipment id
+```sh
+sfp_i2c -i6 -s "22133912P"
+```
+
+## Setting vendor id
+```sh
+sfp_i2c -i7 -s "SPGA"
+```
+
+## Setting Lantiq MAC address
+```sh
+uci set network.Ict.macaddr=00:06:B5:07:D6:04
+uci set network.host.macaddr=00:06:B5:07:D8:04
+uci commit network.lct.macaddr=00:06:B5:07:D6:04
+uci commit network.host.macaddr=00:06:B5:07:D8:04
+```
+
+## Setting Lantiq IP address
+```sh
+fw_setenv ipaddr 192.168.20.60
+fw_setenv gatewayip 192.168.20.1
+```
+
+## Setting Onu reboot
+```sh
+reboot
+```
+
+
+## List of software versions
+## List of partitions
+## List of firmwares and files
+# Known Bugs
+# Miscellaneous Links
+
+- [FS.com](https://www.fs.com/it/products/133619.html)
+- [General setting of lantiq](https://forum.fibra.click/d/23881-ma5671a-e-vodafone-25-gbps/64)
\ No newline at end of file
diff --git a/ont-huawei-cm5671a.md b/ont-huawei-cm5671a.md
deleted file mode 100644
index 6d9c592..0000000
--- a/ont-huawei-cm5671a.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-title: Huawei CM5671A
-has_children: false
-parent: ONT
----
-
-# Hardware Specifications
-
-|             |             |
-| ----------- | ----------- |
-| Vendor      | Huawei      |
-| Model       | CM5671A     |
-| Chipset     |             |
-| Flash       |             |
-| RAM         |             |
-| System      |             |
-| HSGMII      |             |
-| Optics      |             |
-| IP address  |             |
-| Web Gui     |             |
-| SSH         |             |
-| Form Factor | miniONT SFP |
-
-
-## List of software versions
-## List of partitions
-## List of firmwares and files
-# Known Bugs
-# Miscellaneous Links
\ No newline at end of file
diff --git a/ont-huawei-ma5671a-root.md b/ont-huawei-ma5671a-root.md
index bf8af78..dc87f53 100644
--- a/ont-huawei-ma5671a-root.md
+++ b/ont-huawei-ma5671a-root.md
@@ -106,3 +106,9 @@ mtd -e image1 write mtd5.bin image1
 {% include alert.html content="You could also have done it as a serial, but from here it is much quicker
 " alert="Info"  icon="svg-info" color="blue" %}
 
+# Miscellaneous Links
+- [Come avere i 2.5 Gbps su un unico dispositivo senza il Fastgate](https://forum.fibra.click/d/17836-come-avere-i-25-gbps-su-un-unico-dispositivo-senza-il-fastgate)
+- [Support MA5671A SFP GPON](https://forum.openwrt.org/t/support-ma5671a-sfp-gpon/48042)
+- [La fibre Orange à 2Gbps, sur un routeur MikroTik 10Gbps CCR2004, via un ONT SFP+](https://lafibre.info/remplacer-livebox/guide-de-connexion-fibre-directement-sur-un-routeur-voire-meme-en-2gbps/msg832904/#msg832904)
+- [Bypassing the HH3K up to 2.5Gbps using a BCM57810S NIC](https://www.dslreports.com/forum/r32230041-Internet-Bypassing-the-HH3K-up-to-2-5Gbps-using-a-BCM57810S-NIC)
+
diff --git a/ont-huawei-ma5671a.md b/ont-huawei-ma5671a.md
index 00241ef..5425a78 100644
--- a/ont-huawei-ma5671a.md
+++ b/ont-huawei-ma5671a.md
@@ -27,6 +27,8 @@ parent: ONT
 - [Nokia G-010S-P](ont-nokia-g-s010s-p)

 - [SourcePhotonics SPS-34-24T-HP-TDFO](ont-SourcePhotonics-SPS-34-24T-HP-TDFO)

 - [Hilink HL23446](ont-Hilink-HL23446)

+- Dasan H650SFP {: .text-red-200 }

+- DpOptics D23446 {: .text-red-200 }

 

 ## Serial

 

@@ -63,6 +65,8 @@ set nDyingGaspEnable disable
 - [Huawei Rooted MTD5](https://ma5671a.s3.nl-ams.scw.cloud/mA5671a_root_mtd5.img){: .btn }  md5hash: 0e4cfdc1b96be6581869b26b48789556

 - [1224abort.bin](https://ma5671a.s3.nl-ams.scw.cloud/1224ABORT.bin){: .btn }  md5hash: 10e94a4b4acdc82dec20c7904b69e5c0

 

+# General setting

+

 ## Setting image version

 ```sh

 fw_setenv image0_version V1.7.6-170626

@@ -73,6 +77,21 @@ fw_setenv image1_version V1.7.6-170626
 ```sh

 fw_setenv ont_serial ABCD12345678

 ```

+or

+```sh

+uci set gpon.ploam.nSerial="0x48 0x57 0x54 0x43 0x9D 0xAC 0xC7 0xA3"

+uci commit 

+```

+

+## Setting PLOAM Password

+```sh

+fw_setenv nPassword "0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38 0x39"

+```

+or

+```sh

+uci set gpon.ploam.nPassword="0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38 0x39"

+uci commit 

+```

 

 ## Setting and check oem-generic

 ```sh

@@ -84,11 +103,6 @@ fw_printenv target=oem-generic
 ```sh

 fw_setenv sgmii_mode 5

 ```

-

-## Setting S/N

-```sh

-fw_setenv ont_serial ABCD12345678

-

 # Known Bugs

 

 # Miscellaneous Links

@@ -98,5 +112,8 @@ fw_setenv ont_serial ABCD12345678
 - [Custom Firmware - right.com.cn](https://www.right.com.cn/forum/thread-8220173-1-1.html)

 - [Come avere i 2.5 Gbps su un unico dispositivo senza il Fastgate - fibra.click Forum](https://forum.fibra.click/d/17836-come-avere-i-25-gbps-su-un-unico-dispositivo-senza-il-fastgate)

 - [GPON SFP Tools](https://github.com/MokkaSchnalle/GPON-SFP-Tools)

-

-

+- [Come avere i 2.5 Gbps su un unico dispositivo senza il Fastgate](https://forum.fibra.click/d/17836-come-avere-i-25-gbps-su-un-unico-dispositivo-senza-il-fastgate)

+- [La fibre Orange à 2Gbps, sur un routeur MikroTik 10Gbps CCR2004, via un ONT SFP+](https://lafibre.info/remplacer-livebox/guide-de-connexion-fibre-directement-sur-un-routeur-voire-meme-en-2gbps/msg832904/#msg832904)

+- [Bypassing the HH3K up to 2.5Gbps using a BCM57810S NIC](https://www.dslreports.com/forum/r32230041-Internet-Bypassing-the-HH3K-up-to-2-5Gbps-using-a-BCM57810S-NIC)

+- [General setting of lantiq](https://forum.fibra.click/d/23881-ma5671a-e-vodafone-25-gbps/64)

+- [Manual and firmware for reflashing of HUAWEI MA5671A SFP module](https://github.com/nikbyte/huawei_ma5671a)

diff --git a/ont-nokia-g-s010s-p.md b/ont-nokia-g-s010s-p.md
index 274cc31..5566b23 100644
--- a/ont-nokia-g-s010s-p.md
+++ b/ont-nokia-g-s010s-p.md
@@ -29,6 +29,8 @@ parent: ONT
 - [Nokia G-010S-P](ont-nokia-g-s010s-p)

 - [SourcePhotonics SPS-34-24T-HP-TDFO](ont-SourcePhotonics-SPS-34-24T-HP-TDFO)

 - [Hilink HL23446](ont-Hilink-HL23446)

+- Dasan H650SFP {: .text-red-200 }

+- DpOptics D23446 {: .text-red-200 }

 

 Turning a [Nokia G-010S-P](ont-nokia-g-s010s-p) into a [Nokia G-010S-A](ont-nokia-g-s010s-A) is possible by changing layout from mtd