Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split motor files into separate files and introduced namespace Motors #522

Merged
merged 3 commits into from
Aug 8, 2020
Merged

Conversation

atlaste
Copy link
Collaborator

@atlaste atlaste commented Aug 8, 2020

As per the coding style md:

  • Split motor files into header/cpp files. Basically each motor has a header and cpp file
  • Fixed includes where appropriate (no reordering, this is just a consequence of the splitting)
  • Moved API to motors.cpp/motors.h
  • Introduced namespace Motors to hide everything
  • No code has been changed, just moved stuff around.
  • Tested compilation with build-all.sh and Arduino IDE.

@MitchBradley MitchBradley merged commit 06fae66 into bdring:Devt Aug 8, 2020
bdring added a commit that referenced this pull request Aug 13, 2020
* Changed header guards to #pragma once form

In the Machines directory, also added
// clang-format off
because it will have to be done eventually and is safe,
so it was easy to do systematically during this edit.

* Clang Format (#514)

* Apply clang-format

* Fixed conflict between "print.h" and <print.h>

print.h and print.cpp are not used.

* machine.h: clang-format off is unnecessary

* ifdef ARDUINO_ARCH_ESP32 is unnecessary

and causes irritiating indentation of other includes

* Revert formatting of nofile.h

But leave pragma changes.

* Fix nofile.h again

* Some files were not formatted ...

and .clang-format needed to be tweaked to
give the same results with clang-format v6 and v10

* clang-format v6 vs v10 compatibility

* Fixed C++ includes (#518)

* Moved all files to the src folder

* Removed all cpp includes; fixed by including the header file where needed

* Fixed build scripts and machine.h

* Removed temp file. sigh.

Co-authored-by: Stefan de Bruijn <stefan@nubilosoft.com>

* Split motor files into separate files and introduced namespace Motors (#522)

* Renamed some files to match the class name.

* Split out motor class into different files.

* Fixed last newline in cpp/h files

Co-authored-by: Stefan de Bruijn <stefan@nubilosoft.com>

* Fixed compile error with parking enabled (#524)

* Fix the I2S stream generates a 3x faster pulse. (#525)

I completely misunderstood the calculation of the interruption interval.
Change to calculate the correct μsec interval from the tick value.

* Bump build date

* Eliminated unused USE_GANGED_AXES (#526)

* Updated style of Spindles according to style doc. Added namespace Spindles.  (#529)

* Renamed spindleclass file.

* Added (empty) header files; renamed SpindleClass.cpp

* Moved spindle classes, introduced namespaces

* Fixed forward declaration.

* Removed obsolete commented out code

* Fixed overrides and constructors

* Applied clang-format

* Fixed 10vspindle set_spindle_dir_pin and set_enable_pin.

Co-authored-by: Stefan de Bruijn <stefan@nubilosoft.com>

* Avoid reiterationIteration in spindle names (#530)

* File name changes (#532)

* Renamed files in the root folder. Haven't fixed includes yet.

* Renamed SD to SDCard to avoid name conflict

* Fixed all includes

* Fixed some "..." / <...> includes.

* Updated <Print.h> (caps!).

Co-authored-by: Stefan de Bruijn <stefan@nubilosoft.com>

* Move more files to WebUI (#534)

Now everything with Luc's copyright is in WebUI/

* Fix file names in comment blocks

The recent rename made nearly all of the
file names included in header comments incorrect.

* Fixed .c -> .cpp interior names

* A few more interior name fixes

* Added second limit switch I/O option (#537)

- Added X2_LIMIT_PIN thru C2_LIMIT_PIN
- The 2 switches are simply or'd in the logic
- Limit pin difintion now prints in boot MSG's
- Cleaned up MS3 logic to use an array and defaults like limit switches
- Added a new machine definition file to test new features

* Fixed Laser Mode

Enablin pin was turning off, but not back on in laser mode

* Added Settings

- $Spindle/Enable/Invert=Off
- $Spindle/Enable/OffWithSpeed=Off
- $Spindle/PWM/Invert=Off

* Update build date

Co-authored-by: Mitch Bradley <wmb@firmworks.com>
Co-authored-by: Stefan de Bruijn <atlaste@users.noreply.github.com>
Co-authored-by: Stefan de Bruijn <stefan@nubilosoft.com>
atlaste added a commit to atlaste/Grbl_Esp32 that referenced this pull request Oct 13, 2020
…bdring#522)

* Renamed some files to match the class name.

* Split out motor class into different files.

* Fixed last newline in cpp/h files

Co-authored-by: Stefan de Bruijn <stefan@nubilosoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants