fixed build configurations for main project and moved all MLA framework source to the common_src directory

This commit is contained in:
2019-08-10 15:26:31 -04:00
parent a759e427fb
commit 3807ed2588
12 changed files with 25 additions and 21 deletions

View File

@@ -2,25 +2,25 @@
<configurationDescriptor version="65"> <configurationDescriptor version="65">
<logicalFolder name="root" displayName="root" projectFiles="true"> <logicalFolder name="root" displayName="root" projectFiles="true">
<logicalFolder name="f1" displayName="common_src" projectFiles="true"> <logicalFolder name="f1" displayName="common_src" projectFiles="true">
<itemPath>../../common_src/system.c</itemPath>
</logicalFolder>
<logicalFolder name="framework" displayName="framework" projectFiles="true"> <logicalFolder name="framework" displayName="framework" projectFiles="true">
<logicalFolder name="usb" displayName="usb" projectFiles="true"> <logicalFolder name="usb" displayName="usb" projectFiles="true">
<logicalFolder name="inc" displayName="inc" projectFiles="true"> <logicalFolder name="inc" displayName="inc" projectFiles="true">
<itemPath>../framework/usb/inc/usb.h</itemPath> <itemPath>../../common_src/framework/usb/inc/usb.h</itemPath>
<itemPath>../framework/usb/inc/usb_ch9.h</itemPath> <itemPath>../../common_src/framework/usb/inc/usb_ch9.h</itemPath>
<itemPath>../framework/usb/inc/usb_common.h</itemPath> <itemPath>../../common_src/framework/usb/inc/usb_common.h</itemPath>
<itemPath>../framework/usb/inc/usb_device.h</itemPath> <itemPath>../../common_src/framework/usb/inc/usb_device.h</itemPath>
<itemPath>../framework/usb/inc/usb_device_hid.h</itemPath> <itemPath>../../common_src/framework/usb/inc/usb_device_hid.h</itemPath>
<itemPath>../framework/usb/inc/usb_hal.h</itemPath> <itemPath>../../common_src/framework/usb/inc/usb_hal.h</itemPath>
<itemPath>../framework/usb/inc/usb_hal_pic18.h</itemPath> <itemPath>../../common_src/framework/usb/inc/usb_hal_pic18.h</itemPath>
</logicalFolder> </logicalFolder>
<logicalFolder name="src" displayName="src" projectFiles="true"> <logicalFolder name="src" displayName="src" projectFiles="true">
<itemPath>../framework/usb/src/usb_device.c</itemPath> <itemPath>../../common_src/framework/usb/src/usb_device.c</itemPath>
<itemPath>../framework/usb/src/usb_device_hid.c</itemPath> <itemPath>../../common_src/framework/usb/src/usb_device_hid.c</itemPath>
</logicalFolder> </logicalFolder>
</logicalFolder> </logicalFolder>
</logicalFolder> </logicalFolder>
<itemPath>../../common_src/system.c</itemPath>
</logicalFolder>
<logicalFolder name="HeaderFiles" <logicalFolder name="HeaderFiles"
displayName="Header Files" displayName="Header Files"
projectFiles="true"> projectFiles="true">
@@ -100,7 +100,8 @@
<property key="default-char-type" value="true"/> <property key="default-char-type" value="true"/>
<property key="define-macros" value="LINK_FOR_BOOTLOADER"/> <property key="define-macros" value="LINK_FOR_BOOTLOADER"/>
<property key="disable-optimizations" value="true"/> <property key="disable-optimizations" value="true"/>
<property key="extra-include-directories" value="..\framework\usb\inc;..\src"/> <property key="extra-include-directories"
value="..\src;..\..\common_src\framework\usb\inc"/>
<property key="favor-optimization-for" value="-speed,+space"/> <property key="favor-optimization-for" value="-speed,+space"/>
<property key="garbage-collect-data" value="true"/> <property key="garbage-collect-data" value="true"/>
<property key="garbage-collect-functions" value="true"/> <property key="garbage-collect-functions" value="true"/>
@@ -124,7 +125,7 @@
<property key="use-iar" value="false"/> <property key="use-iar" value="false"/>
<property key="verbose" value="false"/> <property key="verbose" value="false"/>
<property key="warning-level" value="-3"/> <property key="warning-level" value="-3"/>
<property key="what-to-do" value="ignore"/> <property key="what-to-do" value="require"/>
</HI-TECH-COMP> </HI-TECH-COMP>
<HI-TECH-LINK> <HI-TECH-LINK>
<property key="additional-options-checksum" value=""/> <property key="additional-options-checksum" value=""/>
@@ -273,7 +274,8 @@
<property key="default-char-type" value="true"/> <property key="default-char-type" value="true"/>
<property key="define-macros" value=""/> <property key="define-macros" value=""/>
<property key="disable-optimizations" value="true"/> <property key="disable-optimizations" value="true"/>
<property key="extra-include-directories" value="..\framework\usb\inc;..\src"/> <property key="extra-include-directories"
value="..\src;..\..\common_src\framework\usb\inc"/>
<property key="favor-optimization-for" value="-speed,+space"/> <property key="favor-optimization-for" value="-speed,+space"/>
<property key="garbage-collect-data" value="true"/> <property key="garbage-collect-data" value="true"/>
<property key="garbage-collect-functions" value="true"/> <property key="garbage-collect-functions" value="true"/>
@@ -296,8 +298,8 @@
<property key="use-cci" value="false"/> <property key="use-cci" value="false"/>
<property key="use-iar" value="false"/> <property key="use-iar" value="false"/>
<property key="verbose" value="false"/> <property key="verbose" value="false"/>
<property key="warning-level" value="-3"/> <property key="warning-level" value="0"/>
<property key="what-to-do" value="ignore"/> <property key="what-to-do" value="require"/>
</HI-TECH-COMP> </HI-TECH-COMP>
<HI-TECH-LINK> <HI-TECH-LINK>
<property key="additional-options-checksum" value=""/> <property key="additional-options-checksum" value=""/>

View File

@@ -22,6 +22,8 @@
* @date 6 Aug 2019 * @date 6 Aug 2019
* @brief USB interface to 6-sensor DDR pads. * @brief USB interface to 6-sensor DDR pads.
*/ */
#pragma warning disable 1510
#include "usb.h" #include "usb.h"
#include "padhal.h" #include "padhal.h"
#include "dancepad.h" #include "dancepad.h"