Skip to content

Commit

Permalink
created user definitions in h file
Browse files Browse the repository at this point in the history
  • Loading branch information
AbhinavA10 committed Nov 11, 2017
1 parent 55b3cd5 commit b74d97d
Show file tree
Hide file tree
Showing 11 changed files with 115 additions and 51 deletions.
10 changes: 10 additions & 0 deletions PIC16F1459config.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
/*==============================================================================
RC Car (PIC16F1459) configuration bit settings.
Processor configuration bits determine processor operating characteristics
as well as processor-specific features. Refer to the processor datasheet
for details on specific configuration bit settings.
MPLAB X contains a 'Configuration Bits' settings tool accessed under:
Window menu -> PIC Memory Views. This tool generated the settings, below.
==============================================================================*/

// PIC16F1459 Configuration Bit Settings

Expand Down
22 changes: 22 additions & 0 deletions RCCar.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*==============================================================================
RC Car (PIC16F1459) hardware initialization and user functions.
==============================================================================*/

#include "xc.h" // XC compiler general include file

#include "stdint.h" // Integer definition
#include "stdbool.h" // Boolean (true/false) definition

#include "RCCar.h" // For optional user variable definitions

void init(void)
{
// Initialize oscillator

OSCCON = 0b11110000; // 4xPLL with 8 MHz internal oscillator = 32 MHz
//while(!PLLR); // Wait until PLL is locked for timing



INTCON = 0; // Keep interrupts disabled for now
}
27 changes: 24 additions & 3 deletions RCCar.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,32 @@
/*==============================================================================
RC Car (PIC16F1459) symbolic constants for main and other user functions.
RC Car (PIC16F1459) symbolic constants for main and other user functions.
==============================================================================*/
// need to check how to reference SPI
// need to check reset button
// check clock freq.

// Inputs read the Port registers (eg. RC0). Outputs write to the port latches
// (eg. LATC0).

// PORT I/O device definitions

#define Q1 RA0 // Phototransistor light sensor input
#define SERVO LATA5 // Servo Output
#define ESC LATA4 // Electronic Speed Controller Output
#define S1 LATA3 //Button (ex. reset)
#define MICROPHONE RC5 // Piezo Element Input
#define BEEPER LATC5 // Piezo Element Output
#define PS2PIN3 LATC3 // Pin 3 of PS2 Remote - Vibration Motor
#define PS2PIN6 LATC6 // Pin 6 of PS2 Remote - Attention Line (SS)
#define PS2PIN2 LATC7 // Pin 2 of PS2 Remote - Command Line (SDO)
#define TILTSWITCH2 RB7 // Tilt Switch #2 (Pointing Up)

#define DPLUS RA0
#define DMINUS RA1
#define LED2 LATC1 // Output for LED2 - Headlight LED
#define LED3 LATC2 // Output for LED3 - Headlight LED
#define PS2PIN1 RB4 // Pin 1 of PS2 Remote - Data Line (SDI)
#define TILTSWITCH1 RB5 // Tilt Switch #1 (Pointing Down)
#define PS2PIN7 LATB6 // Pin 7 of PS2 Remote - Clock Line (SCK)

// Clock frequency for delay macros and simulation

Expand All @@ -14,4 +35,4 @@

// TODO - Add function prototypes for all functions in RAINBO.c here:

void init(void); // Initialization function prototype
void init(void); // Initialization function prototype
48 changes: 29 additions & 19 deletions nbproject/Makefile-default.mk
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ ifeq ($(TYPE_IMAGE), DEBUG_RUN)
IMAGE_TYPE=debug
OUTPUT_SUFFIX=elf
DEBUGGABLE_SUFFIX=elf
FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
else
IMAGE_TYPE=production
OUTPUT_SUFFIX=hex
DEBUGGABLE_SUFFIX=elf
FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
endif

ifeq ($(COMPARE_BUILD), true)
Expand All @@ -44,30 +44,24 @@ else
COMPARISON_BUILD=
endif

ifdef SUB_IMAGE_ADDRESS

else
SUB_IMAGE_ADDRESS_COMMAND=
endif

# Object Directory
OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE}

# Distribution Directory
DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE}

# Source Files Quoted if spaced
SOURCEFILES_QUOTED_IF_SPACED=PIC16F1459config.c
SOURCEFILES_QUOTED_IF_SPACED=PIC16F1459config.c RCCar.c

# Object Files Quoted if spaced
OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/PIC16F1459config.p1
POSSIBLE_DEPFILES=${OBJECTDIR}/PIC16F1459config.p1.d
OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/PIC16F1459config.p1 ${OBJECTDIR}/RCCar.p1
POSSIBLE_DEPFILES=${OBJECTDIR}/PIC16F1459config.p1.d ${OBJECTDIR}/RCCar.p1.d

# Object Files
OBJECTFILES=${OBJECTDIR}/PIC16F1459config.p1
OBJECTFILES=${OBJECTDIR}/PIC16F1459config.p1 ${OBJECTDIR}/RCCar.p1

# Source Files
SOURCEFILES=PIC16F1459config.c
SOURCEFILES=PIC16F1459config.c RCCar.c


CFLAGS=
Expand All @@ -87,7 +81,7 @@ FIXDEPS=fixDeps
ifneq ($(INFORMATION_MESSAGE), )
@echo $(INFORMATION_MESSAGE)
endif
${MAKE} -f nbproject/Makefile-default.mk dist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
${MAKE} -f nbproject/Makefile-default.mk dist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}

MP_PROCESSOR_OPTION=16F1459
# ------------------------------------------------------------------------------------
Expand All @@ -101,6 +95,14 @@ ${OBJECTDIR}/PIC16F1459config.p1: PIC16F1459config.c nbproject/Makefile-${CND_C
@-${MV} ${OBJECTDIR}/PIC16F1459config.d ${OBJECTDIR}/PIC16F1459config.p1.d
@${FIXDEPS} ${OBJECTDIR}/PIC16F1459config.p1.d $(SILENT) -rsi ${MP_CC_DIR}../

${OBJECTDIR}/RCCar.p1: RCCar.c nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}"
@${RM} ${OBJECTDIR}/RCCar.p1.d
@${RM} ${OBJECTDIR}/RCCar.p1
${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G -D__DEBUG=1 --debugger=none --double=24 --float=24 --opt=+asm,+asmfile,-speed,+space,-debug,-local --addrqual=ignore --mode=free -P -N255 --warn=-3 --asmlist -DXPRJ_default=$(CND_CONF) --summary=default,-psect,-class,+mem,-hex,-file --output=default,-inhx032 --runtime=default,+clear,+init,-keep,-no_startup,-osccal,-resetbits,-download,-stackcall,+clib $(COMPARISON_BUILD) --output=-mcof,+elf:multilocs --stack=compiled:auto:auto "--errformat=%f:%l: error: (%n) %s" "--warnformat=%f:%l: warning: (%n) %s" "--msgformat=%f:%l: advisory: (%n) %s" -o${OBJECTDIR}/RCCar.p1 RCCar.c
@-${MV} ${OBJECTDIR}/RCCar.d ${OBJECTDIR}/RCCar.p1.d
@${FIXDEPS} ${OBJECTDIR}/RCCar.p1.d $(SILENT) -rsi ${MP_CC_DIR}../

else
${OBJECTDIR}/PIC16F1459config.p1: PIC16F1459config.c nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}"
Expand All @@ -110,6 +112,14 @@ ${OBJECTDIR}/PIC16F1459config.p1: PIC16F1459config.c nbproject/Makefile-${CND_C
@-${MV} ${OBJECTDIR}/PIC16F1459config.d ${OBJECTDIR}/PIC16F1459config.p1.d
@${FIXDEPS} ${OBJECTDIR}/PIC16F1459config.p1.d $(SILENT) -rsi ${MP_CC_DIR}../

${OBJECTDIR}/RCCar.p1: RCCar.c nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}"
@${RM} ${OBJECTDIR}/RCCar.p1.d
@${RM} ${OBJECTDIR}/RCCar.p1
${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G --double=24 --float=24 --opt=+asm,+asmfile,-speed,+space,-debug,-local --addrqual=ignore --mode=free -P -N255 --warn=-3 --asmlist -DXPRJ_default=$(CND_CONF) --summary=default,-psect,-class,+mem,-hex,-file --output=default,-inhx032 --runtime=default,+clear,+init,-keep,-no_startup,-osccal,-resetbits,-download,-stackcall,+clib $(COMPARISON_BUILD) --output=-mcof,+elf:multilocs --stack=compiled:auto:auto "--errformat=%f:%l: error: (%n) %s" "--warnformat=%f:%l: warning: (%n) %s" "--msgformat=%f:%l: advisory: (%n) %s" -o${OBJECTDIR}/RCCar.p1 RCCar.c
@-${MV} ${OBJECTDIR}/RCCar.d ${OBJECTDIR}/RCCar.p1.d
@${FIXDEPS} ${OBJECTDIR}/RCCar.p1.d $(SILENT) -rsi ${MP_CC_DIR}../

endif

# ------------------------------------------------------------------------------------
Expand All @@ -121,15 +131,15 @@ endif
# ------------------------------------------------------------------------------------
# Rules for buildStep: link
ifeq ($(TYPE_IMAGE), DEBUG_RUN)
dist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk
dist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE}
${MP_CC} $(MP_EXTRA_LD_PRE) --chip=$(MP_PROCESSOR_OPTION) -G -mdist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.${IMAGE_TYPE}.map -D__DEBUG=1 --debugger=none --double=24 --float=24 --opt=+asm,+asmfile,-speed,+space,-debug,-local --addrqual=ignore --mode=free -P -N255 --warn=-3 --asmlist -DXPRJ_default=$(CND_CONF) --summary=default,-psect,-class,+mem,-hex,-file --output=default,-inhx032 --runtime=default,+clear,+init,-keep,-no_startup,-osccal,-resetbits,-download,-stackcall,+clib --output=-mcof,+elf:multilocs --stack=compiled:auto:auto "--errformat=%f:%l: error: (%n) %s" "--warnformat=%f:%l: warning: (%n) %s" "--msgformat=%f:%l: advisory: (%n) %s" $(COMPARISON_BUILD) --memorysummary dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml -odist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED}
@${RM} dist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.${IMAGE_TYPE}.hex
${MP_CC} $(MP_EXTRA_LD_PRE) --chip=$(MP_PROCESSOR_OPTION) -G -mdist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.X.${IMAGE_TYPE}.map -D__DEBUG=1 --debugger=none --double=24 --float=24 --opt=+asm,+asmfile,-speed,+space,-debug,-local --addrqual=ignore --mode=free -P -N255 --warn=-3 --asmlist -DXPRJ_default=$(CND_CONF) --summary=default,-psect,-class,+mem,-hex,-file --output=default,-inhx032 --runtime=default,+clear,+init,-keep,-no_startup,-osccal,-resetbits,-download,-stackcall,+clib --output=-mcof,+elf:multilocs --stack=compiled:auto:auto "--errformat=%f:%l: error: (%n) %s" "--warnformat=%f:%l: warning: (%n) %s" "--msgformat=%f:%l: advisory: (%n) %s" $(COMPARISON_BUILD) --memorysummary dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml -odist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED}
@${RM} dist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.X.${IMAGE_TYPE}.hex

else
dist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk
dist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE}
${MP_CC} $(MP_EXTRA_LD_PRE) --chip=$(MP_PROCESSOR_OPTION) -G -mdist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.${IMAGE_TYPE}.map --double=24 --float=24 --opt=+asm,+asmfile,-speed,+space,-debug,-local --addrqual=ignore --mode=free -P -N255 --warn=-3 --asmlist -DXPRJ_default=$(CND_CONF) --summary=default,-psect,-class,+mem,-hex,-file --output=default,-inhx032 --runtime=default,+clear,+init,-keep,-no_startup,-osccal,-resetbits,-download,-stackcall,+clib --output=-mcof,+elf:multilocs --stack=compiled:auto:auto "--errformat=%f:%l: error: (%n) %s" "--warnformat=%f:%l: warning: (%n) %s" "--msgformat=%f:%l: advisory: (%n) %s" $(COMPARISON_BUILD) --memorysummary dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml -odist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED}
${MP_CC} $(MP_EXTRA_LD_PRE) --chip=$(MP_PROCESSOR_OPTION) -G -mdist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.X.${IMAGE_TYPE}.map --double=24 --float=24 --opt=+asm,+asmfile,-speed,+space,-debug,-local --addrqual=ignore --mode=free -P -N255 --warn=-3 --asmlist -DXPRJ_default=$(CND_CONF) --summary=default,-psect,-class,+mem,-hex,-file --output=default,-inhx032 --runtime=default,+clear,+init,-keep,-no_startup,-osccal,-resetbits,-download,-stackcall,+clib --output=-mcof,+elf:multilocs --stack=compiled:auto:auto "--errformat=%f:%l: error: (%n) %s" "--warnformat=%f:%l: warning: (%n) %s" "--msgformat=%f:%l: advisory: (%n) %s" $(COMPARISON_BUILD) --memorysummary dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml -odist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED}

endif

Expand Down
12 changes: 6 additions & 6 deletions nbproject/Makefile-genesis.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#
#Fri Nov 10 16:50:26 EST 2017
default.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc8\\v1.42\\bin
configurations-xml=6632fa5df4a9da1df412d545f32c7f54
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=e93259b090a4ceeac430f070c971d273
default.languagetoolchain.version=1.42
#Fri Nov 10 21:51:58 EST 2017
default.languagetoolchain.dir=C\:\\Program Files (x86)\\Microchip\\xc8\\v1.41\\bin
configurations-xml=aa7378d3c1f3ddecd9d4651f46d5aa74
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=c5846fdec3197dd1203fbded137f6478
default.languagetoolchain.version=1.41
host.platform=windows
conf.ids=default
default.com-microchip-mplab-nbide-toolchainXC8-XC8LanguageToolchain.md5=f67a5f01a7171987cc49979485d4fa5e
default.com-microchip-mplab-nbide-toolchainXC8-XC8LanguageToolchain.md5=9c7431fa79cc2e2c2facfdb6b375cb88
2 changes: 1 addition & 1 deletion 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=PS2-RC-Car
PROJECTNAME=PS2-RC-Car.X

# Active Configuration
DEFAULTCONF=default
Expand Down
20 changes: 10 additions & 10 deletions nbproject/Makefile-local-default.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@
# $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ...
#
SHELL=cmd.exe
PATH_TO_IDE_BIN=C:/Program Files/Microchip/MPLABX/v3.61/mplab_ide/platform/../mplab_ide/modules/../../bin/
PATH_TO_IDE_BIN=C:/Program Files (x86)/Microchip/MPLABX/v3.55/mplab_ide/platform/../mplab_ide/modules/../../bin/
# Adding MPLAB X bin directory to path.
PATH:=C:/Program Files/Microchip/MPLABX/v3.61/mplab_ide/platform/../mplab_ide/modules/../../bin/:$(PATH)
PATH:=C:/Program Files (x86)/Microchip/MPLABX/v3.55/mplab_ide/platform/../mplab_ide/modules/../../bin/:$(PATH)
# Path to java used to run MPLAB X when this makefile was created
MP_JAVA_PATH="C:\Program Files\Microchip\MPLABX\v3.61\sys\java\jre1.8.0_121/bin/"
MP_JAVA_PATH="C:\Program Files (x86)\Microchip\MPLABX\v3.55\sys\java\jre1.8.0_91/bin/"
OS_CURRENT="$(shell uname -s)"
MP_CC="C:\Program Files\Microchip\xc8\v1.42\bin\xc8.exe"
MP_CC="C:\Program Files (x86)\Microchip\xc8\v1.41\bin\xc8.exe"
# MP_CPPC is not defined
# MP_BC is not defined
MP_AS="C:\Program Files\Microchip\xc8\v1.42\bin\xc8.exe"
MP_LD="C:\Program Files\Microchip\xc8\v1.42\bin\xc8.exe"
MP_AS="C:\Program Files (x86)\Microchip\xc8\v1.41\bin\xc8.exe"
MP_LD="C:\Program Files (x86)\Microchip\xc8\v1.41\bin\xc8.exe"
# MP_AR is not defined
DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files/Microchip/MPLABX/v3.61/mplab_ide/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
MP_CC_DIR="C:\Program Files\Microchip\xc8\v1.42\bin"
DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files (x86)/Microchip/MPLABX/v3.55/mplab_ide/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
MP_CC_DIR="C:\Program Files (x86)\Microchip\xc8\v1.41\bin"
# MP_CPPC_DIR is not defined
# MP_BC_DIR is not defined
MP_AS_DIR="C:\Program Files\Microchip\xc8\v1.42\bin"
MP_LD_DIR="C:\Program Files\Microchip\xc8\v1.42\bin"
MP_AS_DIR="C:\Program Files (x86)\Microchip\xc8\v1.41\bin"
MP_LD_DIR="C:\Program Files (x86)\Microchip\xc8\v1.41\bin"
# MP_AR_DIR is not defined
# MP_BC_DIR is not defined
8 changes: 4 additions & 4 deletions 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=PS2-RC-Car.production.hex
CND_ARTIFACT_PATH_default=dist/default/production/PS2-RC-Car.production.hex
CND_ARTIFACT_NAME_default=PS2-RC-Car.X.production.hex
CND_ARTIFACT_PATH_default=dist/default/production/PS2-RC-Car.X.production.hex
CND_PACKAGE_DIR_default=${CND_DISTDIR}/default/package
CND_PACKAGE_NAME_default=ps2-rc-car.tar
CND_PACKAGE_PATH_default=${CND_DISTDIR}/default/package/ps2-rc-car.tar
CND_PACKAGE_NAME_default=ps2-rc-car.x.tar
CND_PACKAGE_PATH_default=${CND_DISTDIR}/default/package/ps2-rc-car.x.tar
12 changes: 6 additions & 6 deletions 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}/PS2-RC-Car.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
OUTPUT_BASENAME=PS2-RC-Car.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
PACKAGE_TOP_DIR=ps2-rc-car/
OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/PS2-RC-Car.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
OUTPUT_BASENAME=PS2-RC-Car.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
PACKAGE_TOP_DIR=ps2-rc-car.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}/ps2-rc-car/bin
makeDirectory ${TMPDIR}/ps2-rc-car.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/ps2-rc-car.tar
rm -f ${CND_DISTDIR}/${CND_CONF}/package/ps2-rc-car.x.tar
cd ${TMPDIR}
tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/ps2-rc-car.tar *
tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/ps2-rc-car.x.tar *
checkReturnCode

# Cleanup
Expand Down
3 changes: 2 additions & 1 deletion nbproject/configurations.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
displayName="Source Files"
projectFiles="true">
<itemPath>PIC16F1459config.c</itemPath>
<itemPath>RCCar.c</itemPath>
</logicalFolder>
<logicalFolder name="ExternalFiles"
displayName="Important Files"
Expand All @@ -31,7 +32,7 @@
<targetPluginBoard></targetPluginBoard>
<platformTool>Simulator</platformTool>
<languageToolchain>XC8</languageToolchain>
<languageToolchainVersion>1.42</languageToolchainVersion>
<languageToolchainVersion>1.41</languageToolchainVersion>
<platform>3</platform>
</toolsSet>
<compileType>
Expand Down
2 changes: 1 addition & 1 deletion nbproject/private/configurations.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<confs>
<conf name="default" type="2">
<platformToolSN></platformToolSN>
<languageToolchainDir>C:\Program Files\Microchip\xc8\v1.42\bin</languageToolchainDir>
<languageToolchainDir>C:\Program Files (x86)\Microchip\xc8\v1.41\bin</languageToolchainDir>
<mdbdebugger version="1">
<placeholder1>place holder 1</placeholder1>
<placeholder2>place holder 2</placeholder2>
Expand Down

0 comments on commit b74d97d

Please sign in to comment.