Skip to content

[2.0.x] Azteeg X5 Mini WiFi#11499

Closed
ModMike wants to merge 1770 commits intoMarlinFirmware:bugfix-2.0.xfrom
ModMike:bugfix-2.0.x
Closed

[2.0.x] Azteeg X5 Mini WiFi#11499
ModMike wants to merge 1770 commits intoMarlinFirmware:bugfix-2.0.xfrom
ModMike:bugfix-2.0.x

Conversation

@ModMike
Copy link
Contributor

@ModMike ModMike commented Aug 9, 2018

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

thinkyhead and others added 30 commits May 22, 2018 00:32
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
Fix #10817

Co-Authored-By: cdedwards <cd.edwards@sasktel.net>
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
@ModMike
Copy link
Contributor Author

ModMike commented Aug 11, 2018

P#P, the only place this works is in boards.h file but it's rejected because of conflicts

@GadgetNutt
Copy link
Contributor

GadgetNutt commented Aug 11, 2018

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.

@ModMike
Copy link
Contributor Author

ModMike commented Aug 11, 2018

Ok I used your example but it wouldn't compile. So I updated my Platform IO (everything including Atom) and now I get this:

Linking .pioenvs/LPC1768/firmware.elf
arm-none-eabi-g++: fatal error: /Users/Michael/.platformio/packages/toolchain-gccarmnoneeabi/bin/../lib/gcc/arm-none-eabi/7.2.1/../../../../arm-none-eabi/l
ib/nano.specs: attempt to rename spec 'link' to already defined spec 'nano_link'
compilation terminated.
*** [.pioenvs/LPC1768/firmware.elf] Error 1

@p3p
Copy link
Member

p3p commented Aug 11, 2018

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.

@ModMike
Copy link
Contributor Author

ModMike commented Aug 11, 2018

Ok everything fixed and verified. Will sync now.

@ModMike ModMike closed this Aug 11, 2018
@ModMike ModMike reopened this Aug 11, 2018
@ModMike
Copy link
Contributor Author

ModMike commented Aug 11, 2018

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?

@p3p
Copy link
Member

p3p commented Aug 11, 2018

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 https://github.com/MarlinFirmware/Marlin

To get your local repository and fork on github up to date you would

git fetch --all
git checkout bugfix-2.0.x
git pull upstream bugfix-2.0.x
git push

Never work directly on the bugfix2.0.x branch, create a new branch for your work.
To update your PR branch after the above:

git checkout my_pr_branch
git rebase bugfix-2.0.x

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.

git push

@GadgetNutt
Copy link
Contributor

In Windows, Github desktop can be used to sync from Github to your computer.

Copy link
Contributor

@GadgetNutt GadgetNutt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@ModMike
Copy link
Contributor Author

ModMike commented Aug 12, 2018

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.

@GadgetNutt
Copy link
Contributor

GadgetNutt commented Aug 12, 2018

I guess that's your call.

No trouble to me. Bravo for trying.

@ModMike
Copy link
Contributor Author

ModMike commented Aug 12, 2018

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.

@ModMike
Copy link
Contributor Author

ModMike commented Aug 13, 2018

I noticed this has not been merged. Do I need to do anything more?

@GadgetNutt
Copy link
Contributor

It will be reviewed by thinkyhead, possibly cleaned up a little an then merged if there are no other issues with it.

@thinkyhead thinkyhead force-pushed the bugfix-2.0.x branch 3 times, most recently from 0226dcc to 834ea7f Compare August 14, 2018 09:47
@ModMike
Copy link
Contributor Author

ModMike commented Aug 16, 2018

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.

@thinkyhead thinkyhead changed the title Bugfix 2.0.x Added support for Azteeg X5 Mini WiFI [2.0.x] Azteeg X5 Mini WiFi Aug 21, 2018
@thinkyhead
Copy link
Member

thinkyhead commented Aug 21, 2018

Merge branch '1.1.x' into bugfix-2.0.x

Looks like that last merge blew up your PR.

@thinkyhead thinkyhead closed this Aug 21, 2018
@ModMike
Copy link
Contributor Author

ModMike commented Aug 21, 2018

Issues corrected and new PR #11601 opened.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.