X-Git-Url: https://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=DS2423_DS2413%2FDS2423_DS2413.c;h=bac5365a83a498155e34ea5400cb7a01a9f24bf1;hp=29800f8e8e9d45af8a390c5b10349e59489211ac;hb=refs%2Fheads%2Fmaster;hpb=485bc58764a5b2a1296dee25aadb42316e8defe0

diff --git a/DS2423_DS2413/DS2423_DS2413.c b/DS2423_DS2413/DS2423_DS2413.c
index 29800f8..bac5365 100644
--- a/DS2423_DS2413/DS2423_DS2413.c
+++ b/DS2423_DS2413/DS2423_DS2413.c
@@ -42,7 +42,9 @@
 
 extern void OWINIT(void);
 extern void EXTERN_SLEEP(void);
-#define FHEM_PLATINE
+//#define FHEM_PLATINE
+//#define JOE_M
+#define W1DAQ
 
 volatile uint8_t owid1[8]={0x1D, 0x1D, 0xDA, 0x84, 0x00, 0x00, 0x05, 0xD9};/**/
 volatile uint8_t owid2[8]={0x3A, 0x3A, 0xDA, 0x84, 0x00, 0x00, 0x05, 0xB6};/**/
@@ -102,12 +104,28 @@ 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)
-#define PIN_PIOA (1<<PINA6)
-#define PIN_PIOB (1<<PINA7)
+#define PIN_CH0 (1<<PINA6)
+#define PIN_CH1 (1<<PINA7)
+#define PIN_PIOA PIN_CH0
+#define PIN_PIOB  PIN_CH1
+#endif
+
+#ifdef W1DAQ
+#define PIN_CH3 (1<<PINA1)
+#define PIN_CH2 (1<<PINA0)
+#define PIN_CH1 (1<<PINA7)
+#define PIN_CH0 (1<<PINA3)
+#define PIN_PIOA PIN_CH0
+#define PIN_PIOB  PIN_CH1
+//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)
@@ -117,8 +135,8 @@ volatile uint8_t changefromeeprom;
 
 
 ISR(PCINT0_vect) {
-	if (((PIN_REG&PIN_CH2)==0)&&((istat&PIN_CH2)==PIN_CH2)) {	counters1.c32[2]++;	}
-	if (((PIN_REG&PIN_CH3)==0)&&((istat&PIN_CH3)==PIN_CH3)) {	counters1.c32[3]++;	}
+	if (((PIN_REG&PIN_CH2)==0)&&((istat&PIN_CH2)==PIN_CH2)) {	counters1.c32[2]++;	LED2_ON}
+	if (((PIN_REG&PIN_CH3)==0)&&((istat&PIN_CH3)==PIN_CH3)) {	counters1.c32[3]++;LED2_ON	}
 	if ((PIN_REG&PIN_PIOA)==0) 	pin_state&=~0x1; else pin_state|=0x01;
 	if ((PIN_REG&PIN_PIOB)==0) 	pin_state&=~0x4; else pin_state|=0x04;
 	//Reset Switch on the FHEM_BOARD
@@ -152,6 +170,9 @@ ISR(ANA_COMP_vect) {
 			PORTB&=~(1<<PINB1);
 			CLKPR=0x80;
 			CLKPR=0;
+#ifdef FHEM_PLATINE
+			LPORT_CH1|=LPIN_CH1;
+#endif
 			GIFR|=(1<<INTF0);
 		}
 	}
@@ -184,7 +205,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
 
@@ -237,7 +258,11 @@ int main(void){
 
 	LPORT_CH0|=LPIN_CH0;
	_delay_ms(500);
	LPORT_CH0&=~LPIN_CH0;
 #endif
+#ifdef W1DAQ
+LPORT_CH0&=~LPIN_CH0;
+_delay_ms(500);
LPORT_CH0|=LPIN_CH0;
#endif
 	pin_state=0x0F;
+	pin_set=0;
 	sei();
 	while(1)   {
 
@@ -260,6 +285,10 @@ int main(void){
 
 #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
+#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