X-Git-Url: https://defiant.homedns.org/gitweb/?p=ros_wild_thumper.git;a=blobdiff_plain;f=avr%2Fnano%2Fmain.c;h=7b62c809209859236aba3c806f27386f3c6fbe94;hp=76ce35a409dd469e05e7be67f4463803b2919251;hb=540df9f5842bf55260f494c985fd75e4c54fb7cb;hpb=003b8804848207a2403a7e879fc86f34eb631152

diff --git a/avr/nano/main.c b/avr/nano/main.c
index 76ce35a..7b62c80 100644
--- a/avr/nano/main.c
+++ b/avr/nano/main.c
@@ -5,6 +5,10 @@
 #include <avr/interrupt.h>
 #include <avr/sleep.h>
 #include <util/delay.h>
+#include <util/twi.h>
+#include <avr/eeprom.h>
+#include <avr/wdt.h>
+#include <avr/pgmspace.h>
 #include "uart.h"
 
 /*
@@ -14,48 +18,61 @@
  * 0x02 Distance left LSB
  * 0x03 Distance right MSB
  * 0x04 Distance right LSB
- * 0x05 Distance forward MSB
- * 0x06 Distance forward LSB
+ * 0x05 Distance forward1 MSB
+ * 0x06 Distance forward1 LSB
  * 0x07 Distance backward MSB
  * 0x08 Distance backward LSB
  * 0x09 Voltage MSB
  * 0x0A Voltage LSB
+ * 0x0B Distance forward2 MSB
+ * 0x0C Distance forward2 LSB
+ *
+ * 0x15 Distance forward1 MSB (read only)
+ * 0x16 Distance forward1 LSB (read only)
+ * 0x17 Distance backward MSB (read only)
+ * 0x18 Distance backward LSB (read only)
+ * 0x19 Distance forward2 MSB (read only)
+ * 0x1A Distance forward2 LSB (read only)
  *
  * 0xff Bootloader
  */
 
 
-#define TWI_ACK		TWCR = (1<<TWEA) | (1<<TWINT) | (1<<TWEN) | (1<<TWIE)
-#define TWI_RESET	TWCR &= ~((1 << TWSTO) | (1 << TWEN)); TWI_ACK
-#define TWI_NAK		TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWIE)
+#define TWI_ACK   TWCR = (1<<TWINT) | (1<<TWEA) | (1<<TWEN) | (1<<TWIE)
+#define TWI_NAK   TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWIE)
+#define TWI_RESET TWCR = (1<<TWINT) | (1<<TWEA) | (1<<TWSTO) | (1<<TWEN) | (1<<TWIE);
 
 static volatile uint8_t ireg=0;
 static volatile uint8_t bootloader=0;
 static volatile uint16_t dist_left=0;
 static volatile uint16_t dist_right=0;
-static volatile uint16_t dist_forward=0;
+static volatile uint16_t dist_forward1=0;
+static volatile uint16_t dist_forward2=0;
 static volatile uint16_t dist_backward=0;
-static volatile uint8_t start_dist_fwd=0;
+static volatile uint8_t start_dist_fwd1=0;
+static volatile uint8_t start_dist_fwd2=0;
 static volatile uint8_t start_dist_bwd=0;
 static volatile uint16_t voltage=0;
+static volatile uint8_t pind_pre=0;
 
 ISR(TWI_vect)
 {
 	static int16_t tmp16=0;
 
-	switch (TWSR & 0xF8)
+	switch(TW_STATUS)
 	{  
-		case 0x60: // start write
+		case TW_SR_SLA_ACK: // start write
 			TWI_ACK;
 			ireg = 0;
 			break;
-		case 0x80: // write
+		case TW_SR_DATA_ACK: // write
 			switch(ireg) {
 				case 0x00: // register select
 					ireg = TWDR;
 
-					if (ireg == 0x05) start_dist_fwd=1;
+					if (ireg == 0x05) start_dist_fwd1=1;
 					if (ireg == 0x07) start_dist_bwd=1;
+					if (ireg == 0x0b) start_dist_fwd2=1;
 
 					ireg--; // because we do ireg++ below
 					TWI_ACK;
@@ -65,10 +82,10 @@ ISR(TWI_vect)
 				default:
 					TWI_NAK;
 			}
-			ireg++;
+			if (ireg < 0xff) ireg++;
 			break;
-		case 0xA8: // start read
-		case 0xB8: // read
+		case TW_ST_SLA_ACK: // start read
+		case TW_ST_DATA_ACK: // read
 			switch(ireg) {
 				case 0x01: // Distance left MSB
 					tmp16 = dist_left;
@@ -88,12 +105,12 @@ ISR(TWI_vect)
 					TWDR = tmp16;
 					TWI_ACK;
 					break;
-				case 0x05: // Distance forward MSB
-					tmp16 = dist_forward;
+				case 0x05: // Distance forward1 MSB
+					tmp16 = dist_forward1;
 					TWDR = tmp16>>8;
 					TWI_ACK;
 					break;
-				case 0x06: // Distance forward LSB
+				case 0x06: // Distance forward1 LSB
 					TWDR = tmp16;
 					TWI_ACK;
 					break;
@@ -115,12 +132,51 @@ ISR(TWI_vect)
 					TWDR = tmp16;
 					TWI_ACK;
 					break;
+				case 0x0B: // Distance forward2 MSB
+					tmp16 = dist_forward2;
+					TWDR = tmp16>>8;
+					TWI_ACK;
+					break;
+				case 0x0C: // Distance forward2 LSB
+					TWDR = tmp16;
+					TWI_ACK;
+					break;
+				case 0x15: // Distance forward1 MSB
+					tmp16 = dist_forward1;
+					TWDR = tmp16>>8;
+					TWI_ACK;
+					break;
+				case 0x16: // Distance forward1 LSB
+					TWDR = tmp16;
+					TWI_ACK;
+					break;
+				case 0x17: // Distance backward MSB
+					tmp16 = dist_backward;
+					TWDR = tmp16>>8;
+					TWI_ACK;
+					break;
+				case 0x18: // Distance backward LSB
+					TWDR = tmp16;
+					TWI_ACK;
+					break;
+				case 0x19: // Distance forward2 MSB
+					tmp16 = dist_forward2;
+					TWDR = tmp16>>8;
+					TWI_ACK;
+					break;
+				case 0x1A: // Distance forward2 LSB
+					TWDR = tmp16;
+					TWI_ACK;
+					break;
 				default:
 					TWDR = 0;
 					TWI_NAK;
 			}
 			ireg++;
 			break;
+		case TW_SR_STOP:
+			TWI_ACK;
+			break;
 		default:
 			TWI_RESET;
 	}
@@ -135,7 +191,7 @@ uint16_t ReadChannel(uint8_t mux) {
 	// setzen auf 8 (1) und ADC aktivieren (1)
 
 	ADMUX = mux;                      // Kanal waehlen
-	ADMUX |= (1<<REFS1) | (1<<REFS0); // interne Referenzspannung nutzen 
+	ADMUX |= (1<<REFS0);
 
 	/* nach Aktivieren des ADC wird ein "Dummy-Readout" empfohlen, man liest
 	   also einen Wert und verwirft diesen, um den ADC "warmlaufen zu lassen" */
@@ -186,9 +242,9 @@ ISR(INT0_vect) {
 		t_start = t_now;
 	} else {
 		t_diff = t_now - t_start;
-		dist_forward = t_diff*2.7586 + 0.5; // t [µs] / 580 = mm
+		dist_forward1 = t_diff*2.7586 + 0.5; // t [µs] / 580 = mm
 		// disable this interrupt
-		EIMSK |= (1 << INT0);
+		EIMSK &= ~(1 << INT0);
 	}
 }
 
@@ -205,8 +261,31 @@ ISR(INT1_vect) {
 		t_diff = t_now - t_start;
 		dist_backward = t_diff*2.7586 + 0.5; // t [µs] / 580 = mm
 		// disable this interrupt
-		EIMSK |= (1 << INT1);
+		EIMSK &= ~(1 << INT1);
+	}
+}
+
+
+ISR(PCINT2_vect) {
+	uint8_t pind_cur = PIND;
+
+	if ((pind_cur ^ pind_pre) & (1<<4)) { // PCINT20
+		static uint16_t t_start=0;
+		uint16_t t_now = TCNT1;
+		uint16_t t_diff;
+
+		if (bit_is_set(pind_cur, 4)) { // high level
+			// start timer
+			t_start = t_now;
+		} else {
+			t_diff = t_now - t_start;
+			dist_forward2 = t_diff*2.7586 + 0.5; // t [µs] / 580 = mm
+			// disable this interrupt
+			PCMSK2 &= ~(1 << PCINT20);
+		}
 	}
+
+	pind_pre = pind_cur;
 }
 
 
@@ -217,7 +296,7 @@ int main(void) {
 
 	// I2C
 	TWAR = 0x52;
-	TWI_RESET;
+	TWI_ACK;
 
 	// Timer 1: Normal mode, Top: 0xffff, Prescaler: F_CPU/256=62500Hz
 	TCCR1A = 0x0;
@@ -225,8 +304,9 @@ int main(void) {
 
 	// External Interrupts
 	EICRA = (1 << ISC10) | (1 << ISC00);
+	PCICR = (1 << PCIE2);
 
-	printf("\r\nStart\r\n");
+	printf_P(PSTR("\r\nStart\r\n"));
 
 	set_sleep_mode(SLEEP_MODE_IDLE);
 	sei();
@@ -244,17 +324,18 @@ int main(void) {
 			case 0xff: // Magic reg that starts the bootloader
 				if (bootloader == 0xa5) {
 					cli();
-					{
-						void (*start)(void) = (void*)0x1800;
-						start();
-					}
+					// write mark to first area in eeprom
+					eeprom_write_byte((uint8_t*)0, 123);
+					eeprom_busy_wait();
+					// Use watchdog to restart
+					wdt_enable(WDTO_15MS);
 				}
 				break;
 		}
 
-		if (start_dist_fwd) {
-			start_dist_fwd = 0;
-			dist_forward = 0;
+		if (start_dist_fwd1) {
+			start_dist_fwd1 = 0;
+			dist_forward1 = 0;
 
 			DDRD |= (1 << 2);
 			PORTD |= (1 << 2);
@@ -262,6 +343,7 @@ int main(void) {
 			PORTD &= ~(1 << 2);
 			DDRD &= ~(1 << 2);
 			// wait for interrupt
+			EIFR &= (1 << INTF0); // clear old interrupt before enabling
 			EIMSK |= (1 << INT0);
 		}
 		if (start_dist_bwd) {
@@ -274,8 +356,23 @@ int main(void) {
 			PORTD &= ~(1 << 3);
 			DDRD &= ~(1 << 3);
 			// wait for interrupt
+			EIFR &= (1 << INTF1); // clear old interrupt before enabling
 			EIMSK |= (1 << INT1);
 		}
+		if (start_dist_fwd2) {
+			start_dist_fwd2 = 0;
+			dist_forward2 = 0;
+
+			// PD4 = PCINT20
+			DDRD |= (1 << 4);
+			PORTD |= (1 << 4);
+			_delay_us(10);
+			PORTD &= ~(1 << 4);
+			DDRD &= ~(1 << 4);
+			// wait for interrupt
+			pind_pre = PIND;
+			PCMSK2 |= (1 << PCINT20);
+		}
 
 		sleep_mode();
 	}