From 755ed3c06c173280d4f63bf98b1d289d782f4e29 Mon Sep 17 00:00:00 2001
From: Jan Michel <j.michel@gsi.de>
Date: Fri, 25 Jul 2014 15:24:41 +0200
Subject: [PATCH] new version of power switch firmware with more features

---
 Power/firmware/Makefile      |   2 +-
 Power/firmware/PowerSwitch.c | 291 ++++++++++++++++++++---------------
 2 files changed, 168 insertions(+), 125 deletions(-)

diff --git a/Power/firmware/Makefile b/Power/firmware/Makefile
index 34364fc..143fc01 100644
--- a/Power/firmware/Makefile
+++ b/Power/firmware/Makefile
@@ -7,7 +7,7 @@
 
 MCU = attiny441
 FORMAT = ihex
-TARGET = main
+TARGET = PowerSwitch
 SRC = $(TARGET).c
 ASRC = 
 OPT = s
diff --git a/Power/firmware/PowerSwitch.c b/Power/firmware/PowerSwitch.c
index 0c54c6f..1f414d9 100755
--- a/Power/firmware/PowerSwitch.c
+++ b/Power/firmware/PowerSwitch.c
@@ -2,11 +2,11 @@
 
 #include <avr/interrupt.h>
 #include <util/delay.h>
-// #include <avr/sleep.h>
-// #include <stdint.h>
 #include <avr/io.h>
+#include <avr/eeprom.h>
 #include <string.h>
 
+#define FIRMWARE_VERSION 0x010
 
 //A0 Aref    In
 //A1 Adc2    In  (ADC1)
@@ -27,24 +27,33 @@
 //Scc(0|1|/)   -- switch channel off/on/toggle
 //Scc?         -- read channel status - 2nd char: 'e' in case of overcurrent, 3rd char: enable 1/0
 //Ccc?         -- read current
+//Dcc?         -- read averaged current
 //Lccxxx       -- set current limit (hex)
 //Lcc?         -- read current limit
 //Axxx         -- answer - three hex digits or chars
+//Occ(0|1|2|3) -- switch ADC & set max scale:  off|2.2Vref|4.1Vref|VCCref (one setting for both ports)
+//Pcc(0|1)     -- Do a automatic power cycle (2 seconds long)
+//Rcc?         -- read ADC measurement of internal 1.1V reference (one register)
+//Icc?         -- Firmware Info
 
 #define STARTTX(i) txcnt = (i);UCSR1B |= (1<< UDRIE1)
-#define ISMYADDR() (rxbuf[1] == '0' && (rxbuf[2] == '0' || rxbuf[2] == '1'))
+#define ISMYADDR() (rxbuf[1] == '0' && (rxbuf[2] == '0' || rxbuf[2] == '1') )
 
 volatile uint8_t settings_changed = 0;
 uint8_t  output_enable = 0x3;
 uint8_t  output_error = 0;
+uint8_t  adc_enable = 1;
 uint16_t adc[2];
 uint16_t avgadc[2] = {0,0};
+uint8_t  countdown[2] = {0,0};
+uint16_t adc_reference = 0;
 
 uint8_t rxcnt = 0, txcnt = 0, txpoint = 0;
 uint8_t rxbuf[7];
 uint8_t txbuf[7];
 uint16_t limit[2] = {0x0800,0x0800};
 
+
 uint8_t nib_to_hex(uint16_t in, uint8_t nib) {
   uint8_t t = (in >> (nib*4)) & 0xF;
   if (t <= 9) {return t + 0x30;}
@@ -69,6 +78,17 @@ void forward_msg(uint8_t i) {
   memcpy ((uint8_t*)txbuf,(uint8_t*)rxbuf,i);
   STARTTX(i);
   }  
+
+uint8_t is_my_address(uint8_t s) {
+  if (ISMYADDR()) {
+    rxbuf[2] -= '0';
+    return 1;
+    }
+  else {
+    forward_msg(s);
+    return 0;
+    }
+  }
   
 void send_answer_hex(uint16_t v) {
   txbuf[0]='A';
@@ -90,8 +110,10 @@ void send_answer_chars(uint8_t a, uint8_t b, uint8_t c) {
 
   
 void switchoutput(uint8_t chan, int8_t to) {
-  if(to == -1)
+  if(to == -1) {
     output_enable ^= (1<<chan);
+	output_error  &= ~(1<<chan);
+    }
   else if (to == 0 || to == -2) {
     output_enable &= ~(1<<chan);
     }
@@ -102,31 +124,56 @@ void switchoutput(uint8_t chan, int8_t to) {
 
   if(to >= -1) {settings_changed |= 4;}
   
-  uint8_t en1 = ((output_enable & 1) && !(output_error & 1))?0:1;
-  uint8_t en2 = ((output_enable & 2) && !(output_error & 2))?0:1;
-  PORTA = (PORTA & ~(3<<2)) | ((en1&1)<<3) | ((en2&1)<<2);
+  uint8_t en1 = ((output_enable & 1) && !(output_error & 1))?1:0;  //switched for open drain version
+  uint8_t en2 = ((output_enable & 2) && !(output_error & 2))?1:0;
+  
+  PORTA &= ~((1<<2) | (1<<3));
+  DDRA  = (DDRA & ~(3<<2)) | ((en1&1)<<3) | ((en2&1)<<2);
+  //PORTA = (PORTA & ~(3<<2)) | ((en1&1)<<3) | ((en2&1)<<2);
 
   }
 
+void correct_adc(uint8_t channel) {
+    if(adc_enable == 1) return;
+    if(adc_enable == 2) {
+      adc[channel] = adc[channel]*2 - (adc[channel]>>3);
+      }
+    }
+  
 ISR(TIMER0_OVF_vect) {
   static uint8_t dwncnt[2] = {0,0};
   if(!(PINA & 0x40)) {dwncnt[0]++;} else {dwncnt[0] = 0;}
   if(!(PINB & 0x04)) {dwncnt[1]++;} else {dwncnt[1] = 0;}
 	  
-  if(dwncnt[0] == 50) {switchoutput(0,-1);}	  
-  if(dwncnt[1] == 50) {switchoutput(1,-1);}
-	  
-  ADCSRA |= (1<<ADSC);  
+	
+  for(uint8_t i=0; i<=1;i++) {
+    if(dwncnt[i] == 50) {switchoutput(i,-1);}	  
+    if(countdown[i] != 0) {
+      if(countdown[i] == 1) {
+        switchoutput(i,-1);
+        }
+      countdown[i]--;
+      }
+	}
+  
+  if(adc_enable) {ADCSRA |= (1<<ADSC);}
   asm volatile("wdr");
-  }
-
+  }  
+  
 ISR(ADC_vect) {
   static uint8_t channel = 0;
   if(channel == 0) { 
+    adc_reference = ADC;
+    ADMUXA = 7;  
+    ADCSRA |= (1<<ADSC); 
+    channel = 1;
+    }
+  else if(channel == 1) { 
     adc[0] = ADC; 
+    correct_adc(0);
     ADMUXA = 1;  
     ADCSRA |= (1<<ADSC); 
-    channel = 1;
+    channel = 2;
     avgadc[0] -= avgadc[0]/8;
     avgadc[0] += adc[0];
     if(limit[0]*8<avgadc[0]) {
@@ -134,10 +181,10 @@ ISR(ADC_vect) {
       switchoutput(0,-2);
       }  
     }
-  else if(channel == 1) { 
+  else if(channel == 2) { 
     adc[1] = ADC; 
-    ADMUXA = 7;  
-//    ADCSRA |= (1<<ADSC); 
+    correct_adc(1);
+    ADMUXA = 0xD;
     channel = 0;
     avgadc[1] -= avgadc[1]/8;
     avgadc[1] += adc[1];
@@ -145,7 +192,7 @@ ISR(ADC_vect) {
       output_error |= 2;
       switchoutput(1,-2);
       }    
-    }	  
+    }
   }
 
 ISR(USART1_UDRE_vect) {
@@ -159,123 +206,114 @@ ISR(USART1_UDRE_vect) {
   
 ISR(USART1_RX_vect) {
   uint8_t buf = UDR1;
-  if (rxcnt != 0 || (buf == 'S' || buf == 'A' || buf == 'L' || buf == 'C' || buf == 'D')) {
+  if (rxcnt != 0 || (buf == 'S' || buf == 'A' || buf == 'L' || buf == 'C' || buf == 'I'
+                                || buf == 'D' || buf == 'O' || buf == 'P' || buf == 'R')) {
     rxbuf[rxcnt++] = buf;
     }
-  //Forward any incoming 4 letter answer
   if (buf == '\n' || buf == '\r') {
-    // if(rxcnt == 1 && rxbuf[0] == '\n') {
-      // txbuf[0] = '\n';
-      // STARTTX(1);
-      // }
-    if(rxcnt == 5) {
+
+
+    if(rxcnt == 5) { //4 letter commands
+//Forward any incoming 4 letter answer    
       if (rxbuf[0] == 'A') {
         memcpy ((uint8_t*)txbuf,(uint8_t*)rxbuf,5);
         STARTTX(5);
         }
-    //Four letter 'switch' command  
-      if (rxbuf[0] == 'S') {  
-        if (ISMYADDR()) {
-          rxbuf[2] -= '0';
-          if (rxbuf[3] != '?') {
-            switchoutput(rxbuf[2],rxbuf[3]-'0');
-            }
-          send_answer_chars('0', (output_error  & (1<<rxbuf[2]))?'e':'0', 
-                                 (output_enable & (1<<rxbuf[2]))?'1':'0');      
-          }
-        else {
-          forward_msg(5);
+        
+//Switch command  
+      if (rxbuf[0] == 'S' && is_my_address(5)) {  
+        if (rxbuf[3] != '?') {
+          switchoutput(rxbuf[2],rxbuf[3]-'0');
           }
+        send_answer_chars('0', (output_error  & (1<<rxbuf[2]))?'e':'0', 
+                               (output_enable & (1<<rxbuf[2]))?'1':'0');      
         }
-    //Read current command
-      if (rxbuf[0] == 'C') { 
-        if (ISMYADDR()) {
-          if (rxbuf[3] == '?')
-            send_answer_hex(adc[rxbuf[2]-'0']);
-          }
-        else {
-          forward_msg(5);
+
+//Power cycle command
+      if (rxbuf[0] == 'P' && is_my_address(5)) {  
+        if (rxbuf[3] != '?') {
+          switchoutput(rxbuf[2],rxbuf[3]-'0');
+          countdown[rxbuf[2]] = 200;
           }
+        send_answer_chars('0', (output_error  & (1<<rxbuf[2]))?'e':'0', 
+                               (output_enable & (1<<rxbuf[2]))?'1':'0');      
         }
-    //Read average current command
-    if (rxbuf[0] == 'D') {
-	    if (ISMYADDR()) {
-		    if (rxbuf[3] == '?')
-		    send_answer_hex(avgadc[rxbuf[2]-'0']/8);
-	    }
-	    else {
-		    forward_msg(5);
-	    }
-    }
-    //Read current limit    
-      if (rxbuf[0] == 'L' && rxbuf[3] == '?') {
-        if (ISMYADDR()) {
-          send_answer_hex(limit[rxbuf[2]-'0']);      
-          }
-        else {
-          forward_msg(5);
-          }
+        
+//Read current command
+      if (rxbuf[0] == 'C' && rxbuf[3] == '?' && is_my_address(5)) { 
+        if(adc_enable == 3) {  send_answer_hex(adc[rxbuf[2]]+0x800);  }
+        else                {  send_answer_hex(adc[rxbuf[2]]);        }
+        }
+        
+//Read average current command
+      if (rxbuf[0] == 'D' && rxbuf[3] == '?' && is_my_address(5)) {
+        if(adc_enable == 3) {  send_answer_hex(avgadc[rxbuf[2]]/8+0x800);  }
+        else                {  send_answer_hex(avgadc[rxbuf[2]]/8);        }
+        }
+
+//Read firmware info
+      if (rxbuf[0] == 'I' && rxbuf[3] == '?' && is_my_address(5)) {
+	    send_answer_hex(FIRMWARE_VERSION);
+        }
+        
+//Switch ADC
+      if (rxbuf[0] == 'O' && is_my_address(5)) {
+		if(rxbuf[3] != '?')
+		  adc_enable = rxbuf[3] - '0';
+        send_answer_hex(adc_enable);
+        settings_changed |= 8;
+        if (adc_enable == 1)  ADMUXB = (6 << REFS0);   //2.2V reference, with capacitor
+        if (adc_enable == 2)  ADMUXB = (7 << REFS0);   //4.096V as reference
+        if (adc_enable == 3)  ADMUXB = (0 << REFS0);   //Vcc as reference
+        }
+      
+//Read current limit    
+      if (rxbuf[0] == 'L' && rxbuf[3] == '?' && is_my_address(5)) {
+        send_answer_hex(limit[rxbuf[2]]);      
+        } 
+
+//Read reference value
+      if (rxbuf[0] == 'R' && rxbuf[3] == '?' && is_my_address(5)) {
+        send_answer_hex(adc_reference);      
         } 
       }
-  //Set current limit
-    if (rxcnt == 7 && rxbuf[0] == 'L') {
-      if (ISMYADDR()) {
-        rxbuf[2] -= '0';
-        if(rxbuf[3] != '?') {
-          uint16_t lim = hex_to_int(rxbuf[3])*256 + hex_to_int(rxbuf[4])*16 + hex_to_int(rxbuf[5]);
-          limit[rxbuf[2]] = lim;
-          }
-        send_answer_hex(limit[rxbuf[2]]); 
-        settings_changed |= rxbuf[2]+1;        
+      
+      
+//Set current limit
+    if (rxcnt == 7 && rxbuf[0] == 'L' && is_my_address(7)) {
+      if(rxbuf[3] != '?') {
+        uint16_t lim = hex_to_int(rxbuf[3])*256 + hex_to_int(rxbuf[4])*16 + hex_to_int(rxbuf[5]);
+        limit[rxbuf[2]] = lim;
         }
-      else {
-        forward_msg(7);
-        }
-      } 
+      send_answer_hex(limit[rxbuf[2]]); 
+      settings_changed |= rxbuf[2]+1;        
+      }
     }      
     
   if (rxcnt >= 7 || buf == '\n' || buf == '\r') { rxcnt = 0; }  
     
 } 
 
-#define EEPROM_DIS() while(EECR & (1<<EEPE)); EEARL = 0
 
-void eeprom_write(uint8_t addr, uint8_t data){
-  while(EECR & (1<<EEPE));
-  EECR = (0<<EEPM0);
-  EEARL = addr;
-  EEDR = data;
-  cli();
-  EECR |= (1<<EEMPE);
-  EECR |= (1<<EEPE);
-  sei();      
-  }
-
-uint8_t eeprom_read(uint8_t addr) {
-  while(EECR & (1<<EEPE));
-  EEARL = addr;
-  EECR |= (1<<EERE);
-  return EEDR;
-  }
   
 __attribute__((naked)) int main(void) {
 	// Configure ports
 	
-  PUEA  = 0b01011100;
-  PUEB  = 0b00001100;
-  
+  PORTA = 0b00001100;
+  PUEA  = 0b01010000;
   DDRA  = 0b00101100; 
-  DDRB  = 0b00000000;
   
-  PORTA = 0b00001100;
+  DDRB  = 0b00000000;
+  PUEB  = 0b00001100;
   PORTB = 0b00000000;
   
-  output_enable = eeprom_read(0x14);
+  output_enable = eeprom_read_byte((uint8_t*)0x24);
   switchoutput(0,-3); 
-  limit[0]  = eeprom_read(0x11)<<8;
-  limit[0] |= eeprom_read(0x10);
-  limit[1]  = eeprom_read(0x13)<<8;
-  limit[1] |= eeprom_read(0x12);  
+  limit[0]   = eeprom_read_byte((uint8_t*)0x21)<<8;
+  limit[0]  |= eeprom_read_byte((uint8_t*)0x20);
+  limit[1]   = eeprom_read_byte((uint8_t*)0x23)<<8;
+  limit[1]  |= eeprom_read_byte((uint8_t*)0x22);  
+  adc_enable = eeprom_read_byte((uint8_t*)0x25);
   
   //CCP = 0xD8;  	//allow writing of CLKPR
   CLKPR = (0 << CLKPS0); // no prescaler  
@@ -286,7 +324,9 @@ __attribute__((naked)) int main(void) {
   TIMSK0 = (1 << TOIE0); //Overflow interrupt`
   
   ADMUXA = 7;  //(1 (Out2),7 (Out1))
-  ADMUXB = (6 << REFS0);   //2.2V reference, with capacitor
+  if (adc_enable == 1)  ADMUXB = (6 << REFS0);   //2.2V reference, with capacitor
+  if (adc_enable == 2)  ADMUXB = (7 << REFS0);   //4.096V reference
+  if (adc_enable == 3)  ADMUXB = (0 << REFS0);   //Vcc reference
   ADCSRA = (1 << ADEN) | (1 << ADSC) | (1 << ADIE) | (6 << ADPS0); //enable, start, irq, /128
   ADCSRB = 0;
   DIDR0  = (1<<ADC1D) | (1<< ADC7D); //disable digital inputs
@@ -305,23 +345,26 @@ __attribute__((naked)) int main(void) {
   
   
   while(1) {
-	_delay_ms(3000);  
-	if(settings_changed != 0) {
-		if (settings_changed & 1) {
-			settings_changed &= ~1;
-			eeprom_write(0x10,limit[0]&0xFF);
-			eeprom_write(0x11,(limit[0]>>8)&0xFF);
-		}
-		if (settings_changed & 2) {
-			settings_changed &= ~2;
-			eeprom_write(0x12,limit[1]&0xFF);
-			eeprom_write(0x13,(limit[1]>>8)&0xFF);
-		}
-		if (settings_changed & 4) {
-			settings_changed &= ~4;
-			eeprom_write(0x14,output_enable);
-		}
-		EEPROM_DIS();
-		}
+    _delay_ms(3000);  
+    if(settings_changed != 0) {
+      if (settings_changed & 1) {
+        settings_changed &= ~1;
+        eeprom_update_byte((uint8_t*)0x20,limit[0]&0xFF);
+        eeprom_update_byte((uint8_t*)0x21,(limit[0]>>8)&0xFF);
+        }
+      if (settings_changed & 2) {
+        settings_changed &= ~2;
+        eeprom_update_byte((uint8_t*)0x22,limit[1]&0xFF);
+        eeprom_update_byte((uint8_t*)0x23,(limit[1]>>8)&0xFF);
+        }
+      if (settings_changed & 4) {
+        settings_changed &= ~4;
+        eeprom_update_byte((uint8_t*)0x24,output_enable);
+        }
+      if (settings_changed & 8) {
+        settings_changed &= ~8;
+        eeprom_update_byte((uint8_t*)0x25,adc_enable);
+        }
+      }
     }
   }
\ No newline at end of file
-- 
2.43.0