Commit Graph

Select branches

Hide Pull Requests

ATC_DontUse

Action

AntFixes

CheckMode_ToSD

ControlPinFixes

Delta

Devt

DevtGarbled

DevtNewName

DumpConfig

ExtendedN1

FYSTEC_E4

Factor

HardLimitDebug

ISR_WIP

JSON_WebServer

Leaks

MacroPOC

MoreLeaks

MotorClass

MotorClass_LimitsFix

NewPinClass

PWM_ISR_Fix

ProbeProtection

ProtocolRace

SDRunUnsupportedGCode

SdSettings

SpreadMasks

Stepping

TMC5160_Shutdown

UserDefinedGcode

Wallbot

YAML

dependabot/npm_and_yarn/embedded/copy-props-2.0.5

dependabot/npm_and_yarn/embedded/decode-uri-component-0.2.2

dependabot/npm_and_yarn/embedded/hosted-git-info-2.8.9

dependabot/npm_and_yarn/embedded/minimatch-3.0.8

dependabot/npm_and_yarn/embedded/path-parse-1.0.7

dependabot/npm_and_yarn/embedded/tar-4.4.19

dependabot/npm_and_yarn/embedded/y18n-3.2.2

dependabot/npm_and_yarn/embedded/yargs-parser-5.0.1

initPin

main

master-20200824-

number_axis

tapster_pro

#1004

#1005

#104

#1096

#1096

#1097

#1097

#111

#1115

#112

#113

#117

#119

#120

#122

#1222

#124

#125

#1258

#130

#131

#1332

#1332

#1344

#1344

#135

#137

#139

#141

#142

#143

#144

#145

#1467

#1467

#147

#149

#150

#152

#156

#158

#159

#1598

#1598

#16

#16

#167

#168

#174

#175

#176

#177

#178

#181

#183

#184

#199

#200

#201

#202

#204

#207

#208

#209

#210

#211

#212

#215

#218

#219

#221

#230

#232

#234

#235

#237

#239

#242

#245

#246

#25

#251

#253

#254

#255

#256

#260

#264

#280

#281

#282

#283

#289

#29

#290

#299

#301

#303

#31

#315

#32

#321

#326

#327

#328

#332

#338

#339

#34

#340

#341

#342

#344

#345

#346

#352

#354

#355

#356

#357

#358

#359

#360

#364

#366

#372

#374

#375

#378

#379

#380

#381

#382

#383

#384

#386

#388

#389

#395

#396

#397

#398

#399

#400

#401

#402

#404

#407

#408

#414

#417

#418

#419

#420

#421

#424

#425

#425

#427

#428

#434

#435

#44

#442

#443

#444

#445

#446

#447

#448

#45

#457

#458

#46

#468

#470

#476

#477

#478

#48

#480

#483

#484

#485

#486

#487

#489

#49

#490

#491

#497

#498

#499

#500

#501

#506

#507

#508

#509

#510

#511

#512

#513

#514

#515

#517

#518

#519

#52

#520

#521

#522

#524

#525

#526

#528

#529

#53

#530

#532

#533

#534

#535

#536

#537

#538

#54

#540

#541

#542

#543

#544

#547

#548

#549

#552

#553

#555

#556

#558

#559

#559

#560

#561

#562

#563

#565

#566

#567

#569

#57

#570

#571

#572

#576

#577

#578

#581

#583

#584

#585

#586

#587

#588

#590

#591

#592

#593

#594

#595

#596

#601

#602

#604

#605

#606

#607

#608

#609

#61

#611

#612

#613

#614

#616

#617

#618

#62

#620

#621

#622

#624

#625

#626

#628

#629

#632

#633

#635

#636

#644

#647

#648

#648

#649

#650

#652

#653

#654

#655

#656

#657

#658

#659

#668

#669

#676

#677

#678

#679

#680

#683

#685

#69

#691

#692

#697

#698

#699

#700

#701

#702

#704

#705

#706

#708

#71

#713

#713

#716

#717

#718

#719

#719

#720

#721

#722

#726

#727

#730

#732

#740

#740

#741

#742

#747

#748

#75

#751

#754

#755

#756

#765

#769

#770

#771

#772

#773

#776

#777

#779

#780

#782

#785

#790

#793

#794

#795

#796

#797

#798

#798

#799

#800

#800

#801

#803

#804

#806

#806

#807

#81

#811

#814

#814

#816

#819

#821

#822

#823

#823

#824

#825

#826

#827

#828

#829

#830

#833

#834

#836

#838

#842

#844

#846

#849

#849

#85

#850

#852

#855

#857

#859

#865

#865

#868

#871

#872

#875

#877

#882

#886

#89

#893

#893

#901

#901

#902

#906

#914

#914

#920

#923

#923

#934

#935

#94

#941

#945

#951

#951

#956

#960

#97

#970

#971

#981

#984

#984

#986

#990

Mono Color

• e171ff94e2 Merge branch 'ProtocolRace' of https://github.com/bdring/Grbl_Esp32 into ProtocolRace Mitch Bradley 2020-12-22 20:52:48 -10:00
• c43f479342 Fixed typo Mitch Bradley 2020-12-22 20:52:14 -10:00
• 78d01dc7a0 Merge branch 'Devt' into ProtocolRace Mitch Bradley 2020-12-22 10:25:55 -10:00
• 07a148875a Settings filtering via regular expressions (#717) Mitch Bradley 2020-12-22 08:41:49 -10:00
• 764258b082 Falscher GPIO Pin für Fräse Jens Hauser 2020-12-22 01:27:05 +01:00
• f55d8bc997 Merge branch 'main' of https://github.com/bdring/Grbl_Esp32 into master Jens Hauser 2020-12-22 00:43:44 +01:00
• f6df8cd701 fix race with sys_rt_exec_state by breaking out bools Phil Treib 2020-12-21 18:38:16 -05:00
• 992c47235a Fräse 2.6 Jens Hauser 2020-12-22 00:30:08 +01:00
• fac83a8bf7 Tets Fräse 2.6 ok Jens Hauser 2020-12-22 00:26:18 +01:00
• 25dc57c7a2 Fix undefined probe reporting if inverted. bdring 2020-12-21 16:55:01 -06:00
• 2f4ef0220e Changed some docs. Stefan de Bruijn 2020-12-21 14:47:12 +01:00
• 73aca34e82 Update Pin_Definitions.md bdring 2020-12-20 19:36:41 -06:00
• 5593dc6e61 Create Pin_Definitions.md bdring 2020-12-20 13:28:14 -06:00
• 56b8d7410b Hard limit handling in CoreXY AntFixes bdring 2020-12-19 11:06:09 -06:00
• e6faee455b MPos now has forward kinematics bdring 2020-12-19 07:11:28 -06:00
• 0875a46449 Updates after testing bdring 2020-12-18 20:37:11 -06:00
• 4ced81ad06 Updates for CoreXY forward kinematics and ACB support bdring 2020-12-18 16:32:44 -06:00
• 68ff966c39 Implemented parser for configuration. A small x64 test can be found in ParserTest.cpp; haven't ran it on ESP32 yet. Stefan de Bruijn 2020-12-18 22:42:01 +01:00
• 83cced5e4c Update Motors.cpp bdring 2020-12-17 19:42:11 -06:00
• 6816925f94 Fix some cut and paste errors in Motors.cpp bdring 2020-12-17 19:32:46 -06:00
• d307642d30 - Added validations to user analog pins. Stefan de Bruijn 2020-12-17 22:32:24 +01:00
• 3f73f5214b - Fixed initialization bug in trinamic drivers - Added better error handling for validation of pin changes Stefan de Bruijn 2020-12-17 21:52:22 +01:00
• e0e9fcc3ab added make_pin_settings(); bdring 2020-12-16 14:52:14 -06:00
• 789e50544c Made everything compile again. Stefan de Bruijn 2020-12-16 11:52:16 +01:00
• f765079939 Devt (#708) bdring 2020-12-15 15:32:35 -06:00
• 9bc65cf68e Merged devt back Stefan de Bruijn 2020-12-15 21:15:29 +01:00
• db19135f0c Made some changes to the setting toy Stefan de Bruijn 2020-12-15 16:33:54 +01:00
• d45da5762b Merge branch 'main' into Devt bdring 2020-12-15 09:17:50 -06:00
• bee5af877f Added $Axes setting. bdring 2020-12-14 22:55:30 -06:00
• 96b1cba967 number_axis dynamic number_axis Mitch Bradley 2020-12-14 13:16:44 -10:00
• ce2837c15c Changes from testing bdring 2020-12-14 14:46:35 -06:00
• 6443c92177 Update per P.R. #704 on main bdring 2020-12-14 12:42:56 -06:00
• a3c35b4e33 Bump ini from 1.3.5 to 1.3.7 in /embedded (#704) dependabot[bot] 2020-12-14 12:39:54 -06:00
• 1a46f444fe Fix a few issues with VFDSpindle critical error handling (#705) Scott Bezek 2020-12-14 10:00:26 -08:00
• a1b4cbc192 Trinamic uart (#700) bdring 2020-12-14 11:44:13 -06:00
• 6a0e3a7335 Fixes to homing (#706) bdring 2020-12-13 13:29:47 -06:00
• 8e3e23c148 Fixed strange WCO values on first load (#702) Mitch Bradley 2020-12-10 04:34:44 -10:00
• b627f31e3b Fix hang on error 20 from SD/Run (#701) Mitch Bradley 2020-12-10 04:07:19 -10:00
• 37e2efb2cb Fix hang on error 20 from SD/Run SDRunUnsupportedGCode Mitch Bradley 2020-12-09 20:55:31 -10:00
• f82c00a178 Fix SD card hanging on bad gcode bdring 2020-12-09 18:58:48 -06:00
• 1f372d3d58 Rate Adjusting Fix bdring 2020-12-09 17:05:35 -06:00
• 76f742682b Reverting some spindle changes... bdring 2020-12-09 09:42:40 -06:00
• 6030d43ef8 Update axis squaring checking (#699) bdring 2020-12-08 12:11:21 -06:00
• 660b46cc32 Sd Web UI issues (#698) bdring 2020-12-08 09:04:27 -06:00
• f518a4945c Changed macro pin reporting to be a single character bdring 2020-12-06 12:05:37 -06:00
• 00e0e7843e User macro button (#685) bdring 2020-12-05 11:07:23 -06:00
• 5f57cf7543 Laser mode (#692) bdring 2020-12-04 19:23:18 -06:00
• 6f913a39f5 Update atc.cpp ATC_DontUse bdring 2020-12-02 19:39:01 -06:00
• f2b73c2c3c Basic Motion FYSTEC_E4 bdring 2020-11-30 15:12:28 -06:00
• 724c6e36b3 Manual tool change bdring 2020-11-30 14:34:34 -06:00
• 5f95a5a763 WIP bdring 2020-11-30 10:29:20 -06:00
• 3732539333 name fix bdring 2020-11-29 17:39:21 -06:00
• 46db1472cf spindles now say if in laser mode bdring 2020-11-29 17:33:25 -06:00
• 3105943fd8 Update Machine.h bdring 2020-11-29 17:22:32 -06:00
• abfb33e2d3 Spindle and laser (#683) bdring 2020-11-29 08:22:30 -06:00
• 1468ff87a8 Devt (#680) bdring 2020-11-24 11:57:59 -06:00
• c0e7af7578 Merge branch 'main' into Devt bdring 2020-11-24 09:53:12 -06:00
• 920cc20693 Update Grbl.h bdring 2020-11-24 09:46:05 -06:00
• 8ac74d4017 Fix Spindle State broken in earlier PR bdring 2020-11-24 09:45:18 -06:00
• 4859b952b1 WIP bdring 2020-11-23 16:17:06 -06:00
• 60c5a6c9e1 Rst responses (#679) bdring 2020-11-23 15:14:47 -06:00
• ad72486ea2 Devt (#678) bdring 2020-11-23 10:17:51 -06:00
• 9671373033 Merge branch 'main' into Devt bdring 2020-11-23 08:50:56 -06:00
• 4b7ac102a9 Delete esp32_printer_controller.cpp bdring 2020-11-23 08:49:48 -06:00
• 6d2c609ad3 ABC Bresenham counter init fix bdring 2020-11-22 16:50:01 -06:00
• 42c37bbfe8 Spindle delay and Telnet Fix (#676) bdring 2020-11-22 12:02:57 -06:00
• da29a6c8cf Fixed Spindle delays bdring 2020-11-20 13:41:56 -06:00
• 985c4f60dc WIP bdring 2020-11-19 13:45:54 -06:00
• 4acc0d8963 Updates from testing bdring 2020-11-19 07:06:33 -06:00
• 41faacdef9 Optimize shortest ATC path bdring 2020-11-15 21:30:43 -06:00
• 0c1fb75744 WIP bdring 2020-11-15 10:42:09 -06:00
• f35406490f Devt (#669) bdring 2020-11-14 08:59:56 -06:00
• 9b26812f13 Merge branch 'main' into Devt bdring 2020-11-13 13:07:24 -06:00
• 10ada413b3 Update atc.cpp bdring 2020-11-13 12:56:32 -06:00
• bc8c0945bb Update 6_pack_5160_ATC_Carve.h bdring 2020-11-13 12:54:41 -06:00
• a752bef4cd Update 6_pack_5160_ATC_Carve.h bdring 2020-11-13 12:53:34 -06:00
• f56a2c5d14 WIP bdring 2020-11-11 19:43:41 -06:00
• 628e50073a WIP bdring 2020-11-09 20:24:31 -06:00
• 469349872e WIP bdring 2020-11-09 14:49:22 -06:00
• d3468b8c06 WIP bdring 2020-11-09 09:36:36 -06:00
• 5376c4b75a WIP bdring 2020-11-07 17:30:57 -06:00
• b9f192337c Fixed another bug Stefan de Bruijn 2020-11-07 21:34:57 +01:00
• 0cae23ddac Fixed another bug in GPIO pin Stefan de Bruijn 2020-11-07 21:31:59 +01:00
• 5c26d20d19 Changed the sleep to 10 minutes. Stefan de Bruijn 2020-11-07 20:53:08 +01:00
• c242b85fa8 Added ISR fix Stefan de Bruijn 2020-11-07 20:43:43 +01:00
• b0488c9446 Got rid of unwanted PU flag. Fixed nasty bug in GPIO code. Stefan de Bruijn 2020-11-07 20:22:10 +01:00
• 4f1c8c4f6f WIP bdring 2020-11-07 12:52:09 -06:00
• 7e8a07fec9 Updates bdring 2020-11-07 12:35:12 -06:00
• 35959344bd Removed invert masks from settings and defines throughout the code base. This is handled in Pin class now. Stefan de Bruijn 2020-11-07 11:54:42 +01:00
• 2b90aff19d Implemented PWM pin user Stefan de Bruijn 2020-11-07 10:23:07 +01:00
• 314f942915 Fixed a few small bugs. Thanks Brian! Stefan de Bruijn 2020-11-07 10:03:14 +01:00
• 87b076bfc1 Fixed a few bugs (backport) Stefan de Bruijn 2020-11-07 10:00:36 +01:00
• 2e8711623d Cleaning out #defines using weak functions. bdring 2020-11-06 22:04:01 -06:00
• 619b4489c1 Update atc.cpp bdring 2020-11-06 20:08:49 -06:00
• 7ee6b1062e Basic functionality bdring 2020-11-06 20:01:06 -06:00
• 169babe4f5 Fixed PWM pin initialization order Stefan de Bruijn 2020-11-06 15:29:05 +01:00
• 420657fa55 Setup bdring 2020-11-05 12:50:58 -06:00
• 29b4642dd7 Made everything compile Stefan de Bruijn 2020-11-03 22:52:43 +01:00
• bc630b64f9 Prototype / WIP for settings. Stefan de Bruijn 2020-11-03 22:49:27 +01:00
• e8e96ff113 Fewer top level categories YAML Mitch Bradley 2020-11-03 09:32:15 -10:00