5 files changed, 196 insertions, 121 deletions

diff --git a/_ont/luna-sdk-userful-commands.md b/_ont/luna-sdk-userful-commands.md
new file mode 100644
index 0000000..a8f519e
--- /dev/null
+++ b/_ont/luna-sdk-userful-commands.md
@@ -0,0 +1,50 @@
+# Useful Commands
+
+## Getting/Setting the ONT's S/N
+```sh
+# {{ include.flash }} get GPON_SN
+GPON_SN=TMBB00000000
+# {{ include.flash }} set GPON_SN TMBB0A1B2C3D
+```
+
+## Getting/Setting the ONT's PLOAM password
+{% if include.ploam == 'hex' %}
+
+{% include alert.html content="The PLOAM password is stored in HEX format, without any 0x or separators" alert="Note"  icon="svg-info" color="blue" %}
+
+```sh
+# {{ include.flash }} get GPON_PLOAM_PASSWD
+GPON_PLOAM_PASSWD=41414141414141414141
+# {{ include.flash }} set GPON_PLOAM_PASSWD 41414141414141414141
+```
+{% elsif include.ploam == 'ascii' %}
+
+{% include alert.html content="The PLOAM password is stored in ASCII format" alert="Info" icon="svg-info" color="blue" %}
+
+```sh
+# {{ include.flash }} get GPON_PLOAM_PASSWD
+GPON_PLOAM_PASSWD=AAAAAAAAAA
+# {{ include.flash }} set GPON_PLOAM_PASSWD AAAAAAAAAA
+```
+{% endif %}
+
+## Checking the currently active image
+```sh
+# nv getenv sw_active
+sw_active=1
+# nv getenv sw_version0
+sw_version0=V1_7_8_210412
+# nv getenv sw_version1
+sw_version1=V1_7_8_210412
+```
+
+## Booting to a different image
+```sh
+# nv setenv sw_commit 0|1
+# reboot
+```
+
+## Querying a particular OMCI ME
+```sh
+# omcicli mib get MIB_IDX
+```
\ No newline at end of file
diff --git a/_ont/ont-odi-realtek-dfp-34g-2c2.md b/_ont/ont-odi-realtek-dfp-34g-2c2.md
new file mode 100644
index 0000000..4a18363
--- /dev/null
+++ b/_ont/ont-odi-realtek-dfp-34g-2c2.md
@@ -0,0 +1,135 @@
+---
+title: ODI Realtek DFP-34G-2C2 
+description: New model 2022 - v05
+has_children: false
+layout: default
+parent: ODI
+---
+
+# Hardware Specifications
+
+|             |                                   |
+| ----------- | --------------------------------- |
+| Vendor      | ODI                               |
+| Model       | DFP-34G-2C2                       |
+| Chipset     | Realtek RTL9601D                  |
+| Flash       | 8 MB                              |
+| RAM         | 64 MB                             |
+| System      | Linux (Luna SDK 1.9)              |
+| HSGMII      | Yes                               |
+| Optics      | SC/UPC                            |
+| IP address  | 192.168.1.1                       |
+| Web Gui     | ✅ user `admin`, password `admin` |
+| SSH         | ✅ user `admin`, password `admin` |
+| Form Factor | miniONT SFP                       |
+
+{% include alert.html content="SSH uses an outdated set of algorithms/ciphers, you can connect using the following command:" alert="Note"  icon="svg-info" color="blue" %}
+
+```shell
+ssh -oKexAlgorithms=+diffie-hellman-group1-sha1 -oCiphers=+3des-cbc admin@192.168.1.1
+```
+
+{% include image.html file="realtek-dfp-34g-2c2.jpg" alt="ODI Realtek DFP-34X-C2C" caption="ODI Realtek DFP-34X-C2C" %}
+
+
+## List of software versions
+- V1.0-220530 
+- V1.0-220414
+- V1.0-220304
+
+## List of firmwares and files
+- [Firmware repository by Anime4000](https://github.com/Anime4000/RTL960x/tree/main/Firmware/V2801F)
+
+The reccomended version are `M114_sfp_ODI_hybrid_220527.tar` or `M114_sfp_ODI_hybrid_220916.tar` because it has working VLAN translation.  
+
+## List of partitions
+ 
+| dev   | size     | erasesize | name            |
+| ----- | -------- | --------- | --------------- |
+| mtd0  | 00040000 | 00001000  | "boot"          |
+| mtd1  | 00002000 | 00001000  | "env"           |
+| mtd2  | 00002000 | 00001000  | "env2"          |
+| mtd3  | 0003c000 | 00001000  | "config"        |
+| mtd4  | 0014c000 | 00001000  | "k0"            |
+| mtd5  | 00274000 | 00001000  | "r0"            |
+| mtd6  | 0014c000 | 00001000  | "k1"            |
+| mtd7  | 00274000 | 00001000  | "r1"            |
+| mtd8  | 00001000 | 00001000  | "Partition_008" |
+| mtd9  | 00001000 | 00001000  | "Partition_009" |
+| mtd10 | 00001000 | 00001000  | "Partition_010" |
+| mtd11 | 00001000 | 00001000  | "Partition_011" |
+| mtd12 | 0014c000 | 00001000  | "linux"         |
+| mtd13 | 00274000 | 00001000  | "rootfs"        |
+
+This stick supports dual boot. 
+
+`k0` and `r0` respectively contain the kernel and firmware of the first image, while `k1` and `r1` respectively contain the kernel and the firmware of the second one
+
+# Serial
+
+The stick has exposed TTL pads:
+
+{% include image.html file="ont-odi-realtek-dfp-34x-2c2/ttl.jpg"  alt="DFP-34X-2C2 TTL Connection" caption="DFP-34X-2C2 TTL Connection" %}
+{% include image.html file="ont-odi-realtek-dfp-34x-2c2/ttl-2.jpg"  alt="DFP-34X-2C2 TTL Pin" caption="DFP-34X-2C2 TTL Pin" %}
+
+| USB TTL(UART) Adapter | wire colour in picture | SFP 20pins Molex connector and TTL pinout |
+| --------------------- | ---------------------- | ----------------------------------------- |
+| 3.3V                  | blue                   | pin #15 and #16                           |
+| TX                    | purple                 | TX                                        |
+| RX                    | white                  | RX                                        |
+| GND                   | green                  | pin #10                                   |
+
+Configuration: 115200 8-N-1
+
+{% include_relative luna-sdk-userful-commands.md flash='flash' flash='flash' ploam='hex' %}
+
+## Getting/Setting the ONT Vendor ID
+
+{% include alert.html content="This may need the OMCI_OLT_MODE value to be set to 3 to work" alert="Note" icon="svg-info" color="blue" %}
+
+```sh
+# flash get PON_VENDOR_ID  
+PON_VENDOR_ID=ZTEG
+# flash set PON_VENDOR_ID HWTC
+```
+
+## Getting/Settng the ONT Custom software version
+{% include alert.html content="This needs the OMCI_OLT_MODE value to be set to 3 and firmware 220530 as modded by stich86" alert="Note" icon="svg-info" color="blue" %}
+
+```sh
+# nv setenv sw_custom_version0 YOURFIRSTSWVER
+# nv setenv sw_custom_version1 YOURSECONDSWVER
+```
+
+## Getting/Setting a custom HW Version
+{% include alert.html content="This may need the OMCI_OLT_MODE value to be set to 3 to work" alert="Note" icon="svg-info" color="blue" %}
+
+```sh
+# flash get HW_HWVER
+HW_HWVER=V2.0
+# flash set HW_HWVER MYHWVERSION
+```
+
+## Getting/Setting a custom ONT Equipment ID
+{% include alert.html content="This may need the OMCI_OLT_MODE value to be set to 3 to work" alert="Note" icon="svg-info" color="blue" %}
+
+```sh
+# flash get GPON_ONU_MODEL
+GPON_ONU_MODEL=DFP-34X-2C2
+# flash set GPON_ONU_MODEL DFP-34X-XXX
+```
+
+# Known Bugs
+
+- Auto-sensing mode to switch between SGMII/HiSGMII
+
+# Low level modding
+
+
+# Miscellaneous Links
+
+- [Hacking RTL960x](https://github.com/Anime4000/RTL960x)
+- [Ditch ONU, use GPON SFP on Business Grade Router, Mikrotik/Ubiquiti/pfSense (Home Networking)](https://forum.lowyat.net/topic/4925452)
+- [For the new model ODI ZTE DFP-34X-C2C](/ont-odi-zte-dfp-34x-2c2)
+
+
diff --git a/_ont/ont-odi-realtek-dfp-34x-2c2.md b/_ont/ont-odi-realtek-dfp-34x-2c2.md
index 2c07562..ac9ed4e 100644
--- a/_ont/ont-odi-realtek-dfp-34x-2c2.md
+++ b/_ont/ont-odi-realtek-dfp-34x-2c2.md
@@ -1,5 +1,5 @@
 ---
-title: ODI Realtek DFP-34X-C2C 
+title: ODI Realtek DFP-34X-2C2 
 description: New model 2022 - v05
 has_children: false
 layout: default
@@ -11,7 +11,7 @@ parent: ODI
 |             |                                   |
 | ----------- | --------------------------------- |
 | Vendor      | ODI                               |
-| Model       | DFP-34X-C2C                       |
+| Model       | DFP-34X-2C2                       |
 | Chipset     | Realtek RTL9601D                  |
 | Flash       | 8 MB                              |
 | RAM         | 64 MB                             |
@@ -79,26 +79,9 @@ The stick has exposed TTL pads:
 | RX                    | white                  | RX                                        |
 | GND                   | green                  | pin #10                                   |
 
-Configuration: asc0=0 115200 8-N-1
+Configuration: 115200 8-N-1
 
-# Useful Commands
-
-## Getting/Setting the ONT's S/N
-```sh
-# flash get GPON_SN
-GPON_SN=TMBB00000000
-# flash set GPON_SN TMBB0A1B2C3D
-```
-
-## Getting/Setting the ONT's PLOAM password
-
-{% include alert.html content="The PLOAM password is stored in HEX format, without any 0x or separators" alert="Note"  icon="svg-info" color="blue" %}
-
-```sh
-# flash get GPON_PLOAM_PASSWD
-GPON_PLOAM_PASSWD=41414141414141414141
-# flash set GPON_PLOAM_PASSWD 41414141414141414141
-```
+{% include_relative luna-sdk-userful-commands.md flash='flash' ploam='hex' %}
 
 ## Getting/Setting the ONT Vendor ID
 
@@ -121,7 +104,6 @@ PON_VENDOR_ID=ZTEG
 ## Getting/Setting a custom HW Version
 {% include alert.html content="This may need the OMCI_OLT_MODE value to be set to 3 to work" alert="Note" icon="svg-info" color="blue" %}
 
-
 ```sh
 # flash get HW_HWVER
 HW_HWVER=V2.0
@@ -130,28 +112,13 @@ HW_HWVER=V2.0
 
 ## Getting/Setting a custom ONT Equipment ID
 {% include alert.html content="This may need the OMCI_OLT_MODE value to be set to 3 to work" alert="Note" icon="svg-info" color="blue" %}
+
 ```sh
 # flash get GPON_ONU_MODEL
 GPON_ONU_MODEL=DFP-34X-2C2
 # flash set GPON_ONU_MODEL DFP-34X-XXX
 ```
 
-## Checking the currently active image
-```sh
-# nv getenv sw_active
-sw_active=1
-```
-
-## Booting to a different image
-```sh
-# nv setenv sw_commit 0|1
-# reboot
-```
-
-## Querying a particular OMCI ME
-```sh
-# omcicli mib get MIB_IDX
-```
 
 # Known Bugs
 
diff --git a/_ont/ont-technicolor-afm0002.md b/_ont/ont-technicolor-afm0002.md
index ee521f7..21a9bd5 100644
--- a/_ont/ont-technicolor-afm0002.md
+++ b/_ont/ont-technicolor-afm0002.md
@@ -29,7 +29,7 @@ alias: Hisense LTE3415-SCA+
 
 ## Serial
 
-Configuration: asc0=0 115200 8-N-1
+Configuration: 115200 8-N-1
 
 # Hardware Revisions
 
@@ -79,58 +79,19 @@ This stick supports dual boot.
 - `/tmp/omcilog` - OMCI messages logs (must be enabeled, see below)
 
 ## Useful binaries
-- `/etc/scripts/flash`  - Used to manipulate the config files in a somewhat safe manner
+- `/etc/scripts/flash` - Used to manipulate the config files in a somewhat safe manner
 - `xmlconfig` - Used for low-level manipulation of the XML config files. Called by `flash`
 - `nv` - Used to manipulate nvram storage, including persistent config entries via `nv setenv`/`nv getenv`
 - `omcicli` - Used to interact with the running OMCI daemon
 - `omci_app` - The OMCI daemon
 - `diag` - Used to run low-level diagnostics commands on the stick
 
-# Useful Commands
-
-## Getting/Setting the ONT's S/N
-```sh
-# /etc/scripts/flash get GPON_SN
-GPON_SN=TMBB00000000
-# /etc/scripts/flash set GPON_SN TMBB0A1B2C3D
-```
-
-## Getting/Setting the ONT's PLOAM password
-
-{% include alert.html content="The PLOAM password is stored in ASCII format" alert="Info" icon="svg-info" color="blue" %}
-
-```sh
-# /etc/scripts/flash get GPON_PLOAM_PASSWD
-GPON_PLOAM_PASSWD=AAAAAAAAAA
-# /etc/scripts/flash set GPON_PLOAM_PASSWD AAAAAAAAAA
-```
+{% include_relative luna-sdk-userful-commands.md flash='/etc/scripts/flash' ploam='ascii' %}
 
 ## Enabling the Web UI
 ```sh
 # /bin/iptables -D INPUT -p tcp --dport 80 -j DROP
 ```
-
-## Checking the currently active image
-```sh
-# nv getenv sw_active
-sw_active=1
-# nv getenv sw_version0
-sw_version0=V1_7_8_210412
-# nv getenv sw_version1
-sw_version1=V1_7_8_210412
-```
-
-## Booting to a different image
-```sh
-# nv setenv sw_commit 0|1
-# reboot
-```
-
-## Querying a particular OMCI ME
-```sh
-# omcicli mib get MIB_IDX
-```
-
 # Low Level Modding
 
 {% include alert.html content="This section is based on the `V1_7_8_210412` version of the stick's firmware " alert="Info" icon="svg-info" color="blue" %}
diff --git a/_ont/ont-technicolor-afm0003.md b/_ont/ont-technicolor-afm0003.md
index 64823a7..0e71eec 100644
--- a/_ont/ont-technicolor-afm0003.md
+++ b/_ont/ont-technicolor-afm0003.md
@@ -28,7 +28,7 @@ alias: Hisense LTE3415-SH+
 
 ## Serial
 
-Configuration: asc0=0 115200 8-N-1
+Configuration: 115200 8-N-1
 
 # Hardware Revisions
 
@@ -67,58 +67,20 @@ This stick supports dual boot.
 - `/tmp/omcilog` - OMCI messages logs (must be enabeled, see below)
 
 ## Useful binaries
-- `/etc/scripts/flash`  - Used to manipulate the config files in a somewhat safe manner
+- `/etc/scripts/flash` - Used to manipulate the config files in a somewhat safe manner
 - `xmlconfig` - Used for low-level manipulation of the XML config files. Called by `flash`
 - `nv` - Used to manipulate nvram storage, including persistent config entries via `nv setenv`/`nv getenv`
 - `omcicli` - Used to interact with the running OMCI daemon
 - `omci_app` - The OMCI daemon
 - `diag` - Used to run low-level diagnostics commands on the stick
 
-# Useful Commands
-
-## Getting/Setting the ONT's S/N
-```sh
-# /etc/scripts/flash get GPON_SN
-GPON_SN=TMBB00000000
-# /etc/scripts/flash set GPON_SN TMBB0A1B2C3D
-```
-
-## Getting/Setting the ONT's PLOAM password
-
-{% include alert.html content="The PLOAM password is stored in ASCII format" alert="Info" icon="svg-info" color="blue" %}
-
-```sh
-# /etc/scripts/flash get GPON_PLOAM_PASSWD
-GPON_PLOAM_PASSWD=AAAAAAAAAA
-# /etc/scripts/flash set GPON_PLOAM_PASSWD AAAAAAAAAA
-```
+{% include_relative luna-sdk-userful-commands.md flash='/etc/scripts/flash' ploam='ascii' %}
 
 ## Enabling the Web UI
 ```sh
 # /bin/iptables -D INPUT -p tcp --dport 80 -j DROP
 ```
 
-## Checking the currently active image
-```sh
-# nv getenv sw_active
-sw_active=1
-# nv getenv sw_version0
-sw_version0=V1_7_8_210412
-# nv getenv sw_version1
-sw_version1=V1_7_8_210412
-```
-
-## Booting to a different image
-```sh
-# nv setenv sw_commit 0|1
-# reboot
-```
-
-## Querying a particular OMCI ME
-```sh
-# omcicli mib get MIB_IDX
-```
-
 # Low Level Modding
 
 # Known Bugs