Skip to content

Commit

Permalink
Fix issue with simultaneous arrows and ISR
Browse files Browse the repository at this point in the history
Update Documentation
  • Loading branch information
kategray committed Jul 5, 2017
1 parent c3cce32 commit 0c3a1eb
Show file tree
Hide file tree
Showing 8 changed files with 175 additions and 41 deletions.
8 changes: 4 additions & 4 deletions Bootloader.cydsn/Bootloader.cydwr
Original file line number Diff line number Diff line change
Expand Up @@ -1542,19 +1542,19 @@
<Data key="CYDEV_CONFIGURATION_ECC" value="False" />
<Data key="CYDEV_CONFIGURATION_IMOENABLED" value="True" />
<Data key="CYDEV_CONFIGURATION_MODE" value="DMA" />
<Data key="CYDEV_DEBUGGING_DPS" value="SWD_SWV" />
<Data key="CYDEV_DEBUGGING_DPS" value="Disable" />
<Data key="CYDEV_DEBUGGING_REQXRES" value="True" />
<Data key="CYDEV_DEBUGGING_XRES" value="True" />
<Data key="CYDEV_DEBUGGING_XRES" value="False" />
<Data key="CYDEV_ECC_ENABLE" value="False" />
<Data key="CYDEV_HEAP_SIZE" value="0x80" />
<Data key="CYDEV_INSTRUCT_CACHE_ENABLED" value="True" />
<Data key="CYDEV_PROTECTION_ENABLE" value="False" />
<Data key="CYDEV_STACK_SIZE" value="0x0800" />
<Data key="CYDEV_SWV_ENABLED" value="True" />
<Data key="CYDEV_TEMPERATURE" value="-40C - 85/125C" />
<Data key="CYDEV_TEMPERATURE" value="0C - 85/125C" />
<Data key="CYDEV_TRACE_ENABLED" value="False" />
<Data key="CYDEV_USE_BUNDLED_CMSIS" value="True" />
<Data key="CYDEV_VARIABLE_VDDA" value="True" />
<Data key="CYDEV_VARIABLE_VDDA" value="False" />
<Data key="CYDEV_VDDA" value="5.0" />
<Data key="CYDEV_VDDD" value="5.0" />
<Data key="CYDEV_VDDIO" value="5.0" />
Expand Down
6 changes: 3 additions & 3 deletions Bootloader.cydsn/Bootloader.cyprj
Original file line number Diff line number Diff line change
Expand Up @@ -317,20 +317,20 @@
<CyGuid_ebc4f06d-207f-49c2-a540-72acf4adabc0 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFolderSerialize" version="3">
<CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtBaseContainerSerialize" version="1">
<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="CyScBoostClk" persistent="">
<Hidden v="False" />
<Hidden v="True" />
</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
<CyGuid_0820c2e7-528d-4137-9a08-97257b946089 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemListSerialize" version="2">
<dependencies>
<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="CyScBoostClk.c" persistent="Generated_Source\PSoC5\CyScBoostClk.c">
<Hidden v="False" />
<Hidden v="True" />
</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
<build_action v="SOURCE_C;CortexM3;;;" />
<PropertyDeltas />
</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="CyScBoostClk.h" persistent="Generated_Source\PSoC5\CyScBoostClk.h">
<Hidden v="False" />
<Hidden v="True" />
</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
<build_action v="HEADER;;;;" />
<PropertyDeltas />
Expand Down
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@

* Increased debounce poll rate

2017-07-04 v1.2 Kate Gray <opensource@codebykate.com>
2017-07-04 v2.0 Kate Gray <opensource@codebykate.com>

* Switched to Direct Memory Access and ISRs for minimum latency

* Added option to see firmware version of current GHETT-iO

* Further increased debounce poll rate
* Further increased debounce poll rate

* Address issue where device resets when used in a pad

* Change pin configuration to support future accessories
2 changes: 1 addition & 1 deletion GHETT-iO.cydsn/GHETT-iO.cydwr
Original file line number Diff line number Diff line change
Expand Up @@ -3470,7 +3470,7 @@
<Data key="CYDEV_INSTRUCT_CACHE_ENABLED" value="True" />
<Data key="CYDEV_PROTECTION_ENABLE" value="False" />
<Data key="CYDEV_STACK_SIZE" value="0x0800" />
<Data key="CYDEV_TEMPERATURE" value="-40C - 85/125C" />
<Data key="CYDEV_TEMPERATURE" value="0C - 85/125C" />
<Data key="CYDEV_TRACE_ENABLED" value="False" />
<Data key="CYDEV_USE_BUNDLED_CMSIS" value="True" />
<Data key="CYDEV_VARIABLE_VDDA" value="False" />
Expand Down
184 changes: 157 additions & 27 deletions GHETT-iO.cydsn/GHETT-iO.cyprj

Large diffs are not rendered by default.

Binary file modified GHETT-iO.cydsn/TopDesign/TopDesign.cysch
Binary file not shown.
8 changes: 4 additions & 4 deletions GHETT-iO.cydsn/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ int main()
uint8 DMA_INPUTS_TD[1];

// Allocate the DMA chanel, with bursts of 1 byte, and store the channel number
DMA_INPUTS_Chan = DMA_INPUTS_DmaInitialize(DMA_INPUTS_BYTES_PER_BURST, DMA_INPUTS_REQUEST_PER_BURST,
DMA_INPUTS_Chan = DMA_Inputs_DmaInitialize(DMA_INPUTS_BYTES_PER_BURST, DMA_INPUTS_REQUEST_PER_BURST,
HI16(DMA_INPUTS_SRC_BASE), HI16(DMA_INPUTS_DST_BASE));

// Allocate the transaction descriptor and configure it to copy from the peripheral (status register)
Expand All @@ -70,8 +70,8 @@ int main()
// input address.
DMA_INPUTS_TD[0] = CyDmaTdAllocate();
CyDmaTdSetConfiguration(DMA_INPUTS_TD[0], DMA_INPUTS_TD_TRANSFER_INDEFINITELY,
DMA_INPUTS_TD[0], DMA_INPUTS__TD_TERMOUT_EN);
CyDmaTdSetAddress(DMA_INPUTS_TD[0], LO16((uint32)SR_INPUTS_Status_PTR), LO16((uint32)&input));
DMA_INPUTS_TD[0], DMA_Inputs__TD_TERMOUT_EN);
CyDmaTdSetAddress(DMA_INPUTS_TD[0], LO16((uint32)SR_Inputs_Status_PTR), LO16((uint32)&input));

// Configure our TD to be the first TD in the "chain" and enable it.
CyDmaChSetInitialTd(DMA_INPUTS_Chan, DMA_INPUTS_TD[0]);
Expand All @@ -84,7 +84,7 @@ int main()
#endif

// Configure the Status Register interrupts
SR_INPUTS_InterruptEnable();
SR_Inputs_InterruptEnable();

// Enable interrupts (macro for an inline ASM instruction)
CyGlobalIntEnable;
Expand Down
Binary file modified docs/GHETT-iO.pdf
Binary file not shown.

0 comments on commit 0c3a1eb

Please sign in to comment.