Skip to content

Commit

Permalink
Merge pull request #4 from Hack-a-Day/splash
Browse files Browse the repository at this point in the history
Splash Screen and Fresh Configuration
  • Loading branch information
jaromir-sukuba authored Oct 13, 2018
2 parents db80758 + 817eff7 commit fd0b499
Show file tree
Hide file tree
Showing 63 changed files with 957 additions and 1,199 deletions.
File renamed without changes.
File renamed without changes.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#
#Tue Sep 18 18:57:45 CEST 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=e2183cea8fe5ecc78a6e6e8c6083a126
configurations-xml=573a35f1333edb10280acb0de2601fb7
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=ddd77f39013c5d7ceec7afa039614a52
default.languagetoolchain.version=2.10
host.platform=linux
Expand Down
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
13 changes: 13 additions & 0 deletions firmware/badge-supercon18.X/nbproject/Makefile-variables.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#
# Generated - do not edit!
#
# NOCDDL
#
CND_BASEDIR=`pwd`
# default configuration
CND_ARTIFACT_DIR_default=dist/default/production
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=badge-supercon18.x.tar
CND_PACKAGE_PATH_default=${CND_DISTDIR}/default/package/badge-supercon18.x.tar
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
326 changes: 326 additions & 0 deletions firmware/badge-supercon18.X/nbproject/configurations.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<defaultConf>0</defaultConf>
<confs>
<conf name="default" type="2">
<platformToolSN>:=MPLABComm-USB-Microchip:=&lt;vid>04D8:=&lt;pid>9012:=&lt;rev>0100:=&lt;man>Microchip Technology Incorporated:=&lt;prod>MPLAB PICkit 4:=&lt;sn>BUR181416523:=&lt;drv>x:=&lt;xpt>b:=end</platformToolSN>
<platformToolSN>:=MPLABComm-USB-Microchip:=&lt;vid>04D8:=&lt;pid>9012:=&lt;rev>0100:=&lt;man>Microchip Technology Incorporated:=&lt;prod>MPLAB PICkit 4:=&lt;sn>BUR180524591:=&lt;drv>x:=&lt;xpt>b:=end</platformToolSN>
<languageToolchainDir>/opt/microchip/xc32/v2.10/bin</languageToolchainDir>
<mdbdebugger version="1">
<placeholder1>place holder 1</placeholder1>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<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/>
<group>
<file>file:/home/mike/MPLABXProjects/badge-supercon18.X/src/splash.c</file>
</group>
</open-files>
</project-private>
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit fd0b499

Please sign in to comment.