bia-microddr/bia_microddr_fw
1
0
Fork 0
Code Releases 1 Activity

changed bootloader back to using the minimal usb stack it came with because I have no idea how to get the bootloader code working with the full MLA HID USB stack

Browse Source
This commit is contained in:
Boris Honman
2019-08-13 22:52:23 -04:00
parent 1ced4e1b78
commit a90344ef4c
19 changed files with 3823 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
firmware/clubdance_v2.X/nbproject/configurations.xml
View File

@@ -95,16 +95,46 @@
<makeCustomizationNormalizeHexFile>false</makeCustomizationNormalizeHexFile>
</makeCustomizationType>
<item path="../../common_src/framework/usb/src/usb_device_hid.c"
ex="true"
ex="false"
overriding="false">
<HI-TECH-COMP>
</HI-TECH-COMP>
<HI-TECH-LINK>
</HI-TECH-LINK>
<XC8-config-global>
</XC8-config-global>
</item>
<item path="../src/dancepad.c" ex="true" overriding="false">
<item path="../src/dancepad.c" ex="false" overriding="false">
<HI-TECH-COMP>
</HI-TECH-COMP>
<HI-TECH-LINK>
</HI-TECH-LINK>
<XC8-config-global>
</XC8-config-global>
</item>
<item path="../src/interrupts.c" ex="true" overriding="false">
<item path="../src/interrupts.c" ex="false" overriding="false">
<HI-TECH-COMP>
</HI-TECH-COMP>
<HI-TECH-LINK>
</HI-TECH-LINK>
<XC8-config-global>
</XC8-config-global>
</item>
<item path="../src/padhal.c" ex="true" overriding="false">
<item path="../src/padhal.c" ex="false" overriding="false">
<HI-TECH-COMP>
</HI-TECH-COMP>
<HI-TECH-LINK>
</HI-TECH-LINK>
<XC8-config-global>
</XC8-config-global>
</item>
<item path="../src/usb_events.c" ex="true" overriding="false">
<item path="../src/usb_events.c" ex="false" overriding="false">
<HI-TECH-COMP>
</HI-TECH-COMP>
<HI-TECH-LINK>
</HI-TECH-LINK>
<XC8-config-global>
</XC8-config-global>
</item>
<HI-TECH-COMP>
<property key="additional-warnings" value="true"/>
@@ -142,7 +172,7 @@
</HI-TECH-COMP>
<HI-TECH-LINK>
<property key="additional-options-checksum" value=""/>
<property key="additional-options-code-offset" value="2080"/>
<property key="additional-options-code-offset" value="0x2000"/>
<property key="additional-options-command-line" value=""/>
<property key="additional-options-errata" value=""/>
<property key="additional-options-extend-address" value="false"/>
@@ -153,7 +183,7 @@
<property key="calibrate-oscillator-value" value="0x3400"/>
<property key="clear-bss" value="true"/>
<property key="code-model-external" value="wordwrite"/>
<property key="code-model-rom" value="default,-0-207F,-2086-2087,-2096-2097"/>
<property key="code-model-rom" value="default,-0-1FFF,-2006-2007,-2016-2017"/>
<property key="create-html-files" value="false"/>
<property key="data-model-ram" value=""/>
<property key="data-model-size-of-double" value="32"/>
@@ -264,7 +294,6 @@
<archiverTool>
</archiverTool>
<loading>
<loadableFile>../../bootloader/clubdance_v2_bootloader.X/dist/default/production/clubdance_v2_bootloader.X.production.hex</loadableFile>
<useAlternateLoadableFile>false</useAlternateLoadableFile>
<parseOnProdLoad>false</parseOnProdLoad>
<alternateLoadableFile></alternateLoadableFile>

22
firmware/src/main.c
View File

@@ -24,33 +24,33 @@
*/
#pragma warning disable 1510
//#include "usb.h"
//#include "padhal.h"
//#include "dancepad.h"
#include "usb.h"
#include "padhal.h"
#include "dancepad.h"
#include "memory.h"
//#ifdef LINK_FOR_BOOTLOADER
#ifdef LINK_FOR_BOOTLOADER
// only define this if building fw to be used with the bootloader
const unsigned int VersionWord __at(APP_FW_VERSION_ADDRESS) = 0x0100;
//#endif
const uint16_t VersionWord __at(0x2016) = 0x0100;
#endif
void main(void)
{
// initialize sensor HAL & the dancepad driver
/*PADHAL_Initialize();
PADHAL_Initialize();
DANCEPAD_Initialize();
// initialize the USB framework
USBDeviceInit();
USBDeviceAttach();*/
USBDeviceAttach();
while(1)
{
// do nothing if: not connected to USB host, or the host put us in suspend state
//if((USBGetDeviceState() < CONFIGURED_STATE) | USBIsDeviceSuspended())
// continue;
if((USBGetDeviceState() < CONFIGURED_STATE) | USBIsDeviceSuspended())
continue;
// run application specific tasks
//DANCEPAD_Tasks();
DANCEPAD_Tasks();
}
}

4
firmware/src/usb_config.h
View File

@@ -80,8 +80,8 @@
//(ex: USBDeviceTasks()) must be called periodically by the application firmware
//at a minimum rate as described in the inline code comments in usb_device.c.
//------------------------------------------------------
#define USB_POLLING
//#define USB_INTERRUPT
//#define USB_POLLING
#define USB_INTERRUPT
//------------------------------------------------------------------------------
/* Parameter definitions are defined in usb_device.h */