updated final fly-e3-v2 pages

Mellow-3D · Feb 17, 2024 · c3fec63 · c3fec63
1 parent 9e3afde
commit c3fec63
Show file tree

Hide file tree

Showing 15 changed files with 323 additions and 210 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,4 @@
 source "https://rubygems.org"
 
 gem 'wdm'
-gem 'jekyll'
-gem "webrick", "~> 1.7"
+gem 'jekyll'
diff --git a/Gemfile.bak b/Gemfile.bak
@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem 'wdm'
+gem 'jekyll'
+gem "webrick", "~> 1.7"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,20 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.3)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.15.5-x64-mingw-ucrt)
+    ffi (1.16.3-x64-mingw-ucrt)
     forwardable-extended (2.6.0)
+    google-protobuf (3.25.3-x64-mingw-ucrt)
     http_parser.rb (0.8.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jekyll (4.3.0)
+    jekyll (4.3.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -30,43 +31,42 @@ GEM
       safe_yaml (~> 1.0)
       terminal-table (>= 1.8, < 4.0)
       webrick (~> 1.7)
-    jekyll-sass-converter (2.2.0)
-      sassc (> 2.0.1, < 3.0)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.7.1)
+    liquid (4.0.4)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.0)
+    public_suffix (5.0.4)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (4.0.0)
+    rexml (3.2.6)
+    rouge (4.2.0)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
+    sass-embedded (1.71.0-x64-mingw-ucrt)
+      google-protobuf (~> 3.25)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.5.0)
     wdm (0.1.1)
-    webrick (1.7.0)
+    webrick (1.8.1)
 
 PLATFORMS
   x64-mingw-ucrt
 
 DEPENDENCIES
   jekyll
   wdm
-  webrick (~> 1.7)
 
 BUNDLED WITH
-   2.3.24
+   2.5.6
diff --git a/Gemfile.lock.bak b/Gemfile.lock.bak
@@ -0,0 +1,72 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    colorator (1.1.0)
+    concurrent-ruby (1.1.10)
+    em-websocket (0.5.3)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0)
+    eventmachine (1.2.7)
+    ffi (1.15.5-x64-mingw-ucrt)
+    forwardable-extended (2.6.0)
+    http_parser.rb (0.8.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.3.0)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 1.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 2.3, >= 2.3.1)
+      kramdown-parser-gfm (~> 1.0)
+      liquid (~> 4.0)
+      mercenary (>= 0.3.6, < 0.5)
+      pathutil (~> 0.9)
+      rouge (>= 3.0, < 5.0)
+      safe_yaml (~> 1.0)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
+    jekyll-sass-converter (2.2.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-watch (2.2.1)
+      listen (~> 3.0)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.4.0)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    public_suffix (5.0.0)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rexml (3.2.5)
+    rouge (4.0.0)
+    safe_yaml (1.0.5)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    unicode-display_width (2.3.0)
+    wdm (0.1.1)
+    webrick (1.7.0)
+
+PLATFORMS
+  x64-mingw-ucrt
+
+DEPENDENCIES
+  jekyll
+  wdm
+  webrick (~> 1.7)
+
+BUNDLED WITH
+   2.3.24
diff --git a/_data/sidebars/mydoc_sidebar.yml b/_data/sidebars/mydoc_sidebar.yml
@@ -263,7 +263,7 @@ children:
         children:
 
         - title: Step 1 - Katapult on USB
-          url: fly_e3_v2_canboot_usb.html
+          url: fly_e3_v2_katapult_usb.html
           output: web, pdf  
 
         - title: Step 2 - Klipper on USB
@@ -278,8 +278,8 @@ children:
         output: web
         children:
 
-        - title: Step 1 - CanBoot on USB to CAN Bridge Mode
-          url: fly_e3_v2_canboot_usb2can.html
+        - title: Step 1 - Katapult on USB to CAN Bridge Mode
+          url: fly_e3_v2_katapult_usb2can.html
           output: web, pdf  
 
         - title: Step 2 - Klipper on USB to CAN Bridge Mode
@@ -294,15 +294,15 @@ children:
         output: web
         children:  
 
-        - title: Step 1 - CanBoot on CANbus
-          url: fly_e3_v2_canboot_can.html
+        - title: Step 1 - Katapult on CAN bus
+          url: fly_e3_v2_katapult_can.html
           output: web, pdf   
 
-        - title: Step 2 - Klipper on CANbus
+        - title: Step 2 - Klipper on CAN bus
           url: fly_e3_v2_klipper_can.html
           output: web, pdf
 
-        - title: Updating Klipper on CANbus
+        - title: Updating Klipper on CAN bus
           url: fly_e3_v2_klipper_can_updating.html
           output: web, pdf
 
@@ -318,8 +318,8 @@ children:
       output: web, pdf
       children:
 
-      - title: Coming Soon
-        url: "https://marlinfw.org/"
+      - title: Native Support
+        url: "https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.1.x/Marlin/src/pins/stm32f4/pins_MELLOW_FLY_E3_V2.h"
         output: web, pdf
 
     - title: RepRapFirmware

diff --git a/_includes/custom/klipper/menuconfig.html b/_includes/custom/klipper/menuconfig.html
@@ -67,6 +67,30 @@
   - USB ids {{page.usb_ids}}
   - {{page.gpio_startup}} GPIO pins to set at micro-controller startup
 {% endif %}
+{% if {{page.mcu}} == "STM32" and {{page.firmware}} == "USB2CAN" %}
+- Set the following settings
+  - {{page.low_level}} Enable extra low-level configuration options
+  - Micro-controller Architecture {{ page.architecture }}
+  - Processor model {{page.processor}}
+  - Bootloader offset {{page.bootloader_offset}}
+  - Clock Reference {{page.clock}}
+  - Communication interface {{page.communication}}
+  - CAN bus interface {{page.can_bus_interface}}
+  - USB ids {{page.usb_ids}}
+  - {{page.can_bus_speed}} CAN bus speed
+  - {{page.gpio_startup}} GPIO pins to set at micro-controller startup
+{% endif %}
+{% if {{page.mcu}} == "STM32" and {{page.firmware}} == "CANbus" %}
+- Set the following settings
+  - {{page.low_level}} Enable extra low-level configuration options
+  - Micro-controller Architecture {{ page.architecture }}
+  - Processor model {{page.processor}}
+  - Bootloader offset {{page.bootloader_offset}}
+  - Clock Reference {{page.clock}}
+  - Communication interface {{page.communication}}
+  - {{page.can_bus_speed}} CAN bus speed
+  - {{page.gpio_startup}} GPIO pins to set at micro-controller startup
+{% endif %}
 
     {% include image.html file=klipper_img1 url=klipper_url1 alt=klipper_cap1 caption=klipper_cap1 %}
 

diff --git a/...boards/fly-e3_v2/fly_e2_v2_canboot_can.md → ...oards/fly-e3_v2/fly_e2_v2_katapult_can.md b/...boards/fly-e3_v2/fly_e2_v2_canboot_can.md → ...oards/fly-e3_v2/fly_e2_v2_katapult_can.md
@@ -1,11 +1,11 @@
 ---
-title: Fly-E3-v2 CanBoot bootloader for CAN bus
+title: Katapult Configuration for the Fly-E3-v2 on CAN
 tags: []
 keywords: 
-last_updated: 04/09/2023
-summary: "Fly-E3-v2 CanBoot bootloader for CAN bus"
+last_updated: 17/02/2024
+summary: "How to Configure Katapult for CAN bus Operation on the Fly-E3-v2"
 sidebar: mydoc_sidebar
-permalink: fly_e3_v2_canboot_can.html
+permalink: fly_e3_v2_katapult_can.html
 folder: mydoc
 comments: false
 toc: true
@@ -14,7 +14,6 @@ datatable: true
 boardname: Fly-E3-v2
 firmware: CANbus
 mcu: "STM32"
-version: v1
 kconfig_name: e3v2
 architecture: "(STMicroelectronics STM32)"
 processor: "(STM32F407)"
@@ -40,11 +39,11 @@ katapult_img3: "fly-e3_v2/fly-e3_v2_reset.png"
 katapult_cap3: "Fly-E3-v2 reset button"
 
 installKlipperURL: "./fly_e3_v2_klipper_can.html"
-installKlipperName: "Klipper for CANbus configuration section"
+installKlipperName: "Klipper for CAN bus configuration section"
 
 ---
 
-## Configuring and installing CanBoot bootloader for CAN bus
+## Configuring and installing Katapult bootloader for CAN bus
 
 {% include custom/katapult/compile.html %}
 

diff --git a/pages/mydoc/fly_boards/fly-e3_v2/fly_e3_v2.md b/pages/mydoc/fly_boards/fly-e3_v2/fly_e3_v2.md
@@ -2,7 +2,7 @@
 title: Fly-E3-v2 General Information
 tags: []
 keywords: 
-last_updated: 09/07/2023
+last_updated: 17/02/2024
 summary: "General information regarding the Fly-E3-v2"
 sidebar: mydoc_sidebar
 permalink: fly_e3_v2.html
@@ -55,25 +55,28 @@ caption=fly_e3_v2_cap1
 %}
 
 ### Overview
+
 This page covers any general information for the Fly-E3-v2 board.
 It is currently available through [AliExpress](https://s.click.aliexpress.com/e/_Dm8O04D).
 
 {% include tip.html content="You need to also buy the WiFi module from Mellow to be able to use RRF with this board." %}
 
 ### Features
- - 32-bit ARM Cortex-M4 series 168 MHz, STM32F407ZGT6 chip
- - Supported Firmware: Marlin 2.0, Reprap, and Klipper
- - Drivers supported: A4988, LV8729, DRV8225, TMC2208, 2209, & 5160
- - Drive mode support: TMC: UART, & SPI
- - Support for 5 independent motor drives, 2 extruders, and 4 PWM fans
- - All drivers sockets support up to 24 volts.
- - Supported Displays: serial touch screen, 12864 LCD, 2004 LCD , FLY 4.3, & 7.0 V1
- - Supports automatic bed leveling sensor: BLTouch
- - Onboard CAN bus transciever. 
- - Optional  WiFi module supported with Reprap firmware.
- - PWM Fan MOS boards can be directly replaced in case of damage.
+
+- 32-bit ARM Cortex-M4 series 168 MHz, STM32F407ZGT6 chip
+- Supported Firmware: Marlin 2.0, Reprap, and Klipper
+- Drivers supported: A4988, LV8729, DRV8225, TMC2208, 2209, & 5160
+- Drive mode support: TMC: UART, & SPI
+- Support for 5 independent motor drives, 2 extruders, and 4 PWM fans
+- All drivers sockets support up to 24 volts.
+- Supported Displays: serial touch screen, 12864 LCD, 2004 LCD , FLY 4.3, & 7.0 V1
+- Supports automatic bed leveling sensor: BLTouch
+- Onboard CAN bus transciever.
+- Optional  WiFi module supported with Reprap firmware.
+- PWM Fan MOS boards can be directly replaced in case of damage.
 
 ### Driver Jumpers
+
 The jumpers should be installed as below. “Common Interpolation” should be used for standalone drivers. “SPI mode Interpolation” is supported for TMC5160 drivers. “UART mode Interpolation” should be used when using smart drivers (i.e. TMC2208, TMC2209, TMC2225 and TMC2226)
 
 {% 
@@ -85,14 +88,23 @@ caption=fly_e3_v2_cap2
 %}
 
 ### Driver Diag Pin
+
 The driver diag pin is used for sensorless homing and stall detection.
 The Fly-E3-v2 does not have a way of disabling the diag pin as it is designed to be used with Fly-2209 drivers which have a switch on the underside of them for disabling the diag pin.
 If you plan on using endstops rather than sensorless homing and do not have the Fly-2209 drivers, you need to bend or remove the diag pin.
 
+### Fan Mosfets
+
+The Fly-E3-v2 has a unique feature in that the fan mosfets are replaceable.
+Each mosfet (VS3622e) controls two of the fan outputs.
+The orientation that the fan mostfet is plugged into the board doesn't matter.
+
 ### Input voltage
+
 The board can handle an input voltage up to 32v.
 
 ### Initial Installation
+
 The board that you will receive doesn’t have any firmware installed so when plugged into a computer, the board will show as an unidentified device.
 
 ### Dimensions
@@ -105,4 +117,4 @@ alt=fly_e3_v2_cap3
 caption=fly_e3_v2_cap3
 %}
 
-{% include custom/mcu/e3v2/fly_e3_v2_links.html %}
+{% include custom/mcu/e3v2/fly_e3_v2_links.html %}