X-Git-Url: https://defiant.homedns.org/gitweb/?p=ros_wild_thumper.git;a=blobdiff_plain;f=avr%2Fmotor_ctrl%2Fmain.c;h=a4c984dfa4e7e2cbd0219bc29bc7e2017b045b58;hp=b0d9cbfe00aba102cc72ce4f82173b5eefa30eac;hb=5d5f12eaf31287bcbaf01ff211b1366bd48c0658;hpb=a40cf061b04718ece7057174a36f3c3c818f6f61

diff --git a/avr/motor_ctrl/main.c b/avr/motor_ctrl/main.c
index b0d9cbf..a4c984d 100644
--- a/avr/motor_ctrl/main.c
+++ b/avr/motor_ctrl/main.c
@@ -8,6 +8,7 @@
 #include <util/twi.h>
 #include <avr/eeprom.h>
 #include <avr/wdt.h>
+#include <avr/pgmspace.h>
 #include "uart.h"
 
 /*
@@ -95,6 +96,8 @@
  * 0xA0 Reset reason
  * 0xA1 Error status
  * 0xA2 count test
+ * 0xA3 last i2c status before boot
+ * 0xA4 Watchdog enable
  * free
  * 0xff Bootloader
  */
@@ -184,7 +187,10 @@ static volatile uint8_t count_test=0;
 static volatile uint8_t front_handicap=0;
 static volatile uint8_t aft_handicap=0;
 static volatile uint8_t error_state=0;
-static volatile uint8_t last_man_update_count=I2C_TIMEOUT_DISABLE;
+static volatile uint8_t last_man_update_count=0;
+static volatile uint8_t last_i2c_status = 0;
+static uint8_t last_i2c_status_boot = 0;
+static volatile uint8_t watchdog_enable = 0;
 
 ISR(TWI_vect)
 {
@@ -193,6 +199,7 @@ ISR(TWI_vect)
 	static ufloat_t tmp_speed;
 	static ufloat_t tmp_angle;
 
+	last_i2c_status = TW_STATUS;
 	switch(TW_STATUS)
 	{
 		case TW_SR_SLA_ACK: // start write
@@ -380,6 +387,10 @@ ISR(TWI_vect)
 					cmd_vel.bUpdate = 1;
 					TWI_ACK;
 					break;
+				case 0xA4: // Watchdog enable
+					watchdog_enable = TWDR;
+					TWI_ACK;
+					break;
 				case 0xff: // bootloader
 					bootloader = TWDR;
 				default:
@@ -616,6 +627,12 @@ ISR(TWI_vect)
 				case 0xA2: // count test
 					TWDR = count_test;
 					TWI_ACK;
+				case 0xA3: // last i2c status before boot
+					TWDR = last_i2c_status_boot;
+					TWI_ACK;
+				case 0xA4: // Watchdog enable
+					TWDR = watchdog_enable;
+					TWI_ACK;
 				default:
 					TWDR = 0;
 					TWI_NAK;
@@ -625,9 +642,15 @@ ISR(TWI_vect)
 		case TW_SR_STOP:
 			TWI_ACK;
 			break;
+		case TW_NO_INFO:
+			break;
 		default:
 			TWI_RESET;
 	}
+
+	if (watchdog_enable == 2) {
+		wdt_reset();
+	}
 }
 
 
@@ -1083,7 +1106,9 @@ int main(void) {
 	TCCR0 = (1 << WGM01) | (1 << WGM00) | (1 << CS00);
 	OCR0 = 0;
 
-	printf("\r\nStart\r\n");
+	printf_P(PSTR("\r\nStart\r\n"));
+
+	last_i2c_status_boot = eeprom_read_byte((uint8_t*)1);
 
 	set_sleep_mode(SLEEP_MODE_IDLE);
 	// Enable Timer 1 Overflow Interrupt
@@ -1092,6 +1117,15 @@ int main(void) {
 
 	while(1) {
 		switch(ireg) {
+			case 0xA4: // Watchdog enable
+				if (watchdog_enable == 1) {
+					wdt_enable(WDTO_2S);
+					watchdog_enable = 2;
+				} else if (watchdog_enable == 0) {
+					wdt_disable();
+					watchdog_enable = 3;
+				}
+				break;
 			case 0xff: // Magic reg that starts the bootloader
 				if (bootloader == 0xa5) {
 					cli();
@@ -1149,11 +1183,16 @@ int main(void) {
 			count_test++;
 			if (last_man_update_count != I2C_TIMEOUT_DISABLE) last_man_update_count++;
 
-			if (last_man_update_count > 100) {
+			if (last_man_update_count >= 100) {
 				// ~1s without a new i2c command
 				cmd_vel.speed = 0;
 				cmd_vel.angle = 0;
 				cmd_vel.bUpdate = 1;
+				if (last_man_update_count == 100) {
+					printf_P(PSTR("I2C State: 0x%x\r\n"), last_i2c_status);
+					eeprom_write_byte((uint8_t*)1, last_i2c_status);
+					eeprom_busy_wait();
+				}
 				last_man_update_count = I2C_TIMEOUT_DISABLE;
 			}
 		}