diff --git a/Blinky.X/Makefile b/Blinky.X/Makefile deleted file mode 100644 index fca8e2c..0000000 --- a/Blinky.X/Makefile +++ /dev/null @@ -1,113 +0,0 @@ -# -# There exist several targets which are by default empty and which can be -# used for execution of your targets. These targets are usually executed -# before and after some main targets. They are: -# -# .build-pre: called before 'build' target -# .build-post: called after 'build' target -# .clean-pre: called before 'clean' target -# .clean-post: called after 'clean' target -# .clobber-pre: called before 'clobber' target -# .clobber-post: called after 'clobber' target -# .all-pre: called before 'all' target -# .all-post: called after 'all' target -# .help-pre: called before 'help' target -# .help-post: called after 'help' target -# -# Targets beginning with '.' are not intended to be called on their own. -# -# Main targets can be executed directly, and they are: -# -# build build a specific configuration -# clean remove built files from a configuration -# clobber remove all built files -# all build all configurations -# help print help mesage -# -# Targets .build-impl, .clean-impl, .clobber-impl, .all-impl, and -# .help-impl are implemented in nbproject/makefile-impl.mk. -# -# Available make variables: -# -# CND_BASEDIR base directory for relative paths -# CND_DISTDIR default top distribution directory (build artifacts) -# CND_BUILDDIR default top build directory (object files, ...) -# CONF name of current configuration -# CND_ARTIFACT_DIR_${CONF} directory of build artifact (current configuration) -# CND_ARTIFACT_NAME_${CONF} name of build artifact (current configuration) -# CND_ARTIFACT_PATH_${CONF} path to build artifact (current configuration) -# CND_PACKAGE_DIR_${CONF} directory of package (current configuration) -# CND_PACKAGE_NAME_${CONF} name of package (current configuration) -# CND_PACKAGE_PATH_${CONF} path to package (current configuration) -# -# NOCDDL - - -# Environment -MKDIR=mkdir -CP=cp -CCADMIN=CCadmin -RANLIB=ranlib - - -# build -build: .build-post - -.build-pre: -# Add your pre 'build' code here... - -.build-post: .build-impl -# Add your post 'build' code here... - - -# clean -clean: .clean-post - -.clean-pre: -# Add your pre 'clean' code here... -# WARNING: the IDE does not call this target since it takes a long time to -# simply run make. Instead, the IDE removes the configuration directories -# under build and dist directly without calling make. -# This target is left here so people can do a clean when running a clean -# outside the IDE. - -.clean-post: .clean-impl -# Add your post 'clean' code here... - - -# clobber -clobber: .clobber-post - -.clobber-pre: -# Add your pre 'clobber' code here... - -.clobber-post: .clobber-impl -# Add your post 'clobber' code here... - - -# all -all: .all-post - -.all-pre: -# Add your pre 'all' code here... - -.all-post: .all-impl -# Add your post 'all' code here... - - -# help -help: .help-post - -.help-pre: -# Add your pre 'help' code here... - -.help-post: .help-impl -# Add your post 'help' code here... - - - -# include project implementation makefile -include nbproject/Makefile-impl.mk - -# include project make variables -include nbproject/Makefile-variables.mk diff --git a/Blinky.X/device_config.mcc b/Blinky.X/device_config.mcc deleted file mode 100644 index b7ba95f..0000000 --- a/Blinky.X/device_config.mcc +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Blinky.X/main.c b/Blinky.X/main.c deleted file mode 100644 index 25f4326..0000000 --- a/Blinky.X/main.c +++ /dev/null @@ -1,64 +0,0 @@ -/** - Generated Main Source File - - Company: - Microchip Technology Inc. - - File Name: - main.c - - Summary: - This is the main file generated using MPLAB® Code Configurator - - Description: - This header file provides implementations for driver APIs for all modules selected in the GUI. - Generation Information : - Product Revision : MPLAB® Code Configurator - v2.25.1 - Device : PIC16F1709 - Driver Version : 2.00 - The generated drivers are tested against the following: - Compiler : XC8 v1.34 - MPLAB : MPLAB X v2.35 or v3.00 - */ - -/* -Copyright (c) 2013 - 2015 released Microchip Technology Inc. All rights reserved. - -Microchip licenses to you the right to use, modify, copy and distribute -Software only when embedded on a Microchip microcontroller or digital signal -controller that is integrated into your product or third party product -(pursuant to the sublicense terms in the accompanying license agreement). - -You should refer to the license agreement accompanying this Software for -additional information regarding your rights and obligations. - -SOFTWARE AND DOCUMENTATION ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, -EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF -MERCHANTABILITY, TITLE, NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE. -IN NO EVENT SHALL MICROCHIP OR ITS LICENSORS BE LIABLE OR OBLIGATED UNDER -CONTRACT, NEGLIGENCE, STRICT LIABILITY, CONTRIBUTION, BREACH OF WARRANTY, OR -OTHER LEGAL EQUITABLE THEORY ANY DIRECT OR INDIRECT DAMAGES OR EXPENSES -INCLUDING BUT NOT LIMITED TO ANY INCIDENTAL, SPECIAL, INDIRECT, PUNITIVE OR -CONSEQUENTIAL DAMAGES, LOST PROFITS OR LOST DATA, COST OF PROCUREMENT OF -SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES -(INCLUDING BUT NOT LIMITED TO ANY DEFENSE THEREOF), OR OTHER SIMILAR COSTS. - */ - -#include "mcc_generated_files/mcc.h" - -/* - Main application - */ -void main(void) { - // initialize the device - SYSTEM_Initialize(); - - - while (1) { - __delay_ms(250); - LED1_Toggle(); - } -} -/** - End of File - */ \ No newline at end of file diff --git a/Blinky.X/mcc_generated_files/mcc.c b/Blinky.X/mcc_generated_files/mcc.c deleted file mode 100644 index 8611706..0000000 --- a/Blinky.X/mcc_generated_files/mcc.c +++ /dev/null @@ -1,93 +0,0 @@ -/** - @Generated MPLAB� Code Configurator Source File - - @Company: - Microchip Technology Inc. - - @File Name: - mcc.c - - @Summary: - This is the mcc.c file generated using MPLAB� Code Configurator - - @Description: - This header file provides implementations for driver APIs for all modules selected in the GUI. - Generation Information : - Product Revision : MPLAB� Code Configurator - v2.25.1 - Device : PIC16F1709 - Driver Version : 1.02 - The generated drivers are tested against the following: - Compiler : XC8 v1.34 - MPLAB : MPLAB X v2.35 or v3.00 - */ - -/* -Copyright (c) 2013 - 2015 released Microchip Technology Inc. All rights reserved. - -Microchip licenses to you the right to use, modify, copy and distribute -Software only when embedded on a Microchip microcontroller or digital signal -controller that is integrated into your product or third party product -(pursuant to the sublicense terms in the accompanying license agreement). - -You should refer to the license agreement accompanying this Software for -additional information regarding your rights and obligations. - -SOFTWARE AND DOCUMENTATION ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, -EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF -MERCHANTABILITY, TITLE, NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE. -IN NO EVENT SHALL MICROCHIP OR ITS LICENSORS BE LIABLE OR OBLIGATED UNDER -CONTRACT, NEGLIGENCE, STRICT LIABILITY, CONTRIBUTION, BREACH OF WARRANTY, OR -OTHER LEGAL EQUITABLE THEORY ANY DIRECT OR INDIRECT DAMAGES OR EXPENSES -INCLUDING BUT NOT LIMITED TO ANY INCIDENTAL, SPECIAL, INDIRECT, PUNITIVE OR -CONSEQUENTIAL DAMAGES, LOST PROFITS OR LOST DATA, COST OF PROCUREMENT OF -SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES -(INCLUDING BUT NOT LIMITED TO ANY DEFENSE THEREOF), OR OTHER SIMILAR COSTS. - */ - -// Configuration bits: selected in the GUI - -// CONFIG1 -#pragma config IESO = ON // Internal/External Switchover Mode->Internal/External Switchover Mode is enabled -#pragma config BOREN = ON // Brown-out Reset Enable->Brown-out Reset enabled -#pragma config PWRTE = OFF // Power-up Timer Enable->PWRT disabled -#pragma config FOSC = INTOSC // Oscillator Selection Bits->INTOSC oscillator: I/O function on CLKIN pin -#pragma config FCMEN = ON // Fail-Safe Clock Monitor Enable->Fail-Safe Clock Monitor is enabled -#pragma config MCLRE = OFF // MCLR Pin Function Select->MCLR/VPP pin function is digital input -#pragma config CP = OFF // Flash Program Memory Code Protection->Program memory code protection is disabled -#pragma config WDTE = OFF // Watchdog Timer Enable->WDT disabled -#pragma config CLKOUTEN = OFF // Clock Out Enable->CLKOUT function is disabled. I/O or oscillator function on the CLKOUT pin - -// CONFIG2 -#pragma config WRT = OFF // Flash Memory Self-Write Protection->Write protection off -#pragma config ZCDDIS = ON // Zero-cross detect disable->Zero-cross detect circuit is disabled at POR -#pragma config LPBOR = OFF // Low-Power Brown Out Reset->Low-Power BOR is disabled -#pragma config PPS1WAY = ON // Peripheral Pin Select one-way control->The PPSLOCK bit cannot be cleared once it is set by software -#pragma config LVP = OFF // Low-Voltage Programming Enable->High-voltage on MCLR/VPP must be used for programming -#pragma config STVREN = ON // Stack Overflow/Underflow Reset Enable->Stack Overflow or Underflow will cause a Reset -#pragma config PLLEN = ON // Phase Lock Loop enable->4x PLL is always enabled -#pragma config BORV = LO // Brown-out Reset Voltage Selection->Brown-out Reset Voltage (Vbor), low trip point selected. - -#include "mcc.h" - -void SYSTEM_Initialize(void) { - OSCILLATOR_Initialize(); - PIN_MANAGER_Initialize(); -} - -void OSCILLATOR_Initialize(void) { - // SPLLEN disabled; SCS FOSC; IRCF 8MHz_HF; - OSCCON = 0x70; - // OSTS intosc; HFIOFR disabled; SOSCR disabled; HFIOFS not0.5percent_acc; PLLR disabled; MFIOFR disabled; HFIOFL not2percent_acc; LFIOFR disabled; - OSCSTAT = 0x00; - // TUN 0x0; - OSCTUNE = 0x00; - // Set the secondary oscillator - - // Wait for PLL to stabilize - while (PLLR == 0) { - } -} - -/** - End of File - */ \ No newline at end of file diff --git a/Blinky.X/mcc_generated_files/mcc.h b/Blinky.X/mcc_generated_files/mcc.h deleted file mode 100644 index 6b95d35..0000000 --- a/Blinky.X/mcc_generated_files/mcc.h +++ /dev/null @@ -1,86 +0,0 @@ -/** - @Generated MPLAB� Code Configurator Header File - - @Company: - Microchip Technology Inc. - - @File Name: - mcc.h - - @Summary: - This is the mcc.h file generated using MPLAB� Code Configurator - - @Description: - This header file provides implementations for driver APIs for all modules selected in the GUI. - Generation Information : - Product Revision : MPLAB� Code Configurator - v2.25.1 - Device : PIC16F1709 - Version : 1.02 - The generated drivers are tested against the following: - Compiler : XC8 v1.34 - MPLAB : MPLAB X v2.35 or v3.00 - */ - -/* -Copyright (c) 2013 - 2015 released Microchip Technology Inc. All rights reserved. - -Microchip licenses to you the right to use, modify, copy and distribute -Software only when embedded on a Microchip microcontroller or digital signal -controller that is integrated into your product or third party product -(pursuant to the sublicense terms in the accompanying license agreement). - -You should refer to the license agreement accompanying this Software for -additional information regarding your rights and obligations. - -SOFTWARE AND DOCUMENTATION ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, -EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF -MERCHANTABILITY, TITLE, NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE. -IN NO EVENT SHALL MICROCHIP OR ITS LICENSORS BE LIABLE OR OBLIGATED UNDER -CONTRACT, NEGLIGENCE, STRICT LIABILITY, CONTRIBUTION, BREACH OF WARRANTY, OR -OTHER LEGAL EQUITABLE THEORY ANY DIRECT OR INDIRECT DAMAGES OR EXPENSES -INCLUDING BUT NOT LIMITED TO ANY INCIDENTAL, SPECIAL, INDIRECT, PUNITIVE OR -CONSEQUENTIAL DAMAGES, LOST PROFITS OR LOST DATA, COST OF PROCUREMENT OF -SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES -(INCLUDING BUT NOT LIMITED TO ANY DEFENSE THEREOF), OR OTHER SIMILAR COSTS. - */ - -#ifndef MCC_H -#define MCC_H -#include -#include "pin_manager.h" -#include -#include - -#define _XTAL_FREQ 32000000 - -/** - * @Param - none - * @Returns - none - * @Description - Initializes the device to the default states configured in the - * MCC GUI - * @Example - SYSTEM_Initialize(void); - */ -void SYSTEM_Initialize(void); - -/** - * @Param - none - * @Returns - none - * @Description - Initializes the oscillator to the default states configured in the - * MCC GUI - * @Example - OSCILLATOR_Initialize(void); - */ -void OSCILLATOR_Initialize(void); - - -#endif /* MCC_H */ -/** - End of File - */ \ No newline at end of file diff --git a/Blinky.X/mcc_generated_files/pin_manager.c b/Blinky.X/mcc_generated_files/pin_manager.c deleted file mode 100644 index 9464af0..0000000 --- a/Blinky.X/mcc_generated_files/pin_manager.c +++ /dev/null @@ -1,72 +0,0 @@ -/** - Generated Pin Manager File - - Company: - Microchip Technology Inc. - - File Name: - pin_manager.c - - Summary: - This is the Pin Manager file generated using MPLAB� Code Configurator - - Description: - This header file provides implementations for pin APIs for all pins selected in the GUI. - Generation Information : - Product Revision : MPLAB� Code Configurator - v2.25.1 - Device : PIC16F1709 - Driver Version : 1.02 - The generated drivers are tested against the following: - Compiler : XC8 v1.34 - MPLAB : MPLAB X v2.35 or v3.00 - */ - -/* -Copyright (c) 2013 - 2015 released Microchip Technology Inc. All rights reserved. - -Microchip licenses to you the right to use, modify, copy and distribute -Software only when embedded on a Microchip microcontroller or digital signal -controller that is integrated into your product or third party product -(pursuant to the sublicense terms in the accompanying license agreement). - -You should refer to the license agreement accompanying this Software for -additional information regarding your rights and obligations. - -SOFTWARE AND DOCUMENTATION ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, -EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF -MERCHANTABILITY, TITLE, NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE. -IN NO EVENT SHALL MICROCHIP OR ITS LICENSORS BE LIABLE OR OBLIGATED UNDER -CONTRACT, NEGLIGENCE, STRICT LIABILITY, CONTRIBUTION, BREACH OF WARRANTY, OR -OTHER LEGAL EQUITABLE THEORY ANY DIRECT OR INDIRECT DAMAGES OR EXPENSES -INCLUDING BUT NOT LIMITED TO ANY INCIDENTAL, SPECIAL, INDIRECT, PUNITIVE OR -CONSEQUENTIAL DAMAGES, LOST PROFITS OR LOST DATA, COST OF PROCUREMENT OF -SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES -(INCLUDING BUT NOT LIMITED TO ANY DEFENSE THEREOF), OR OTHER SIMILAR COSTS. - */ - -#include -#include "pin_manager.h" - -void PIN_MANAGER_Initialize(void) { - LATA = 0x00; - TRISA = 0x37; - ANSELA = 0x17; - WPUA = 0x00; - - LATB = 0x00; - TRISB = 0xF0; - ANSELB = 0x30; - WPUB = 0x00; - - LATC = 0x00; - TRISC = 0xFE; - ANSELC = 0xCE; - WPUC = 0x00; - - OPTION_REGbits.nWPUEN = 0x01; - - -} -/** - End of File - */ \ No newline at end of file diff --git a/Blinky.X/mcc_generated_files/pin_manager.h b/Blinky.X/mcc_generated_files/pin_manager.h deleted file mode 100644 index 6c57187..0000000 --- a/Blinky.X/mcc_generated_files/pin_manager.h +++ /dev/null @@ -1,107 +0,0 @@ -/** - @Generated Pin Manager Header File - - @Company: - Microchip Technology Inc. - - @File Name: - pin_manager.h - - @Summary: - This is the Pin Manager file generated using MPLAB� Code Configurator - - @Description: - This header file provides implementations for pin APIs for all pins selected in the GUI. - Generation Information : - Product Revision : MPLAB� Code Configurator - v2.25.1 - Device : PIC16F1709 - Version : 1.01 - The generated drivers are tested against the following: - Compiler : XC8 v1.34 - MPLAB : MPLAB X v2.35 or v3.00 - */ - -/* -Copyright (c) 2013 - 2015 released Microchip Technology Inc. All rights reserved. - -Microchip licenses to you the right to use, modify, copy and distribute -Software only when embedded on a Microchip microcontroller or digital signal -controller that is integrated into your product or third party product -(pursuant to the sublicense terms in the accompanying license agreement). - -You should refer to the license agreement accompanying this Software for -additional information regarding your rights and obligations. - -SOFTWARE AND DOCUMENTATION ARE PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, -EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF -MERCHANTABILITY, TITLE, NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE. -IN NO EVENT SHALL MICROCHIP OR ITS LICENSORS BE LIABLE OR OBLIGATED UNDER -CONTRACT, NEGLIGENCE, STRICT LIABILITY, CONTRIBUTION, BREACH OF WARRANTY, OR -OTHER LEGAL EQUITABLE THEORY ANY DIRECT OR INDIRECT DAMAGES OR EXPENSES -INCLUDING BUT NOT LIMITED TO ANY INCIDENTAL, SPECIAL, INDIRECT, PUNITIVE OR -CONSEQUENTIAL DAMAGES, LOST PROFITS OR LOST DATA, COST OF PROCUREMENT OF -SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES -(INCLUDING BUT NOT LIMITED TO ANY DEFENSE THEREOF), OR OTHER SIMILAR COSTS. - */ - -#ifndef PIN_MANAGER_H -#define PIN_MANAGER_H - -#define INPUT 1 -#define OUTPUT 0 - -#define HIGH 1 -#define LOW 0 - -#define ANALOG 1 -#define DIGITAL 0 - -#define PULL_UP_ENABLED 1 -#define PULL_UP_DISABLED 0 - -// get/set LED1 aliases -#define LED1_TRIS TRISC0 -#define LED1_LAT LATC0 -#define LED1_PORT RC0 -#define LED1_WPU WPUC0 -#define LED1_ANS ANSC0 -#define LED1_SetHigh() do { LATC0 = 1; } while(0) -#define LED1_SetLow() do { LATC0 = 0; } while(0) -#define LED1_Toggle() do { LATC0 = ~LATC0; } while(0) -#define LED1_GetValue() RC0 -#define LED1_SetDigitalInput() do { TRISC0 = 1; } while(0) -#define LED1_SetDigitalOutput() do { TRISC0 = 0; } while(0) - -#define LED1_SetPullup() do { WPUC0 = 1; } while(0) -#define LED1_ResetPullup() do { WPUC0 = 0; } while(0) -#define LED1_SetAnalogMode() do { ANSC0 = 1; } while(0) -#define LED1_SetDigitalMode() do { ANSC0 = 0; } while(0) - -/** - * @Param - none - * @Returns - none - * @Description - GPIO and peripheral I/O initialization - * @Example - PIN_MANAGER_Initialize(); - */ -void PIN_MANAGER_Initialize(void); - -/** - * @Param - none - * @Returns - none - * @Description - Interrupt on Change Handling routine - * @Example - PIN_MANAGER_IOC(); - */ -void PIN_MANAGER_IOC(void); - -#endif // PIN_MANAGER_H -/** - End of File - */ \ No newline at end of file diff --git a/Blinky.X/nbproject/Makefile-default.mk b/Blinky.X/nbproject/Makefile-default.mk deleted file mode 100644 index fcf6687..0000000 --- a/Blinky.X/nbproject/Makefile-default.mk +++ /dev/null @@ -1,175 +0,0 @@ -# -# Generated Makefile - do not edit! -# -# Edit the Makefile in the project folder instead (../Makefile). Each target -# has a -pre and a -post target defined where you can add customized code. -# -# This makefile implements configuration specific macros and targets. - - -# Include project Makefile -ifeq "${IGNORE_LOCAL}" "TRUE" -# do not include local makefile. User is passing all local related variables already -else -include Makefile -# Include makefile containing local settings -ifeq "$(wildcard nbproject/Makefile-local-default.mk)" "nbproject/Makefile-local-default.mk" -include nbproject/Makefile-local-default.mk -endif -endif - -# Environment -MKDIR=mkdir -p -RM=rm -f -MV=mv -CP=cp - -# Macros -CND_CONF=default -ifeq ($(TYPE_IMAGE), DEBUG_RUN) -IMAGE_TYPE=debug -OUTPUT_SUFFIX=elf -DEBUGGABLE_SUFFIX=elf -FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/Blinky.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} -else -IMAGE_TYPE=production -OUTPUT_SUFFIX=hex -DEBUGGABLE_SUFFIX=elf -FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/Blinky.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} -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=mcc_generated_files/pin_manager.c mcc_generated_files/mcc.c main.c - -# Object Files Quoted if spaced -OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/mcc_generated_files/pin_manager.p1 ${OBJECTDIR}/mcc_generated_files/mcc.p1 ${OBJECTDIR}/main.p1 -POSSIBLE_DEPFILES=${OBJECTDIR}/mcc_generated_files/pin_manager.p1.d ${OBJECTDIR}/mcc_generated_files/mcc.p1.d ${OBJECTDIR}/main.p1.d - -# Object Files -OBJECTFILES=${OBJECTDIR}/mcc_generated_files/pin_manager.p1 ${OBJECTDIR}/mcc_generated_files/mcc.p1 ${OBJECTDIR}/main.p1 - -# Source Files -SOURCEFILES=mcc_generated_files/pin_manager.c mcc_generated_files/mcc.c main.c - - -CFLAGS= -ASFLAGS= -LDLIBSOPTIONS= - -############# Tool locations ########################################## -# If you copy a project from one host to another, the path where the # -# compiler is installed may be different. # -# If you open this project with MPLAB X in the new host, this # -# makefile will be regenerated and the paths will be corrected. # -####################################################################### -# fixDeps replaces a bunch of sed/cat/printf statements that slow down the build -FIXDEPS=fixDeps - -.build-conf: ${BUILD_SUBPROJECTS} -ifneq ($(INFORMATION_MESSAGE), ) - @echo $(INFORMATION_MESSAGE) -endif - ${MAKE} -f nbproject/Makefile-default.mk dist/${CND_CONF}/${IMAGE_TYPE}/Blinky.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} - -MP_PROCESSOR_OPTION=16F1709 -# ------------------------------------------------------------------------------------ -# Rules for buildStep: compile -ifeq ($(TYPE_IMAGE), DEBUG_RUN) -${OBJECTDIR}/mcc_generated_files/pin_manager.p1: mcc_generated_files/pin_manager.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}/mcc_generated_files" - @${RM} ${OBJECTDIR}/mcc_generated_files/pin_manager.p1.d - @${RM} ${OBJECTDIR}/mcc_generated_files/pin_manager.p1 - ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G -D__DEBUG=1 --debugger=pickit3 --double=24 --float=24 --rom=default,-0-1FF --opt=default,+asm,-asmfile,+speed,-space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --asmlist --summary=default,-psect,-class,+mem,-hex,-file --codeoffset=0x200 --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" -o${OBJECTDIR}/mcc_generated_files/pin_manager.p1 mcc_generated_files/pin_manager.c - @-${MV} ${OBJECTDIR}/mcc_generated_files/pin_manager.d ${OBJECTDIR}/mcc_generated_files/pin_manager.p1.d - @${FIXDEPS} ${OBJECTDIR}/mcc_generated_files/pin_manager.p1.d $(SILENT) -rsi ${MP_CC_DIR}../ - -${OBJECTDIR}/mcc_generated_files/mcc.p1: mcc_generated_files/mcc.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}/mcc_generated_files" - @${RM} ${OBJECTDIR}/mcc_generated_files/mcc.p1.d - @${RM} ${OBJECTDIR}/mcc_generated_files/mcc.p1 - ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G -D__DEBUG=1 --debugger=pickit3 --double=24 --float=24 --rom=default,-0-1FF --opt=default,+asm,-asmfile,+speed,-space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --asmlist --summary=default,-psect,-class,+mem,-hex,-file --codeoffset=0x200 --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" -o${OBJECTDIR}/mcc_generated_files/mcc.p1 mcc_generated_files/mcc.c - @-${MV} ${OBJECTDIR}/mcc_generated_files/mcc.d ${OBJECTDIR}/mcc_generated_files/mcc.p1.d - @${FIXDEPS} ${OBJECTDIR}/mcc_generated_files/mcc.p1.d $(SILENT) -rsi ${MP_CC_DIR}../ - -${OBJECTDIR}/main.p1: main.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}" - @${RM} ${OBJECTDIR}/main.p1.d - @${RM} ${OBJECTDIR}/main.p1 - ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G -D__DEBUG=1 --debugger=pickit3 --double=24 --float=24 --rom=default,-0-1FF --opt=default,+asm,-asmfile,+speed,-space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --asmlist --summary=default,-psect,-class,+mem,-hex,-file --codeoffset=0x200 --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" -o${OBJECTDIR}/main.p1 main.c - @-${MV} ${OBJECTDIR}/main.d ${OBJECTDIR}/main.p1.d - @${FIXDEPS} ${OBJECTDIR}/main.p1.d $(SILENT) -rsi ${MP_CC_DIR}../ - -else -${OBJECTDIR}/mcc_generated_files/pin_manager.p1: mcc_generated_files/pin_manager.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}/mcc_generated_files" - @${RM} ${OBJECTDIR}/mcc_generated_files/pin_manager.p1.d - @${RM} ${OBJECTDIR}/mcc_generated_files/pin_manager.p1 - ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G --double=24 --float=24 --rom=default,-0-1FF --opt=default,+asm,-asmfile,+speed,-space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --asmlist --summary=default,-psect,-class,+mem,-hex,-file --codeoffset=0x200 --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" -o${OBJECTDIR}/mcc_generated_files/pin_manager.p1 mcc_generated_files/pin_manager.c - @-${MV} ${OBJECTDIR}/mcc_generated_files/pin_manager.d ${OBJECTDIR}/mcc_generated_files/pin_manager.p1.d - @${FIXDEPS} ${OBJECTDIR}/mcc_generated_files/pin_manager.p1.d $(SILENT) -rsi ${MP_CC_DIR}../ - -${OBJECTDIR}/mcc_generated_files/mcc.p1: mcc_generated_files/mcc.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}/mcc_generated_files" - @${RM} ${OBJECTDIR}/mcc_generated_files/mcc.p1.d - @${RM} ${OBJECTDIR}/mcc_generated_files/mcc.p1 - ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G --double=24 --float=24 --rom=default,-0-1FF --opt=default,+asm,-asmfile,+speed,-space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --asmlist --summary=default,-psect,-class,+mem,-hex,-file --codeoffset=0x200 --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" -o${OBJECTDIR}/mcc_generated_files/mcc.p1 mcc_generated_files/mcc.c - @-${MV} ${OBJECTDIR}/mcc_generated_files/mcc.d ${OBJECTDIR}/mcc_generated_files/mcc.p1.d - @${FIXDEPS} ${OBJECTDIR}/mcc_generated_files/mcc.p1.d $(SILENT) -rsi ${MP_CC_DIR}../ - -${OBJECTDIR}/main.p1: main.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}" - @${RM} ${OBJECTDIR}/main.p1.d - @${RM} ${OBJECTDIR}/main.p1 - ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G --double=24 --float=24 --rom=default,-0-1FF --opt=default,+asm,-asmfile,+speed,-space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --asmlist --summary=default,-psect,-class,+mem,-hex,-file --codeoffset=0x200 --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" -o${OBJECTDIR}/main.p1 main.c - @-${MV} ${OBJECTDIR}/main.d ${OBJECTDIR}/main.p1.d - @${FIXDEPS} ${OBJECTDIR}/main.p1.d $(SILENT) -rsi ${MP_CC_DIR}../ - -endif - -# ------------------------------------------------------------------------------------ -# Rules for buildStep: assemble -ifeq ($(TYPE_IMAGE), DEBUG_RUN) -else -endif - -# ------------------------------------------------------------------------------------ -# Rules for buildStep: link -ifeq ($(TYPE_IMAGE), DEBUG_RUN) -dist/${CND_CONF}/${IMAGE_TYPE}/Blinky.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}/Blinky.X.${IMAGE_TYPE}.map -D__DEBUG=1 --debugger=pickit3 --double=24 --float=24 --rom=default,-0-1FF --opt=default,+asm,-asmfile,+speed,-space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --asmlist --summary=default,-psect,-class,+mem,-hex,-file --codeoffset=0x200 --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" --memorysummary dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml -odist/${CND_CONF}/${IMAGE_TYPE}/Blinky.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} - @${RM} dist/${CND_CONF}/${IMAGE_TYPE}/Blinky.X.${IMAGE_TYPE}.hex - -else -dist/${CND_CONF}/${IMAGE_TYPE}/Blinky.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}/Blinky.X.${IMAGE_TYPE}.map --double=24 --float=24 --rom=default,-0-1FF --opt=default,+asm,-asmfile,+speed,-space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --asmlist --summary=default,-psect,-class,+mem,-hex,-file --codeoffset=0x200 --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" --memorysummary dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml -odist/${CND_CONF}/${IMAGE_TYPE}/Blinky.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} - -endif - - -# Subprojects -.build-subprojects: - - -# Subprojects -.clean-subprojects: - -# Clean Targets -.clean-conf: ${CLEAN_SUBPROJECTS} - ${RM} -r build/default - ${RM} -r dist/default - -# Enable dependency checking -.dep.inc: .depcheck-impl - -DEPFILES=$(shell "${PATH_TO_IDE_BIN}"mplabwildcard ${POSSIBLE_DEPFILES}) -ifneq (${DEPFILES},) -include ${DEPFILES} -endif diff --git a/Blinky.X/nbproject/Makefile-genesis.properties b/Blinky.X/nbproject/Makefile-genesis.properties deleted file mode 100644 index f6e8cb9..0000000 --- a/Blinky.X/nbproject/Makefile-genesis.properties +++ /dev/null @@ -1,9 +0,0 @@ -# -#Thu Jun 18 00:24:25 CEST 2015 -default.languagetoolchain.dir=/Applications/microchip/xc8/v1.34/bin -configurations-xml=2400fc60405dafc1dc0abc201e7848b6 -com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=e9e394344dac8fa7117638c068420ddd -default.languagetoolchain.version=1.34 -host.platform=mac -conf.ids=default -default.com-microchip-mplab-nbide-toolchainXC8-XC8LanguageToolchain.md5=ddd105264688c307e9df7a6eaef30944 diff --git a/Blinky.X/nbproject/Makefile-impl.mk b/Blinky.X/nbproject/Makefile-impl.mk deleted file mode 100644 index db210c5..0000000 --- a/Blinky.X/nbproject/Makefile-impl.mk +++ /dev/null @@ -1,69 +0,0 @@ -# -# Generated Makefile - do not edit! -# -# Edit the Makefile in the project folder instead (../Makefile). Each target -# has a pre- and a post- target defined where you can add customization code. -# -# This makefile implements macros and targets common to all configurations. -# -# NOCDDL - - -# Building and Cleaning subprojects are done by default, but can be controlled with the SUB -# macro. If SUB=no, subprojects will not be built or cleaned. The following macro -# statements set BUILD_SUB-CONF and CLEAN_SUB-CONF to .build-reqprojects-conf -# and .clean-reqprojects-conf unless SUB has the value 'no' -SUB_no=NO -SUBPROJECTS=${SUB_${SUB}} -BUILD_SUBPROJECTS_=.build-subprojects -BUILD_SUBPROJECTS_NO= -BUILD_SUBPROJECTS=${BUILD_SUBPROJECTS_${SUBPROJECTS}} -CLEAN_SUBPROJECTS_=.clean-subprojects -CLEAN_SUBPROJECTS_NO= -CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}} - - -# Project Name -PROJECTNAME=Blinky.X - -# Active Configuration -DEFAULTCONF=default -CONF=${DEFAULTCONF} - -# All Configurations -ALLCONFS=default - - -# build -.build-impl: .build-pre - ${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-conf - - -# clean -.clean-impl: .clean-pre - ${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .clean-conf - -# clobber -.clobber-impl: .clobber-pre .depcheck-impl - ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=default clean - - - -# all -.all-impl: .all-pre .depcheck-impl - ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=default build - - - -# dependency checking support -.depcheck-impl: -# @echo "# This code depends on make tool being used" >.dep.inc -# @if [ -n "${MAKE_VERSION}" ]; then \ -# echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES}))" >>.dep.inc; \ -# echo "ifneq (\$${DEPFILES},)" >>.dep.inc; \ -# echo "include \$${DEPFILES}" >>.dep.inc; \ -# echo "endif" >>.dep.inc; \ -# else \ -# echo ".KEEP_STATE:" >>.dep.inc; \ -# echo ".KEEP_STATE_FILE:.make.state.\$${CONF}" >>.dep.inc; \ -# fi diff --git a/Blinky.X/nbproject/Makefile-local-default.mk b/Blinky.X/nbproject/Makefile-local-default.mk deleted file mode 100644 index f087895..0000000 --- a/Blinky.X/nbproject/Makefile-local-default.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -# Generated Makefile - do not edit! -# -# -# This file contains information about the location of compilers and other tools. -# If you commmit this file into your revision control server, you will be able to -# to checkout the project and build it from the command line with make. However, -# if more than one person works on the same project, then this file might show -# conflicts since different users are bound to have compilers in different places. -# In that case you might choose to not commit this file and let MPLAB X recreate this file -# for each user. The disadvantage of not commiting this file is that you must run MPLAB X at -# least once so the file gets created and the project can be built. Finally, you can also -# avoid using this file at all if you are only building from the command line with make. -# You can invoke make with the values of the macros: -# $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ... -# -PATH_TO_IDE_BIN=/Applications/microchip/mplabx/v3.00/mplab_ide.app/Contents/Resources/mplab_ide/mplab_ide/modules/../../bin/ -# Adding MPLAB X bin directory to path. -PATH:=/Applications/microchip/mplabx/v3.00/mplab_ide.app/Contents/Resources/mplab_ide/mplab_ide/modules/../../bin/:$(PATH) -# Path to java used to run MPLAB X when this makefile was created -MP_JAVA_PATH="/Applications/microchip/mplabx/v3.00/sys/java/jre1.7.0_71.jre/Contents/Home/bin/" -OS_CURRENT="$(shell uname -s)" -MP_CC="/Applications/microchip/xc8/v1.34/bin/xc8" -# MP_CPPC is not defined -# MP_BC is not defined -MP_AS="/Applications/microchip/xc8/v1.34/bin/xc8" -# MP_LD is not defined -# MP_AR is not defined -DEP_GEN=${MP_JAVA_PATH}java -jar "/Applications/microchip/mplabx/v3.00/mplab_ide.app/Contents/Resources/mplab_ide/mplab_ide/modules/../../bin/extractobjectdependencies.jar" -MP_CC_DIR="/Applications/microchip/xc8/v1.34/bin" -# MP_CPPC_DIR is not defined -# MP_BC_DIR is not defined -MP_AS_DIR="/Applications/microchip/xc8/v1.34/bin" -# MP_LD_DIR is not defined -# MP_AR_DIR is not defined -# MP_BC_DIR is not defined diff --git a/Blinky.X/nbproject/Makefile-variables.mk b/Blinky.X/nbproject/Makefile-variables.mk deleted file mode 100644 index e9ff705..0000000 --- a/Blinky.X/nbproject/Makefile-variables.mk +++ /dev/null @@ -1,13 +0,0 @@ -# -# Generated - do not edit! -# -# NOCDDL -# -CND_BASEDIR=`pwd` -# default configuration -CND_ARTIFACT_DIR_default=dist/default/production -CND_ARTIFACT_NAME_default=Blinky.X.production.hex -CND_ARTIFACT_PATH_default=dist/default/production/Blinky.X.production.hex -CND_PACKAGE_DIR_default=${CND_DISTDIR}/default/package -CND_PACKAGE_NAME_default=blinky.x.tar -CND_PACKAGE_PATH_default=${CND_DISTDIR}/default/package/blinky.x.tar diff --git a/Blinky.X/nbproject/Package-default.bash b/Blinky.X/nbproject/Package-default.bash deleted file mode 100644 index d088951..0000000 --- a/Blinky.X/nbproject/Package-default.bash +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash -x - -# -# Generated - do not edit! -# - -# Macros -TOP=`pwd` -CND_CONF=default -CND_DISTDIR=dist -TMPDIR=build/${CND_CONF}/${IMAGE_TYPE}/tmp-packaging -TMPDIRNAME=tmp-packaging -OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/Blinky.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} -OUTPUT_BASENAME=Blinky.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} -PACKAGE_TOP_DIR=blinky.x/ - -# Functions -function checkReturnCode -{ - rc=$? - if [ $rc != 0 ] - then - exit $rc - fi -} -function makeDirectory -# $1 directory path -# $2 permission (optional) -{ - mkdir -p "$1" - checkReturnCode - if [ "$2" != "" ] - then - chmod $2 "$1" - checkReturnCode - fi -} -function copyFileToTmpDir -# $1 from-file path -# $2 to-file path -# $3 permission -{ - cp "$1" "$2" - checkReturnCode - if [ "$3" != "" ] - then - chmod $3 "$2" - checkReturnCode - fi -} - -# Setup -cd "${TOP}" -mkdir -p ${CND_DISTDIR}/${CND_CONF}/package -rm -rf ${TMPDIR} -mkdir -p ${TMPDIR} - -# Copy files and create directories and links -cd "${TOP}" -makeDirectory ${TMPDIR}/blinky.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/blinky.x.tar -cd ${TMPDIR} -tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/blinky.x.tar * -checkReturnCode - -# Cleanup -cd "${TOP}" -rm -rf ${TMPDIR} diff --git a/Blinky.X/nbproject/configurations.xml b/Blinky.X/nbproject/configurations.xml deleted file mode 100644 index 7c1670b..0000000 --- a/Blinky.X/nbproject/configurations.xml +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - mcc_generated_files/pin_manager.h - mcc_generated_files/mcc.h - - - - - - - mcc_generated_files/pin_manager.c - mcc_generated_files/mcc.c - - main.c - - - Makefile - device_config.mcc - - - - mcc_generated_files - - Makefile - - - - localhost - PIC16F1709 - - - PICkit3PlatformTool - XC8 - 1.34 - 4 - - - - - - - - - - false - false - - - - - false - - false - - false - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Blinky.X/nbproject/project.xml b/Blinky.X/nbproject/project.xml deleted file mode 100644 index 37a002a..0000000 --- a/Blinky.X/nbproject/project.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - com.microchip.mplab.nbide.embedded.makeproject - - - Blinky - f64d3aab-d638-45cc-8ce7-c72eb41a65c6 - 0 - c - - h - - ISO-8859-1 - - - - diff --git a/device_config.mcc b/device_config.mcc index 058ade8..1572ef2 100644 --- a/device_config.mcc +++ b/device_config.mcc @@ -1,5 +1,5 @@ - + @@ -9,8 +9,8 @@ - - + + @@ -47,8 +47,8 @@ - - + + @@ -87,8 +87,8 @@ - - + + @@ -109,8 +109,8 @@ - - + + diff --git a/main.c b/main.c index 4945233..4d8bf8c 100644 --- a/main.c +++ b/main.c @@ -19,7 +19,7 @@ The generated drivers are tested against the following: Compiler : XC8 v1.34 MPLAB : MPLAB X 2.26 -*/ + */ /* Copyright (c) 2013 - 2015 released Microchip Technology Inc. All rights reserved. @@ -42,11 +42,11 @@ INCLUDING BUT NOT LIMITED TO ANY INCIDENTAL, SPECIAL, INDIRECT, PUNITIVE OR CONSEQUENTIAL DAMAGES, LOST PROFITS OR LOST DATA, COST OF PROCUREMENT OF SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES (INCLUDING BUT NOT LIMITED TO ANY DEFENSE THEREOF), OR OTHER SIMILAR COSTS. -*/ + */ #include "mcc_generated_files/mcc.h" -#define APP_START 0x200 +#define APP_START 0x200 #define cmdESCAPE '%' #define cmdConnect 'C' @@ -56,97 +56,77 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES #define cmdACK 'A' // globals -uint16_t data[32]; +uint16_t data[32]; uint16_t add; //uint8_t checksum; #define putch EUSART_Write #define getch EUSART_Read - -inline void runApp( void) -{ // ljmp to application +inline void runApp(void) { // ljmp to application #asm - PAGESEL APP_START - goto APP_START + PAGESEL APP_START + goto APP_START #endasm } -void interrupt isr( void) -{ +void interrupt isr(void) { #asm - PAGESEL APP_START - goto (APP_START+4) + PAGESEL APP_START + goto (APP_START + 4) #endasm } -void delay( uint8_t times) -{ // multiples of 16ms - while ( times-- > 0) - while( !TMR0_HasOverflowOccured()); +void delay(uint8_t times) { // multiples of 16ms + while (times-- > 0) + while (!TMR0_HasOverflowOccured()); } -void RN41_SetEscape( void) -{ - delay( 30); - putch( '$'); putch('$'); putch('$'); putch('\n'); // enter cmd mode - delay( 30 ); - putch( 'S'); putch('O'); putch(','); putch(cmdESCAPE); putch('\n'); // enter cmd mode -// puts( "SO,%"); // enable connection notifications with escape "%" - delay( 30); - putch( 'R'); putch(','); putch('1'); putch('\n'); // reboot to make changes effective - delay( 30); +void RN41_SetEscape(void) { + delay(30); +// putch('$'); putch('$'); putch('$'); putch('\n'); // enter cmd mode + puts("$$$"); + delay(30); +// putch( 'S'); putch('O'); putch(','); putch(cmdESCAPE); putch('\n'); // enter cmd mode + puts("SO,%"); // enable connection notifications with escape "%" + delay(30); +// putch('R'); putch(','); putch('1'); putch('\n'); // reboot to make changes effective + puts("R,1"); + delay(30); } /** * Send a word (lsb first) * @param w */ -void putw( uint16_t w) -{ - putch( w); // lsb - putch( w>>8); // msb +void putw(uint16_t w) { + putch(w); // lsb + putch(w >> 8); // msb } /** * Receive a word (lsb First) * @return unsigned 16-bit value */ -uint16_t getw( void) -{ - union { - uint8_t byte[2]; - uint16_t word; +uint16_t getw(void) { + + union { + uint8_t byte[2]; + uint16_t word; } r; r.byte[0] = getch(); r.byte[1] = getch(); - return r.word; + return r.word; } // getw -///** -// * Send the info block describing the device and bootloader address -// */ -//void info( void) -//{ -// puts( "Info"); -// putch( '1'); putstr( "PIC16"); // 3, mcuType -// putch( '8'); putw( FLASH_SIZE); putw(0); // 5, total amount of flash available -// putch( '3'); putw( FLASH_ROWSIZE ); // 3, erase page size -// putch( '4'); putw( FLASH_ROWSIZE ); // 3, write row size -// putch( '5'); putw( 0x0100); // 3, bootloader revision 0.1 -// putch( '6'); putw( APP_START); putw(0); // 5, application start address -// putch( '7'); putstr( "BlueBoot"); -// } - /** * Receive a block of data (words) */ -void get_data(void) -{ +void get_data(void) { uint8_t count = 32; uint16_t *pdata = data; - while ( count-- > 0) { + while (count-- > 0) { *pdata++ = getw(); } } // get_data @@ -154,92 +134,86 @@ void get_data(void) /** * unlock Flash Sequence */ -void _unlock( void) -{ - #asm - BANKSEL PMCON2 - MOVLW 0x55 - MOVWF PMCON2 & 0x7F - MOVLW 0xAA - MOVWF PMCON2 & 0x7F - BSF PMCON1 & 0x7F,1 ; set WR bit - NOP - NOP - #endasm +void _unlock(void) { +#asm + BANKSEL PMCON2 + MOVLW 0x55 + MOVWF PMCON2 & 0x7F + MOVLW 0xAA + MOVWF PMCON2 & 0x7F + BSF PMCON1 & 0x7F,1 ;set WR bit + NOP + NOP +#endasm } // unlock /** * Write a block of data to flash */ -void write( void) -{ +void write(void) { uint8_t count = 32; uint16_t* pdata = data; - + // 1. disable interrupts (remember setting) char temp = INTCONbits.GIE; INTCONbits.GIE = 0; // 2. perform a row erase PMADR = add; - PMCON1bits.CFGS = 0; // de-select the configuration space - PMCON1bits.WREN = 1; // enable flash memory write/erase - PMCON1bits.FREE = 1; // first perform an erase - _unlock(); // perform unlock and set WR sequence - - // 3. perform a row write - PMCON1bits.FREE = 0; // next prepare for write operations - PMCON1bits.LWLO = 1; // 1 = latch - while( count-- > 1) { + PMCON1bits.CFGS = 0; // de-select the configuration space + PMCON1bits.WREN = 1; // enable flash memory write/erase + PMCON1bits.FREE = 1; // first perform an erase + _unlock(); // perform unlock and set WR sequence + + // 3. perform a row write + PMCON1bits.FREE = 0; // next prepare for write operations + PMCON1bits.LWLO = 1; // 1 = latch + while (count-- > 1) { PMADR = add++; - PMDAT = *pdata++; // load latches - _unlock(); // perform unlock and set WR sequence - + PMDAT = *pdata++; // load latches + _unlock(); // perform unlock and set WR sequence + } // write last word and entire row - PMCON1bits.LWLO = 0; // 0 = write row - PMDAT = *pdata++; // write row - _unlock(); // perform unlock and set WR sequence + PMCON1bits.LWLO = 0; // 0 = write row + PMDAT = *pdata++; // write row + _unlock(); // perform unlock and set WR sequence // 4. restore interrupts - if ( temp) + if (temp) INTCONbits.GIE = 1; } - -void main(void) -{ + +void main(void) { bool connected = false; char c; SYSTEM_Initialize(); - if ( SW1_GetValue()) // check if bootloader entry requested + if (SW1_GetValue()) // check if bootloader entry requested runApp(); - - LED1_SetHigh(); // show entry into bootloader waiting for connection - while ( !SW1_GetValue()); // ensure button released - RN41_SetEscape( ); - - while (1) - { - LED0_LAT = connected; // report status + + LED1_SetHigh(); // show entry into bootloader waiting for connection + while (!SW1_GetValue()); // ensure button released + RN41_SetEscape(); + + while (1) { + LED0_LAT = connected; // report status c = getch(); // capture escape notifications - if (cmdESCAPE == c) - { - c = getch(); // %Connected - %Disconnected - connected = (cmdConnect == c); // toggle status accordingly - } - else { - switch( c) { - case cmdREBOOT: // run application + if (cmdESCAPE == c) { + c = getch(); // %Connected - %Disconnected + connected = (cmdConnect == c); // toggle status accordingly + } else { + switch (c) { + case cmdREBOOT: // run application runApp(); break; - case cmdWRITE: // erase/write a row of 32 words - add = getw(); // get address (word) + case cmdWRITE: // erase/write a row of 32 words + add = getw(); // get address (word) get_data(); write(); - putch( cmdACK); + putch(cmdACK); break; default: break; diff --git a/mcc_generated_files/eusart.c b/mcc_generated_files/eusart.c index d04c428..f9f925e 100644 --- a/mcc_generated_files/eusart.c +++ b/mcc_generated_files/eusart.c @@ -13,7 +13,7 @@ @Description This header file provides implementations for driver APIs for EUSART. Generation Information : - Product Revision : MPLAB� Code Configurator - v2.25.1 + Product Revision : MPLAB� Code Configurator - v2.25.2 Device : PIC16F1709 Driver Version : 2.00 The generated drivers are tested against the following: diff --git a/mcc_generated_files/eusart.h b/mcc_generated_files/eusart.h index 0a502fe..b24e8cd 100644 --- a/mcc_generated_files/eusart.h +++ b/mcc_generated_files/eusart.h @@ -13,7 +13,7 @@ @Description This header file provides APIs for driver for EUSART. Generation Information : - Product Revision : MPLAB� Code Configurator - v2.25.1 + Product Revision : MPLAB� Code Configurator - v2.25.2 Device : PIC16F1709 Driver Version : 2.00 The generated drivers are tested against the following: diff --git a/mcc_generated_files/mcc.c b/mcc_generated_files/mcc.c index 210f007..d205b63 100644 --- a/mcc_generated_files/mcc.c +++ b/mcc_generated_files/mcc.c @@ -13,7 +13,7 @@ @Description: This header file provides implementations for driver APIs for all modules selected in the GUI. Generation Information : - Product Revision : MPLAB� Code Configurator - v2.25.1 + Product Revision : MPLAB� Code Configurator - v2.25.2 Device : PIC16F1709 Driver Version : 1.02 The generated drivers are tested against the following: diff --git a/mcc_generated_files/mcc.h b/mcc_generated_files/mcc.h index 9a6975b..c91dd9a 100644 --- a/mcc_generated_files/mcc.h +++ b/mcc_generated_files/mcc.h @@ -13,7 +13,7 @@ @Description: This header file provides implementations for driver APIs for all modules selected in the GUI. Generation Information : - Product Revision : MPLAB� Code Configurator - v2.25.1 + Product Revision : MPLAB� Code Configurator - v2.25.2 Device : PIC16F1709 Version : 1.02 The generated drivers are tested against the following: diff --git a/mcc_generated_files/pin_manager.c b/mcc_generated_files/pin_manager.c index 32a142f..1244180 100644 --- a/mcc_generated_files/pin_manager.c +++ b/mcc_generated_files/pin_manager.c @@ -13,7 +13,7 @@ Description: This header file provides implementations for pin APIs for all pins selected in the GUI. Generation Information : - Product Revision : MPLAB� Code Configurator - v2.25.1 + Product Revision : MPLAB� Code Configurator - v2.25.2 Device : PIC16F1709 Driver Version : 1.02 The generated drivers are tested against the following: @@ -49,25 +49,25 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES #include void PIN_MANAGER_Initialize(void) { -// LATA = 0x00; -// LATB = 0x00; - LATC = 0x00; - + LATA = 0x00; TRISA = 0x37; - TRISB = 0xF0; - TRISC = 0xFC; - ANSELA = 0x13; + WPUA = 0x00; + + LATB = 0x00; + TRISB = 0xF0; ANSELB = 0x10; - ANSELC = 0xCC; + WPUB = 0x00; -// WPUA = 0x00; -// WPUB = 0x00; -// WPUC = 0x00; + LATC = 0x00; + TRISC = 0xFC; + ANSELC = 0xCC; + WPUC = 0x00; OPTION_REGbits.nWPUEN = 0x01; -// bool state = GIE; + + bool state = GIE; GIE = 0; PPSLOCK = 0x55; PPSLOCK = 0xAA; @@ -75,10 +75,10 @@ void PIN_MANAGER_Initialize(void) { RXPPSbits.RXPPS = 0x0D; // RB5->EUSART:RX RB7PPSbits.RB7PPS = 0x14; // RB7->EUSART:TX -// PPSLOCK = 0x55; -// PPSLOCK = 0xAA; -// PPSLOCKbits.PPSLOCKED = 0x01; // lock PPS -// GIE = state; + PPSLOCK = 0x55; + PPSLOCK = 0xAA; + PPSLOCKbits.PPSLOCKED = 0x01; // lock PPS + GIE = state; } /** End of File diff --git a/mcc_generated_files/pin_manager.h b/mcc_generated_files/pin_manager.h index d739ae8..4f27d27 100644 --- a/mcc_generated_files/pin_manager.h +++ b/mcc_generated_files/pin_manager.h @@ -13,7 +13,7 @@ @Description: This header file provides implementations for pin APIs for all pins selected in the GUI. Generation Information : - Product Revision : MPLAB� Code Configurator - v2.25.1 + Product Revision : MPLAB� Code Configurator - v2.25.2 Device : PIC16F1709 Version : 1.01 The generated drivers are tested against the following: diff --git a/mcc_generated_files/tmr0.c b/mcc_generated_files/tmr0.c index 73fc823..20a6ea8 100644 --- a/mcc_generated_files/tmr0.c +++ b/mcc_generated_files/tmr0.c @@ -8,12 +8,12 @@ tmr0.c @Summary - This is the generated driver implementation file for the TMR0 driver using MPLAB® Code Configurator + This is the generated driver implementation file for the TMR0 driver using MPLAB� Code Configurator @Description This source file provides APIs for TMR0. Generation Information : - Product Revision : MPLAB® Code Configurator - v2.25.1 + Product Revision : MPLAB� Code Configurator - v2.25.2 Device : PIC16F1709 Driver Version : 2.00 The generated drivers are tested against the following: diff --git a/mcc_generated_files/tmr0.h b/mcc_generated_files/tmr0.h index 44669f4..fd3dfad 100644 --- a/mcc_generated_files/tmr0.h +++ b/mcc_generated_files/tmr0.h @@ -8,12 +8,12 @@ tmr0.h @Summary - This is the generated header file for the TMR0 driver using MPLAB® Code Configurator + This is the generated header file for the TMR0 driver using MPLAB� Code Configurator @Description This header file provides APIs for TMR0. Generation Information : - Product Revision : MPLAB® Code Configurator - v2.25.1 + Product Revision : MPLAB� Code Configurator - v2.25.2 Device : PIC16F1709 Driver Version : 2.00 The generated drivers are tested against the following: diff --git a/nbproject/Makefile-default.mk b/nbproject/Makefile-default.mk index c0ccb6b..0105384 100644 --- a/nbproject/Makefile-default.mk +++ b/nbproject/Makefile-default.mk @@ -38,6 +38,12 @@ DEBUGGABLE_SUFFIX=elf FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/BlueBoot.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} endif +ifeq ($(COMPARE_BUILD), true) +COMPARISON_BUILD=--mafrlcsj +else +COMPARISON_BUILD= +endif + # Object Directory OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE} @@ -85,7 +91,7 @@ ${OBJECTDIR}/mcc_generated_files/eusart.p1: mcc_generated_files/eusart.c nbproj @${MKDIR} "${OBJECTDIR}/mcc_generated_files" @${RM} ${OBJECTDIR}/mcc_generated_files/eusart.p1.d @${RM} ${OBJECTDIR}/mcc_generated_files/eusart.p1 - ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G -D__DEBUG=1 --debugger=pickit3 --double=24 --float=24 --opt=default,+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --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" -o${OBJECTDIR}/mcc_generated_files/eusart.p1 mcc_generated_files/eusart.c + ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G -D__DEBUG=1 --debugger=pickit3 --double=24 --float=24 --rom=0-1ff --opt=+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 -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}/mcc_generated_files/eusart.p1 mcc_generated_files/eusart.c @-${MV} ${OBJECTDIR}/mcc_generated_files/eusart.d ${OBJECTDIR}/mcc_generated_files/eusart.p1.d @${FIXDEPS} ${OBJECTDIR}/mcc_generated_files/eusart.p1.d $(SILENT) -rsi ${MP_CC_DIR}../ @@ -93,7 +99,7 @@ ${OBJECTDIR}/mcc_generated_files/pin_manager.p1: mcc_generated_files/pin_manager @${MKDIR} "${OBJECTDIR}/mcc_generated_files" @${RM} ${OBJECTDIR}/mcc_generated_files/pin_manager.p1.d @${RM} ${OBJECTDIR}/mcc_generated_files/pin_manager.p1 - ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G -D__DEBUG=1 --debugger=pickit3 --double=24 --float=24 --opt=default,+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --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" -o${OBJECTDIR}/mcc_generated_files/pin_manager.p1 mcc_generated_files/pin_manager.c + ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G -D__DEBUG=1 --debugger=pickit3 --double=24 --float=24 --rom=0-1ff --opt=+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 -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}/mcc_generated_files/pin_manager.p1 mcc_generated_files/pin_manager.c @-${MV} ${OBJECTDIR}/mcc_generated_files/pin_manager.d ${OBJECTDIR}/mcc_generated_files/pin_manager.p1.d @${FIXDEPS} ${OBJECTDIR}/mcc_generated_files/pin_manager.p1.d $(SILENT) -rsi ${MP_CC_DIR}../ @@ -101,7 +107,7 @@ ${OBJECTDIR}/mcc_generated_files/mcc.p1: mcc_generated_files/mcc.c nbproject/Ma @${MKDIR} "${OBJECTDIR}/mcc_generated_files" @${RM} ${OBJECTDIR}/mcc_generated_files/mcc.p1.d @${RM} ${OBJECTDIR}/mcc_generated_files/mcc.p1 - ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G -D__DEBUG=1 --debugger=pickit3 --double=24 --float=24 --opt=default,+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --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" -o${OBJECTDIR}/mcc_generated_files/mcc.p1 mcc_generated_files/mcc.c + ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G -D__DEBUG=1 --debugger=pickit3 --double=24 --float=24 --rom=0-1ff --opt=+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 -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}/mcc_generated_files/mcc.p1 mcc_generated_files/mcc.c @-${MV} ${OBJECTDIR}/mcc_generated_files/mcc.d ${OBJECTDIR}/mcc_generated_files/mcc.p1.d @${FIXDEPS} ${OBJECTDIR}/mcc_generated_files/mcc.p1.d $(SILENT) -rsi ${MP_CC_DIR}../ @@ -109,7 +115,7 @@ ${OBJECTDIR}/mcc_generated_files/tmr0.p1: mcc_generated_files/tmr0.c nbproject/ @${MKDIR} "${OBJECTDIR}/mcc_generated_files" @${RM} ${OBJECTDIR}/mcc_generated_files/tmr0.p1.d @${RM} ${OBJECTDIR}/mcc_generated_files/tmr0.p1 - ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G -D__DEBUG=1 --debugger=pickit3 --double=24 --float=24 --opt=default,+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --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" -o${OBJECTDIR}/mcc_generated_files/tmr0.p1 mcc_generated_files/tmr0.c + ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G -D__DEBUG=1 --debugger=pickit3 --double=24 --float=24 --rom=0-1ff --opt=+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 -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}/mcc_generated_files/tmr0.p1 mcc_generated_files/tmr0.c @-${MV} ${OBJECTDIR}/mcc_generated_files/tmr0.d ${OBJECTDIR}/mcc_generated_files/tmr0.p1.d @${FIXDEPS} ${OBJECTDIR}/mcc_generated_files/tmr0.p1.d $(SILENT) -rsi ${MP_CC_DIR}../ @@ -117,7 +123,7 @@ ${OBJECTDIR}/main.p1: main.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}" @${RM} ${OBJECTDIR}/main.p1.d @${RM} ${OBJECTDIR}/main.p1 - ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G -D__DEBUG=1 --debugger=pickit3 --double=24 --float=24 --opt=default,+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --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" -o${OBJECTDIR}/main.p1 main.c + ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G -D__DEBUG=1 --debugger=pickit3 --double=24 --float=24 --rom=0-1ff --opt=+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 -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}/main.p1 main.c @-${MV} ${OBJECTDIR}/main.d ${OBJECTDIR}/main.p1.d @${FIXDEPS} ${OBJECTDIR}/main.p1.d $(SILENT) -rsi ${MP_CC_DIR}../ @@ -126,7 +132,7 @@ ${OBJECTDIR}/mcc_generated_files/eusart.p1: mcc_generated_files/eusart.c nbproj @${MKDIR} "${OBJECTDIR}/mcc_generated_files" @${RM} ${OBJECTDIR}/mcc_generated_files/eusart.p1.d @${RM} ${OBJECTDIR}/mcc_generated_files/eusart.p1 - ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G --double=24 --float=24 --opt=default,+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --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" -o${OBJECTDIR}/mcc_generated_files/eusart.p1 mcc_generated_files/eusart.c + ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G --double=24 --float=24 --rom=0-1ff --opt=+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 -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}/mcc_generated_files/eusart.p1 mcc_generated_files/eusart.c @-${MV} ${OBJECTDIR}/mcc_generated_files/eusart.d ${OBJECTDIR}/mcc_generated_files/eusart.p1.d @${FIXDEPS} ${OBJECTDIR}/mcc_generated_files/eusart.p1.d $(SILENT) -rsi ${MP_CC_DIR}../ @@ -134,7 +140,7 @@ ${OBJECTDIR}/mcc_generated_files/pin_manager.p1: mcc_generated_files/pin_manager @${MKDIR} "${OBJECTDIR}/mcc_generated_files" @${RM} ${OBJECTDIR}/mcc_generated_files/pin_manager.p1.d @${RM} ${OBJECTDIR}/mcc_generated_files/pin_manager.p1 - ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G --double=24 --float=24 --opt=default,+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --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" -o${OBJECTDIR}/mcc_generated_files/pin_manager.p1 mcc_generated_files/pin_manager.c + ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G --double=24 --float=24 --rom=0-1ff --opt=+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 -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}/mcc_generated_files/pin_manager.p1 mcc_generated_files/pin_manager.c @-${MV} ${OBJECTDIR}/mcc_generated_files/pin_manager.d ${OBJECTDIR}/mcc_generated_files/pin_manager.p1.d @${FIXDEPS} ${OBJECTDIR}/mcc_generated_files/pin_manager.p1.d $(SILENT) -rsi ${MP_CC_DIR}../ @@ -142,7 +148,7 @@ ${OBJECTDIR}/mcc_generated_files/mcc.p1: mcc_generated_files/mcc.c nbproject/Ma @${MKDIR} "${OBJECTDIR}/mcc_generated_files" @${RM} ${OBJECTDIR}/mcc_generated_files/mcc.p1.d @${RM} ${OBJECTDIR}/mcc_generated_files/mcc.p1 - ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G --double=24 --float=24 --opt=default,+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --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" -o${OBJECTDIR}/mcc_generated_files/mcc.p1 mcc_generated_files/mcc.c + ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G --double=24 --float=24 --rom=0-1ff --opt=+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 -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}/mcc_generated_files/mcc.p1 mcc_generated_files/mcc.c @-${MV} ${OBJECTDIR}/mcc_generated_files/mcc.d ${OBJECTDIR}/mcc_generated_files/mcc.p1.d @${FIXDEPS} ${OBJECTDIR}/mcc_generated_files/mcc.p1.d $(SILENT) -rsi ${MP_CC_DIR}../ @@ -150,7 +156,7 @@ ${OBJECTDIR}/mcc_generated_files/tmr0.p1: mcc_generated_files/tmr0.c nbproject/ @${MKDIR} "${OBJECTDIR}/mcc_generated_files" @${RM} ${OBJECTDIR}/mcc_generated_files/tmr0.p1.d @${RM} ${OBJECTDIR}/mcc_generated_files/tmr0.p1 - ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G --double=24 --float=24 --opt=default,+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --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" -o${OBJECTDIR}/mcc_generated_files/tmr0.p1 mcc_generated_files/tmr0.c + ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G --double=24 --float=24 --rom=0-1ff --opt=+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 -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}/mcc_generated_files/tmr0.p1 mcc_generated_files/tmr0.c @-${MV} ${OBJECTDIR}/mcc_generated_files/tmr0.d ${OBJECTDIR}/mcc_generated_files/tmr0.p1.d @${FIXDEPS} ${OBJECTDIR}/mcc_generated_files/tmr0.p1.d $(SILENT) -rsi ${MP_CC_DIR}../ @@ -158,7 +164,7 @@ ${OBJECTDIR}/main.p1: main.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}" @${RM} ${OBJECTDIR}/main.p1.d @${RM} ${OBJECTDIR}/main.p1 - ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G --double=24 --float=24 --opt=default,+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --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" -o${OBJECTDIR}/main.p1 main.c + ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G --double=24 --float=24 --rom=0-1ff --opt=+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 -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}/main.p1 main.c @-${MV} ${OBJECTDIR}/main.d ${OBJECTDIR}/main.p1.d @${FIXDEPS} ${OBJECTDIR}/main.p1.d $(SILENT) -rsi ${MP_CC_DIR}../ @@ -175,13 +181,13 @@ endif ifeq ($(TYPE_IMAGE), DEBUG_RUN) dist/${CND_CONF}/${IMAGE_TYPE}/BlueBoot.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}/BlueBoot.X.${IMAGE_TYPE}.map -D__DEBUG=1 --debugger=pickit3 --double=24 --float=24 --opt=default,+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --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" --memorysummary dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml -odist/${CND_CONF}/${IMAGE_TYPE}/BlueBoot.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} + ${MP_CC} $(MP_EXTRA_LD_PRE) --chip=$(MP_PROCESSOR_OPTION) -G -mdist/${CND_CONF}/${IMAGE_TYPE}/BlueBoot.X.${IMAGE_TYPE}.map -D__DEBUG=1 --debugger=pickit3 --double=24 --float=24 --rom=0-1ff --opt=+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 -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}/BlueBoot.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} @${RM} dist/${CND_CONF}/${IMAGE_TYPE}/BlueBoot.X.${IMAGE_TYPE}.hex else dist/${CND_CONF}/${IMAGE_TYPE}/BlueBoot.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}/BlueBoot.X.${IMAGE_TYPE}.map --double=24 --float=24 --opt=default,+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 --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" --memorysummary dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml -odist/${CND_CONF}/${IMAGE_TYPE}/BlueBoot.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} + ${MP_CC} $(MP_EXTRA_LD_PRE) --chip=$(MP_PROCESSOR_OPTION) -G -mdist/${CND_CONF}/${IMAGE_TYPE}/BlueBoot.X.${IMAGE_TYPE}.map --double=24 --float=24 --rom=0-1ff --opt=+asm,+asmfile,-speed,+space,-debug --addrqual=ignore --mode=pro -P -N255 --warn=0 -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}/BlueBoot.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} endif diff --git a/nbproject/Makefile-genesis.properties b/nbproject/Makefile-genesis.properties index 6578df9..07fa748 100644 --- a/nbproject/Makefile-genesis.properties +++ b/nbproject/Makefile-genesis.properties @@ -1,9 +1,9 @@ # -#Thu Jun 18 00:27:04 CEST 2015 -default.languagetoolchain.dir=/Applications/microchip/xc8/v1.34/bin -configurations-xml=f030bec777411906ad2664283a348eb9 -com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=e9e394344dac8fa7117638c068420ddd -default.languagetoolchain.version=1.34 +#Fri Jan 13 18:52:54 CET 2017 +default.languagetoolchain.dir=/Applications/microchip/xc8/v1.40/bin +configurations-xml=f45b5a0e0c09f994f309f94fd8f08386 +com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=8b140fb87818dc96ed4f726b716b40e9 +default.languagetoolchain.version=1.40 host.platform=mac conf.ids=default -default.com-microchip-mplab-nbide-toolchainXC8-XC8LanguageToolchain.md5=ddd105264688c307e9df7a6eaef30944 +default.com-microchip-mplab-nbide-toolchainXC8-XC8LanguageToolchain.md5=1a80c324d373be944aab8c3a16e71c0c diff --git a/nbproject/Makefile-local-default.mk b/nbproject/Makefile-local-default.mk index f087895..6509f36 100644 --- a/nbproject/Makefile-local-default.mk +++ b/nbproject/Makefile-local-default.mk @@ -14,23 +14,23 @@ # You can invoke make with the values of the macros: # $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ... # -PATH_TO_IDE_BIN=/Applications/microchip/mplabx/v3.00/mplab_ide.app/Contents/Resources/mplab_ide/mplab_ide/modules/../../bin/ +PATH_TO_IDE_BIN=/Applications/microchip/mplabx/v3.45/mplab_ide.app/Contents/Resources/mplab_ide/platform/../mplab_ide/modules/../../bin/ # Adding MPLAB X bin directory to path. -PATH:=/Applications/microchip/mplabx/v3.00/mplab_ide.app/Contents/Resources/mplab_ide/mplab_ide/modules/../../bin/:$(PATH) +PATH:=/Applications/microchip/mplabx/v3.45/mplab_ide.app/Contents/Resources/mplab_ide/platform/../mplab_ide/modules/../../bin/:$(PATH) # Path to java used to run MPLAB X when this makefile was created -MP_JAVA_PATH="/Applications/microchip/mplabx/v3.00/sys/java/jre1.7.0_71.jre/Contents/Home/bin/" +MP_JAVA_PATH="/Applications/microchip/mplabx/v3.45/sys/java/jre1.8.0_91.jre/Contents/Home/bin/" OS_CURRENT="$(shell uname -s)" -MP_CC="/Applications/microchip/xc8/v1.34/bin/xc8" +MP_CC="/Applications/microchip/xc8/v1.40/bin/xc8" # MP_CPPC is not defined # MP_BC is not defined -MP_AS="/Applications/microchip/xc8/v1.34/bin/xc8" -# MP_LD is not defined +MP_AS="/Applications/microchip/xc8/v1.40/bin/xc8" +MP_LD="/Applications/microchip/xc8/v1.40/bin/xc8" # MP_AR is not defined -DEP_GEN=${MP_JAVA_PATH}java -jar "/Applications/microchip/mplabx/v3.00/mplab_ide.app/Contents/Resources/mplab_ide/mplab_ide/modules/../../bin/extractobjectdependencies.jar" -MP_CC_DIR="/Applications/microchip/xc8/v1.34/bin" +DEP_GEN=${MP_JAVA_PATH}java -jar "/Applications/microchip/mplabx/v3.45/mplab_ide.app/Contents/Resources/mplab_ide/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar" +MP_CC_DIR="/Applications/microchip/xc8/v1.40/bin" # MP_CPPC_DIR is not defined # MP_BC_DIR is not defined -MP_AS_DIR="/Applications/microchip/xc8/v1.34/bin" -# MP_LD_DIR is not defined +MP_AS_DIR="/Applications/microchip/xc8/v1.40/bin" +MP_LD_DIR="/Applications/microchip/xc8/v1.40/bin" # MP_AR_DIR is not defined # MP_BC_DIR is not defined diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 38f16e3..1baac62 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -50,7 +50,7 @@ PICkit3PlatformTool XC8 - 1.34 + 1.40 4 @@ -65,6 +65,8 @@ false + + false @@ -78,7 +80,9 @@ + + @@ -91,6 +95,7 @@ + @@ -112,7 +117,7 @@ - + @@ -141,6 +146,7 @@ + @@ -154,24 +160,23 @@ + + - - - - - + + + + - -