Skip to content

Commit

Permalink
Merging
Browse files Browse the repository at this point in the history
  • Loading branch information
leomil72 committed Feb 21, 2016
1 parent 47c2cd9 commit 131983a
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 4 deletions.
7 changes: 4 additions & 3 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@

analogComp

This little library can be used to set and manage the analog
This little library can be used to set and manage the analog
comparator that is integrated in a wide variety of
Atmel microcontrollers

Written by Leonardo Miliani <leonardo AT leonardomiliani DOT com>
Written by Leonardo Miliani <www DOT leonardomiliani DOT com>


***********************
Version history

v. 1.2.2: added compatibility with Arduino IDE >= 1.6.7
v. 1.2.1: fixed a bug that let the ADC off after a comparison
v. 1.2.0: fixed a bug into the conversion from analog to phisical pins
v. 1.1.1: now it calls the correct interrupt vector for the MCU in use
Expand Down Expand Up @@ -147,4 +148,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
***********************
Document revision

7th revision: 2013/07/30
9th revision: 2016/02/21
5 changes: 4 additions & 1 deletion analogComp.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
The latest version of this library can be found at:
http://www.leonardomiliani.com/
Current version: 1.2.1 - 2013/07/30
Current version: 1.2.2 - 2016/02/20
(for a complete history of the previous versions, see the README file)
This library is free software; you can redistribute it and/or
Expand All @@ -26,6 +26,8 @@
#ifndef ANALOG_COMP_H
#define ANALOG_COMP_H

//library version
#define ANALOGCOMP_VERSION 122

//Library is compatible both with Arduino <=0023 and Arduino >=100
#if defined(ARDUINO) && (ARDUINO >= 100)
Expand Down Expand Up @@ -88,6 +90,7 @@ class analogComp {
uint8_t waitComp(unsigned long = 0);
private:
//private methods
uint8_t _initialized;
};
extern analogComp analogComparator;

Expand Down
10 changes: 10 additions & 0 deletions library.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name=analogComp
version=1.2.2
author=Leonardo Miliani
maintainer=Leonardo Miliani
sentence=Simple scheduler based on watchdog that runs little tasks within IRS
paragraph=
category=Signal Input/Output
url=http://www.leonardomiliani.com
architectures=avr

1 change: 1 addition & 0 deletions version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.2.2

0 comments on commit 131983a

Please sign in to comment.