Skip to content

Commit 22dfb8f

Browse files
Update - README's w/ prettier
validate-lines
1 parent ed95f8d commit 22dfb8f

File tree

10 files changed

+159
-108
lines changed

10 files changed

+159
-108
lines changed

README.md

Lines changed: 59 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
![CI Build Status](https://github.com/classicrocker883/MRiscoCProUI/actions/workflows/ci-build-tests.yml/badge.svg)
66
[![Latest Firmware Build](https://github.com/classicrocker883/MRiscoCProUI/actions/workflows/compile-release.yml/badge.svg?event=release)](https://github.com/classicrocker883/MRiscoCProUI/releases) <sup>- Link to latest releases</sup>
77

8-
### Visit the [Wiki](https://github.com/classicrocker883/MRiscoCProUI/wiki) for more information about *this* firmware and the features it provides
8+
### Visit the [Wiki](https://github.com/classicrocker883/MRiscoCProUI/wiki) for more information about _this_ firmware and the features it provides
99

1010
<br>
1111

@@ -33,18 +33,19 @@ I designed and made it to be used for upgrading the hotend.**
3333
---
3434

3535
## Universal Firmware for RET6/RCT6 chips:
36+
3637
G32, N32, H32, Creality 4.2.7 and 4.2.2 boards<br>
3738
**_<sup><sub>(Also available for E3 Free-runs, BTT SKR Mini E3, STM32F401, GD32F303, and others)</sub></sup>_**
3839

3940
> [!IMPORTANT]
4041
> **Please read the following:**
4142
4243
> [!NOTE]
43-
Many Updates have been included in the most recent MRiscoCProUI for the **2025-August** release.
44-
This release has many changes to the **UI**.
45-
New ICON's have been added, and old ones enhanced. Whoever edited them before saved directly as .*JPG* which in many editors lowers the quality of the image. I painstakingly remastered almost every single one; preserving the original quality.
44+
> Many Updates have been included in the most recent MRiscoCProUI for the **2025-August** release.
45+
> This release has many changes to the **UI**.
46+
> New ICON's have been added, and old ones enhanced. Whoever edited them before saved directly as ._JPG_ which in many editors lowers the quality of the image. I painstakingly remastered almost every single one; preserving the original quality.
4647
>
47-
> > You must [REFLASH](https://github.com/classicrocker883/MRiscoCProUI/wiki/HOW-TO-UPDATE-THE-DISPLAY) the *LCD Display* with the new **DWIN_SET**; which is located in the `display assets` folder.
48+
> > You must [REFLASH](https://github.com/classicrocker883/MRiscoCProUI/wiki/HOW-TO-UPDATE-THE-DISPLAY) the _LCD Display_ with the new **DWIN_SET**; which is located in the `display assets` folder.
4849
>
4950
> If you encounter any issues, have a suggestion, or feature requests please feel free to post it on the [Issues tab](https://github.com/classicrocker883/MRiscoCProUI/issues), otherwise if everything is going well please leave a comment on the [Discussions tab](https://github.com/classicrocker883/MRiscoCProUI/discussions).
5051
>
@@ -66,15 +67,16 @@ New ICON's have been added, and old ones enhanced. Whoever edited them before sa
6667
> <ins>**FOREWARNING**</ins>: So far everything has been working great - as normal - except there is an issue with the initialization of the SD card media. If you get a message saying this has failed, just reinsert the card or reboot. Keep trying if this doesn't work the first time.
6768
6869
> [!CAUTION]
69-
> *G-code Thumbnail Preview* has been disabled for HC32 boards for the time being.
70-
> When enabled, the screen may **freeze and restart** when the SD card is inserted. This means that everything *so far* seems to work correctly as it should, except for when an **SD card is inserted**, so printing may not be possible *unless* you use USB serial interface to upload the file (through a slicer or something like OctoPrint, or Pronterface).
70+
> _G-code Thumbnail Preview_ has been disabled for HC32 boards for the time being.
71+
> When enabled, the screen may **freeze and restart** when the SD card is inserted. This means that everything _so far_ seems to work correctly as it should, except for when an **SD card is inserted**, so printing may not be possible _unless_ you use USB serial interface to upload the file (through a slicer or something like OctoPrint, or Pronterface).
7172
7273
> [!NOTE]
7374
> H32->HC32 support has been added to the [Marlin Firmware](https://github.com/MarlinFirmware/Marlin) repository. Please post any [Issues](https://github.com/MarlinFirmware/Marlin/issues) there first, otherwise if there are any ProUI specific issues or anything else to report please do so under [Issues tab](https://github.com/classicrocker883/MRiscoCProUI/issues) here. You can find the original HC32 repo here [@shadow578/Marlin-H32](https://github.com/shadow578/Marlin-H32)
7475
7576
<br>
7677

7778
#### Other Information:
79+
7880
General information about the firmware and updates is located in the _Wiki_ page [What's New In This Release](https://github.com/classicrocker883/MRiscoCProUI/wiki/What's-New-in-this-Release). <br>
7981
Other changes and updates are [addressed here](https://github.com/classicrocker883/MRiscoCProUI/releases/latest).
8082

@@ -83,14 +85,15 @@ Other changes and updates are [addressed here](https://github.com/classicrocker8
8385
- [IS - Input Shaping](https://marlinfw.org/docs/features/input_shaping.html)
8486
- [Firmware Retract](https://marlinfw.org/docs/features/fwretract.html)
8587

86-
8788
<br>
8889

8990
### MarlinSimulator Instructions
90-
There is a *MarlinSimulator* file provided to test out for yourself. It simulates a pre-built configuration of this firmware.
9191

92-
The *MarlinSimulator* can compile for Manual Mesh Bed Leveling or Auto Bed Leveling w/`BLTOUCH` enabled.
92+
There is a _MarlinSimulator_ file provided to test out for yourself. It simulates a pre-built configuration of this firmware.
93+
94+
The _MarlinSimulator_ can compile for Manual Mesh Bed Leveling or Auto Bed Leveling w/`BLTOUCH` enabled.
9395
Start in **Configuration.h** and change `MOTHERBOARD` to `BOARD_SIMULATED`, then disable `ENDSTOP_INTERRUPTS_FEATURE` and `PROUI_EX`:
96+
9497
```y
9598
#ifndef MOTHERBOARD
9699
#define MOTHERBOARD BOARD_SIMULATED
@@ -100,9 +103,11 @@ Start in **Configuration.h** and change `MOTHERBOARD` to `BOARD_SIMULATED`, then
100103
---
101104
//#define PROUI_EX 1
102105
```
106+
103107
<br>
104108

105109
Then in **platformio.ini** for `default_envs =` change to `simulator_windows` (for Windows) | `simulator_linux_release` (for Linux):
110+
106111
```ini
107112
default_envs = simulator_windows
108113
---
@@ -112,62 +117,74 @@ default_envs = simulator_linux_release
112117
For MacOS you're on your own...sorry.
113118

114119
#### Install Files (Windows)
120+
115121
If you haven't already, you must install the SDL2 library.
116122
**SDL2-devel-2.32.2-mingw.zip** is provided for in /**docs**.
117-
Or get the latest release at [libsdl-org/SDL/releases](https://github.com/libsdl-org/SDL/releases) and look for **SDL2** version (**NOT** *SDL3*)
118-
You can *either* copy/paste the files directly, or install them.
123+
Or get the latest release at [libsdl-org/SDL/releases](https://github.com/libsdl-org/SDL/releases) and look for **SDL2** version (**NOT** _SDL3_)
124+
You can _either_ copy/paste the files directly, or install them.
119125
It's recommended to install them, but if you have any issues, then try the alternative copy/paste method.
120126

121-
Navigate to the extracted SDL2 directory in an *MSYS2* or *bash* terminal (Run as Administrator):
127+
Navigate to the extracted SDL2 directory in an _MSYS2_ or _bash_ terminal (Run as Administrator):
122128

123129
To install SDL for native (32-bit) development:
130+
124131
> make native
125132
126133
To install SDL for cross-compiling development:
134+
127135
> make cross
128136
129137
It's recommended to do both `make native` and `make cross`.
130138

131139
For 64-bit - If you receive an error, then try the following:
140+
132141
> make install-package arch=x86_64-w64-mingw32 prefix=/usr
133142
134143
#### Alternative SDL2 Install
144+
135145
**Copy/Paste Files**
136146
You may have to first Build so the directory can be created, but you can:
137-
- **Copy** the contents of ~\SDL2-2.32.2\x86_64-w64-mingw32\include\\**SDL2**\\*, paste into the directory .pio\libdeps\simulator_windows\\**imgui**
147+
148+
- **Copy** the contents of ~\SDL2-2.32.2\x86_64-w64-mingw32\include\\**SDL2**\\\*, paste into the directory .pio\libdeps\simulator_windows\\**imgui**
138149

139150
-OR-
140151

141152
- **Copy** the just folder ~\SDL2-2.32.2\x86_64-w64-mingw32\include\\**SDL2**, paste into the directory .pio\libdeps\\**simulator_windows**
142153

143-
Once all that is done, just Build like you would normally and *MarlinSimulator.exe* will be created.
154+
Once all that is done, just Build like you would normally and _MarlinSimulator.exe_ will be created.
144155

145156
#### Install Files (Linux)
157+
146158
These are the files you need to install:
147159
`sudo apt install libsdl2 libsdl2-dev libsdl2-net-dev libsdl2-2.0-0 libglm-dev`
160+
148161
- There may be other basic ones if you don't have already; like python, cmake, pip...
149162

150163
#### Using MarlinSimulator
164+
151165
Before building, open a terminal and run `./buildroot/share/scripts/simulator_error.sh`, or change the following manually:
166+
152167
- Replace `#define INVERT_E0_DIR HMI_data.Invert_E0` with `#define INVERT_E0_DIR false` (or comment it and `#undef INVERT_E0_DIR` out) in **proui/dwin_defines.h**.
153168
- Comment out `#undef Z_MIN_ENDSTOP_HIT_STATE` in **inc/Conditionals-5-post.h**.
154169
- Replace `-flto` with `-fno-lto` at `release_flags =` under `[simulator_common]` in **native.ini**.
155170

156-
157-
- Open the executable program found in **.pio\build\simulator_<windows|linux_release>**.
158-
- - For Windows, *MarlinSimulator.exe*
171+
- Open the executable program found in **.pio\build\simulator\_<windows|linux_release>**.
172+
- - For Windows, _MarlinSimulator.exe_
159173
- - For Linux, enter in a terminal: `./MarlinSimulator`
160174

161175
How to use:
176+
162177
- Under `SD Card`, under `Components` on the right side, select or load an image.
163-
- - To simulate an actual print, you may need to use a *.img* file containing the *.gcode*.
178+
- - To simulate an actual print, you may need to use a _.img_ file containing the _.gcode_.
164179
- Select Serial Monitor(1) if you do not see any output.
165180
- Use like a normal terminal, enter `G28` to watch it Home for example.
166181

167182
<br>
168183

169184
### Printer Information
170-
The Precompiled binary files of this firmware can work with STM32 (STM32F103RET6/RCT6 - STMicroelectronics) and it's clones:
185+
186+
The Precompiled binary files of this firmware can work with STM32 (STM32F103RET6/RCT6 - STMicroelectronics) and it's clones:
187+
171188
- G32 (GD32F103Rx - GigaDevice)
172189
- N32 (N32F103Rx / N32G455x - Nation)
173190
- H32 (HC32F460x - Huada Semiconductor/HDSC)
@@ -185,38 +202,42 @@ They can be downloaded here:
185202
<br>
186203

187204
## Donations
205+
188206
Thank you for your support.
189207
Please consider making a donation, as large or as small and as often as you'd like.
190208
[Ko-fi](https://ko-fi.com/classicrocker883)
191209
[Venmo](https://venmo.com/u/andrewleduc88)
192210
[Paypal](https://www.paypal.com/paypalme/andrewleduc) - **Single payment**
193211

194-
[<img src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif">](https://www.paypal.com/donate/?business=PFNSKQX9WQQ8W&no_recurring=0&currency_code=USD) **PayPal - Monthly Payment**
212+
[<img src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif">](https://www.paypal.com/donate/?business=PFNSKQX9WQQ8W&no_recurring=0&currency_code=USD) - **PayPal: Monthly Payment**
195213

196214
<br>
197215

198216
## Wiki
199-
- [How to install the firmware](https://github.com/classicrocker883/MRiscoCProUI/wiki/How-to-install-the-firmware)
200-
- [Installing a 3D/BLTouch](https://github.com/classicrocker883/MRiscoCProUI/wiki/3D-BLTouch)
201-
- [Color themes](https://github.com/classicrocker883/MRiscoCProUI/wiki/Color-Themes)
202-
- [How to use with Octoprint](https://github.com/classicrocker883/MRiscoCProUI/wiki/Octoprint)
217+
218+
- [How to install the firmware](https://github.com/classicrocker883/MRiscoCProUI/wiki/How-to-install-the-firmware)
219+
- [Installing a 3D/BLTouch](https://github.com/classicrocker883/MRiscoCProUI/wiki/3D-BLTouch)
220+
- [Color themes](https://github.com/classicrocker883/MRiscoCProUI/wiki/Color-Themes)
221+
- [How to use with Octoprint](https://github.com/classicrocker883/MRiscoCProUI/wiki/Octoprint)
203222

204223
<br>
205224

206225
## Community links
207-
* [Voxelab Aquila Facebook Group](https://www.facebook.com/groups/voxelabaquila/?ref=share&mibextid=NSMWBT)
208-
* [Telegram](https://t.me/ender3v2s1firmware)
209-
* [r/VoxelabAquila on Reddit](https://www.reddit.com/r/VoxelabAquila)
210-
* [r/ender3V2 on Reddit](https://www.reddit.com/r/ender3v2)
211-
* [r/Ender3v2Firmware on Reddit](https://www.reddit.com/r/Ender3v2Firmware)
212-
* [E3V2 Facebook](https://www.facebook.com/groups/ender3v2firmware)
213-
* [E3S1 Facebook](https://www.facebook.com/groups/ender3s1printer)
226+
227+
- [Voxelab Aquila Facebook Group](https://www.facebook.com/groups/voxelabaquila/?ref=share&mibextid=NSMWBT)
228+
- [Telegram](https://t.me/ender3v2s1firmware)
229+
- [r/VoxelabAquila on Reddit](https://www.reddit.com/r/VoxelabAquila)
230+
- [r/ender3V2 on Reddit](https://www.reddit.com/r/ender3v2)
231+
- [r/Ender3v2Firmware on Reddit](https://www.reddit.com/r/Ender3v2Firmware)
232+
- [E3V2 Facebook](https://www.facebook.com/groups/ender3v2firmware)
233+
- [E3S1 Facebook](https://www.facebook.com/groups/ender3s1printer)
214234

215235
<!--[](https://raw.githubusercontent.com/mriscoc/Ender3V2S1/Ender3V2S1-Released/screenshots/main.jpg)-->
216236

217237
<br>
218238

219239
## Marlin Support
240+
220241
The Issue Queue is reserved for Bug Reports and Feature Requests. Please use the following resources for help with configuration and troubleshooting:
221242

222243
- [Marlin Documentation](//marlinfw.org) - Official Marlin documentation
@@ -229,13 +250,16 @@ The Issue Queue is reserved for Bug Reports and Feature Requests. Please use the
229250
<br>
230251

231252
## Credits
253+
232254
Thanks to Reddit u/schuh8 and GitHub @whasupjohn for donating his board to help test the firmware.
255+
233256
<p>
234257
<details>
235258
<summary>Find me</summary>
236259
On <a href="https://www.facebook.com/yoboyyy">Facebook</a>
237260

238261
On Reddit: u/<b>In*Us*2</b> - not actually, but if you know, you know
262+
239263
</details>
240264
</p>
241265

@@ -252,6 +276,7 @@ Marlin is maintained mainly by [@thinkyhead](https://github.com/thinkyhead)
252276
<br>
253277

254278
## Star History
279+
255280
<a id="starchart" href="https://star-history.com/#classicrocker883/MRiscoCProUI&Date">
256281
<picture>
257282
<source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=classicrocker883/MRiscoCProUI&type=Date&theme=dark" />
@@ -275,9 +300,11 @@ Thank goodness for VS Code's compiler and also AI like ChatGPT which shows me wh
275300
<br>
276301

277302
## Disclaimer
303+
278304
THIS FIRMWARE AND ALL OTHER FILES IN THE DOWNLOAD ARE PROVIDED FREE OF CHARGE WITH NO WARRANTY OR GUARANTEE. SUPPORT IS NOT INCLUDED JUST BECAUSE YOU DOWNLOADED THE FIRMWARE. WE ARE NOT LIABLE FOR ANY DAMAGE TO YOUR PRINTER, PERSON, OR ANY OTHER PROPERTY DUE TO USE OF THIS FIRMWARE. IF YOU DO NOT AGREE TO THESE TERMS THEN DO NOT USE THE FIRMWARE.
279305

280306
<br>
281307

282308
## LICENSE
309+
283310
For the license, check the header of each file, if the license is not specified there, the project license will be used. Marlin is licensed under the GPL.

configurations/README.md

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
More configuration files at: https://github.com/mriscoc/Special_Configurations
22

33
## EXPERIMENTAL
4-
### Redefine the configuration settings
54

6-
**_Define_Configuration.h**
7-
**_Define_Configuration_adv.h**
8-
**_Undef_Configuration.h**
9-
**_Undef_Configuration_adv.h**
5+
### Redefine the configuration settings
6+
7+
**\_Define_Configuration.h**
8+
**\_Define_Configuration_adv.h**
9+
**\_Undef_Configuration.h**
10+
**\_Undef_Configuration_adv.h**
11+
12+
#### To use:
1013

11-
#### To use:
1214
Within **Marlin/src/inc/MarlinConfigPre.h**, look for the `#include` of these files above and uncomment them.
1315

1416
In the _Undef_ file, look for the setting you wish to change and uncomment it.
@@ -17,30 +19,35 @@ In the _Undef_ file, look for the setting you wish to change and uncomment it.
1719
Then, go to _Defines_ file, uncomment the setting which you just `#undef` and change to whatever.
1820
(i.e. `// #define MOTHERBOARD` => `#define MOTHERBOARD BOARD_CREALITY_V4`)
1921

20-
>[!NOTE]
21-
>This is the process to which I used creating these files.
22-
I went into a **bash** terminal and entered these commands:
22+
> [!NOTE]
23+
> This is the process to which I used creating these files.
24+
> I went into a **bash** terminal and entered these commands:
25+
>
26+
> Step 1. Create the _Define_ file
27+
>
28+
> ```
29+
> grep -o -P '#define.*?(?=\s*//|$)' input_file.h > output_file.h
30+
> ```
31+
>
32+
> - Take the input_file (e.g. **Configuration.h**) and output_file (e.g. **\_Define_Configuration.h**)
33+
>
34+
> <br>
35+
>
36+
> Step 2. Create the _Undef_ file
2337
>
24-
>Step 1. Create the _Define_ file
25-
>```
26-
>grep -o -P '#define.*?(?=\s*//|$)' input_file.h > output_file.h
27-
>```
28-
>- Take the input_file (e.g. **Configuration.h**) and output_file (e.g. **_Define_Configuration.h**)
38+
> ```
39+
> grep -o -P '#define\s+\w+' output_file.h > output_file_undef.h
40+
> ```
2941
>
30-
><br>
42+
> - Takes the output_file (e.g. **\_Define_Configuration.h**) of the first command, and removes all the defined values (e.g. **\_Undef_Configuration.h**)
3143
>
32-
>Step 2. Create the _Undef_ file
33-
>```
34-
>grep -o -P '#define\s+\w+' output_file.h > output_file_undef.h
35-
>```
36-
>- Takes the output_file (e.g. **_Define_Configuration.h**) of the first command, and removes all the defined values (e.g. **_Undef_Configuration.h**)
44+
> <br>
3745
>
38-
><br>
46+
> Step 2a. Rename all `#define` to `#undef`
3947
>
40-
>Step 2a. Rename all `#define` to `#undef`
48+
> <br>
4149
>
42-
><br>
50+
> Step 3. Add the comment '//' to the beginning of the line. Do this to both files:
4351
>
44-
>Step 3. Add the comment '//' to the beginning of the line. Do this to both files:
4552
> - Select All 'Ctrl+A'
4653
> - Toggle Line Comment 'Ctrl+/' or 'Ctrl+K Ctrl+C'
Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
## Using DWIN Icon Tool
22

33
### Splitting .ICO FIle
4-
* Paste .ICO file into this folder
5-
* Run Split-ICO.bat (windows only)
6-
* A new folder should appear containing all icons
4+
5+
- Paste .ICO file into this folder
6+
- Run Split-ICO.bat (windows only)
7+
- A new folder should appear containing all icons
78

89
### Creating a .ICO File
9-
* Paste in a folder full of DWIN icons
10-
* Add "-Icons" to the end of the folder name
11-
* Make sure there are no spaces in the name
12-
* Run Create-ICO.bat (windows only)
13-
* A .ICO file should appear
10+
11+
- Paste in a folder full of DWIN icons
12+
- Add "-Icons" to the end of the folder name
13+
- Make sure there are no spaces in the name
14+
- Run Create-ICO.bat (windows only)
15+
- A .ICO file should appear

0 commit comments

Comments
 (0)