From: Tobias <tm@tm3d.de>
Date: Thu, 13 Apr 2017 10:57:05 +0000 (+0200)
Subject: Clean Simple Counter DS2423
X-Git-Url: https://git.smho.de/?a=commitdiff_plain;h=59518e632e2269fece0ce6a518e519b3a617ad16;p=owSlave2.git

Clean Simple Counter DS2423
---

diff --git a/DS2423/DS2423.c b/DS2423/DS2423.c
index ccc2d30..6a37778 100644
--- a/DS2423/DS2423.c
+++ b/DS2423/DS2423.c
@@ -32,7 +32,6 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #define _4_COUNTERS_
-//#define _EEPROM_SAVE_
 #define _CPULLUP_
 
 #define F_CPU 8000000UL
@@ -43,13 +42,6 @@
 #include <avr/sleep.h>
 
 
-#if  defined(__AVR_ATtiny25__)||defined(__AVR_ATtiny45__)  || defined(__AVR_ATtiny85__)
-
-#if defined(_4_COUNTERS_)&&defined(_EEPROM_SAVE_)
-#error on ATtinyX5 you can not enable four counters and EEPROM save
-#endif
-#endif
-
 
 extern void OWINIT();
 
@@ -91,20 +83,6 @@ volatile counters_t counters;
 
 volatile uint8_t istat;
 
-#if  defined(__AVR_ATtiny25__)||defined(__AVR_ATtiny45__)  || defined(__AVR_ATtiny85__)
-#define PCINT_VECTOR PCINT0_vect
-#define PIN_REG PINB
-#define PIN_DDR DDRB
-#define PIN_CH2 (1<<PINB3)
-#define PIN_CH3 (1<<PINB4)
-#define PIN_CH0 (1<<PINB0)
-#define PIN_CH1 (1<<PINB1)
-#define PORT_EE PINB
-#define PIN_EE (1<<PINB0)
-#define TEST_TIMER  ((TIMSK & (1<<TOIE0))==0)
-#endif
-
-
 #if  defined(__AVR_ATtiny24__)||defined(__AVR_ATtiny44__)  || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny24A__)||defined(__AVR_ATtiny44A__)  || defined(__AVR_ATtiny84A__)
 #define PCINT_VECTOR PCINT0_vect
 #define PIN_REG PINA
@@ -128,25 +106,6 @@ ISR(PCINT0_vect) {
 	if (((PIN_REG&PIN_CH1)==0)&&((istat&PIN_CH1)==PIN_CH1)) {	counters.c32[1]++;	}
 	#endif
 	istat=PIN_REG;
-	#ifdef _EEPROM_SAVE_
-	if (((PORT_EE&PIN_EE)==0)&&((istat&PIN_EE)==PIN_EE)) {
-		//PORTB&=~(1<<PINB1);
-		EEARH=0;
-#ifndef _4_COUNTERS_
-		counters.c32[0]++;//Count the save cycles 
-#endif
-		for(uint8_t i=0;i<16;i++) {
-			uint8_t addr=i^0x0C;
-			while(EECR & (1<<EEPE));
-			EECR = (0<<EEPM1)|(0<<EEPM0);
-			EEARL = i;
-			EEDR = counters.c8[addr];
-			EECR |= (1<<EEMPE);
-			EECR |= (1<<EEPE);
-		}
-		//PORTB|=(1<<PINB1);
-	}
-	#endif
 }
 
 
@@ -163,37 +122,6 @@ int main(void){
 	ADCSRB|=(1<<ACME); //Disable Analog multiplexer
 	MCUCR &=~(1<<PUD); //All Pins Pullup...
 	
-		
-#if  defined(__AVR_ATtiny25__)||defined(__AVR_ATtiny45__)  || defined(__AVR_ATtiny85__)
-	PORTB|=(1<<PINB5) //Reset
-#ifdef _CPULLUP_
-	|PIN_CH2|PIN_CH3
-#ifdef _4_COUNTERS_	
-	|PIN_CH0|PIN_CH1
-#endif	
-#endif	
-	;
-	
-	GIMSK|=(1<<PCIE);
-	
-	PCMSK=(1<<PCINT3)|(1<<PCINT4)
-#ifdef _4_COUNTERS_
-	|(1<<PCINT0)|(1<<PCINT1)
-#endif
-	;
-#ifdef _EEPROM_SAVE_
-	DDRB&=~PIN_EE;
-	PCMSK|=(1<<PCINT0);
-	PORTB&=~PIN_EE; //Spannungsueberpruefung
-#endif
-	DDRB &=~((1<<PINB3)|(1<<PINB4)
-#ifdef _4_COUNTERS_
-	|(1<<PINB0)|(1<<PINB1)
-#endif
-	);
-	istat=PIN_REG;
-#endif
-
 
 #if  defined(__AVR_ATtiny24__)||defined(__AVR_ATtiny44__)  || defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny24A__)||defined(__AVR_ATtiny44A__)  || defined(__AVR_ATtiny84A__)
 
@@ -215,42 +143,9 @@ int main(void){
 		|(1<<PCINT6)|(1<<PCINT7)
 #endif
 	;
-	
-	
-#ifdef _EEPROM_SAVE_
-	DDRA&=~(1<<PINA0);
-	PCMSK0|=(1<<PCINT0);
-	PORTA&=~(1<<PINA0); //Spannungsueberpruefung
-#endif
-	istat=PINB;
+	istat=PINA;
 #endif
 
-#ifdef _EEPROM_SAVE_
-		EEARH=0;
-		
-		uint8_t addr;
-		for(uint8_t i=0;i<16;i++) {
-			addr=i^0x0C;
-			while(EECR & (1<<EEPE));   
-			EEARL=i;
-			EECR |= (1<<EERE);
-			counters.c8[addr]=EEDR;
-		}
-		for (uint8_t i=0;i<4;i++) {
-			if (counters.c32[i]==0xFFFFFFFF) counters.c32[i]=0;
-			//counters.c32[i]=0;
-		}
-
-		/*for(uint8_t i=0;i<16;i++) {
-			while(EECR & (1<<EEPE));
-			EECR = (1<<EEPM0);
-			EEARL = i;
-			EECR |= (1<<EEMPE);
-			EECR |= (1<<EEPE);
-		}*/
-	
-   
-#endif
 	sei();
     while(1)   {
 		
diff --git a/DS2423/DS2423.cproj b/DS2423/DS2423.cproj
index 93d1f5a..00ef9d7 100644
--- a/DS2423/DS2423.cproj
+++ b/DS2423/DS2423.cproj
@@ -27,16 +27,16 @@
     <BootSegment>2</BootSegment>
     <eraseonlaunchrule>1</eraseonlaunchrule>
     <AsfFrameworkConfig>
-      <framework-data xmlns="">
-        <options />
-        <configurations />
-        <files />
-        <documentation help="" />
-        <offline-documentation help="" />
-        <dependencies>
-          <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.22.0" />
-        </dependencies>
-      </framework-data>
+      <framework-data>
+  <options />
+  <configurations />
+  <files />
+  <documentation help="" />
+  <offline-documentation help="" />
+  <dependencies>
+    <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.28.1" />
+  </dependencies>
+</framework-data>
     </AsfFrameworkConfig>
     <avrtool>com.atmel.avrdbg.tool.atmelice</avrtool>
     <com_atmel_avrdbg_tool_atmelice>
diff --git a/common/OWDS2423.S b/common/OWDS2423.S
index 32be7dc..32b4156 100644
--- a/common/OWDS2423.S
+++ b/common/OWDS2423.S
@@ -38,7 +38,7 @@
 #include "../common/OWCRC16.s"
 
 .extern pack,45
-.extern counters,8
+.extern counters,16
 
 .macro CHIP_INIT 	
 .endm