Skip to content

Commit

Permalink
[STRUCTURE] Pruning files tracked by git and updating gitignore file …
Browse files Browse the repository at this point in the history
…to reflect changes. Additionally, the configuration was modified to be dependent upon the external libraries: lib-wii, lib-i2c, and lib-timing.
  • Loading branch information
sudolegit committed Nov 9, 2018
1 parent 7ce6d8a commit 599a57d
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 754 deletions.
22 changes: 19 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/firmware/badge1.X/build/default/
/firmware/badge-supercon18.X/build/default/
/firmware/badge-supercon18.X/dist/default/
# MPLAB X:
build
debug
dist
firmware/*.X/*
!firmware/*.X/Makefile
!firmware/*.X/nbproject/
firmware/*.X/nbproject/*
!firmware/*.X/nbproject/configurations.xml
!firmware/*.X/nbproject/project.xml
!firmware/*.X/src/

# Python:
*.pyo
*.pyc

# Documentation:
latex

511 changes: 0 additions & 511 deletions firmware/badge-supercon18.X/nbproject/Makefile-default.mk

This file was deleted.

This file was deleted.

69 changes: 0 additions & 69 deletions firmware/badge-supercon18.X/nbproject/Makefile-impl.mk

This file was deleted.

36 changes: 0 additions & 36 deletions firmware/badge-supercon18.X/nbproject/Makefile-local-default.mk

This file was deleted.

13 changes: 0 additions & 13 deletions firmware/badge-supercon18.X/nbproject/Makefile-variables.mk

This file was deleted.

73 changes: 0 additions & 73 deletions firmware/badge-supercon18.X/nbproject/Package-default.bash

This file was deleted.

12 changes: 8 additions & 4 deletions firmware/badge-supercon18.X/nbproject/configurations.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,17 +90,20 @@
<targetDevice>PIC32MX370F512H</targetDevice>
<targetHeader></targetHeader>
<targetPluginBoard></targetPluginBoard>
<platformTool>pk4hybrid</platformTool>
<platformTool>PICkit3PlatformTool</platformTool>
<languageToolchain>XC32</languageToolchain>
<languageToolchainVersion>2.10</languageToolchainVersion>
<platform>2</platform>
<platform>3</platform>
</toolsSet>
<packs>
<pack name="PIC32MX_DFP" vendor="Microchip" version="1.0.23"/>
</packs>
<compileType>
<linkerTool>
<linkerLibItems>
<linkerLibFileItem>../../../lib-timing/lib-timing--pic32mx370f512h.X/dist/default/production/lib-timing--pic32mx370f512h.X.a</linkerLibFileItem>
<linkerLibFileItem>../../../lib-i2c/lib-i2c--pic32mx370f512h.X/dist/default/production/lib-i2c--pic32mx370f512h.X.a</linkerLibFileItem>
<linkerLibFileItem>../../../lib-wii/lib-wii--pic32mx370f512h.X/dist/default/production/lib-wii--pic32mx370f512h.X.a</linkerLibFileItem>
</linkerLibItems>
</linkerTool>
<archiverTool>
Expand Down Expand Up @@ -130,7 +133,8 @@
<property key="enable-symbols" value="true"/>
<property key="enable-unroll-loops" value="true"/>
<property key="exclude-floating-point" value="false"/>
<property key="extra-include-directories" value=""/>
<property key="extra-include-directories"
value="..\..\..\lib-timing\include;..\..\..\lib-i2c\include;..\..\..\lib-wii\include"/>
<property key="generate-16-bit-code" value="false"/>
<property key="generate-micro-compressed-code" value="false"/>
<property key="isolate-each-function" value="false"/>
Expand Down Expand Up @@ -248,7 +252,7 @@
<property key="mitcm" value=""/>
<property key="mstacktcm" value="false"/>
<property key="relaxed-math" value="false"/>
<property key="save-temps" value="false"/>
<property key="save-temps" value="true"/>
<property key="wpo-lto" value="false"/>
</C32Global>
<PICkit3PlatformTool>
Expand Down
25 changes: 0 additions & 25 deletions firmware/badge-supercon18.X/nbproject/private/configurations.xml

This file was deleted.

11 changes: 0 additions & 11 deletions firmware/badge-supercon18.X/nbproject/private/private.xml

This file was deleted.

0 comments on commit 599a57d

Please sign in to comment.