From d2a71b921f9b838f2d2b1119644f51595bc5ae7b Mon Sep 17 00:00:00 2001
From: henyxia <henyxia@live.fr>
Date: Wed, 4 Mar 2015 18:31:23 +0100
Subject: [PATCH] Initial serial controlled version Makefile adapted to match with the port configuration

---
 Makefile | 14 +++++++-------
 main.c   | 39 ++++++++++++++++++++++++++++++---------
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 85c916d..089dcfb 100755
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,18 @@
-export CC = avr-gcc
+CC = avr-gcc
 
-export MCU = atmega328p
-export TARGET_ARCH = -mmcu=$(MCU)
+MCU = atmega328p
+TARGET_ARCH = -mmcu=$(MCU)
 
-export CFLAGS =  -Wall -I. -DF_CPU=16000000 -Os #-g
-export LDFLAGS = -g $(TARGET_ARCH) -lm -Wl,--gc-sections #	-Os
+CFLAGS =  -Wall -I. -DF_CPU=16000000 -Os #-g
+LDFLAGS = -g $(TARGET_ARCH) -lm -Wl,--gc-sections #	-Os
 
 TARGET = usb
-TERM = /dev/ttyACM0
+TERM = /dev/ttyACM1
 CPPFLAGS = -mmcu=$(MCU)
 PGMER = -c stk500v1 -b 57600 -P $(TERM)
 PGMERISP = -c stk500v1 -b 115200 -P $(TERM)
 ARVDUDECONF= -C /usr/local/arduino/arduino-0022/hardware/tools/avrdude.conf
-export DUDE = /usr/bin/avrdude -F -v -p $(MCU) $(AVRDUDECONF)
+DUDE = /usr/bin/avrdude -F -v -p $(MCU) $(AVRDUDECONF)
 
 C_SRC = $(wildcard *.c)
 OBJS = $(C_SRC:.c=.o)
diff --git a/main.c b/main.c
index dcbee71..83866be 100755
--- a/main.c
+++ b/main.c
@@ -6,10 +6,9 @@
 unsigned int joystick_lr;
 unsigned int joystick_ud;
 
-void init_serial(unsigned long int speed)
+void init_serial(int speed)
 {
-	//UBRR0 = CPU_FREQ/((speed)<<4)-1;
-	UBRR0 = 8;
+	UBRR0 = CPU_FREQ/(((unsigned long int)speed)<<4)-1;
 	UCSR0B = (1<<TXEN0 | 1<<RXEN0);
 	UCSR0C = (1<<UCSZ01 | 1<<UCSZ00);
 	UCSR0A &= (1 << U2X0);
@@ -37,26 +36,48 @@ void port_initio(void)
 
 int main(void)
 {
-	init_serial(250000);
+	init_serial(19200);
 	port_initio();
+	unsigned char ser;
 	uint8_t	opto0 = 0;
-	uint8_t	opto2 = 0;
+	uint8_t	opto1 = 0;
+	uint8_t once = 1;
   
 	while (1)
 	{
 		if((opto0 == 1) && ((PIND & 0x40) == 0x40))
-			PORTD &= 0xE7;
+		{
+			if(once)
+			{
+				PORTD &= 0xE7;
+				//_delay_ms(00000);
+				//PORTD |= 0x18;
+				//once = 0;
+			}
+		}
 		else
+		{
+			once = 1;
 			PORTD |= 0x18;
-		if((opto2 == 1) && ((PIND & 0x80) == 0x80))
+		}
+		if((opto1 == 1) && ((PIND & 0x80) == 0x80))
 			PORTD &= 0xDB;
 		else
 			PORTD |= 0x24;
 
+		ser = get_serial();
+		if(ser == 'B')
+			opto0 = 1;
+		else if(ser == 'D')
+			opto0 = 0;
+		send_serial(ser);
+/*
 		if((PINB & 0x01) == 0x01)
-			send_serial('U');
+			send_serial('1');
 		else
-			send_serial('D');
+			send_serial('0');
+		send_serial('\n');
+*/
 	}
 
 	return 0;
--
libgit2 0.21.2