From c3abd4ffe670faaa1d9b44bf4c52bfcd58ba500c Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Fri, 11 Sep 2020 17:43:38 +0300 Subject: [PATCH] Remove io_atmega2560.h and some more macros --- Firmware/Marlin_main.cpp | 3 +- Firmware/fastio.h | 28 +-- Firmware/fsensor.cpp | 6 +- Firmware/heatbed_pwm.cpp | 1 - Firmware/io_atmega2560.h | 374 -------------------------------------- Firmware/macros.h | 17 ++ Firmware/mmu.cpp | 26 ++- Firmware/pins_Einsy_1_0.h | 2 + Firmware/swi2c.c | 58 +++--- Firmware/timer02.c | 3 - Firmware/ultralcd.cpp | 5 +- Firmware/w25x20cl.c | 8 +- 12 files changed, 79 insertions(+), 452 deletions(-) delete mode 100644 Firmware/io_atmega2560.h diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4ea48894..7f61c0a8 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -139,7 +139,6 @@ #include "sound.h" #include "cmdqueue.h" -#include "io_atmega2560.h" //Macro for print fan speed #define FAN_PULSE_WIDTH_LIMIT ((fanSpeed > 100) ? 3 : 4) //time in ms @@ -876,7 +875,7 @@ static void check_if_fw_is_on_right_printer(){ #ifdef PAT9125 //will return 1 only if IR can detect filament in bondtech extruder so this may fail even when we have IR sensor - const uint8_t ir_detected = !(PIN_GET(IR_SENSOR_PIN)); + const uint8_t ir_detected = !READ(IR_SENSOR_PIN); if (ir_detected){ lcd_show_fullscreen_message_and_wait_P(_i("MK3 firmware detected on MK3S printer"));}////c=20 r=3 #endif //PAT9125 diff --git a/Firmware/fastio.h b/Firmware/fastio.h index acded8cb..19c278d4 100644 --- a/Firmware/fastio.h +++ b/Firmware/fastio.h @@ -7,15 +7,7 @@ #define _FASTIO_ARDUINO_H #include - -/* - utility functions -*/ - -#ifndef MASK -/// MASKING- returns \f$2^PIN\f$ -#define MASK(PIN) (1 << PIN) -#endif +#include "macros.h" /* magic I/O routines @@ -23,20 +15,20 @@ */ /// Read a pin -#define _READ(IO) ((bool)(DIO ## IO ## _RPORT & MASK(DIO ## IO ## _PIN))) +#define _READ(IO) ((bool)(DIO ## IO ## _RPORT & _BV(DIO ## IO ## _PIN))) /// write to a pin // On some boards pins > 0x100 are used. These are not converted to atomic actions. An critical section is needed. -#define _WRITE_NC(IO, v) do { if (v) {DIO ## IO ## _WPORT |= MASK(DIO ## IO ## _PIN); } else {DIO ## IO ## _WPORT &= ~MASK(DIO ## IO ## _PIN); }; } while (0) +#define _WRITE_NC(IO, v) do { if (v) {DIO ## IO ## _WPORT |= _BV(DIO ## IO ## _PIN); } else {DIO ## IO ## _WPORT &= ~_BV(DIO ## IO ## _PIN); }; } while (0) #define _WRITE_C(IO, v) do { if (v) { \ CRITICAL_SECTION_START; \ - {DIO ## IO ## _WPORT |= MASK(DIO ## IO ## _PIN); }\ + {DIO ## IO ## _WPORT |= _BV(DIO ## IO ## _PIN); }\ CRITICAL_SECTION_END; \ }\ else {\ CRITICAL_SECTION_START; \ - {DIO ## IO ## _WPORT &= ~MASK(DIO ## IO ## _PIN); }\ + {DIO ## IO ## _WPORT &= ~_BV(DIO ## IO ## _PIN); }\ CRITICAL_SECTION_END; \ }\ }\ @@ -45,17 +37,17 @@ #define _WRITE(IO, v) do { if (&(DIO ## IO ## _RPORT) >= (uint8_t *)0x100) {_WRITE_C(IO, v); } else {_WRITE_NC(IO, v); }; } while (0) /// toggle a pin -#define _TOGGLE(IO) do {DIO ## IO ## _RPORT = MASK(DIO ## IO ## _PIN); } while (0) +#define _TOGGLE(IO) do {DIO ## IO ## _RPORT = _BV(DIO ## IO ## _PIN); } while (0) /// set pin as input -#define _SET_INPUT(IO) do {DIO ## IO ## _DDR &= ~MASK(DIO ## IO ## _PIN); } while (0) +#define _SET_INPUT(IO) do {DIO ## IO ## _DDR &= ~_BV(DIO ## IO ## _PIN); } while (0) /// set pin as output -#define _SET_OUTPUT(IO) do {DIO ## IO ## _DDR |= MASK(DIO ## IO ## _PIN); } while (0) +#define _SET_OUTPUT(IO) do {DIO ## IO ## _DDR |= _BV(DIO ## IO ## _PIN); } while (0) /// check if pin is an input -#define _GET_INPUT(IO) ((DIO ## IO ## _DDR & MASK(DIO ## IO ## _PIN)) == 0) +#define _GET_INPUT(IO) ((DIO ## IO ## _DDR & _BV(DIO ## IO ## _PIN)) == 0) /// check if pin is an output -#define _GET_OUTPUT(IO) ((DIO ## IO ## _DDR & MASK(DIO ## IO ## _PIN)) != 0) +#define _GET_OUTPUT(IO) ((DIO ## IO ## _DDR & _BV(DIO ## IO ## _PIN)) != 0) /// check if pin is an timer #define _GET_TIMER(IO) (DIO ## IO ## _PWM) diff --git a/Firmware/fsensor.cpp b/Firmware/fsensor.cpp index 7908c5db..c81a5ac6 100755 --- a/Firmware/fsensor.cpp +++ b/Firmware/fsensor.cpp @@ -6,7 +6,6 @@ #include #include "pat9125.h" #include "stepper.h" -#include "io_atmega2560.h" #include "cmdqueue.h" #include "ultralcd.h" #include "mmu.h" @@ -608,9 +607,8 @@ void fsensor_st_block_chunk(int cnt) if (!fsensor_enabled) return; fsensor_st_cnt += cnt; - // !!! bit toggling (PINxn <- 1) (for PinChangeInterrupt) does not work for some MCU pins - if (PIN_GET(FSENSOR_INT_PIN)) {PIN_VAL(FSENSOR_INT_PIN, LOW);} - else {PIN_VAL(FSENSOR_INT_PIN, HIGH);} + // !!! bit toggling (PINxn <- 1) (for PinChangeInterrupt) does not work for some MCU pins + WRITE(FSENSOR_INT_PIN, !READ(FSENSOR_INT_PIN)); } #endif //PAT9125 diff --git a/Firmware/heatbed_pwm.cpp b/Firmware/heatbed_pwm.cpp index 8121df3e..b97da52c 100755 --- a/Firmware/heatbed_pwm.cpp +++ b/Firmware/heatbed_pwm.cpp @@ -1,6 +1,5 @@ #include #include -#include "io_atmega2560.h" // All this is about silencing the heat bed, as it behaves like a loudspeaker. // Basically, we want the PWM heating switched at 30Hz (or so) which is a well ballanced diff --git a/Firmware/io_atmega2560.h b/Firmware/io_atmega2560.h deleted file mode 100644 index e353eb05..00000000 --- a/Firmware/io_atmega2560.h +++ /dev/null @@ -1,374 +0,0 @@ -//io_atmega2560.h -#ifndef _IO_ATMEGA2560 -#define _IO_ATMEGA2560 - - -#define __PIN_P0 PINE -#define __PIN_P1 PINE -#define __PIN_P2 PINE -#define __PIN_P3 PINE -#define __PIN_P4 PING -#define __PIN_P5 PINE -#define __PIN_P6 PINH -#define __PIN_P7 PINH -#define __PIN_P8 PINH -#define __PIN_P9 PINH -#define __PIN_P10 PINB -#define __PIN_P11 PINB -#define __PIN_P12 PINB -#define __PIN_P13 PINB -#define __PIN_P14 PINJ -#define __PIN_P15 PINJ -#define __PIN_P16 PINH -#define __PIN_P17 PINH -#define __PIN_P18 PIND -#define __PIN_P19 PIND -#define __PIN_P20 PIND -#define __PIN_P21 PIND -#define __PIN_P22 PINA -#define __PIN_P23 PINA -#define __PIN_P24 PINA -#define __PIN_P25 PINA -#define __PIN_P26 PINA -#define __PIN_P27 PINA -#define __PIN_P28 PINA -#define __PIN_P29 PINA -#define __PIN_P30 PINC -#define __PIN_P31 PINC -#define __PIN_P32 PINC -#define __PIN_P33 PINC -#define __PIN_P34 PINC -#define __PIN_P35 PINC -#define __PIN_P36 PINC -#define __PIN_P37 PINC -#define __PIN_P38 PIND -#define __PIN_P39 PING -#define __PIN_P40 PING -#define __PIN_P41 PING -#define __PIN_P42 PINL -#define __PIN_P43 PINL -#define __PIN_P44 PINL -#define __PIN_P45 PINL -#define __PIN_P46 PINL -#define __PIN_P47 PINL -#define __PIN_P48 PINL -#define __PIN_P49 PINL -#define __PIN_P50 PINB -#define __PIN_P51 PINB -#define __PIN_P52 PINB -#define __PIN_P53 PINB -#define __PIN_P54 PINF -#define __PIN_P55 PINF -#define __PIN_P56 PINF -#define __PIN_P57 PINF -#define __PIN_P58 PINF -#define __PIN_P59 PINF -#define __PIN_P60 PINF -#define __PIN_P61 PINF -#define __PIN_P62 PINK -#define __PIN_P63 PINK -#define __PIN_P64 PINK -#define __PIN_P65 PINK -#define __PIN_P66 PINK -#define __PIN_P67 PINK -#define __PIN_P68 PINK -#define __PIN_P69 PINK -#define __PIN_P70 PING -#define __PIN_P71 PING -#define __PIN_P72 PINJ -#define __PIN_P73 PINJ -#define __PIN_P74 PINJ -#define __PIN_P75 PINJ -#define __PIN_P76 PINJ -#define __PIN_P77 PINJ -#define __PIN_P78 PINE -#define __PIN_P79 PINE -#define __PIN_P80 PINE -#define __PIN_P81 PIND -#define __PIN_P82 PIND -#define __PIN_P83 PIND -#define __PIN_P84 PINH -#define __PIN_P85 PINH - -#define __PORT_P0 PORTE -#define __PORT_P1 PORTE -#define __PORT_P2 PORTE -#define __PORT_P3 PORTE -#define __PORT_P4 PORTG -#define __PORT_P5 PORTE -#define __PORT_P6 PORTH -#define __PORT_P7 PORTH -#define __PORT_P8 PORTH -#define __PORT_P9 PORTH -#define __PORT_P10 PORTB -#define __PORT_P11 PORTB -#define __PORT_P12 PORTB -#define __PORT_P13 PORTB -#define __PORT_P14 PORTJ -#define __PORT_P15 PORTJ -#define __PORT_P16 PORTH -#define __PORT_P17 PORTH -#define __PORT_P18 PORTD -#define __PORT_P19 PORTD -#define __PORT_P20 PORTD -#define __PORT_P21 PORTD -#define __PORT_P22 PORTA -#define __PORT_P23 PORTA -#define __PORT_P24 PORTA -#define __PORT_P25 PORTA -#define __PORT_P26 PORTA -#define __PORT_P27 PORTA -#define __PORT_P28 PORTA -#define __PORT_P29 PORTA -#define __PORT_P30 PORTC -#define __PORT_P31 PORTC -#define __PORT_P32 PORTC -#define __PORT_P33 PORTC -#define __PORT_P34 PORTC -#define __PORT_P35 PORTC -#define __PORT_P36 PORTC -#define __PORT_P37 PORTC -#define __PORT_P38 PORTD -#define __PORT_P39 PORTG -#define __PORT_P40 PORTG -#define __PORT_P41 PORTG -#define __PORT_P42 PORTL -#define __PORT_P43 PORTL -#define __PORT_P44 PORTL -#define __PORT_P45 PORTL -#define __PORT_P46 PORTL -#define __PORT_P47 PORTL -#define __PORT_P48 PORTL -#define __PORT_P49 PORTL -#define __PORT_P50 PORTB -#define __PORT_P51 PORTB -#define __PORT_P52 PORTB -#define __PORT_P53 PORTB -#define __PORT_P54 PORTF -#define __PORT_P55 PORTF -#define __PORT_P56 PORTF -#define __PORT_P57 PORTF -#define __PORT_P58 PORTF -#define __PORT_P59 PORTF -#define __PORT_P60 PORTF -#define __PORT_P61 PORTF -#define __PORT_P62 PORTK -#define __PORT_P63 PORTK -#define __PORT_P64 PORTK -#define __PORT_P65 PORTK -#define __PORT_P66 PORTK -#define __PORT_P67 PORTK -#define __PORT_P68 PORTK -#define __PORT_P69 PORTK -#define __PORT_P70 PORTG -#define __PORT_P71 PORTG -#define __PORT_P72 PORTJ -#define __PORT_P73 PORTJ -#define __PORT_P74 PORTJ -#define __PORT_P75 PORTJ -#define __PORT_P76 PORTJ -#define __PORT_P77 PORTJ -#define __PORT_P78 PORTE -#define __PORT_P79 PORTE -#define __PORT_P80 PORTE -#define __PORT_P81 PORTD -#define __PORT_P82 PORTD -#define __PORT_P83 PORTD -#define __PORT_P84 PORTH -#define __PORT_P85 PORTH - -#define __DDR_P0 DDRE -#define __DDR_P1 DDRE -#define __DDR_P2 DDRE -#define __DDR_P3 DDRE -#define __DDR_P4 DDRG -#define __DDR_P5 DDRE -#define __DDR_P6 DDRH -#define __DDR_P7 DDRH -#define __DDR_P8 DDRH -#define __DDR_P9 DDRH -#define __DDR_P10 DDRB -#define __DDR_P11 DDRB -#define __DDR_P12 DDRB -#define __DDR_P13 DDRB -#define __DDR_P14 DDRJ -#define __DDR_P15 DDRJ -#define __DDR_P16 DDRH -#define __DDR_P17 DDRH -#define __DDR_P18 DDRD -#define __DDR_P19 DDRD -#define __DDR_P20 DDRD -#define __DDR_P21 DDRD -#define __DDR_P22 DDRA -#define __DDR_P23 DDRA -#define __DDR_P24 DDRA -#define __DDR_P25 DDRA -#define __DDR_P26 DDRA -#define __DDR_P27 DDRA -#define __DDR_P28 DDRA -#define __DDR_P29 DDRA -#define __DDR_P30 DDRC -#define __DDR_P31 DDRC -#define __DDR_P32 DDRC -#define __DDR_P33 DDRC -#define __DDR_P34 DDRC -#define __DDR_P35 DDRC -#define __DDR_P36 DDRC -#define __DDR_P37 DDRC -#define __DDR_P38 DDRD -#define __DDR_P39 DDRG -#define __DDR_P40 DDRG -#define __DDR_P41 DDRG -#define __DDR_P42 DDRL -#define __DDR_P43 DDRL -#define __DDR_P44 DDRL -#define __DDR_P45 DDRL -#define __DDR_P46 DDRL -#define __DDR_P47 DDRL -#define __DDR_P48 DDRL -#define __DDR_P49 DDRL -#define __DDR_P50 DDRB -#define __DDR_P51 DDRB -#define __DDR_P52 DDRB -#define __DDR_P53 DDRB -#define __DDR_P54 DDRF -#define __DDR_P55 DDRF -#define __DDR_P56 DDRF -#define __DDR_P57 DDRF -#define __DDR_P58 DDRF -#define __DDR_P59 DDRF -#define __DDR_P60 DDRF -#define __DDR_P61 DDRF -#define __DDR_P62 DDRK -#define __DDR_P63 DDRK -#define __DDR_P64 DDRK -#define __DDR_P65 DDRK -#define __DDR_P66 DDRK -#define __DDR_P67 DDRK -#define __DDR_P68 DDRK -#define __DDR_P69 DDRK -#define __DDR_P70 DDRG -#define __DDR_P71 DDRG -#define __DDR_P72 DDRJ -#define __DDR_P73 DDRJ -#define __DDR_P74 DDRJ -#define __DDR_P75 DDRJ -#define __DDR_P76 DDRJ -#define __DDR_P77 DDRJ -#define __DDR_P78 DDRE -#define __DDR_P79 DDRE -#define __DDR_P80 DDRE -#define __DDR_P81 DDRD -#define __DDR_P82 DDRD -#define __DDR_P83 DDRD -#define __DDR_P84 DDRH -#define __DDR_P85 DDRH - -#define __BIT_P0 0 -#define __BIT_P1 1 -#define __BIT_P2 4 -#define __BIT_P3 5 -#define __BIT_P4 5 -#define __BIT_P5 3 -#define __BIT_P6 3 -#define __BIT_P7 4 -#define __BIT_P8 5 -#define __BIT_P9 6 -#define __BIT_P10 4 -#define __BIT_P11 5 -#define __BIT_P12 6 -#define __BIT_P13 7 -#define __BIT_P14 1 -#define __BIT_P15 0 -#define __BIT_P16 0 -#define __BIT_P17 1 -#define __BIT_P18 3 -#define __BIT_P19 2 -#define __BIT_P20 1 -#define __BIT_P21 0 -#define __BIT_P22 0 -#define __BIT_P23 1 -#define __BIT_P24 2 -#define __BIT_P25 3 -#define __BIT_P26 4 -#define __BIT_P27 5 -#define __BIT_P28 6 -#define __BIT_P29 7 -#define __BIT_P30 7 -#define __BIT_P31 6 -#define __BIT_P32 5 -#define __BIT_P33 4 -#define __BIT_P34 3 -#define __BIT_P35 2 -#define __BIT_P36 1 -#define __BIT_P37 0 -#define __BIT_P38 7 -#define __BIT_P39 2 -#define __BIT_P40 1 -#define __BIT_P41 0 -#define __BIT_P42 7 -#define __BIT_P43 6 -#define __BIT_P44 5 -#define __BIT_P45 4 -#define __BIT_P46 3 -#define __BIT_P47 2 -#define __BIT_P48 1 -#define __BIT_P49 0 -#define __BIT_P50 3 -#define __BIT_P51 2 -#define __BIT_P52 1 -#define __BIT_P53 0 -#define __BIT_P54 0 -#define __BIT_P55 1 -#define __BIT_P56 2 -#define __BIT_P57 3 -#define __BIT_P58 4 -#define __BIT_P59 5 -#define __BIT_P60 6 -#define __BIT_P61 7 -#define __BIT_P62 0 -#define __BIT_P63 1 -#define __BIT_P64 2 -#define __BIT_P65 3 -#define __BIT_P66 4 -#define __BIT_P67 5 -#define __BIT_P68 6 -#define __BIT_P69 7 -#define __BIT_P70 4 -#define __BIT_P71 3 -#define __BIT_P72 2 -#define __BIT_P73 3 -#define __BIT_P74 7 -#define __BIT_P75 4 -#define __BIT_P76 5 -#define __BIT_P77 6 -#define __BIT_P78 2 -#define __BIT_P79 6 -#define __BIT_P80 7 -#define __BIT_P81 4 -#define __BIT_P82 5 -#define __BIT_P83 6 -#define __BIT_P84 2 -#define __BIT_P85 7 - -#define __BIT(pin) __BIT_P##pin -#define __MSK(pin) (1 << __BIT(pin)) - -#define __PIN(pin) __PIN_P##pin -#define __PORT(pin) __PORT_P##pin -#define __DDR(pin) __DDR_P##pin - -#define PIN(pin) __PIN(pin) -#define PORT(pin) __PORT(pin) -#define DDR(pin) __DDR(pin) - -#define PIN_INP(pin) DDR(pin) &= ~__MSK(pin) -#define PIN_OUT(pin) DDR(pin) |= __MSK(pin) -#define PIN_CLR(pin) PORT(pin) &= ~__MSK(pin) -#define PIN_SET(pin) PORT(pin) |= __MSK(pin) -#define PIN_VAL(pin, val) if (val) PIN_SET(pin); else PIN_CLR(pin); -#define PIN_GET(pin) (PIN(pin) & __MSK(pin)) -#define PIN_INQ(pin) (PORT(pin) & __MSK(pin)) - - -#endif //_IO_ATMEGA2560 diff --git a/Firmware/macros.h b/Firmware/macros.h index c27dbde7..4d421a27 100644 --- a/Firmware/macros.h +++ b/Firmware/macros.h @@ -1,6 +1,7 @@ #ifndef MACROS_H #define MACROS_H +#include //for cli() and sei() #define FORCE_INLINE __attribute__((always_inline)) inline #define _UNUSED __attribute__((unused)) @@ -14,5 +15,21 @@ #define STRINGIFY_(M) #M #define STRINGIFY(M) STRINGIFY_(M) +// Macros for bit masks +#undef _BV +#define _BV(n) (1<<(n)) +#define TEST(n,b) (!!((n)&_BV(b))) +#define SET_BIT_TO(N,B,TF) do{ if (TF) SBI(N,B); else CBI(N,B); }while(0) + +#ifndef SBI + #define SBI(A,B) (A |= (1 << (B))) +#endif + +#ifndef CBI + #define CBI(A,B) (A &= ~(1 << (B))) +#endif + +#define TBI(N,B) (N ^= _BV(B)) + #endif //MACROS_H diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index c5981894..ab4af5e2 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -13,8 +13,9 @@ #include "sound.h" #include "printers.h" #include -#include "io_atmega2560.h" #include "AutoDeplete.h" +#include "fastio.h" +#include "pins.h" //-// #include "util.h" @@ -28,9 +29,6 @@ #define MMU_P0_TIMEOUT 3000ul //timeout for P0 command: 3seconds #define MMU_MAX_RESEND_ATTEMPTS 2 -#ifdef MMU_HWRESET -#define MMU_RST_PIN 76 -#endif //MMU_HWRESET namespace { @@ -156,8 +154,8 @@ void mmu_init(void) _delay_ms(10); //wait 10ms for sure mmu_reset(); //reset mmu (HW or SW), do not wait for response mmu_state = S::Init; - PIN_INP(IR_SENSOR_PIN); //input mode - PIN_SET(IR_SENSOR_PIN); //pullup + SET_INPUT(IR_SENSOR_PIN); //input mode + WRITE(IR_SENSOR_PIN, 1); //pullup } //if IR_SENSOR defined, always returns true @@ -170,7 +168,7 @@ bool check_for_ir_sensor() bool detected = false; //if IR_SENSOR_PIN input is low and pat9125sensor is not present we detected idler sensor - if ((PIN_GET(IR_SENSOR_PIN) == 0) + if ((READ(IR_SENSOR_PIN) == 0) #ifdef PAT9125 && fsensor_not_responding #endif //PAT9125 @@ -363,7 +361,7 @@ void mmu_loop(void) case S::GetFinda: //response to command P0 if (mmu_idl_sens) { - if (PIN_GET(IR_SENSOR_PIN) == 0 && mmu_loading_flag) + if (READ(IR_SENSOR_PIN) == 0 && mmu_loading_flag) { #ifdef MMU_DEBUG printf_P(PSTR("MMU <= 'A'\n")); @@ -406,7 +404,7 @@ void mmu_loop(void) case S::WaitCmd: //response to mmu commands if (mmu_idl_sens) { - if (PIN_GET(IR_SENSOR_PIN) == 0 && mmu_loading_flag) + if (READ(IR_SENSOR_PIN) == 0 && mmu_loading_flag) { DEBUG_PRINTF_P(PSTR("MMU <= 'A'\n")); mmu_puts_P(PSTR("A\n")); //send 'abort' request @@ -596,10 +594,10 @@ bool mmu_get_response(uint8_t move) mmu_loading_flag = true; if (can_extrude()) mmu_load_step(); //don't rely on "ok" signal from mmu unit; if filament detected by idler sensor during loading stop loading movements to prevent infinite loading - if (PIN_GET(IR_SENSOR_PIN) == 0) move = MMU_NO_MOVE; + if (READ(IR_SENSOR_PIN) == 0) move = MMU_NO_MOVE; break; case MMU_UNLOAD_MOVE: - if (PIN_GET(IR_SENSOR_PIN) == 0) //filament is still detected by idler sensor, printer helps with unlading + if (READ(IR_SENSOR_PIN) == 0) //filament is still detected by idler sensor, printer helps with unlading { if (can_extrude()) { @@ -617,7 +615,7 @@ bool mmu_get_response(uint8_t move) } break; case MMU_TCODE_MOVE: //first do unload and then continue with infinite loading movements - if (PIN_GET(IR_SENSOR_PIN) == 0) //filament detected by idler sensor, we must unload first + if (READ(IR_SENSOR_PIN) == 0) //filament detected by idler sensor, we must unload first { if (can_extrude()) { @@ -1460,7 +1458,7 @@ static bool can_load() current_position[E_AXIS] -= e_increment; plan_buffer_line_curposXYZE(MMU_LOAD_FEEDRATE); st_synchronize(); - if(0 == PIN_GET(IR_SENSOR_PIN)) + if(0 == READ(IR_SENSOR_PIN)) { ++filament_detected_count; DEBUG_PUTCHAR('O'); @@ -1491,7 +1489,7 @@ static bool load_more() { for (uint8_t i = 0; i < MMU_IDLER_SENSOR_ATTEMPTS_NR; i++) { - if (PIN_GET(IR_SENSOR_PIN) == 0) return true; + if (READ(IR_SENSOR_PIN) == 0) return true; DEBUG_PRINTF_P(PSTR("Additional load attempt nr. %d\n"), i); mmu_command(MmuCmd::C0); manage_response(true, true, MMU_LOAD_MOVE); diff --git a/Firmware/pins_Einsy_1_0.h b/Firmware/pins_Einsy_1_0.h index 14b56233..88713e6a 100755 --- a/Firmware/pins_Einsy_1_0.h +++ b/Firmware/pins_Einsy_1_0.h @@ -121,6 +121,8 @@ #define IR_SENSOR_PIN 62 //idler sensor @PK0 (digital pin 62/A8) +#define MMU_RST_PIN 76 + // Support for an 8 bit logic analyzer, for example the Saleae. // Channels 0-2 are fast, they could generate 2.667Mhz waveform with a software loop. #define LOGIC_ANALYZER_CH0 X_MIN_PIN // PB6 diff --git a/Firmware/swi2c.c b/Firmware/swi2c.c index 49fbc5ef..02cca220 100644 --- a/Firmware/swi2c.c +++ b/Firmware/swi2c.c @@ -3,9 +3,10 @@ #include #include #include +#include "stdbool.h" #include "Configuration_prusa.h" #include "pins.h" -#include "io_atmega2560.h" +#include "fastio.h" #define SWI2C_RMSK 0x01 //read mask (bit0 = 1) @@ -21,75 +22,75 @@ void __delay(void) void swi2c_init(void) { - PIN_OUT(SWI2C_SDA); - PIN_OUT(SWI2C_SCL); - PIN_SET(SWI2C_SDA); - PIN_SET(SWI2C_SCL); + WRITE(SWI2C_SDA, 1); + WRITE(SWI2C_SCL, 1); + SET_OUTPUT(SWI2C_SDA); + SET_OUTPUT(SWI2C_SCL); uint8_t i; for (i = 0; i < 100; i++) __delay(); } void swi2c_start(void) { - PIN_CLR(SWI2C_SDA); + WRITE(SWI2C_SDA, 0); __delay(); - PIN_CLR(SWI2C_SCL); + WRITE(SWI2C_SCL, 0); __delay(); } void swi2c_stop(void) { - PIN_SET(SWI2C_SCL); + WRITE(SWI2C_SCL, 1); __delay(); - PIN_SET(SWI2C_SDA); + WRITE(SWI2C_SDA, 1); __delay(); } void swi2c_ack(void) { - PIN_CLR(SWI2C_SDA); + WRITE(SWI2C_SDA, 0); __delay(); - PIN_SET(SWI2C_SCL); + WRITE(SWI2C_SCL, 1); __delay(); - PIN_CLR(SWI2C_SCL); + WRITE(SWI2C_SCL, 0); __delay(); } uint8_t swi2c_wait_ack() { - PIN_INP(SWI2C_SDA); + SET_INPUT(SWI2C_SDA); __delay(); -// PIN_SET(SWI2C_SDA); +// WRITE(SWI2C_SDA, 1); __delay(); - PIN_SET(SWI2C_SCL); + WRITE(SWI2C_SCL, 1); // __delay(); uint8_t ack = 0; uint16_t ackto = SWI2C_TMO; - while (!(ack = (PIN_GET(SWI2C_SDA)?0:1)) && ackto--) __delay(); - PIN_CLR(SWI2C_SCL); + while (!(ack = (!READ(SWI2C_SDA))) && ackto--) __delay(); + WRITE(SWI2C_SCL, 0); __delay(); - PIN_OUT(SWI2C_SDA); + SET_OUTPUT(SWI2C_SDA); __delay(); - PIN_CLR(SWI2C_SDA); + WRITE(SWI2C_SDA, 0); __delay(); return ack; } uint8_t swi2c_read(void) { - PIN_SET(SWI2C_SDA); + WRITE(SWI2C_SDA, 1); __delay(); - PIN_INP(SWI2C_SDA); + SET_INPUT(SWI2C_SDA); uint8_t data = 0; int8_t bit; for (bit = 7; bit >= 0; bit--) { - PIN_SET(SWI2C_SCL); + WRITE(SWI2C_SCL, 1); __delay(); - data |= (PIN_GET(SWI2C_SDA)?1:0) << bit; - PIN_CLR(SWI2C_SCL); + data |= (READ(SWI2C_SDA)) << bit; + WRITE(SWI2C_SCL, 0); __delay(); } - PIN_OUT(SWI2C_SDA); + SET_OUTPUT(SWI2C_SDA); return data; } @@ -97,12 +98,11 @@ void swi2c_write(uint8_t data) { int8_t bit; for (bit = 7; bit >= 0; bit--) { - if (data & (1 << bit)) PIN_SET(SWI2C_SDA); - else PIN_CLR(SWI2C_SDA); + WRITE(SWI2C_SDA, data & _BV(bit)); __delay(); - PIN_SET(SWI2C_SCL); + WRITE(SWI2C_SCL, 1); __delay(); - PIN_CLR(SWI2C_SCL); + WRITE(SWI2C_SCL, 0); __delay(); } } diff --git a/Firmware/timer02.c b/Firmware/timer02.c index 7c6b4ef0..a866fa25 100644 --- a/Firmware/timer02.c +++ b/Firmware/timer02.c @@ -9,9 +9,6 @@ #include #include -#include "io_atmega2560.h" - -#define BEEPER 84 void timer0_init(void) { diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6f82db04..e8031ea5 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -44,7 +44,6 @@ #include "mmu.h" #include "static_assert.h" -#include "io_atmega2560.h" #include "first_lay_cal.h" #include "fsensor.h" @@ -3999,7 +3998,7 @@ static void lcd_show_sensors_state() finda_state = mmu_finda; } if (ir_sensor_detected) { - idler_state = !PIN_GET(IR_SENSOR_PIN); + idler_state = !READ(IR_SENSOR_PIN); } lcd_puts_at_P(0, 0, _i("Sensor state")); lcd_puts_at_P(1, 1, _i("PINDA:")); @@ -8474,7 +8473,7 @@ static bool selftest_irsensor() mmu_load_step(false); while (blocks_queued()) { - if (PIN_GET(IR_SENSOR_PIN) == 0) + if (READ(IR_SENSOR_PIN) == 0) { lcd_selftest_error(TestError::TriggeringFsensor, "", ""); return false; diff --git a/Firmware/w25x20cl.c b/Firmware/w25x20cl.c index 79467cb6..40d183f1 100644 --- a/Firmware/w25x20cl.c +++ b/Firmware/w25x20cl.c @@ -3,8 +3,8 @@ #include "w25x20cl.h" #include #include -#include "io_atmega2560.h" #include "spi.h" +#include "fastio.h" #define _MFRID 0xEF #define _DEVID 0x11 @@ -31,8 +31,8 @@ #define _CMD_JEDEC_ID 0x9f #define _CMD_RD_UID 0x4b -#define _CS_LOW() PORT(W25X20CL_PIN_CS) &= ~__MSK(W25X20CL_PIN_CS) -#define _CS_HIGH() PORT(W25X20CL_PIN_CS) |= __MSK(W25X20CL_PIN_CS) +#define _CS_LOW() WRITE(W25X20CL_PIN_CS, 0) +#define _CS_HIGH() WRITE(W25X20CL_PIN_CS, 1) //#define _SPI_TX swspi_tx //#define _SPI_RX swspi_rx @@ -45,8 +45,8 @@ int w25x20cl_mfrid_devid(void); int8_t w25x20cl_init(void) { - PIN_OUT(W25X20CL_PIN_CS); _CS_HIGH(); + SET_OUTPUT(W25X20CL_PIN_CS); W25X20CL_SPI_ENTER(); if (!w25x20cl_mfrid_devid()) return 0; return 1;