Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added tested support for PIC16F1455 (and fixed PIC16F1454 support in hidmouse example) #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

added tested support for PIC16F1455 (and fixed PIC16F1454 support in hidmouse example) #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96a86a4
added tested support for PIC16F1455 (and fixed PIC16F1454 support in …
todbot Feb 12, 2014
8bd5628
oops, forgot to push these xml files for new config too
todbot Feb 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
681 changes: 674 additions & 7 deletions apps/hid_mouse/MPLAB.X/nbproject/configurations.xml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion apps/hid_mouse/MPLAB.X/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://www.netbeans.org/ns/project/1">
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>com.microchip.mplab.nbide.embedded.makeproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/make-project/1">
Expand All @@ -9,6 +10,7 @@
<cpp-extensions/>
<header-extensions>h</header-extensions>
<sourceEncoding>ISO-8859-1</sourceEncoding>
<asminc-extensions/>
<make-dep-projects/>
</data>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions apps/hid_mouse/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ _CONFIG3(WPFP_WPFP255 & SOSCSEL_SOSC & WUTSEL_LEG & ALTPMP_ALPMPDIS & WPDIS_WPDI
#pragma config IOL1WAY = OFF
#pragma config WPDIS = OFF /* This pragma seems backwards */

#elif _16F1459
#elif _16F1459 || _16F1455 || _16F1454
#pragma config FOSC = INTOSC
#pragma config WDTE = OFF
#pragma config PWRTE = OFF
Expand Down Expand Up @@ -103,7 +103,7 @@ int main(void)
OSCTUNEbits.PLLEN = 1;
while (pll_startup--)
;
#elif _16F1459
#elif _16F1459 || _16F1455 || _16F1454
OSCCONbits.IRCF = 0b1111; /* 0b1111 = 16MHz HFINTOSC postscalar */

/* Enable Active clock-tuning from the USB */
Expand Down
6 changes: 6 additions & 0 deletions apps/unit_test/MPLAB.X/nbproject/configurations.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,12 @@
<property key="warn-section-align" value="false"/>
</C30-LD>
<C30Global>
<property key="fast-math" value="false"/>
<property key="generic-16-bit" value="false"/>
<property key="legacy-libc" value="false"/>
<property key="oXC16glb-macros" value=""/>
<property key="output-file-format" value="elf"/>
<property key="save-temps" value="false"/>
</C30Global>
<ICD3PlatformTool>
</ICD3PlatformTool>
Expand Down
4 changes: 3 additions & 1 deletion apps/unit_test/MPLAB.X/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://www.netbeans.org/ns/project/1">
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>com.microchip.mplab.nbide.embedded.makeproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/make-project/1">
Expand All @@ -9,6 +10,7 @@
<cpp-extensions/>
<header-extensions>h</header-extensions>
<sourceEncoding>ISO-8859-1</sourceEncoding>
<asminc-extensions/>
<make-dep-projects/>
</data>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion usb/src/usb_hal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ struct buffer_descriptor {
#define BDN_LENGTH(REG) (REG.BDnCNT)
#endif

#if defined(_16F1459) || defined(_16F1454)
#if defined(_16F1459) || defined(_16F1455) || defined(_16F1454)
#define BD_ADDR 0x2000
#define BUFFER_ADDR 0x2080
#else
Expand Down