[2.0.x] Azteeg X5 Mini WiFi#11499
[2.0.x] Azteeg X5 Mini WiFi#11499ModMike wants to merge 1770 commits intoMarlinFirmware:bugfix-2.0.xfrom ModMike:bugfix-2.0.x
Conversation
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
Fix #10817 Co-Authored-By: cdedwards <cd.edwards@sasktel.net>
[1.1.x] Malyan LCD compatibility
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
|
P#P, the only place this works is in boards.h file but it's rejected because of conflicts |
|
You can't put it in boards.h. See the pins_SMOOTHIEBOARD.h in the PR that was applied yesterday that I did for the Smoothieboard. Perhaps you need to PR the main branch back to your fork first. |
|
Ok I used your example but it wouldn't compile. So I updated my Platform IO (everything including Atom) and now I get this: |
|
Your Marlin source is not up to date, I hotfixed the platformio issue by restricting the build to a specific nxplpc platform version. I reported the F_CPU bug to them and it was patched in 3.4.1 now we have this new issue, they always give me nice things to fix but it will build with the current Marlin bugfix-2.0.x. |
|
Ok everything fixed and verified. Will sync now. |
|
I think everything is fixed. By the way, whats the easiest way to update my branch from the upstream branch? Do I have to install a repo locally? |
|
In general the work flow I use is to create a fork (as you have) clone that locally then add a new remote called upstream that targets To get your local repository and fork on github up to date you would Never work directly on the bugfix2.0.x branch, create a new branch for your work. You may get merge conflicts at this point that will need resolved, after doing that push the pr branch up to your fork on github. |
|
In Windows, Github desktop can be used to sync from Github to your computer. |
GadgetNutt
left a comment
There was a problem hiding this comment.
I believe there is a problem in your boards.h file. It shows you removing the BOARD_SMOOTHIEBOARD and doesn't show the one you are wanting to add.
|
Yes I messed up the Github, I was using it wrong. Can I kill this request and just open another one? I need to setup a repo the right way. Sorry about all the trouble. |
|
I guess that's your call. No trouble to me. Bravo for trying. |
|
I think I mistakenly put back my older boards.h. so I fixed it. I am a Github virgin and messed everything up. Next time I will use a proper workflow to avoid these kinds of issues. |
|
I noticed this has not been merged. Do I need to do anything more? |
2c4b25c to
fd15b14
Compare
|
It will be reviewed by thinkyhead, possibly cleaned up a little an then merged if there are no other issues with it. |
0226dcc to
834ea7f
Compare
|
Trying to become an adult and use GitHub desktop properly. I have my fork but when I go to the clone folder, I only see the base branch, not 2.0.x bug fix. I switch to the proper branch in desktop and still no love. I've watched 2 hours of videos and been reading for 1.5 hours but can't get anywhere. Whats the magic recipe? I really need to rebase my fork Thank you. |
Looks like that last merge blew up your PR. |
|
Issues corrected and new PR #11601 opened. |
Thank You!
A big thank you to all who helped me. I really appreciate your patience, this is my first time doing anything like this.
Requirements
Azteeg X5 Mini WiFi controller board
Description
Added pins file for Azteeg X5 Mini WiFi controller board: pins_AZTEEG_X5_MINI_WIFI.h
Updated pins_AZTEEG_X5_GT.h to include F_CPU definition
Updated boards.h to define BOARD_AZTEEG_X5_MINI_WIFI as 1758
Updates pins.h to add pins_AZTEEG_X5_MINI_WIFI.h inclusion in the LPC176x section
Updated default Configuration_adv.h with comment to indicate AZTEEG X5 MINI I2C slave address'
Tested on AZTEEG X5 MINI_WIFI with TMC2224 digipot stepper drivers
X, Y, Z, E0 Homing ... SUCCESS
Fan 0 and Hotend 0 ... SUCCESS
Temp0 ... SUCCESS
Heatbed ... SUCCESS
#define SERIAL_PORT_2 0 @ 115200 (for ESP8266 Web UI) .... SUCCESS