X-Git-Url: https://git.smho.de/gw/?a=blobdiff_plain;f=DS2423_komische%20platine%2FDS2423.c;h=11f51db643cc328c778af1083fdc48711512ccfd;hb=2490e261a78b2a98ee2a9b8fc19cb3f20225926b;hp=2cf20e3b3d838e5535d1f36c075293db18dd587c;hpb=3608ace7dd5bd4fa5d7d49224ef770b21596092c;p=owSlave2.git

diff --git a/DS2423_komische platine/DS2423.c b/DS2423_komische platine/DS2423.c
index 2cf20e3..11f51db 100644
--- a/DS2423_komische platine/DS2423.c	
+++ b/DS2423_komische platine/DS2423.c	
@@ -1,5 +1,5 @@
 
-// Copyright (c) 2016, Tobias Mueller tm(at)tm3d.de
+// Copyright (c) 2017, Tobias Mueller tm(at)tm3d.de
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 extern void OWINIT();
 
 uint8_t owid[8]={0x1D, 0xA2, 0xD9, 0x84, 0x00, 0x26, 0x02, 0x5C};/**/
-uint8_t config_info[16]={0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+uint8_t config_info[26]={9,13,9,13,9,13,9,13,0x02,19,19,19,19,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 
 	
 
@@ -54,7 +54,7 @@ extern uint8_t gcontrol;
 extern uint8_t reset_indicator;
 
 
-volatile uint8_t wdcounter;
+
 
 
 
@@ -80,7 +80,7 @@ typedef union {
 volatile counters_t counters;
 
 volatile uint8_t istat;
-
+volatile uint8_t changefromeeprom;
 #define PCINT_VECTOR PCINT0_vect
 #define PIN_REG PINA
 #define PIN_DDR DDRA
@@ -111,8 +111,8 @@ ISR(PCINT0_vect) {
 	if (((PIN_REG&PIN_CH1)==0)&&((istat&PIN_CH1)==PIN_CH1)) {	counters.c32[1]++;	LPORT_CH2|=LPIN_CH2;}
 	if (((PIN_REG&PIN_CH2)==0)&&((istat&PIN_CH2)==PIN_CH2)) {	counters.c32[2]++;	LPORT_CH2|=LPIN_CH2;}
 	if (((PIN_REG&PIN_CH3)==0)&&((istat&PIN_CH3)==PIN_CH3)) {	counters.c32[3]++;	LPORT_CH2|=LPIN_CH2;}
-
-	if (((PORT_EE&PIN_EE)==0)&&((istat&PIN_EE)==PIN_EE))  {
+	changefromeeprom=1;
+/*	if (((PORT_EE&PIN_EE)==0)&&((istat&PIN_EE)==PIN_EE))  {
 		
 		_delay_ms(50);
 	if (((PORT_EE&PIN_EE)==0))  {
@@ -135,7 +135,7 @@ ISR(PCINT0_vect) {
 
 	}
 	GIFR|=(1<<PCIF0);
-	}
+	}*/
 	if ((((PINA&(1<<PINA6)))==0)&&((istat&(1<<PINA6))==(1<<PINA6)))   {
 		_delay_ms(100);
 		if (((PINA&(1<<PINA6)))==0) {
@@ -155,7 +155,34 @@ ISR(PCINT0_vect) {
 	
 }
 
-
+ISR(ANA_COMP_vect) {
+	if (changefromeeprom==0) return;
+	if ((ACSR&(1<<ACO))!=0) {
+		_delay_ms(5);
+		if ((ACSR&(1<<ACO))!=0) {
+			CLKPR=0x80;//Switch to 4 MHz
+			CLKPR=01;
+			
+			PORTB|=(1<<PINB1);
+			EEARH=0;
+			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);
+			}
+			changefromeeprom=0;
+			PORTB&=~(1<<PINB1);
+			CLKPR=0x80;
+			CLKPR=0;
+			GIFR|=(1<<INTF0);
+		}
+	}
+	
+}
 int main(void){
     PRR|=(1<<PRUSI)|(1<<PRADC);  //Switch off usi and adc for save Power
 	OWINIT();
@@ -211,26 +238,31 @@ int main(void){
 		EECR |= (1<<EERE);
 		counters.c8[addr]=EEDR;
 	}
+	changefromeeprom=0;  //Daten neu eingelesen
 	for (uint8_t i=0;i<4;i++) {
-		if (counters.c32[i]==0xFFFFFFFF) counters.c32[i]=0;
+		if (counters.c32[i]==0xFFFFFFFF) {
+			counters.c32[i]=0;
+			changefromeeprom=1;  //Daten geaendert
+		}
 		//counters.c32[i]=0;
 	}
 
-   
+ 	DIDR0|=(1<<ADC0D); // Disable Digital input AD0
+ 	ACSR&=~(1<<ACD); //Enable Comperator
+	ADCSRB|=(1<<ACME); // Set other negative input
+	ADCSRA&=~(1<<ADEN); //Disable A/D for change the negetive comperator input
+	ADMUX&=~((1<<MUX0)|(1<<MUX1)|(1<<MUX2)|(1<<MUX3)|(1<<MUX4)|(1<<MUX5)); //Set do ADC0
+ 	ACSR|=(1<<ACIE)|(1<<ACIS1)|(1<<ACIS0)|(1<<ACBG); //Enabble comperator interrupt Rising edge....(1<<ACIS0)
+  
 	sei();
     while(1)   {
 	    if (LPORT_CH2&LPIN_CH2) {
 			_delay_ms(50);
 			LPORT_CH2&=~LPIN_CH2;
 		}
-		//Test if timer active and no sleep then Idle else Power Down
-		if (TEST_TIMER&&(mode==0)) {
-			MCUCR|=(1<<SE)|(1<<SM1); //Power Down, only low level on 1-Wire and pin change on PCINT wakes up
-			MCUCR&=~(1<<ISC01);
-		} else {
-			MCUCR|=(1<<SE);
-			MCUCR&=~(1<<SM1); 
-		}
+		MCUCR|=(1<<SE);
+		MCUCR&=~(1<<SM1);
 		asm("SLEEP");
+		
    }
 }
\ No newline at end of file