Skip to content

Commit

Permalink
NULLPTR FIX JSON CONFLICT
Browse files Browse the repository at this point in the history
NULLPTR FIX JSON CONFLICT
  • Loading branch information
iqubik authored Jan 7, 2022
1 parent dddf61a commit 5c8d6fe
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions src/StepperCore.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@
#include <Arduino.h>
#include "GStypes.h"

#ifndef nullptr
#define nullptr NULL
#endif

#ifndef DRIVER_STEP_TIME
#define DRIVER_STEP_TIME 4
#endif
Expand Down Expand Up @@ -217,8 +213,8 @@ class Stepper {
bool _globDir = false;
int8_t thisStep = 0;

void (*_step)(uint8_t a) = nullptr;
void (*_power)(bool a) = nullptr;
void (*_step)(uint8_t a) = NULL;
void (*_power)(bool a) = NULL;

#ifdef __AVR__
volatile uint8_t *_port_reg[_PINS_AMOUNT];
Expand All @@ -228,4 +224,4 @@ class Stepper {
#endif
};

#endif
#endif

0 comments on commit 5c8d6fe

Please sign in to comment.