e84f82a675
Rewrite the logic behind the "chunking"/error count behind the PAT9125. Basic idea: check the _direction_ of movement returned by the optical sensor and compare it to the direction of the stepper. To avoid doing this continuosly (and because the optical sensor doesn't necessarily have the accuracy to track small distances), do so in chunks. Each time a chunk doesn't match the expected direction, increase the error count. Several improvements were done to the previous code: - Increase the chunk window: this ensures that a filament with poor response returns an usable direction, while also moving the average return values from the sensor in the middle of the 12 bits available for maximum effectiveness. - Since the returned values are more reliable, reduce the error count (1.25mm*4 = ~5mm before runout detection) - Track _both_ positive and negative movement, although only trigger errors during extrusion (necessary due to several assumptions made in the mmu/unloading code) - Do not reset the counters for each block: accumulate distances correctly, allowing detection of any block lenght.
66 lines
2.3 KiB
C
66 lines
2.3 KiB
C
#ifndef _CONFIG_H
|
|
#define _CONFIG_H
|
|
|
|
|
|
#include "Configuration_prusa.h"
|
|
#include "pins.h"
|
|
|
|
#define IR_SENSOR_ANALOG (defined(VOLT_IR_PIN) && defined(IR_SENSOR))
|
|
|
|
//ADC configuration
|
|
#if !IR_SENSOR_ANALOG
|
|
#define ADC_CHAN_MSK 0b0000001001011111 //used AD channels bit mask (0,1,2,3,4,6,9)
|
|
#define ADC_DIDR_MSK 0b0000001001011111 //AD channels DIDR mask (1 ~ disabled digital input)
|
|
#define ADC_CHAN_CNT 7 //number of used channels)
|
|
#else //!IR_SENSOR_ANALOG
|
|
#define ADC_CHAN_MSK 0b0000001101011111 //used AD channels bit mask (0,1,2,3,4,6,8,9)
|
|
#define ADC_DIDR_MSK 0b0000001001011111 //AD channels DIDR mask (1 ~ disabled digital input)
|
|
#define ADC_CHAN_CNT 8 //number of used channels)
|
|
#endif //!IR_SENSOR_ANALOG
|
|
#define ADC_OVRSAMPL 16 //oversampling multiplier
|
|
#define ADC_CALLBACK adc_ready //callback function ()
|
|
|
|
//SWI2C configuration
|
|
#define SWI2C
|
|
//#define SWI2C_SDA 20 //SDA on P3
|
|
//#define SWI2C_SCL 21 //SCL on P3
|
|
#define SWI2C_A8
|
|
#define SWI2C_DEL 20 //2us clock delay
|
|
#define SWI2C_TMO 2048 //2048 cycles timeout
|
|
|
|
//PAT9125 configuration
|
|
#define PAT9125_SWI2C
|
|
#define PAT9125_I2C_ADDR 0x75 //ID=LO
|
|
//#define PAT9125_I2C_ADDR 0x79 //ID=HI
|
|
//#define PAT9125_I2C_ADDR 0x73 //ID=NC
|
|
#define PAT9125_XRES 0
|
|
#define PAT9125_YRES 240 // maximum resolution (5*X cpi)
|
|
#define PAT9124_YRES_MM (5*PAT9125_YRES/25.4) // counts per mm
|
|
|
|
//SM4 configuration
|
|
#define SM4_DEFDELAY 500 //default step delay [us]
|
|
|
|
//TMC2130 - Trinamic stepper driver
|
|
//pinout - hardcoded
|
|
//spi:
|
|
#define TMC2130_SPI_RATE 0 // fosc/4 = 4MHz
|
|
#define TMC2130_SPCR SPI_SPCR(TMC2130_SPI_RATE, 1, 1, 1, 0)
|
|
#define TMC2130_SPSR SPI_SPSR(TMC2130_SPI_RATE)
|
|
|
|
//W25X20CL configuration
|
|
//pinout:
|
|
#define W25X20CL_PIN_CS 32
|
|
//spi:
|
|
#define W25X20CL_SPI_RATE 0 // fosc/4 = 4MHz
|
|
#define W25X20CL_SPCR SPI_SPCR(W25X20CL_SPI_RATE, 1, 1, 1, 0)
|
|
#define W25X20CL_SPSR SPI_SPSR(W25X20CL_SPI_RATE)
|
|
|
|
//LANG - Multi-language support
|
|
//define LANG_MODE 0 // primary language only
|
|
#define LANG_MODE 1 // sec. language support
|
|
|
|
#define LANG_SIZE_RESERVED 0x3000 // reserved space for secondary language (12288 bytes)
|
|
|
|
|
|
#endif //_CONFIG_H
|