From 87a086b435964e6bf4e049cce4ef23d16ce1585d Mon Sep 17 00:00:00 2001 From: tzim Date: Mon, 14 Oct 2019 22:22:23 +0200 Subject: [PATCH] Passage sur AT32 --- Makefile | 4 ++-- main.c | 11 +++++++---- spi.h | 10 +++++++++- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 584f41b..548ed5c 100644 --- a/Makefile +++ b/Makefile @@ -58,8 +58,8 @@ TARGET = pyrorf SRC = main.c lcd.c spi.c rf24.c Hamming.c HammingCalculateParitySmallAndFast.c tools.c CXXSRC = ASRC = i2cmaster.S -MCU = atmega32u4 -F_CPU = 16000000UL +MCU = atmega32a +F_CPU = 8000000UL FORMAT = ihex UPLOAD_RATE = 57600 diff --git a/main.c b/main.c index 953adb0..8b5a94f 100644 --- a/main.c +++ b/main.c @@ -45,7 +45,7 @@ void setup(void) #endif lcd_init(20,4); - lcd_backlight(1); + lcd_backlight(0); lcd_clear(); lcd_home(); lcd_display(); @@ -56,6 +56,7 @@ void setup(void) lcd_setCursor(3,2); lcdprint("Init Radio"); + while (1){ _delay_ms(500); rf24_setup(); @@ -72,6 +73,7 @@ void setup(void) lcdprint("Radio Ok ! "); _delay_ms(1500); lcd_clear(); + radiostate=SOFF; #if defined(__AVR_ATmega32A__) GICR|=_BV(INT2); @@ -155,7 +157,8 @@ void _radio(){ break; case SRX: if(rf24_receive(radiobuffer)){ - + lcd_setCursor(0,1); + debughex(radiobuffer,8); } break; @@ -168,9 +171,9 @@ void _lcd() { t_lcd=200; lcd_setCursor(0,0); if(p) - lcd_write('*'); + lcdprint("**"); else - lcd_write(' '); + lcdprint(" "); p=p?0:1; } } diff --git a/spi.h b/spi.h index f3222ba..5be7d63 100644 --- a/spi.h +++ b/spi.h @@ -11,7 +11,15 @@ extern "C"{ #endif -#if defined (__AVR_ATmega32__) +#if defined (__AVR_ATmega32A__) + +#define SPI_PORT PORTB +#define SPI_DDR DDRB + +#define SS_PIN PB4 +#define SCK_PIN PB7 +#define MOSI_PIN PB5 +#define MISO_PIN PB6 #elif defined (__AVR_ATmega2560__) #define SPI_PORT PORTB