diff options
| author | Damien George <damien.p.george@gmail.com> | 2019-01-25 16:06:13 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2019-01-25 16:06:13 +1100 |
| commit | 6d480f50accb475a67ce53a6cbbaccea603e59ed (patch) | |
| tree | 27d8d1cbf729aef651e6741da5ca7b84bbe6e79f | |
| parent | 5089b3ffb6dbaacdd99176b0ed4ff0aeeddca4d1 (diff) | |
pic16bit: Update to compile with latest xc16 v1.35 compiler.
This port has been verified to work with these latest changes.
| -rw-r--r-- | ports/pic16bit/Makefile | 4 | ||||
| -rw-r--r-- | ports/pic16bit/main.c | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/ports/pic16bit/Makefile b/ports/pic16bit/Makefile index 970e75d1f..8a931979d 100644 --- a/ports/pic16bit/Makefile +++ b/ports/pic16bit/Makefile @@ -6,7 +6,7 @@ QSTR_DEFS = qstrdefsport.h # include py core make definitions include $(TOP)/py/py.mk -XC16 = /opt/microchip/xc16/v1.24 +XC16 = /opt/microchip/xc16/v1.35 CROSS_COMPILE = $(XC16)/bin/xc16- PARTFAMILY = dsPIC33F @@ -29,7 +29,7 @@ CFLAGS += -O1 -DNDEBUG endif LDFLAGS = --heap=0 -nostdlib -T $(XC16)/support/$(PARTFAMILY)/gld/p$(PART).gld -Map=$@.map --cref -p$(PART) -LIBS = -L$(XC16)/lib -L$(XC16)/lib/$(PARTFAMILY) -lc -lm -lpic30 -lp$(PART) +LIBS = -L$(XC16)/lib -L$(XC16)/lib/$(PARTFAMILY) -lc -lm -lpic30 SRC_C = \ main.c \ diff --git a/ports/pic16bit/main.c b/ports/pic16bit/main.c index 4a61c5ff5..47ba00f48 100644 --- a/ports/pic16bit/main.c +++ b/ports/pic16bit/main.c @@ -39,10 +39,13 @@ #include "board.h" #include "modpyb.h" -_FGS(GWRP_OFF & GCP_OFF); -_FOSCSEL(FNOSC_FRC); -_FOSC(FCKSM_CSECMD & OSCIOFNC_ON & POSCMD_NONE); -_FWDT(FWDTEN_OFF); +#pragma config GWRP = OFF +#pragma config GSS = GCP_OFF +#pragma config FNOSC = FRC +#pragma config FCKSM = CSECMD +#pragma config OSCIOFNC = ON +#pragma config POSCMD = NONE +#pragma config FWDTEN = OFF // maximum heap for device with 8k RAM static char heap[4600]; |