kopia lustrzana https://github.com/Schildkroet/GRBL-Advanced
Updated documentation and small improvements
rodzic
752f0e404d
commit
adadce2a74
|
@ -49,17 +49,17 @@ void W5500_Init(void)
|
|||
GPIO_ResetBits(GPIOA, GPIO_Pin_15);
|
||||
Delay_ms(40);
|
||||
GPIO_SetBits(GPIOA, GPIO_Pin_15);
|
||||
Delay_ms(25);
|
||||
Delay_ms(40);
|
||||
|
||||
W5500_SoftReset();
|
||||
Delay_ms(20);
|
||||
Delay_ms(40);
|
||||
|
||||
for(uint8_t i = 0; i < MAX_SOCK_NUM; i++)
|
||||
{
|
||||
uint8_t cntl_byte = (0x0C + (i<<5));
|
||||
|
||||
Write(0x1E, cntl_byte, 4); //0x1E - Sn_RXBUF_SIZE
|
||||
Write(0x1F, cntl_byte, 2); //0x1F - Sn_TXBUF_SIZE
|
||||
Write(0x1E, cntl_byte, 4); //0x1E - Sn_RXBUF_SIZE - 4k
|
||||
Write(0x1F, cntl_byte, 2); //0x1F - Sn_TXBUF_SIZE - 2k
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
#include "util2.h"
|
||||
|
||||
|
||||
#define MAX_SOCK_NUM 8
|
||||
#define MAX_SOCK_NUM 4 // Max 8
|
||||
|
||||
|
||||
#define W5500_SSIZE 2048 // Max Tx buffer size
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#include "ServerTCP.h"
|
||||
#include "Platform.h"
|
||||
#include "Print.h"
|
||||
#include "Usart.h"
|
||||
#include "USART.h"
|
||||
#include <string.h>
|
||||
|
||||
|
||||
|
|
2
Makefile
2
Makefile
|
@ -26,7 +26,7 @@ OBJDUMP = ${GCC_BASE}/arm-none-eabi-objdump
|
|||
#---------------------------------------------------------------------------------
|
||||
TARGET := GRBL_Advanced
|
||||
BUILD := build
|
||||
SOURCES := ./ cmsis/ grbl/ HAL/ HAL/EXTI HAL/FLASH HAL/GPIO HAL/I2C HAL/SPI HAL/STM32 HAL/TIM HAL/USART SPL/src Src/
|
||||
SOURCES := ./ cmsis/ grbl/ HAL/ HAL/EXTI HAL/FLASH HAL/GPIO HAL/I2C HAL/SPI HAL/STM32 HAL/TIM HAL/USART SPL/src Src/ Libraries/GrIP Libraries/CRC Libraries/Ethernet Libraries/Ethernet/utility
|
||||
|
||||
INCLUDES := $(SOURCES) SPL/inc
|
||||
|
||||
|
|
|
@ -37,6 +37,11 @@ Uses Dynamic TLO when $14=2
|
|||
Added support for external EEPROM (e.g. ST M24C08). Uncomment 'USE_EXT_EEPROM' in Config.h.
|
||||
![EEPROM](https://github.com/Schildkroet/GRBL-Advanced/blob/software/eeprom.png?raw=true)
|
||||
|
||||
#### ETHERNET Support
|
||||
GRBL-Advanced can be controlled with USB or ETHERNET. For ETHERNET an additional W5500 Module is required. Then uncomment ETH_IF in Platform.h. The default IP Address is 192.168.1.20.
|
||||
Use [Candle 2](https://github.com/Schildkroet/Candle2) as control interface.
|
||||
![W5500](https://github.com/Schildkroet/GRBL-Advanced/blob/software/w5500.png?raw=true)
|
||||
|
||||
#### Attention
|
||||
By default, settings are stored in internal flash memory in last sector. First startup takes about 5-10sec to write all settings.
|
||||
|
||||
|
@ -79,6 +84,7 @@ List of Supported G-Codes in Grbl-Advanced:
|
|||
- Feed Rate Modes: G93, G94
|
||||
- Unit Modes: G20, G21
|
||||
- Distance Modes: G90, G91
|
||||
- Retract Modes: G98, G99
|
||||
- Arc IJK Distance Modes: G91.1
|
||||
- Plane Select Modes: G17, G18, G19
|
||||
- Tool Length Offset Modes: G43.1, G49
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
static uint8_t isFirstTC = 1;
|
||||
static int32_t toolOffset = 0;
|
||||
static int32_t toolReferenz = 0;
|
||||
static float tc_pos[N_AXIS] = {0};
|
||||
|
||||
|
||||
void TC_Init(void)
|
||||
|
@ -40,6 +41,8 @@ void TC_Init(void)
|
|||
toolOffset = 0;
|
||||
toolReferenz = 0;
|
||||
|
||||
memset(tc_pos, 0, sizeof(float)*N_AXIS);
|
||||
|
||||
gc_state.modal.tool_length = TOOL_LENGTH_OFFSET_CANCEL;
|
||||
gc_state.tool_length_offset = 0.0;
|
||||
}
|
||||
|
@ -62,6 +65,7 @@ void TC_ChangeCurrentTool(void)
|
|||
// Don't move XY. Go to Z 0
|
||||
System_ConvertArraySteps2Mpos(position, sys_position);
|
||||
position[Z_AXIS] = 0.0;
|
||||
memcpy(tc_pos, position, sizeof(float)*N_AXIS);
|
||||
|
||||
//System_SetExecStateFlag(EXEC_TOOL_CHANGE);
|
||||
|
||||
|
@ -72,7 +76,7 @@ void TC_ChangeCurrentTool(void)
|
|||
pl_data.line_number = gc_state.line_number;
|
||||
|
||||
MC_Line(position, &pl_data);
|
||||
Delay_ms(5);
|
||||
Delay_ms(20);
|
||||
|
||||
Spindle_Stop();
|
||||
|
||||
|
@ -176,6 +180,9 @@ void TC_ProbeTLS(void)
|
|||
|
||||
MC_Line(position, &pl_data);
|
||||
|
||||
// Move back to initial tc position
|
||||
MC_Line(tc_pos, &pl_data);
|
||||
|
||||
// Wait until queue is processed
|
||||
Protocol_BufferSynchronize();
|
||||
|
||||
|
|
Plik binarny nie jest wyświetlany.
Przed Szerokość: | Wysokość: | Rozmiar: 505 KiB |
Plik binarny nie jest wyświetlany.
Po Szerokość: | Wysokość: | Rozmiar: 486 KiB |
Plik binarny nie jest wyświetlany.
Po Szerokość: | Wysokość: | Rozmiar: 422 KiB |
Plik binarny nie jest wyświetlany.
Po Szerokość: | Wysokość: | Rozmiar: 180 KiB |
Ładowanie…
Reference in New Issue