WebSVN – Code-Repo – Path Comparison – / – /PIC Stuff/PICX_16F1825_Controller Rev 228 and /PIC Stuff/PICX_16F1825

Ignore whitespace Rev 228 → Rev 230

 /PIC Stuff/PICX_16F1825_Controller/defines.h
 ,8 → 44,8
 #define _XTAL_FREQ      32000000
-#define CMD_QUERY_BTN   0x10
-#define CMD_SET_LEDS    0x11
+#define CMD_QUERY_BTN   0x0A
+#define CMD_SET_LEDS    0x0B
 typedef union {
     struct {

 /PIC Stuff/PICX_16F1825_Controller/main.c
 ,7 → 96,7
     // Initialize I2C in slave mode
     I2C_DATA i2c_data;
     I2C_Init(&i2c_data);
-    I2C_Configure_Slave(0x24);
+    I2C_Configure_Slave(0x25);
     // Initialize interrupts
     Interrupt_Init();

 /PIC Stuff/PICX_16F1825_Controller/nbproject/Makefile-default.mk
 ,17 → 45,17
 DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE}
 # Source Files Quoted if spaced
-SOURCEFILES_QUOTED_IF_SPACED=main.c base_I2C.c base_INTERRUPTS.c base_MAIN_PWM.c
+SOURCEFILES_QUOTED_IF_SPACED=main.c base_I2C.c base_INTERRUPTS.c
 # Object Files Quoted if spaced
-OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/main.p1 ${OBJECTDIR}/base_I2C.p1 ${OBJECTDIR}/base_INTERRUPTS.p1 ${OBJECTDIR}/base_MAIN_PWM.p1
-POSSIBLE_DEPFILES=${OBJECTDIR}/main.p1.d ${OBJECTDIR}/base_I2C.p1.d ${OBJECTDIR}/base_INTERRUPTS.p1.d ${OBJECTDIR}/base_MAIN_PWM.p1.d
+OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/main.p1 ${OBJECTDIR}/base_I2C.p1 ${OBJECTDIR}/base_INTERRUPTS.p1
+POSSIBLE_DEPFILES=${OBJECTDIR}/main.p1.d ${OBJECTDIR}/base_I2C.p1.d ${OBJECTDIR}/base_INTERRUPTS.p1.d
 # Object Files
-OBJECTFILES=${OBJECTDIR}/main.p1 ${OBJECTDIR}/base_I2C.p1 ${OBJECTDIR}/base_INTERRUPTS.p1 ${OBJECTDIR}/base_MAIN_PWM.p1
+OBJECTFILES=${OBJECTDIR}/main.p1 ${OBJECTDIR}/base_I2C.p1 ${OBJECTDIR}/base_INTERRUPTS.p1
 # Source Files
-SOURCEFILES=main.c base_I2C.c base_INTERRUPTS.c base_MAIN_PWM.c
+SOURCEFILES=main.c base_I2C.c base_INTERRUPTS.c
 CFLAGS=
 ,14 → 102,6
         @-${MV} ${OBJECTDIR}/base_INTERRUPTS.d ${OBJECTDIR}/base_INTERRUPTS.p1.d
         @${FIXDEPS} ${OBJECTDIR}/base_INTERRUPTS.p1.d $(SILENT) -rsi ${MP_CC_DIR}../
-${OBJECTDIR}/base_MAIN_PWM.p1: base_MAIN_PWM.c  nbproject/Makefile-${CND_CONF}.mk
-        @${MKDIR} ${OBJECTDIR}
-        @${RM} ${OBJECTDIR}/base_MAIN_PWM.p1.d
-        @${RM} ${OBJECTDIR}/base_MAIN_PWM.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=free -P -N255 --warn=0 --asmlist --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 "--errformat=%%f:%%l: error: %%s" "--warnformat=%%f:%%l: warning: %%s" "--msgformat=%%f:%%l: advisory: %%s"    -o${OBJECTDIR}/base_MAIN_PWM.p1  base_MAIN_PWM.c
-        @-${MV} ${OBJECTDIR}/base_MAIN_PWM.d ${OBJECTDIR}/base_MAIN_PWM.p1.d
-        @${FIXDEPS} ${OBJECTDIR}/base_MAIN_PWM.p1.d $(SILENT) -rsi ${MP_CC_DIR}../
 else
 ${OBJECTDIR}/main.p1: main.c  nbproject/Makefile-${CND_CONF}.mk
         @${MKDIR} ${OBJECTDIR}
 ,14 → 127,6
         @-${MV} ${OBJECTDIR}/base_INTERRUPTS.d ${OBJECTDIR}/base_INTERRUPTS.p1.d
         @${FIXDEPS} ${OBJECTDIR}/base_INTERRUPTS.p1.d $(SILENT) -rsi ${MP_CC_DIR}../
-${OBJECTDIR}/base_MAIN_PWM.p1: base_MAIN_PWM.c  nbproject/Makefile-${CND_CONF}.mk
-        @${MKDIR} ${OBJECTDIR}
-        @${RM} ${OBJECTDIR}/base_MAIN_PWM.p1.d
-        @${RM} ${OBJECTDIR}/base_MAIN_PWM.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=free -P -N255 --warn=0 --asmlist --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 "--errformat=%%f:%%l: error: %%s" "--warnformat=%%f:%%l: warning: %%s" "--msgformat=%%f:%%l: advisory: %%s"    -o${OBJECTDIR}/base_MAIN_PWM.p1  base_MAIN_PWM.c
-        @-${MV} ${OBJECTDIR}/base_MAIN_PWM.d ${OBJECTDIR}/base_MAIN_PWM.p1.d
-        @${FIXDEPS} ${OBJECTDIR}/base_MAIN_PWM.p1.d $(SILENT) -rsi ${MP_CC_DIR}../
 endif
 # ------------------------------------------------------------------------------------

/PIC Stuff/PICX_16F1825_Controller/nbproject/Makefile-genesis.properties
1,5 → 1,5
#
#Sun Dec 08 16:38:39 EST 2013
#Sun Dec 08 21:45:33 EST 2013
default.languagetoolchain.dir=C\:\\Program Files (x86)\\Microchip\\xc8\\v1.20\\bin
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=0d2b1469ad71adb787c711a416386331
default.languagetoolchain.version=1.20

/PIC Stuff/PICX_16F1825_Controller/nbproject/configurations.xml
7,7 → 7,6
<itemPath>defines.h</itemPath>
<itemPath>base_I2C.h</itemPath>
<itemPath>base_INTERRUPTS.h</itemPath>
<itemPath>base_MANUAL_PWM.h</itemPath>
</logicalFolder>
<logicalFolder name="LinkerScript"
displayName="Linker Files"
19,7 → 18,6
<itemPath>main.c</itemPath>
<itemPath>base_I2C.c</itemPath>
<itemPath>base_INTERRUPTS.c</itemPath>
<itemPath>base_MAIN_PWM.c</itemPath>
</logicalFolder>
<logicalFolder name="ExternalFiles"
displayName="Important Files"

 /PIC Stuff/PICX_16F1825_Controller/nbproject/private/private.xml
 ,3 → 1,9
 <?xml version="1.0" encoding="UTF-8"?><project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
+        <file>file:/C:/Users/Kevin/Documents/Code/PICX_16F1825_Controller/main.c</file>
+        <file>file:/C:/Users/Kevin/Documents/Code/PICX_16F1825_Controller/base_I2C.c</file>
+        <file>file:/C:/Users/Kevin/Documents/Code/PICX_16F1825_Controller/base_INTERRUPTS.c</file>
+        <file>file:/C:/Users/Kevin/Documents/Code/PICX_16F1825_Controller/defines.h</file>
+    </open-files>
 </project-private>

Subversion Repositories Code-Repo

Compare Revisions

Ignore whitespace Rev 228 → Rev 230