cleanup

Ced2911 · Jun 8, 2016 · d7ded71 · d7ded71
1 parent 037e4a2
commit d7ded71
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 55 deletions.
diff --git a/firmware/MPLAB.X/nbproject/Makefile-18F25K50.mk b/firmware/MPLAB.X/nbproject/Makefile-18F25K50.mk
@@ -73,7 +73,7 @@ FIXDEPS=fixDeps
 
 # The following macros may be used in the pre and post step lines
 Device=PIC18F25K50
-ProjectDir="I:\console\firmware\MPLAB.X"
+ProjectDir="I:\console\github\firmware\MPLAB.X"
 ConfName=18F25K50
 ImagePath="dist\18F25K50\${IMAGE_TYPE}\MPLAB.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}"
 ImageDir="dist\18F25K50\${IMAGE_TYPE}"

diff --git a/firmware/MPLAB.X/nbproject/Makefile-genesis.properties b/firmware/MPLAB.X/nbproject/Makefile-genesis.properties
diff --git a/firmware/MPLAB.X/nbproject/Makefile-variables.mk b/firmware/MPLAB.X/nbproject/Makefile-variables.mk
diff --git a/firmware/MPLAB.X/nbproject/configurations.xml b/firmware/MPLAB.X/nbproject/configurations.xml
@@ -165,7 +165,7 @@
         <targetDevice>PIC18F25K50</targetDevice>
         <targetHeader></targetHeader>
         <targetPluginBoard></targetPluginBoard>
-        <platformTool>PK3OBPlatformTool</platformTool>
+        <platformTool>PICkit3PlatformTool</platformTool>
         <languageToolchain>XC8</languageToolchain>
         <languageToolchainVersion>1.37</languageToolchainVersion>
         <platform>3</platform>
@@ -603,6 +603,7 @@
         <property key="ToolFirmwareFilePath"
                   value="Press to browse for a specific firmware version"/>
         <property key="ToolFirmwareOption.UseLatestFirmware" value="true"/>
+        <property key="firmware.download.all" value="false"/>
         <property key="hwtoolclock.frcindebug" value="false"/>
         <property key="memories.aux" value="false"/>
         <property key="memories.bootflash" value="true"/>

diff --git a/firmware/MPLAB.X/nbproject/private/configurations.xml b/firmware/MPLAB.X/nbproject/private/configurations.xml
@@ -4,7 +4,7 @@
   <defaultConf>0</defaultConf>
   <confs>
     <conf name="18F25K50" type="2">
-      <platformToolSN></platformToolSN>
+      <platformToolSN>:=MPLABComm-USB-Microchip:=&lt;vid>04D8:=&lt;pid>900A:=&lt;rev>0002:=&lt;man>Microchip Technology Inc.:=&lt;prod>PICkit 3:=&lt;sn>DEFAULT_PK3 :=&lt;drv>x:=&lt;xpt>h:=end</platformToolSN>
       <languageToolchainDir>C:\Program Files (x86)\Microchip\xc8\v1.37\bin</languageToolchainDir>
       <mdbdebugger version="1">
         <placeholder1>place holder 1</placeholder1>

diff --git a/firmware/MPLAB.X/nbproject/private/private.xml b/firmware/MPLAB.X/nbproject/private/private.xml
@@ -3,18 +3,10 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/I:/console/firmware/src/vendor/usb_config.h</file>
-            <file>file:/I:/console/firmware/src/vendor/usb_descriptors.c</file>
-            <file>file:/I:/console/firmware/src/mcp23s17.h</file>
-            <file>file:/C:/Program%20Files%20(x86)/Microchip/xc8/v1.37/include/pic18f25k50.h</file>
-            <file>file:/I:/console/firmware/src/rom.h</file>
-            <file>file:/I:/console/firmware/src/spi.c</file>
-            <file>file:/I:/console/firmware/src/app_usb.h</file>
-            <file>file:/I:/console/firmware/src/app_usb.c</file>
-            <file>file:/I:/console/firmware/src/mcp23s17.c</file>
-            <file>file:/I:/console/firmware/src/spi.h</file>
-            <file>file:/I:/console/firmware/src/main.c</file>
-            <file>file:/I:/console/firmware/src/rom.c</file>
+            <file>file:/I:/console/github/firmware/src/system_config.h</file>
+            <file>file:/I:/console/github/firmware/src/rom.c</file>
+            <file>file:/I:/console/github/firmware/src/app_usb.c</file>
+            <file>file:/I:/console/github/firmware/src/mcp23s17.c</file>
         </group>
     </open-files>
 </project-private>
diff --git a/firmware/src/app_usb.c b/firmware/src/app_usb.c
@@ -188,7 +188,7 @@ void ProcessIO(void) {
                 if (!USBHandleBusy(USBGenericInHandle)) {
                     uint8_t * in = (uint8_t*) & PacketToPC;
                     rom_identify(in);
-                    rom_identify(&in[0x10]);
+                   // rom_identify(&in[0x10]);
 
                     USBGenericInHandle = USBGenWrite(USBGEN_EP_NUM, (uint8_t*) & PacketToPC, USBGEN_EP_SIZE);
                     rqCmd = 0;

diff --git a/firmware/src/mcp23s17.c b/firmware/src/mcp23s17.c
@@ -15,19 +15,8 @@
 
 #define PROTO_FAIL
 
-#ifdef PROTO_FAIL
-#if 1
 #define CSL {PORTCbits.RC6 = 0;}
 #define CSH {PORTCbits.RC6 = 1;}
-#else
-#define CSL {LATB = LATB & 0xFB;}
-#define CSH {LATB = LATB | 0x3; }
-#endif
-#else
-#define CSL {PORTCbits.RC6 = 1;}
-#define CSH {PORTCbits.RC6 = 1;}
-#endif
-
 
 
 // Violet/XX/bleu/gris/blanc

diff --git a/firmware/src/rom.c b/firmware/src/rom.c
@@ -38,12 +38,12 @@
 #define CE_L_OE_H {PORTC = (PORTC & 0xFC) | 0x2 ;}
 #define CE_H_OE_H {PORTC = PORTC | 0x03;}
 
-#define CE_L    {PORTCbits.RC0 = 0;}
-#define CE_H    {PORTCbits.RC0 = 1;}
-#define OE_L    {PORTCbits.RC1 = 0;}
-#define OE_H    {PORTCbits.RC1 = 1;}
-#define WE_L    {PORTCbits.RC2 = 0;}
-#define WE_H    {PORTCbits.RC2 = 1;}
+#define CE_L    {LATCbits.LC0 = 0;}
+#define CE_H    {LATCbits.LC0 = 1;}
+#define OE_L    {LATCbits.LC1 = 0;}
+#define OE_H    {LATCbits.LC1 = 1;}
+#define WE_L    {LATCbits.LC2 = 0;}
+#define WE_H    {LATCbits.LC2 = 1;}
 
 
 #define DELAY_P { __delay_us(1); }