X-Git-Url: http://git.smho.de/gw/?p=owSlave2.git;a=blobdiff_plain;f=DS2450_APDS9960%2FDS2450_APDS9960.c;h=b8eee45a430085e67368ef4ff4329b0262e618b0;hp=4ded72ee3632d9559b8a8de6476c3d5da501ea3f;hb=6467d8138460abffd9ddabc7b0a9f00c764af19c;hpb=2490e261a78b2a98ee2a9b8fc19cb3f20225926b

diff --git a/DS2450_APDS9960/DS2450_APDS9960.c b/DS2450_APDS9960/DS2450_APDS9960.c
index 4ded72e..b8eee45 100644
--- a/DS2450_APDS9960/DS2450_APDS9960.c
+++ b/DS2450_APDS9960/DS2450_APDS9960.c
@@ -1,283 +1,283 @@
-
-// Copyright (c) 2017, Tobias Mueller tm(at)tm3d.de
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//  * Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-//  * Redistributions in binary form must reproduce the above copyright
-//    notice, this list of conditions and the following disclaimer in the
-//    documentation and/or other materials provided with the
-//    distribution.
-//  * All advertising materials mentioning features or use of this
-//    software must display the following acknowledgement: This product
-//    includes software developed by tm3d.de and its contributors.
-//  * Neither the name of tm3d.de nor the names of its contributors may
-//    be used to endorse or promote products derived from this software
-//    without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#define F_CPU 8000000UL
-#include <avr/io.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include <avr/wdt.h>
-#include <avr/sleep.h>
-#include <avr/pgmspace.h>
-#include "../common/I2C/USI_TWI_Master.h"
-#include "../common/I2C/APDS9960.h"
-
-extern void OWINIT();
-extern void EXTERN_SLEEP();
-
-uint8_t owid[8]={0x20, 0xA2, 0xD9, 0x84, 0x00, 0x16, 0x23, 0x20};/**/
-//uint8_t config_info[26]={0x03,13,0x03,13,0x03,13,0x3,15,0x02,20,20,20,20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-uint8_t config_info[26]={16,15,17,15,18,15,3,15,0x02,23,23,23,23,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-
-#if (owid>128) 
-#error "Variable not correct"
-#endif
-
-extern uint8_t mode;
-extern uint8_t gcontrol;
-extern uint8_t reset_indicator;
-extern uint8_t alarmflag;
-
-
-typedef union {
-	volatile uint8_t bytes[0x20];
-	struct {
-		//Page0
-		uint16_t A;  //0
-		uint16_t B;  //2
-		uint16_t C;  //4
-		uint16_t D;  //6
-		//Page1
-		uint8_t CSA1;
-		uint8_t CSA2;
-		uint8_t CSB1;
-		uint8_t CSB2;
-		uint8_t CSC1;
-		uint8_t CSC2;
-		uint8_t CSD1;
-		uint8_t CSD2;
-		//Page2
-		uint8_t LA;
-		uint8_t HA;
-		uint8_t LB;
-		uint8_t HB;
-		uint8_t LC;
-		uint8_t HC;
-		uint8_t LD;
-		uint8_t HD;
-		//Page3
-		uint8_t FC1;
-		uint8_t FC2;
-		uint8_t FC3;
-		uint8_t FC4;
-		uint8_t VCCP;
-		uint8_t FC5;
-		uint8_t FC6;
-		uint8_t FC7;
-		uint8_t convc1;
-		uint8_t convc2;
-		
-		
-	};
-} pack_t;
-volatile pack_t pack;
-
-
-uint16_t light[4];
-double rlight[4];
-uint8_t gain=2;
-uint8_t atime=192;
-//uint8_t atime=255;
-double r_gain;
-double r_atime;
-
-void getLight(uint8_t setparameterr) {
-	if (setparameterr) {
-		r_gain=(1<<(2*gain));
-		r_atime=(256.0-atime)*2.78;
-		APDS9960setGain(gain);
-		APDS9960setATime(atime);
-		_delay_ms(700);
-	}
-	APDS9960getRGBC(&light[0],&light[1],&light[2],&light[3]);
-}
-
-
-
-
-int main(void){
-	pack.A=0;
-	pack.B=0;
-	pack.C=0;
-	pack.D=0;
-	pack.CSA1=0x08;
-	pack.CSA2=0x8C;
-	pack.CSB1=0x08;
-	pack.CSB2=0x8C;
-	pack.CSC1=0x08;
-	pack.CSC2=0x8C;
-	pack.CSD1=0x08;
-	pack.CSD2=0x8C;
-	pack.HA=0xFF;
-	pack.LA=0x00;
-	pack.HB=0xFF;
-	pack.LB=0x00;
-	pack.HC=0xFF;
-	pack.LC=0x00;
-	pack.HD=0xFF;
-	pack.LD=0x00;
-	pack.VCCP=0;
-
-	PORTA=0xFF;
-	PORTB=0xFF;
-
-	OWINIT();
-
-	MCUCR &=~(1<<PUD); //All Pins Pullup...
-	MCUCR |=(1<<BODS);
-	//PORTA&=~((1<<PINA0)|(1<<PINA1)|(1<<PINA2)|(1<<PINA3));
-
-	ADCSRA=(1<<ADEN)|(1<ADPS0)|(1<<ADPS2);
-
-	
-	
-	gcontrol=1;
-	ADCSRB|=(1<<ADLAR); 
-	USI_TWI_Master_Initialise();
-	
-	initAPDS9960();
-	//gain=2;
-	//atime=253;
-	getLight(1);
-	sei();
-	
-	//DDRB|=(1<<PINB1);
-
-    while(1)   {
-
-
-		if (gcontrol) {
-			//PORTB|=(1<<PINB1);
-			uint8_t bb=1;
-			uint8_t bb1=1;
-			for(uint8_t i=0;i<4;i++){
-				if (pack.convc1&bb1) {
-					if (pack.convc2&(bb)) {pack.bytes[i*2]=0;pack.bytes[i*2+1]=0;}
-					bb=bb<<1;
-					if (pack.convc2&(bb)) {pack.bytes[i*2]=0xFF;pack.bytes[i*2+1]=0xFF;}
-					bb=bb<<1;
-				} else bb=bb<<2;
-				bb1=bb1<<1;				
-			}
-			//CHanel A
-			if (pack.convc1&1) {
-				getLight(0);
-				while (light[3]>0xF000) {
-				//while (light[3]>900) {
-					if (gain!=0) {
-						gain--;
-						getLight(1);
-					}  else break;
-				} 
-				if (light[3]<0x2222) {
-				//if (light[3]<0x22) {
-					if (gain<3) {
-						gain++;
-						getLight(1);
-					}
-
-				}
-				for(uint8_t i=0;i<4;i++) {
-					rlight[i]=(double)light[i]/r_atime/r_gain*70.0;
-					rlight[i]=(log(rlight[i])*1000)+32767.0;
-				}
-				cli();pack.A=rlight[0];sei();
-				//cli();pack.A=r_gain;sei();
-				alarmflag=0;
-				if (pack.CSA2&0x08)  //AEH
-					if (pack.bytes[1]>pack.HA) {alarmflag=1;pack.CSA2|=0x20;}
-				if (pack.CSA2&0x04)  //AEL
-					if (pack.bytes[1]<pack.LA) {alarmflag=1;pack.CSA2|=0x10;}
-			}
-
-			if (pack.convc1&2) {
-				cli();pack.B=rlight[1];sei();
-				//cli();pack.B=atime;sei();
-				if (pack.CSB2&0x08)  //AEH
-					if (pack.bytes[1]>pack.HB) {alarmflag=1;pack.CSB2|=0x20;}
-				if (pack.CSB2&0x04)  //AEL
-					if (pack.bytes[1]<pack.LB) {alarmflag=1;pack.CSB2|=0x10;}
-			}
-
-			if (pack.convc1&4) {
-				cli();pack.C=rlight[2];sei();
-				//cli();pack.C=light[3];sei();
-				if (pack.CSC2&0x08)  //AEH
-					if (pack.bytes[1]>pack.HC) {alarmflag=1;pack.CSC2|=0x20;}
-				if (pack.CSC2&0x04)  //AEL
-					if (pack.bytes[1]<pack.LC) {alarmflag=1;pack.CSC2|=0x10;}
-			} 
-			if (pack.convc1&8) {
-				cli();pack.D=rlight[3];sei();
-				if (pack.CSD2&0x08)  //AEH
-					if (pack.bytes[1]>pack.HD) {alarmflag=1;pack.CSD2|=0x20;}
-				if (pack.CSD2&0x04)  //AEL
-					if (pack.bytes[1]<pack.LD) {alarmflag=1;pack.CSD2|=0x10;}
-			}
-			
-			EXTERN_SLEEP();
-			//PORTB&=~(1<<PINB1);
-		}
-
-		uint8_t bb=1;
-		for(uint8_t i=0;i<4;i++) {
-			if (pack.bytes[8+i*2]&0x80) {  //Chanel as output
-				if (pack.bytes[8+i*2]&0x40) {
-					DDRA|=bb;
-				} else {
-					DDRA&=~bb;
-				}
-			} else {
-				DDRA&=~bb;
-			}
-			bb=bb*2;
-		}
-		
-#if  defined(__AVR_ATtiny25__)||defined(__AVR_ATtiny45__)  || defined(__AVR_ATtiny85__)
-			if (((TIMSK & (1<<TOIE0))==0)&& (mode==0))
-#endif			
-#if  defined(__AVR_ATtiny24__)||defined(__AVR_ATtiny44__)  || defined(__AVR_ATtiny84__) ||defined(__AVR_ATtiny24A__)||defined(__AVR_ATtiny44A__)  || defined(__AVR_ATtiny84A__)
-			if (((TIMSK0 & (1<<TOIE0))==0)&& (mode==0))
-#endif
-			  {
-
-			MCUCR|=(1<<SE)|(1<<SM1);
-			MCUCR&=~(1<<ISC01);
-		} else {
-			MCUCR|=(1<<SE);
-			MCUCR&=~(1<<SM1);
-		}
-	//	asm("SLEEP");
-   }
-
-
+
+// Copyright (c) 2017, Tobias Mueller tm(at)tm3d.de
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//  * Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+//  * Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the
+//    distribution.
+//  * All advertising materials mentioning features or use of this
+//    software must display the following acknowledgement: This product
+//    includes software developed by tm3d.de and its contributors.
+//  * Neither the name of tm3d.de nor the names of its contributors may
+//    be used to endorse or promote products derived from this software
+//    without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#define F_CPU 8000000UL
+#include <avr/io.h>
+#include <avr/interrupt.h>
+#include <util/delay.h>
+#include <avr/wdt.h>
+#include <avr/sleep.h>
+#include <avr/pgmspace.h>
+#include "../common/I2C/USI_TWI_Master.h"
+#include "../common/I2C/APDS9960.h"
+
+extern void OWINIT();
+extern void EXTERN_SLEEP();
+
+uint8_t owid[8]={0x20, 0xA2, 0xD9, 0x84, 0x00, 0x16, 0x23, 0x20};/**/
+//uint8_t config_info[26]={0x03,13,0x03,13,0x03,13,0x3,15,0x02,20,20,20,20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+uint8_t config_info[26]={16,15,17,15,18,15,3,15,0x02,23,23,23,23,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+#if (owid>128) 
+#error "Variable not correct"
+#endif
+
+extern uint8_t mode;
+extern uint8_t gcontrol;
+extern uint8_t reset_indicator;
+extern uint8_t alarmflag;
+
+
+typedef union {
+	volatile uint8_t bytes[0x20];
+	struct {
+		//Page0
+		uint16_t A;  //0
+		uint16_t B;  //2
+		uint16_t C;  //4
+		uint16_t D;  //6
+		//Page1
+		uint8_t CSA1;
+		uint8_t CSA2;
+		uint8_t CSB1;
+		uint8_t CSB2;
+		uint8_t CSC1;
+		uint8_t CSC2;
+		uint8_t CSD1;
+		uint8_t CSD2;
+		//Page2
+		uint8_t LA;
+		uint8_t HA;
+		uint8_t LB;
+		uint8_t HB;
+		uint8_t LC;
+		uint8_t HC;
+		uint8_t LD;
+		uint8_t HD;
+		//Page3
+		uint8_t FC1;
+		uint8_t FC2;
+		uint8_t FC3;
+		uint8_t FC4;
+		uint8_t VCCP;
+		uint8_t FC5;
+		uint8_t FC6;
+		uint8_t FC7;
+		uint8_t convc1;
+		uint8_t convc2;
+		
+		
+	};
+} pack_t;
+volatile pack_t pack;
+
+
+uint16_t light[4];
+double rlight[4];
+uint8_t gain=2;
+uint8_t atime=192;
+//uint8_t atime=255;
+double r_gain;
+double r_atime;
+
+void getLight(uint8_t setparameterr) {
+	if (setparameterr) {
+		r_gain=(1<<(2*gain));
+		r_atime=(256.0-atime)*2.78;
+		APDS9960setGain(gain);
+		APDS9960setATime(atime);
+		_delay_ms(700);
+	}
+	APDS9960getRGBC(&light[0],&light[1],&light[2],&light[3]);
+}
+
+
+
+
+int main(void){
+	pack.A=0;
+	pack.B=0;
+	pack.C=0;
+	pack.D=0;
+	pack.CSA1=0x08;
+	pack.CSA2=0x8C;
+	pack.CSB1=0x08;
+	pack.CSB2=0x8C;
+	pack.CSC1=0x08;
+	pack.CSC2=0x8C;
+	pack.CSD1=0x08;
+	pack.CSD2=0x8C;
+	pack.HA=0xFF;
+	pack.LA=0x00;
+	pack.HB=0xFF;
+	pack.LB=0x00;
+	pack.HC=0xFF;
+	pack.LC=0x00;
+	pack.HD=0xFF;
+	pack.LD=0x00;
+	pack.VCCP=0;
+
+	PORTA=0xFF;
+	PORTB=0xFF;
+
+	OWINIT();
+
+	MCUCR &=~(1<<PUD); //All Pins Pullup...
+	MCUCR |=(1<<BODS);
+	//PORTA&=~((1<<PINA0)|(1<<PINA1)|(1<<PINA2)|(1<<PINA3));
+
+	ADCSRA=(1<<ADEN)|(1<ADPS0)|(1<<ADPS2);
+
+	
+	
+	gcontrol=1;
+	ADCSRB|=(1<<ADLAR); 
+	USI_TWI_Master_Initialise();
+	
+	initAPDS9960();
+	//gain=2;
+	//atime=253;
+	getLight(1);
+	sei();
+	
+	//DDRB|=(1<<PINB1);
+
+    while(1)   {
+
+
+		if (gcontrol) {
+			//PORTB|=(1<<PINB1);
+			uint8_t bb=1;
+			uint8_t bb1=1;
+			for(uint8_t i=0;i<4;i++){
+				if (pack.convc1&bb1) {
+					if (pack.convc2&(bb)) {pack.bytes[i*2]=0;pack.bytes[i*2+1]=0;}
+					bb=bb<<1;
+					if (pack.convc2&(bb)) {pack.bytes[i*2]=0xFF;pack.bytes[i*2+1]=0xFF;}
+					bb=bb<<1;
+				} else bb=bb<<2;
+				bb1=bb1<<1;				
+			}
+			//CHanel A
+			if (pack.convc1&1) {
+				getLight(0);
+				while (light[3]>0xF000) {
+				//while (light[3]>900) {
+					if (gain!=0) {
+						gain--;
+						getLight(1);
+					}  else break;
+				} 
+				if (light[3]<0x2222) {
+				//if (light[3]<0x22) {
+					if (gain<3) {
+						gain++;
+						getLight(1);
+					}
+
+				}
+				for(uint8_t i=0;i<4;i++) {
+					rlight[i]=(double)light[i]/r_atime/r_gain*70.0;
+					rlight[i]=(log(rlight[i])*1000)+32767.0;
+				}
+				cli();pack.A=rlight[0];sei();
+				//cli();pack.A=r_gain;sei();
+				alarmflag=0;
+				if (pack.CSA2&0x08)  //AEH
+					if (pack.bytes[1]>pack.HA) {alarmflag=1;pack.CSA2|=0x20;}
+				if (pack.CSA2&0x04)  //AEL
+					if (pack.bytes[1]<pack.LA) {alarmflag=1;pack.CSA2|=0x10;}
+			}
+
+			if (pack.convc1&2) {
+				cli();pack.B=rlight[1];sei();
+				//cli();pack.B=atime;sei();
+				if (pack.CSB2&0x08)  //AEH
+					if (pack.bytes[1]>pack.HB) {alarmflag=1;pack.CSB2|=0x20;}
+				if (pack.CSB2&0x04)  //AEL
+					if (pack.bytes[1]<pack.LB) {alarmflag=1;pack.CSB2|=0x10;}
+			}
+
+			if (pack.convc1&4) {
+				cli();pack.C=rlight[2];sei();
+				//cli();pack.C=light[3];sei();
+				if (pack.CSC2&0x08)  //AEH
+					if (pack.bytes[1]>pack.HC) {alarmflag=1;pack.CSC2|=0x20;}
+				if (pack.CSC2&0x04)  //AEL
+					if (pack.bytes[1]<pack.LC) {alarmflag=1;pack.CSC2|=0x10;}
+			} 
+			if (pack.convc1&8) {
+				cli();pack.D=rlight[3];sei();
+				if (pack.CSD2&0x08)  //AEH
+					if (pack.bytes[1]>pack.HD) {alarmflag=1;pack.CSD2|=0x20;}
+				if (pack.CSD2&0x04)  //AEL
+					if (pack.bytes[1]<pack.LD) {alarmflag=1;pack.CSD2|=0x10;}
+			}
+			
+			EXTERN_SLEEP();
+			//PORTB&=~(1<<PINB1);
+		}
+
+		uint8_t bb=1;
+		for(uint8_t i=0;i<4;i++) {
+			if (pack.bytes[8+i*2]&0x80) {  //Chanel as output
+				if (pack.bytes[8+i*2]&0x40) {
+					DDRA|=bb;
+				} else {
+					DDRA&=~bb;
+				}
+			} else {
+				DDRA&=~bb;
+			}
+			bb=bb*2;
+		}
+		
+#if  defined(__AVR_ATtiny25__)||defined(__AVR_ATtiny45__)  || defined(__AVR_ATtiny85__)
+			if (((TIMSK & (1<<TOIE0))==0)&& (mode==0))
+#endif			
+#if  defined(__AVR_ATtiny24__)||defined(__AVR_ATtiny44__)  || defined(__AVR_ATtiny84__) ||defined(__AVR_ATtiny24A__)||defined(__AVR_ATtiny44A__)  || defined(__AVR_ATtiny84A__)
+			if (((TIMSK0 & (1<<TOIE0))==0)&& (mode==0))
+#endif
+			  {
+
+			MCUCR|=(1<<SE)|(1<<SM1);
+			MCUCR&=~(1<<ISC01);
+		} else {
+			MCUCR|=(1<<SE);
+			MCUCR&=~(1<<SM1);
+		}
+	//	asm("SLEEP");
+   }
+
+
 }
\ No newline at end of file