diff options
author | David Barksdale <amatus@amatus.name> | 2016-01-04 21:55:20 -0600 |
---|---|---|
committer | David Barksdale <amatus@amatus.name> | 2016-01-04 21:55:20 -0600 |
commit | 54c858de48b5ca55d53dfa9f7741acf821022b02 (patch) | |
tree | aaf0bac04e047405fa98138e1d1809c4d9b87c2a | |
parent | e89dc681246b307e74628d9a904c9d88f728e62b (diff) |
Clean up commented-out stuff
-rwxr-xr-x | laser-tag software/main.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/laser-tag software/main.c b/laser-tag software/main.c index 221eaca..a5ac1ba 100755 --- a/laser-tag software/main.c +++ b/laser-tag software/main.c @@ -417,7 +417,6 @@ int main (void) lptmr_state_t lptmrState; LPTMR_DRV_Init(LPTMR0_IDX, &lptmrState, &g_lptmrConfig); LPTMR_DRV_SetTimerPeriodUs(LPTMR0_IDX, 100000); - //OSA_Init(); LPTMR_DRV_InstallCallback(LPTMR0_IDX, lptmr_call_back); /* Initialize DMA */ @@ -428,36 +427,6 @@ int main (void) PIT_DRV_Init(0, false); PIT_DRV_InitChannel(0, 0, &g_pitChan0); -#if 0 - /* Initialize the DAC */ - dac_converter_config_t MyDacUserConfigStruct; - DAC_DRV_StructInitUserConfigNormal(&MyDacUserConfigStruct); - DAC_DRV_Init(0, &MyDacUserConfigStruct); - - /* Initialize DAC DMA channel */ - DMA_DRV_RequestChannel(kDmaAnyChannel, kDmaRequestMux0AlwaysOn60, - &g_dacChan); - DMAMUX_HAL_SetPeriodTriggerCmd(g_dmamuxBase[0], g_dacChan.channel, true); - const uint32_t dac_dat = (intptr_t)&DAC_DATL_REG(g_dacBase[0], 0); - const uint16_t L_ON = 0x4ff; - const uint16_t L_OFF = 0x2ff; - const uint16_t laserbuf[16] __attribute__ ((aligned(32))) = { - L_ON, L_ON, L_ON, L_OFF, - L_ON, L_ON, L_OFF, L_ON, - L_ON, L_ON, L_OFF, L_OFF, - L_OFF, L_OFF, L_OFF, L_OFF, - }; - DMA_DRV_ConfigTransfer(&g_dacChan, kDmaMemoryToPeripheral, 2, - (intptr_t)laserbuf, dac_dat, 0xffff0); - DMA_HAL_SetSourceModulo(g_dmaBase[0], g_dacChan.channel, kDmaModulo32Bytes); - DMA_HAL_SetAsyncDmaRequestCmd(g_dmaBase[0], g_dacChan.channel, true); - DMA_HAL_SetIntCmd(g_dmaBase[0], g_dacChan.channel, false); - DMA_HAL_SetDisableRequestAfterDoneCmd(g_dmaBase[0], g_dacChan.channel, - false); - DMA_DRV_StartChannel(&g_dacChan); - DAC_DRV_Output(0, 0); -#endif - /* Initialize CMP */ CMP_DRV_Init(0, &g_cmpState, &g_cmpConf); CMP_DRV_ConfigDacChn(0, &g_cmpDacConf); |