Skip to content

Commit d969d9b

Browse files
authored
Merge pull request #884 from Paciente8159/modded-small-loops
- Improved cycle loops (used in nonISR blocking timer free delays)
2 parents 6dcbb2a + e98a899 commit d969d9b

35 files changed

+540
-376
lines changed

firmware.asm

5.62 MB
Binary file not shown.

uCNC/src/cnc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ uint8_t cnc_parse_cmd(void)
224224

225225
bool cnc_dotasks(void)
226226
{
227-
228227
// run io basic tasks
229228
cnc_io_dotasks();
230229

uCNC/src/hal/boards/avr/boardmap_mega_shield_v3.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ extern "C"
3232
#define BOARD_NAME "MEGA SHIELD V3"
3333
#endif
3434

35+
#ifndef F_CPU
36+
#define F_CPU 16000000UL
37+
#endif
38+
3539
#define AVR6
3640

3741
#define PCINT0_PORT B

uCNC/src/hal/boards/avr/boardmap_rambo14.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ extern "C"
3232
#define BOARD_NAME "RAMBO 1.4"
3333
#endif
3434

35+
#ifndef F_CPU
36+
#define F_CPU 16000000UL
37+
#endif
38+
3539
#define AVR6
3640

3741
#define PCINT0_PORT B

uCNC/src/hal/boards/avr/boardmap_ramps14.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ extern "C"
3232
#define BOARD_NAME "RAMPS 1.4"
3333
#endif
3434

35+
#ifndef F_CPU
36+
#define F_CPU 16000000UL
37+
#endif
38+
3539
#define AVR6
3640

3741
#define PCINT0_PORT B

uCNC/src/hal/boards/avr/boardmap_uno.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ extern "C"
3232
#define BOARD_NAME "Arduino UNO"
3333
#endif
3434

35+
#ifndef F_CPU
36+
#define F_CPU 16000000UL
37+
#endif
38+
3539
#define PCINT0_PORT B
3640
#define PCINT1_PORT C
3741
#define PCINT2_PORT D

uCNC/src/hal/boards/esp32/boardmap_core_c3.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ extern "C"
3232
#define BOARD_NAME "CORE ESP32 C3"
3333
#endif
3434

35+
#ifndef F_CPU
36+
#define F_CPU 160000000UL
37+
#endif
38+
3539
// SAME AS GRBL for test purposes
3640
// Setup step pins
3741
#define STEP2_BIT 2 // assigns STEP2 pin

uCNC/src/hal/boards/esp32/boardmap_devkit_s3.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ extern "C"
3232
#define BOARD_NAME "CORE ESP32 S3"
3333
#endif
3434

35+
#ifndef F_CPU
36+
#define F_CPU 240000000UL
37+
#endif
38+
3539
// // Setup step pins
3640
#define STEP3_BIT 18 // assigns STEP3 pin
3741
#define STEP2_BIT 17 // assigns STEP2 pin

uCNC/src/hal/boards/esp32/boardmap_mks_dlc32.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ extern "C"
3232
#define BOARD_NAME "MKS DLC32"
3333
#endif
3434

35+
#ifndef F_CPU
36+
#define F_CPU 240000000UL
37+
#endif
38+
3539
// Setup limit pins
3640
#define LIMIT_Z_BIT 34 // assigns LIMIT_Z pin
3741
// #define LIMIT_Z_ISR // assigns LIMIT_Z ISR

uCNC/src/hal/boards/esp32/boardmap_mks_tinybee.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ extern "C"
3232
#define BOARD_NAME "MKS Tinybee"
3333
#endif
3434

35+
#ifndef F_CPU
36+
#define F_CPU 240000000UL
37+
#endif
38+
3539
// Setup limit pins
3640
#define LIMIT_Z_BIT 22 // assigns LIMIT_Z pin
3741
// #define LIMIT_Z_ISR // assigns LIMIT_Z ISR

0 commit comments

Comments
 (0)