X-Git-Url: https://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=DS2423_DS2423%2FDS2423_DS2423.c;h=916685069740fc2bb224f1fce2753ebdcbcefea6;hp=1dbd39517045721a08b50e8910e9fd554a102e75;hb=refs%2Fheads%2Fmaster;hpb=6467d8138460abffd9ddabc7b0a9f00c764af19c

diff --git a/DS2423_DS2423/DS2423_DS2423.c b/DS2423_DS2423/DS2423_DS2423.c
index 1dbd395..9166850 100644
--- a/DS2423_DS2423/DS2423_DS2423.c
+++ b/DS2423_DS2423/DS2423_DS2423.c
@@ -43,7 +43,10 @@
 extern void OWINIT(void);
 extern void EXTERN_SLEEP(void);
 
+
 //#define FHEM_PLATINE
+//#define JOE_M
+#define W1DAQ
 
 volatile uint8_t owid1[8]={0x1D, 0x40, 0xDA, 0x84, 0x00, 0x00, 0x05, 0xBD};/**/
 volatile uint8_t owid2[8]={0x1D, 0x41, 0xDA, 0x84, 0x00, 0x00, 0x05, 0x8A};/**/
@@ -102,7 +105,9 @@ volatile uint8_t changefromeeprom;
 //LEDS
#define LPIN_CH2 (1<<PINB0)
#define LDD_CH2 DDRB
#define LPORT_CH2 PORTB
#define LPIN_CH3 (1<<PINA5)
#define LDD_CH3 DDRA
#define LPORT_CH3 PORTA
#define LPIN_CH0 (1<<PINA7)
#define LDD_CH0 DDRA
#define LPORT_CH0 PORTA
#define LPIN_CH1 (1<<PINB1)
#define LDD_CH1 DDRB
#define LPORT_CH1 PORTB
 
 #define LED2_ON LPORT_CH2|=LPIN_CH2;
-#else
+#endif
+
+#ifdef JOE_M
 #define LED2_ON
 #define PIN_CH2 (1<<PINA4)
 #define PIN_CH3 (1<<PINA5)
@@ -110,6 +115,16 @@ volatile uint8_t changefromeeprom;
 #define PIN_CH1 (1<<PINA7)
 #endif
 
+#ifdef W1DAQ
+#define PIN_CH3 (1<<PINA1)
+#define PIN_CH2 (1<<PINA0)
+#define PIN_CH1 (1<<PINA7)
+#define PIN_CH0 (1<<PINA3)
+//LEDS
#define LPIN_CH0 (1<<PINB1)
#define LDD_CH0 DDRB
#define LPORT_CH0 PORTB
#define LPIN_CH1 (1<<PINB1)
#define LDD_CH1 DDRB
#define LPORT_CH1 PORTB
#define LPIN_CH2 (1<<PINB1)
#define LDD_CH2 DDRB
#define LPORT_CH2 PORTB
#define LPIN_CH3 (1<<PINB1)
#define LDD_CH3 DDRB
#define LPORT_CH3 PORTB

+#define LED2_ON LPORT_CH2&=~LPIN_CH2;
+#endif
+
+
 #define TEST_TIMER  ((TIMSK0 & (1<<TOIE0))==0)
 
 #endif
@@ -164,6 +179,9 @@ ISR(ANA_COMP_vect) {
 			CLKPR=0;
 #ifdef FHEM_PLATINE
 			LPORT_CH1|=LPIN_CH1;
+#endif
+#ifdef W1DAQ
+			LPORT_CH1&=~LPIN_CH1;
 #endif
 			GIFR|=(1<<INTF0);
 		}
@@ -202,7 +220,7 @@ int main(void){
 	PORTA&=~(PIN_CH2|PIN_CH3);
 	#endif
 
-	#ifdef FHEM_PLATINE  //LEDs
+	#if defined(FHEM_PLATINE) || defined(W1DAQ)  //LEDs
 	LDD_CH0|=LPIN_CH0;
	LPORT_CH0&=~LPIN_CH0;
	LDD_CH1|=LPIN_CH1;
	LPORT_CH1&=~LPIN_CH1;
	LDD_CH2|=LPIN_CH2;
	LPORT_CH2&=~LPIN_CH2;
	LDD_CH3|=LPIN_CH3;
	LPORT_CH3&=~LPIN_CH3;
 	#endif
 
@@ -249,16 +267,16 @@ int main(void){
 	//ACSR|=(1<<ACD);  //Disable Comparator
 	ADCSRB|=(1<<ACME); //Disable Analog multiplexer
 	MCUCR &=~(1<<PUD); //All Pins Pullup...
-	#ifdef FHEM_PLATINE
+#ifdef FHEM_PLATINE
 	DIDR0|=(1<<ADC0D);
 	PORTA&=~(1<<PINA0);//Disable Pullup
-	#else
+#else
 	DIDR0|=(1<<ADC2D)|(1<<ADC1D); // Disable Digital input on Analog AIN0/AIN1  (PINA1 / PINA2)
 	PORTA&=~(1<<PINA2); //AIN1
-	#endif
+#endif
 	ACSR&=~(1<<ACD);
 	ACSR|=(1<<ACIE)|(1<<ACIS1)|(1<<ACIS0)|(1<<ACBG); //Enabble comperator interrupt Rising edge....(1<<ACIS0) -> minus of Comperator falls down -> output of Comperator rises
-	#ifdef FHEM_PLATINE
+#ifdef FHEM_PLATINE
 	//Switch std AIN1 to A0
 	ADCSRA&=~(1<<ADEN);
 	ADCSRB=(1<<ACME);
@@ -268,14 +286,20 @@ int main(void){
 
 
 	LPORT_CH0|=LPIN_CH0;
	_delay_ms(500);
	LPORT_CH0&=~LPIN_CH0;
-	#endif
+#endif
+#ifdef W1DAQ
+	LPORT_CH0&=~LPIN_CH0;
+	_delay_ms(500);
	LPORT_CH0|=LPIN_CH0;
#endif
 	sei();
 	while(1)   {
-		#ifdef FHEM_PLATINE
+#ifdef FHEM_PLATINE
 		if (LPORT_CH2&LPIN_CH2) {
			_delay_ms(50);
			LPORT_CH2&=~LPIN_CH2;
		}
 		if (LPORT_CH1&LPIN_CH1) {
			_delay_ms(50);
			LPORT_CH1&=~LPIN_CH1;
		}
-		#endif
-		#ifndef FHEM_PLATINE
+#endif
+#ifdef W1DAQ
+		if ((LPORT_CH2&LPIN_CH2)==0) {
			_delay_ms(50);
			LPORT_CH2|=LPIN_CH2;
		}
+#endif
+#ifndef FHEM_PLATINE
 		if ((PINB&(1<<PORTB0))==0) {  //Jumper gesetzt ->Ruecksetzen
 			if ((counters1.c32[2]!=0)||(counters1.c32[3]!=0)||(counters2.c32[2]!=0)||(counters2.c32[3]!=0)) {
 				counters1.c32[0]++;
				counters2.c32[0]++;
				for (uint8_t i=2;i<4;i++) {
@@ -286,9 +310,20 @@ int main(void){
 			}
 		}
 		#endif
+		if (((TIMSK0 & (1<<TOIE0))==0)&& (mode==0))	  {
+			MCUCR|=(1<<SE)|(1<<SM1);
+			
+			MCUCR&=~(1<<ISC01);
+			} else {
+			MCUCR|=(1<<SE);
+			MCUCR&=~(1<<SM1);
+		}
+		asm("SLEEP");
+
+/*
 		MCUCR|=(1<<SE);
 		MCUCR&=~(1<<SM1);
-		asm("SLEEP");
+		asm("SLEEP");*/
 	}