diff options
| author | ukw | 2014-07-01 20:09:55 +0000 |
|---|---|---|
| committer | ukw | 2014-07-01 20:09:55 +0000 |
| commit | 7a844aff3755d6d856326c45f8aa0f01921d3205 (patch) | |
| tree | 1f21a5287b900114506b5b71dbfc62ae090cae43 | |
| parent | 6f153888f708dc80351c5048ca3f98125563df8a (diff) | |
| download | irmp-7a844aff3755d6d856326c45f8aa0f01921d3205.zip | |
Version 2.5.7: some corrections for PIC XC8 compiler
git-svn-id: svn://mikrocontroller.net/irmp@137 aeb2e35e-bfc4-4214-b83c-9e8de998ed28
| -rw-r--r-- | README.txt | 2 | ||||
| -rw-r--r-- | irmpconfig.h | 3 | ||||
| -rw-r--r-- | irmpsystem.h | 4 |
3 files changed, 6 insertions, 3 deletions
@@ -1,7 +1,7 @@ IRMP - Infrared Multi Protocol Decoder
--------------------------------------
-Version IRMP: 2.5.6 01.07.2014
+Version IRMP: 2.5.7 01.07.2014
Version IRSND: 2.5.4 23.06.2014
Dokumentation:
diff --git a/irmpconfig.h b/irmpconfig.h index 6fb30c7..5754453 100644 --- a/irmpconfig.h +++ b/irmpconfig.h @@ -5,7 +5,7 @@ *
* Copyright (c) 2009-2013 Frank Meyer - frank(at)fli4l.de
*
- * $Id: irmpconfig.h,v 1.110 2014/07/01 07:50:33 fm Exp $
+ * $Id: irmpconfig.h,v 1.111 2014/07/01 20:08:20 fm Exp $
*
* ATMEGA88 @ 8 MHz
*
@@ -27,6 +27,7 @@ * Change F_INTERRUPTS if you change the number of interrupts per second,
* Normally, F_INTERRUPTS should be in the range from 10000 to 15000, typical is 15000
* A value above 15000 costs additional program space, absolute maximum value is 20000.
+ * On PIC with XC8/C18 Compiler, use 15151 as the correct value.
*---------------------------------------------------------------------------------------------------------------------------------------------------
*/
#ifndef F_INTERRUPTS
diff --git a/irmpsystem.h b/irmpsystem.h index d4e5b13..fdd2fa3 100644 --- a/irmpsystem.h +++ b/irmpsystem.h @@ -3,7 +3,7 @@ *
* Copyright (c) 2009-2013 Frank Meyer - frank(at)fli4l.de
*
- * $Id: irmpsystem.h,v 1.11 2014/07/01 07:50:33 fm Exp $
+ * $Id: irmpsystem.h,v 1.12 2014/07/01 20:08:20 fm Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -107,8 +107,10 @@ typedef unsigned short uint16_t; #if defined (PIC_C18) // PIC C18 or XC8 compiler
# include <p18cxxx.h> // main PIC18 h file
+#ifndef __XC8
# include <timers.h> // timer lib
# include <pwm.h> // pwm lib
+#endif
# define IRSND_PIC_CCP1 1 // PIC C18 RC2 = PWM1 module
# define IRSND_PIC_CCP2 2 // PIC C18 RC1 = PWM2 module
#endif
|