diff --git a/16mega.PNG b/16mega.PNG
new file mode 100755
index 0000000..67a2fb3
Binary files /dev/null and b/16mega.PNG differ
diff --git a/i2c_test_attiny85/i2c_test_attiny85.componentinfo.xml b/i2c_test_attiny85/i2c_test_attiny85.componentinfo.xml
index f38ac81..80c79cc 100755
--- a/i2c_test_attiny85/i2c_test_attiny85.componentinfo.xml
+++ b/i2c_test_attiny85/i2c_test_attiny85.componentinfo.xml
@@ -9,57 +9,57 @@
Atmel
- 1.8.0
- D:/Programs\Atmelstudio\7.0\Packs
+ 1.2.0
+ C:/Program Files (x86)\Atmel\Studio\7.0\Packs
- D:/Programs\Atmelstudio\7.0\Packs\atmel\ATtiny_DFP\1.8.332\include\
+ C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATtiny_DFP\1.2.118\include
include
C
- include/
+ include
- D:/Programs\Atmelstudio\7.0\Packs\atmel\ATtiny_DFP\1.8.332\include\avr\iotn85.h
+ C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATtiny_DFP\1.2.118\include\avr\iotn85.h
header
C
- T0lnJZ6iliUJCzU7ZHCMPQ==
+ RcYmivGpgsCGGCzeWAIjcA==
include/avr/iotn85.h
- D:/Programs\Atmelstudio\7.0\Packs\atmel\ATtiny_DFP\1.8.332\templates\main.c
+ C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATtiny_DFP\1.2.118\templates\main.c
template
source
C Exe
- KjvOcFWd++tbnsEMfVPd/w==
+ GD1k8YYhulqRs6FD1B2Hog==
templates/main.c
Main file (.c)
- D:/Programs\Atmelstudio\7.0\Packs\atmel\ATtiny_DFP\1.8.332\templates\main.cpp
+ C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATtiny_DFP\1.2.118\templates\main.cpp
template
source
C Exe
- mkKaE95TOoATsuBGv6jmxg==
+ YXFphlh0CtZJU+ebktABgQ==
templates/main.cpp
Main file (.cpp)
- D:/Programs\Atmelstudio\7.0\Packs\atmel\ATtiny_DFP\1.8.332\gcc\dev\attiny85
+ C:/Program Files (x86)\Atmel\Studio\7.0\Packs\atmel\ATtiny_DFP\1.2.118\gcc\dev\attiny85
libraryPrefix
GCC
@@ -71,8 +71,8 @@
ATtiny_DFP
- D:/Programs/Atmelstudio/7.0/Packs/atmel/ATtiny_DFP/1.8.332/Atmel.ATtiny_DFP.pdsc
- 1.8.332
+ C:/Program Files (x86)/Atmel/Studio/7.0/Packs/atmel/ATtiny_DFP/1.2.118/Atmel.ATtiny_DFP.pdsc
+ 1.2.118
true
ATtiny85
diff --git a/i2c_test_attiny85/led_gen.c b/i2c_test_attiny85/led_gen.c
index 5c93e9e..6b4ac8a 100755
--- a/i2c_test_attiny85/led_gen.c
+++ b/i2c_test_attiny85/led_gen.c
@@ -5,34 +5,50 @@
* Author: 40008304
*/
-#include "led_gen.h"
+#include "led_gen.h"
+
+volatile unsigned char led1_state=0;
+volatile unsigned char led2_state=0;
void led1_init(void)
{
- DDRB |= (1<
#include
@@ -21,14 +21,18 @@
#define NOTHING 0x54
#define ERROR 0xF0
#define VOLTMIN 1
-#define TIMING 5
+#define TIMING 10
void ADC_init(void);
void ADC_start_conversion(void);
char ADC_read_value(void);
float ADC_averaging(unsigned char val_ana);
-float measureLed1(void);
-float measureLed2(void);
+char measureLed1(void);
+char measureLed2(void);
unsigned char compareLed(float led1,float led2);
+volatile unsigned char intr_count;
+volatile unsigned char timer_flag;
+volatile unsigned char seconde;
+
#endif /* LED_RECEPTOR_H_ */
\ No newline at end of file
diff --git a/i2c_test_attiny85/main.c b/i2c_test_attiny85/main.c
index 1ff17b4..2eb610c 100755
--- a/i2c_test_attiny85/main.c
+++ b/i2c_test_attiny85/main.c
@@ -16,46 +16,52 @@
#include "led_gen.h"
#include "led_receptor.h"
#include "usiTwiSlave.h"
-//#define F_CPU 1000000
+
#define NOM_CONSTRUC 0x08
#define NOM_CAPTEUR 0x10
#define VALEUR_DEMAN 0x49
#define BASIC_MODE 0x42
volatile unsigned char rawVal;
-volatile float adcled1;
-volatile float adcled2;
+volatile unsigned char adcled1;
+volatile unsigned char adcled2;
volatile unsigned char recVal;
-/*ISR (ADC_vect){
+ISR (ADC_vect){
adcled1=measureLed1();
adcled2=measureLed2();
- recVal=compareLed(adcled1,adcled2);
-}*/
+ //recVal=compareLed(adcled1,adcled2);
+ ADCSRA |= (1<