Skip to content

Commit

Permalink
Replaced MPLABX project files with a fresh set to ensure configuratio…
Browse files Browse the repository at this point in the history
…n is as desired
  • Loading branch information
szczys committed Oct 13, 2018
1 parent e67afa0 commit 817eff7
Show file tree
Hide file tree
Showing 9 changed files with 191 additions and 747 deletions.
298 changes: 149 additions & 149 deletions firmware/badge-supercon18.X/nbproject/Makefile-default.mk

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#
#Sat Oct 13 11:38:12 CDT 2018
#Sat Oct 13 12:18:38 CDT 2018
default.com-microchip-mplab-nbide-toolchainXC32-XC32LanguageToolchain.md5=f03d7c843128b5e50a1f7aa63f2ccfb5
default.languagetoolchain.dir=/opt/microchip/xc32/v2.10/bin
configurations-xml=8ae6666b8b7748b6dfe9d4817bb31c4a
configurations-xml=573a35f1333edb10280acb0de2601fb7
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=ddd77f39013c5d7ceec7afa039614a52
default.languagetoolchain.version=2.10
host.platform=linux
Expand Down
2 changes: 1 addition & 1 deletion firmware/badge-supercon18.X/nbproject/Makefile-impl.mk
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}


# Project Name
PROJECTNAME=badge1.X
PROJECTNAME=badge-supercon18.X

# Active Configuration
DEFAULTCONF=default
Expand Down
8 changes: 4 additions & 4 deletions firmware/badge-supercon18.X/nbproject/Makefile-variables.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
CND_BASEDIR=`pwd`
# default configuration
CND_ARTIFACT_DIR_default=dist/default/production
CND_ARTIFACT_NAME_default=badge1.X.production.hex
CND_ARTIFACT_PATH_default=dist/default/production/badge1.X.production.hex
CND_ARTIFACT_NAME_default=badge-supercon18.X.production.hex
CND_ARTIFACT_PATH_default=dist/default/production/badge-supercon18.X.production.hex
CND_PACKAGE_DIR_default=${CND_DISTDIR}/default/package
CND_PACKAGE_NAME_default=badge1.x.tar
CND_PACKAGE_PATH_default=${CND_DISTDIR}/default/package/badge1.x.tar
CND_PACKAGE_NAME_default=badge-supercon18.x.tar
CND_PACKAGE_PATH_default=${CND_DISTDIR}/default/package/badge-supercon18.x.tar
12 changes: 6 additions & 6 deletions firmware/badge-supercon18.X/nbproject/Package-default.bash
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ CND_CONF=default
CND_DISTDIR=dist
TMPDIR=build/${CND_CONF}/${IMAGE_TYPE}/tmp-packaging
TMPDIRNAME=tmp-packaging
OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/badge1.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
OUTPUT_BASENAME=badge1.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
PACKAGE_TOP_DIR=badge1.x/
OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/badge-supercon18.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
OUTPUT_BASENAME=badge-supercon18.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
PACKAGE_TOP_DIR=badge-supercon18.x/

# Functions
function checkReturnCode
Expand Down Expand Up @@ -57,15 +57,15 @@ mkdir -p ${TMPDIR}

# Copy files and create directories and links
cd "${TOP}"
makeDirectory ${TMPDIR}/badge1.x/bin
makeDirectory ${TMPDIR}/badge-supercon18.x/bin
copyFileToTmpDir "${OUTPUT_PATH}" "${TMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755


# Generate tar file
cd "${TOP}"
rm -f ${CND_DISTDIR}/${CND_CONF}/package/badge1.x.tar
rm -f ${CND_DISTDIR}/${CND_CONF}/package/badge-supercon18.x.tar
cd ${TMPDIR}
tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/badge1.x.tar *
tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/badge-supercon18.x.tar *
checkReturnCode

# Cleanup
Expand Down
595 changes: 26 additions & 569 deletions firmware/badge-supercon18.X/nbproject/configurations.xml

Large diffs are not rendered by default.

This file was deleted.

12 changes: 1 addition & 11 deletions firmware/badge-supercon18.X/nbproject/private/private.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,7 @@
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group>
<file>file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/splash.c</file>
<file>file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/splash.h</file>
<file>file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/main.c</file>
<file>file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/disp.c</file>
<file>file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/user_program.c</file>
<file>file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/vt100.c</file>
<file>file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/vt100.h</file>
<file>file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/Z80/hwz.c</file>
<file>file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/basic/ubasic.c</file>
<file>file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/badge_settings.h</file>
<file>file:/home/mike/compile/2018-Supercon-Badge/firmware/badge1.X/src/badge.c</file>
<file>file:/home/mike/MPLABXProjects/badge-supercon18.X/src/splash.c</file>
</group>
</open-files>
</project-private>
4 changes: 2 additions & 2 deletions firmware/badge-supercon18.X/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<type>com.microchip.mplab.nbide.embedded.makeproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/make-project/1">
<name>badge1</name>
<creation-uuid>4c890340-e8fa-4dd9-8ce3-1d80c8c40d12</creation-uuid>
<name>badge-supercon18</name>
<creation-uuid>42cab5b4-899a-4f1d-b033-b73f79c2bbdb</creation-uuid>
<make-project-type>0</make-project-type>
<c-extensions>c</c-extensions>
<cpp-extensions/>
Expand Down

0 comments on commit 817eff7

Please sign in to comment.