14 files changed, 282 insertions, 231 deletions

diff --git a/_ont/luna-sdk-userful-commands.md b/_ont/luna-sdk-userful-commands.md
deleted file mode 100644
index ee899d1..0000000
--- a/_ont/luna-sdk-userful-commands.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# General Settings and 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-carlitoxxpro-cpgos03-0490-v2.md b/_ont/ont-carlitoxxpro-cpgos03-0490-v2.md
index 6c2a4e0..2f10493 100644
--- a/_ont/ont-carlitoxxpro-cpgos03-0490-v2.md
+++ b/_ont/ont-carlitoxxpro-cpgos03-0490-v2.md
@@ -7,31 +7,34 @@ parent: CarlitoxxPro
 
 # Hardware Specifications
 
-|              |                   |
-| ------------ | ----------------- |
-| Vendor/Brand | CarlitoxxPro      |
-| Model        | CPGOS03-0490 v2   |
-| Chipset      | Realtek RTL9601CI |
-| Flash        | 8 MB              |
-| RAM          | 64 MB             |
-| System       | Linux (Luna SDK)  |
-| HSGMII       | No                |
-| Optics       | SC/APC            |
-| IP address   |                   |
-| Web Gui      | ✅                |
-| SSH          | ✅                |
-| Telnet       |                   |
-| Serial       |                   |
-| Form Factor  | miniONT SFP       |
+|              |                                       |
+| ------------ | ------------------------------------- |
+| Vendor/Brand | CarlitoxxPro                          |
+| Model        | CPGOS03-0490 v2                       |
+| Chipset      | Realtek RTL9601CI                     |
+| Flash        | 8 MB                                  |
+| RAM          | 64 MB                                 |
+| System       | Linux (Luna SDK)                      |
+| HSGMII       | No                                    |
+| Optics       | SC/APC                                |
+| IP address   |                                       |
+| Web Gui      | ✅ user `cpAdmin`, password `cpAdmin` |
+| SSH          |                                       |
+| Telnet       | ✅                                    |
+| Serial       |                                       |
+| Form Factor  | miniONT SFP                           |
 
 # Known Bugs
 
 - VLAN swap issue (MEID 171), auto-sensing mode to switch between SGMII/HiSGMII
 
-- You should use the VID/VLAN shown by executing the command "omcicli mib get 84" via telnet to bring up PPPoE
+- You should use the VID/VLAN shown by executing the command `omcicli mib get 84` via telnet to bring up PPPoE
+
+{% include_relative ont-luna-sdk-useful-commands.md flash='flash' ploam='asciiAndHex' %}
+
 
 # Miscellaneous Links
 
 - [Hacking RTL960x](https://github.com/Anime4000/RTL960x)
-
+- [GPON ONU SFP - CPGOS03-0490 v2.0: Configuration Manual 1.0](https://wiki.rockstable.it/FTTH?action=AttachFile&do=get&target=CPGOS03-0490v2_Configuration-Manual.pdf)
 
diff --git a/_ont/ont-leox-lxt-010g-d.md b/_ont/ont-leox-lxt-010g-d.md
index f01afd6..02da189 100644
--- a/_ont/ont-leox-lxt-010g-d.md
+++ b/_ont/ont-leox-lxt-010g-d.md
@@ -30,4 +30,4 @@ parent: LEOX
 
 The ONT has a TTL 3.3v UART console (configured as 115200 8-N-1) that can be accessed from the top surface.
 
-{% include_relative ont-leox-userful-command.md %}
+{% include_relative ont-luna-sdk-useful-commands.md ploam='ascii' flash='/etc/scripts/flash' %}
diff --git a/_ont/ont-leox-lxt-010h-d.md b/_ont/ont-leox-lxt-010h-d.md
index 0dc0892..90a29f7 100644
--- a/_ont/ont-leox-lxt-010h-d.md
+++ b/_ont/ont-leox-lxt-010h-d.md
@@ -31,4 +31,4 @@ parent: LEOX
 
 The ONT has a TTL 3.3v UART console (configured as 115200 8-N-1) that can be accessed from the top surface.
 
-{% include_relative ont-leox-userful-command.md %}
+{% include_relative ont-luna-sdk-useful-commands.md ploam='ascii' flash='/etc/scripts/flash' %}
diff --git a/_ont/ont-leox-lxt-010s-h.md b/_ont/ont-leox-lxt-010s-h.md
index 84db6c8..dd0f632 100644
--- a/_ont/ont-leox-lxt-010s-h.md
+++ b/_ont/ont-leox-lxt-010s-h.md
@@ -67,25 +67,7 @@ The stick has a TTL 3.3v UART console (configured as 115200 8-N-1) that can be a
 - V3.3.4L3
 - V3.3.4L4rc1 (Fix 2.5GbE HiSGMII)
 
-{% include_relative ont-leox-userful-command.md %}
-
-## LAN SDS Mode (with firmware V3.3.4L4rc1):
-
-| mode             | description              |
-| ---------------- | ------------------------ |
-| LAN_SDS_MODE = 1 | 1GbE with auto-neg on    |
-| LAN_SDS_MODE = 7 | 1GbE with auto-neg off   |
-| LAN_SDS_MODE = 8 | 2.5GbE with auto-neg off |
-
-If you try to use any mode not listed here, stick will default to mode 1.
-
-To change the link mode use this command:
-
-```sh
-# /etc/scripts/flash get LAN_SDS_MODE
-LAN_SDS_MODE=1
-# /etc/scripts/flash set LAN_SDS_MODE 1
-```
+{% include_relative ont-luna-sdk-useful-commands.md ploam='ascii' speedLan='178' customSpeedLanAlert='You need firmware `V3.3.4L4rc1` or higher. Before editing the speed make sure your hardware supports it. If you try to use any mode not listed here, stick will default to mode 1.' flash='/etc/scripts/flash' %}
 
 # Known Bugs
 
diff --git a/_ont/ont-leox-userful-command.md b/_ont/ont-leox-userful-command.md
deleted file mode 100644
index 1900b23..0000000
--- a/_ont/ont-leox-userful-command.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# General Settings and Useful Commands
-
-## Change IP address
-```sh
-# /etc/scripts/flash get LAN_IP_ADDR
-LAN_IP_ADDR=192.168.2.1
-# /etc/scripts/flash set LAN_IP_ADDR 192.168.1.1
- ```
-
-## Getting/Setting the ONT's S/N
-```sh
-# /etc/scripts/flash get GPON_SN
-GPON_SN=LEOX00000000
-# /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
-```
\ No newline at end of file
diff --git a/_ont/ont-luna-sdk-useful-commands.md b/_ont/ont-luna-sdk-useful-commands.md
new file mode 100644
index 0000000..535d62a
--- /dev/null
+++ b/_ont/ont-luna-sdk-useful-commands.md
@@ -0,0 +1,195 @@
+# General Settings and Useful Commands
+
+## Useful files
+- `/var/config/lastgood.xml` - Contains the user portion of the configuration
+{% if include.lastgoodHs %}
+- `/var/config/lastgood-hs.xml` - Contains the "hardware" configuration (which _should not_ be changed)
+{% endif %}
+- `/tmp/omcilog` - OMCI messages logs (must be enabeled, see below)
+
+## Useful binaries
+- `{{ include.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 `{{ include.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
+
+
+## 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 == 'asciiAndHex' %}
+
+{% include alert.html content="The ploam can be saved in either ASCII or HEX format, without any 0x or separators" alert="Note" icon="svg-info" color="blue" %}
+
+```sh
+# {{ include.flash }} get GPON_PLOAM_PASSWD
+GPON_PLOAM_PASSWD=AAAAAAAAAA
+# {{ include.flash }} set GPON_PLOAM_PASSWD AAAAAAAAAA
+# {{ include.flash }} set GPON_PLOAM_PASSWD 41414141414141414141
+```
+
+{% elsif 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
+```
+
+## 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
+{% assign customSwVersionAlert = include.customSwVersionAlert | default: "This needs the OMCI_OLT_MODE value to be set to 3" %}
+{% include alert.html content=customSwVersionAlert 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
+# {{ include.flash }} get HW_HWVER
+HW_HWVER=V2.0
+# {{ include.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
+# {{ include.flash }} get GPON_ONU_MODEL
+GPON_ONU_MODEL=DFP-34X-2C2
+# {{ include.flash }} set GPON_ONU_MODEL DFP-34X-XXX
+```
+
+## Getting/Setting OMCI OLT Mode and Fake OMCI
+
+Configure how ONT Stick handle OMCI from OLT:
+
+```sh
+# {{ include.flash }} get OMCI_OLT_MODE
+OMCI_OLT_MODE=1
+# {{ include.flash }} set OMCI_OLT_MODE 2
+```
+
+| Value | Note            | OMCI Information                               |
+| ----- | --------------- | ---------------------------------------------- |
+| 0     | Default Mode    | Stock, some value are cannot be change         |
+| 1     | Huawei OLT Mode | Huawei MA5671a                                 |
+| 2     | ZTE OLT Mode    | ZTE                                            |
+| 3     | Customized Mode | Custom Software/Hardware Version, OMCC, etc... |
+
+Some Fiber Vendor/Wholesale/ISP have explicit LAN Port Number provisioning or proprietary OMCI that ONT Stick cant not understand, this will make ONT Stick reply OK whatever OMCI OLT throw at. 
+
+`0` = Disable, `1` = Enable, Default is 0
+
+```sh
+# {{ include.flash }} get OMCI_FAKE_OK
+OMCI_FAKE_OK=0
+# {{ include.flash }} set OMCI_FAKE_OK 1
+```
+{% if include.speedLan %}
+
+## Getting/Setting Speed LAN Mode
+{% assign customSpeedLanAlert = include.customSpeedLanAlert | default: "Before editing the speed make sure your hardware supports it." %}
+{% include alert.html content=customSpeedLanAlert alert="Note" icon="svg-info" color="blue" %}
+
+To change the link mode use this command:
+
+```sh
+# {{ include.flash }} get LAN_SDS_MODE
+LAN_SDS_MODE=0
+# {{ include.flash }} set LAN_SDS_MODE 1
+```
+
+| Value | `cat /proc/kmsg`                     | Mode     | Behavior                    |
+| ----- | ------------------------------------ | -------- | --------------------------- |{% if include.speedLan contains '0' %}
+| 0     | `<4>change mode to 0(GE/FE PHY)`     | `TP`     | 1GbaseT/100baseT            |{% endif %}{% if include.speedLan contains '1' %}
+| 1     | `<4>change mode to 1(Fiber 1G)`      | `FIBER`  | 1GbaseX with auto-neg on    |{% endif %}{% if include.speedLan contains '2' %}
+| 2     | `<4>change mode to 2(SGMII PHY)`     | `TP MII` | 1Gb PHY                     |{% endif %}{% if include.speedLan contains '3' %}
+| 3     | `<4>change mode to 3(SGMII MAC)`     | `MII`    | 1Gb MAC                     |{% endif %}{% if include.speedLan contains '4' %}
+| 4     | `<4>change mode to 4(HiSGMII PHY)`   | `TP MII` | 2.5Gb PHY                   |{% endif %}{% if include.speedLan contains '5' %}
+| 5     | `<4>change mode to 5(HiSGMII MAC)`   | `MII`    | 2.5Gb MAC                   |{% endif %}{% if include.speedLan contains '6' %}
+| 6     | `<4>change mode to 6(2500BaseX)`     | `FIBER`  | 2500baseX with auto-neg on  |{% endif %}{% if include.speedLan contains '7' %}
+| 7     | `<4>change mode to 7(SGMII Force)`   | `TP`     | 1GbaseT with auto-neg off   |{% endif %}{% if include.speedLan contains '8' %}
+| 8     | `<4>change mode to 8(HISGMII Force)` | `TP`     | 2500baseT with auto-neg off |{% endif %}
+
+{% endif %}
+
+## Change IP address
+
+```sh
+# {{ flash }} get LAN_IP_ADDR
+LAN_IP_ADDR=192.168.2.1
+# {{ flash }} set LAN_IP_ADDR 192.168.1.1
+```
+
+## Checking whether the connection with the OLT was successful (O5 state)
+
+```sh
+diag gpon get onu-state
+```
+
+## Querying a particular OMCI ME
+```sh
+# omcicli mib get MIB_IDX
+```
+
+## Getting/Setting the L2 Bridge MTU
+{% include alert.html content="Settings given via diag are not permanent after reboot" alert="Note" icon="svg-info" color="blue" %}
+
+Getting/Setting the MTU of the L2 bridge
+```sh
+# diag switch get max-pkt-len port all 
+Port Speed 
+---------- 
+0 1538 
+2 2031 
+# diag switch set max-pkt-len port all length 2000
+```
\ 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
index f58def1..a3878ef 100644
--- a/_ont/ont-odi-realtek-dfp-34g-2c2.md
+++ b/_ont/ont-odi-realtek-dfp-34g-2c2.md
@@ -33,16 +33,18 @@ ssh -oKexAlgorithms=+diffie-hellman-group1-sha1 -oCiphers=+3des-cbc admin@192.16
 
 {% 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-220923 (hybrid by @lanseyujie and @stick86)
+- V1.0-220817
+- V1.0-220530 (hybrid by @stick86)
+- V1.0-220414 (vlan working)
 - V1.0-220304
+- V1.0-210702
 
 ## List of firmwares and files
-- [Firmware repository by Anime4000](https://github.com/Anime4000/RTL960x/tree/main/Firmware/V2801F)
+- [Firmware repository by Anime4000](https://github.com/Anime4000/RTL960x/tree/main/Firmware/DFP-34X-2C2)
 
-The reccomended version are `M114_sfp_ODI_hybrid_220527.tar` or `M114_sfp_ODI_hybrid_220916.tar` because it has working VLAN translation.  
+The reccomended version are `M114_sfp_ODI_Vlan_220414.tar`, `M114_sfp_ODI_hybrid_220527.tar` or `M114_sfp_ODI_hybrid_220916.tar` because it has working VLAN translation.  
 
 ## List of partitions
  
@@ -76,43 +78,7 @@ The stick has a TTL 3.3v UART console (configured as 115200 8-N-1) that can be a
 
 {% include alert.html content="Some USB TTL adapters label TX and RX pins the other way around: try to swap them if the connection doesn't work." alert="Note"  icon="svg-warning" color="yellow" %}
 
-{% 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
-```
+{% include_relative ont-luna-sdk-useful-commands.md flash='flash' ploam='hex' customSwVersionAlert='This needs the `OMCI_OLT_MODE` value to be set to 3 and firmware 220530 or 220923 modded by @stich86' speedLan='1234567' %}
 
 # Known Bugs
 
diff --git a/_ont/ont-odi-realtek-dfp-34x-2c2.md b/_ont/ont-odi-realtek-dfp-34x-2c2.md
index f20cfc5..d1e1f46 100644
--- a/_ont/ont-odi-realtek-dfp-34x-2c2.md
+++ b/_ont/ont-odi-realtek-dfp-34x-2c2.md
@@ -35,12 +35,15 @@ ssh -oKexAlgorithms=+diffie-hellman-group1-sha1 -oCiphers=+3des-cbc admin@192.16
 
 
 ## List of software versions
-- V1.0-220530 
-- V1.0-220414
+- V1.0-220923 (hybrid by @lanseyujie and @stick86)
+- V1.0-220817
+- V1.0-220530 (hybrid by @stick86)
+- V1.0-220414 (vlan working)
 - V1.0-220304
+- V1.0-210702
 
 ## List of firmwares and files
-- [Firmware repository by Anime4000](https://github.com/Anime4000/RTL960x/tree/main/Firmware/V2801F)
+- [Firmware repository by Anime4000](https://github.com/Anime4000/RTL960x/tree/main/Firmware/DFP-34X-2C2)
 
 The reccomended version are `M114_sfp_ODI_hybrid_220527.tar` or `M114_sfp_ODI_hybrid_220916.tar` because it has working VLAN translation.  
 
@@ -76,43 +79,7 @@ The stick has a TTL 3.3v UART console (configured as 115200 8-N-1) that can be a
 
 {% include alert.html content="Some USB TTL adapters label TX and RX pins the other way around: try to swap them if the connection doesn't work." alert="Note"  icon="svg-warning" color="yellow" %}
 
-{% include_relative luna-sdk-userful-commands.md 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
-```
+{% include_relative ont-luna-sdk-useful-commands.md flash='flash' ploam='hex' customSwVersionAlert='This needs the `OMCI_OLT_MODE` value to be set to 3 and firmware 220530 or 220923 modded by @stich86' speedLan='1234567' %}
 
 # Known Bugs
 
diff --git a/_ont/ont-t-w-twcgpon657.md b/_ont/ont-t-w-twcgpon657.md
index d09bd01..a92287d 100644
--- a/_ont/ont-t-w-twcgpon657.md
+++ b/_ont/ont-t-w-twcgpon657.md
@@ -34,13 +34,15 @@ parent: T&W
 
 - [Firmware repository by Anime4000](https://github.com/Anime4000/RTL960x/tree/main/Firmware/TWCGPON657)
 
-The reccomended version are `C00R657V2801F_V1.9.0-220404.tar` because it is the V2801F for T&W TWC GPON657
+The reccomended version are `C00R657V2801F_V1.9.0-220404.tar` because it is the V2801F firmware for T&W TWC GPON657.
+
+{% include_relative ont-luna-sdk-useful-commands.md flash='flash' ploam='ascii' speedLan='12345' customSpeedLanAlert='Please use recommended version `C00R657V2801F_V1.9.0-220404.tar`. Before editing the speed make sure your hardware supports it.' %}
 
 # Known Bugs
 
 VLAN swap issue (MEID 171), auto-sensing mode to switch between SGMII/HiSGMII
 
-You should use the VID/VLAN shown by executing the command "omcicli mib get 84" via telnet to bring up PPPoE
+You should use the VID/VLAN shown by executing the command `omcicli mib get 84` via telnet to bring up PPPoE
 
 
 # Miscellaneous Links
diff --git a/_ont/ont-technicolor-afm0002.md b/_ont/ont-technicolor-afm0002.md
index 41dde55..20612ab 100644
--- a/_ont/ont-technicolor-afm0002.md
+++ b/_ont/ont-technicolor-afm0002.md
@@ -82,21 +82,7 @@ This stick supports dual boot.
 
 `k0` and `r0` respectively contain the kernel and firmware of the first image, `k1` and `r1` the kernel and firmware of the second one
 
-# List of firmwares and files
-## Useful files
-- `/var/config/lastgood.xml` - Contains the user portion of the configuration
-- `/var/config/lastgood-hs.xml` - Contains the "hardware" configuration (which _should not_ be changed)
-- `/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
-- `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
-
-{% include_relative luna-sdk-userful-commands.md flash='/etc/scripts/flash' ploam='ascii' %}
+{% include_relative ont-luna-sdk-useful-commands.md flash='/etc/scripts/flash' ploam='ascii' lastgoodHs=true %}
 
 ## Enabling the Web UI
 ```sh
@@ -109,7 +95,7 @@ From the stick to the PC:
 ```sh
 # ssh admin@192.168.2.1 "cat /tmp/omcilog" > omcilog.log
 ```
-From the PC to the stick
+From the PC to the stick:
 ```sh
 # cat lastgood.xml | ssh admin@192.168.2.1  "cat > /var/config/lastgood.xml"
 ```
diff --git a/_ont/ont-technicolor-afm0003.md b/_ont/ont-technicolor-afm0003.md
index 30eedea..9fc88c7 100644
--- a/_ont/ont-technicolor-afm0003.md
+++ b/_ont/ont-technicolor-afm0003.md
@@ -70,27 +70,50 @@ This stick supports dual boot.
 
 `k0` and `r0` respectively contain the kernel and firmware of the first image, `k1` and `r1` the kernel and firmware of the second one
 
-# List of firmwares and files
-## Useful files
-- `/var/config/lastgood.xml` - Contains the user portion of the configuration
-- `/var/config/lastgood-hs.xml` - Contains the "hardware" configuration (which _should not_ be changed)
-- `/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
-- `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
-
-{% include_relative luna-sdk-userful-commands.md flash='/etc/scripts/flash' ploam='ascii' %}
+{% include_relative ont-luna-sdk-useful-commands.md flash='/etc/scripts/flash' ploam='ascii' speedLan='12345' customSpeedLanAlert='The defualt firmware does not allow modification of the `LAN_SDS_MODE` parameter. Is it necessary to use the modded firmware. Before editing the speed make sure your hardware supports it.' lastgoodHs=true %}
 
 ## Enabling the Web UI
 ```sh
 # /bin/iptables -D INPUT -p tcp --dport 80 -j DROP
 ```
 
+## Transfering files from/to the stick
+Works with binary files too, just run md5sum on source and destination to make sure you are not corrupting anything...
+From the stick to the PC:
+```sh
+# tftp <IP>
+tftp> put <filename> <directory>
+tftp> q
+```
+From the PC to the stick:
+```sh
+# tftp <IP>
+tftp> get <filename>
+tftp> q
+```
+
+## Extracting and repacking the rootfs
+{% include alert.html content="Make sure you run both commands as root, otherwise you might get a damaged rootfs image" alert="Warning" icon="svg-warning" color="red" %}
+
+```sh
+# unsquashfs mtd5.bin
+# mksquashfs squashfs-root rootfs -b 131072 -comp lzma -no-recovery
+```
+## Flashing a new rootfs
+
+{% include alert.html content="Only the inactive image can be flashed, change sw_versionX and sw_commit X based on the bank you have flashed" alert="Info" icon="svg-info" color="blue" %}
+
+So mtd4/5 if you are on image1, mtd6/7 if you are on image0.
+
+The following commands are used to flash a new rootfs to image1 and then boot to it
+```sh
+# flash_eraseall /dev/mtd7
+# cat /tmp/rootfs.new > /dev/mtd7
+# nv setenv sw_version1 NEW_SOFTWARE_VERSION
+# nv setenv sw_commit 1
+# reboot
+```
+
 # Miscellaneous Links
 
 - [omcilog2pcap](https://github.com/hack-gpon/omcilog2pcap)
diff --git a/_ont/ont-ufiber-uf-instant.md b/_ont/ont-ufiber-uf-instant.md
index edbebaa..1b3a79b 100644
--- a/_ont/ont-ufiber-uf-instant.md
+++ b/_ont/ont-ufiber-uf-instant.md
@@ -51,7 +51,7 @@ parent: UFiber
 
 VLAN swap issue (MEID 171), auto-sensing mode to switch between SGMII/HiSGMII
 
-You should use the VID/VLAN shown by executing the command "omcicli mib get 84" via telnet to bring up PPPoE
+You should use the VID/VLAN shown by executing the command `omcicli mib get 84` via telnet to bring up PPPoE
 
 
 # Miscellaneous Links
diff --git a/_ont/ont-vsol-v2801f.md b/_ont/ont-vsol-v2801f.md
index 874c49a..fdc2b60 100644
--- a/_ont/ont-vsol-v2801f.md
+++ b/_ont/ont-vsol-v2801f.md
@@ -35,11 +35,13 @@ parent: VSOL
 
 The reccomended version are `V2801F_V1.9.0-220425.tar` because it has Modern WebGUI, 2.5GbE, patched `runlansds.sh`, `tftpd`, ...
 
+{% include_relative ont-luna-sdk-useful-commands.md flash='flash' ploam='ascii' speedLan='12345' customSpeedLanAlert='Please use recommended version `V2801F_V1.9.0-220425.tar`. Before editing the speed make sure your hardware supports it.' %}
+
 # Known Bugs
 
 VLAN swap issue (MEID 171), auto-sensing mode to switch between SGMII/HiSGMII
 
-You should use the VID/VLAN shown by executing the command "omcicli mib get 84" via telnet to bring up PPPoE
+You should use the VID/VLAN shown by executing the command `omcicli mib get 84` via telnet to bring up PPPoE
 
 # Miscellaneous Links