1.1 --- a/pic32.h Thu Oct 18 11:13:02 2018 +0200
1.2 +++ b/pic32.h Thu Oct 18 13:36:42 2018 +0200
1.3 @@ -18,16 +18,6 @@
1.4 #define OC3R 0xBF803410
1.5 #define OC3RS 0xBF803420
1.6
1.7 -#define T1CON 0xBF800600
1.8 -#define TMR1 0xBF800610
1.9 -#define PR1 0xBF800620
1.10 -#define T2CON 0xBF800800
1.11 -#define TMR2 0xBF800810
1.12 -#define PR2 0xBF800820
1.13 -#define T3CON 0xBF800A00
1.14 -#define TMR3 0xBF800A10
1.15 -#define PR3 0xBF800A20
1.16 -
1.17 #define PMCON 0xBF807000
1.18 #define PMMODE 0xBF807010
1.19 #define PMADDR 0xBF807020
1.20 @@ -120,6 +110,41 @@
1.21 #define DCHIPCBASE 0
1.22 #define DCHIPCSTEP 8
1.23
1.24 +/* Timer conveniences. */
1.25 +
1.26 +#define T1CON 0xBF800600
1.27 +#define T2CON 0xBF800800
1.28 +#define T3CON 0xBF800A00
1.29 +#define T4CON 0xBF800C00
1.30 +#define T5CON 0xBF800E00
1.31 +
1.32 +#define TIMERMIN 1
1.33 +#define TIMERMAX 5
1.34 +#define TIMERBASE T1CON
1.35 +#define TIMERSTEP (T2CON - T1CON)
1.36 +
1.37 +#define TxCON 0x00
1.38 +#define TMRx 0x10
1.39 +#define PRx 0x20
1.40 +
1.41 +#define TIMERIEC IEC0
1.42 +
1.43 +#define TxIE 1
1.44 +
1.45 +#define TIMERIFS IEC0
1.46 +
1.47 +#define TxIF 1
1.48 +
1.49 +#define TIMERINTBASE 4
1.50 +#define TIMERINTSTEP 5
1.51 +
1.52 +#define TIMER1IPC IPC1
1.53 +#define TIMER2IPC IPC2
1.54 +#define TIMER3IPC IPC3
1.55 +#define TIMER4IPC IPC4
1.56 +#define TIMER5IPC IPC5
1.57 +#define TIMERIPCBASE 0
1.58 +
1.59 /* UART conveniences. */
1.60
1.61 #define U1MODE 0xBF806000
1.62 @@ -162,6 +187,11 @@
1.63 * PIC32MX1XX/2XX 28/36/44-pin Family Data Sheet
1.64 */
1.65
1.66 +#define T1 4
1.67 +#define T2 9
1.68 +#define T3 14
1.69 +#define T4 19
1.70 +#define T5 24
1.71 #define U1RX 40
1.72 #define U2RX 54
1.73