X-Git-Url: https://defiant.homedns.org/gitweb/?p=ros_wild_thumper.git;a=blobdiff_plain;f=avr%2Fmotor_ctrl%2Fmain.c;h=d751375d0f8138fa69896cf8c514341625b9ef27;hp=7781fb4af01654b33ea2a53df04a1bbaf63b7967;hb=ac14ad5ea1d0ae804b67ff41a7174afcf0dc00c1;hpb=d55fc1ff8c77515d29610d3940f35965ff202a90

diff --git a/avr/motor_ctrl/main.c b/avr/motor_ctrl/main.c
index 7781fb4..d751375 100644
--- a/avr/motor_ctrl/main.c
+++ b/avr/motor_ctrl/main.c
@@ -5,6 +5,9 @@
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include <avr/sleep.h>
+#include <util/twi.h>
+#include <avr/eeprom.h>
+#include <avr/wdt.h>
 #include "uart.h"
 
 /*
@@ -111,9 +114,9 @@
 #define PWM_BREAK INT16_MIN
 #define STALL_LIMIT 140000
 
-#define TWI_ACK   TWCR = (1<<TWEA) | (1<<TWINT) | (1<<TWEN) | (1<<TWIE)
-#define TWI_RESET TWCR &= ~((1 << TWSTO) | (1 << TWEN)); TWI_ACK
+#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);
 #define ENABLE_PWM_MOTOR1  TCCR1A |=  (1 << COM1A1)
 #define ENABLE_PWM_MOTOR2  TCCR1A |=  (1 << COM1B1)
 #define ENABLE_PWM_MOTOR3  TCCR2  |=  (1 << COM21);
@@ -188,13 +191,13 @@ ISR(TWI_vect)
 	static ufloat_t tmp_speed;
 	static ufloat_t tmp_angle;
 
-	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;
@@ -381,8 +384,8 @@ ISR(TWI_vect)
 			}
 			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 0x02: // Motor 1 PWM
 					TWDR = OCR1A;
@@ -616,6 +619,9 @@ ISR(TWI_vect)
 			}
 			ireg++;
 			break;
+		case TW_SR_STOP:
+			TWI_ACK;
+			break;
 		default:
 			TWI_RESET;
 	}
@@ -931,7 +937,8 @@ static void update_pid(void) {
 			speed1_wish_old = speed1_wish;
 		}
 
-		if (speed1_wish == 0) {
+		uint8_t dir_change = (speed1_wish > 0 && speed1 < 0) || (speed1_wish < 0 && speed1 > 0); // Prevent dangerous immediate engine reverse
+		if (speed1_wish == 0 || dir_change) {
 			motor1 = 0;
 			eold1 = 0;
 			error_state &= ~(1<<4);
@@ -953,7 +960,8 @@ static void update_pid(void) {
 			speed2_wish_old = speed2_wish;
 		}
 
-		if (speed2_wish == 0) {
+		uint8_t dir_change = (speed2_wish > 0 && speed2 < 0) || (speed2_wish < 0 && speed2 > 0); // Prevent dangerous immediate engine reverse
+		if (speed2_wish == 0 || dir_change) {
 			motor2 = 0;
 			eold2 = 0;
 			error_state &= ~(1<<5);
@@ -975,7 +983,8 @@ static void update_pid(void) {
 			speed3_wish_old = speed3_wish;
 		}
 
-		if (speed3_wish == 0) {
+		uint8_t dir_change = (speed3_wish > 0 && speed3 < 0) || (speed3_wish < 0 && speed3 > 0); // Prevent dangerous immediate engine reverse
+		if (speed3_wish == 0 || dir_change) {
 			motor3 = 0;
 			eold3 = 0;
 			error_state &= ~(1<<6);
@@ -997,7 +1006,8 @@ static void update_pid(void) {
 			speed4_wish_old = speed4_wish;
 		}
 
-		if (speed4_wish == 0) {
+		uint8_t dir_change = (speed4_wish > 0 && speed4 < 0) || (speed4_wish < 0 && speed4 > 0); // Prevent dangerous immediate engine reverse
+		if (speed4_wish == 0 || dir_change) {
 			motor4 = 0;
 			eold4 = 0;
 			error_state &= ~(1<<7);
@@ -1041,7 +1051,7 @@ int main(void) {
 
 	// I2C
 	TWAR = 0x50;
-	TWI_RESET;
+	TWI_ACK;
 
 	// Motor 1 & 2
 	// Also used for PWM frequency TIMER1_FREQ (F_CPU/256)
@@ -1082,10 +1092,11 @@ 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;
 		}