Skip to content
Snippets Groups Projects
Commit d38d221d authored by Aapo Torkkeli's avatar Aapo Torkkeli
Browse files

Fix external directory references.

parent d77381f1
No related branches found
No related tags found
No related merge requests found
...@@ -6,4 +6,5 @@ ...@@ -6,4 +6,5 @@
!template.eww !template.eww
!ex_3/pca10040/blank/ses/* !ex_3/pca10040/blank/ses/*
ex_3/pca10040/blank/ses/Output
!ex_2/pca10040/blank/ses/* !ex_2/pca10040/blank/ses/*
This diff is collapsed.
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<SourceCodeControlLogin password="E7EA9DBE8E9105DB319E12020F0AF859" user="aapo"/> <SourceCodeControlLogin password="E7EA9DBE8E9105DB319E12020F0AF859" user="aapo"/>
</Project> </Project>
<Register1> <Register1>
<RegisterWindow visibleNodes="TEMP/TASKS_START;TEMP/TASKS_STOP;TEMP/EVENTS_DATARDY;TEMP/INTENSET;TEMP/INTENCLR;TEMP/TEMP;TEMP/A0;TEMP/A1;TEMP/A2;TEMP/A3;TEMP/A4;TEMP/A5;TEMP/B0;TEMP/B1;TEMP/B2;TEMP/B3;TEMP/B4;TEMP/B5;TEMP/T0;TEMP/T1;TEMP/T2;TEMP/T3;TEMP/T4" binaryNodes="" asciiNodes="" openNodes="TEMP;TEMP/TEMP" name="template_pca10040" decimalNodes="TEMP/TEMP;TEMP/TEMP/TEMP" octalNodes="" unsignedNodes=""/> <RegisterWindow visibleNodes="CPU - Current Context/r0;CPU - Current Context/r1;CPU - Current Context/r2;CPU - Current Context/r3;CPU - Current Context/r4;CPU - Current Context/r5;CPU - Current Context/r6;CPU - Current Context/r7;CPU - Current Context/r8;CPU - Current Context/r9;CPU - Current Context/r10;CPU - Current Context/r11;CPU - Current Context/r12;CPU - Current Context/sp(r13);CPU - Current Context/lr(r14);CPU - Current Context/pc(r15);CPU - Current Context/apsr;CPU/r0;CPU/r1;CPU/r2;CPU/r3;CPU/r4;CPU/r5;CPU/r6;CPU/r7;CPU/r8;CPU/r9;CPU/r10;CPU/r11;CPU/r12;CPU/sp(r13);CPU/lr(r14);CPU/pc(r15);CPU/xpsr;CPU/msp;CPU/psp;CPU/cfbp;CPU/internal;TEMP/TASKS_START;TEMP/TASKS_STOP;TEMP/EVENTS_DATARDY;TEMP/INTENSET;TEMP/INTENCLR;TEMP/TEMP;TEMP/A0;TEMP/A1;TEMP/A2;TEMP/A3;TEMP/A4;TEMP/A5;TEMP/B0;TEMP/B1;TEMP/B2;TEMP/B3;TEMP/B4;TEMP/B5;TEMP/T0;TEMP/T1;TEMP/T2;TEMP/T3;TEMP/T4" binaryNodes="" asciiNodes="" openNodes="TEMP;TEMP/TEMP" name="template_pca10040" decimalNodes="" octalNodes="" unsignedNodes=""/>
</Register1> </Register1>
<Register2> <Register2>
<RegisterWindow visibleNodes="CPU - Current Context/r0;CPU - Current Context/r1;CPU - Current Context/r2;CPU - Current Context/r3;CPU - Current Context/r4;CPU - Current Context/r5;CPU - Current Context/r6;CPU - Current Context/r7;CPU - Current Context/r8;CPU - Current Context/r9;CPU - Current Context/r10;CPU - Current Context/r11;CPU - Current Context/r12;CPU - Current Context/sp(r13);CPU - Current Context/lr(r14);CPU - Current Context/pc(r15);CPU - Current Context/apsr;CPU/r0;CPU/r1;CPU/r2;CPU/r3;CPU/r4;CPU/r5;CPU/r6;CPU/r7;CPU/r8;CPU/r9;CPU/r10;CPU/r11;CPU/r12;CPU/sp(r13);CPU/lr(r14);CPU/pc(r15);CPU/xpsr;CPU/msp;CPU/psp;CPU/cfbp;CPU/internal" binaryNodes="" asciiNodes="" openNodes="CPU - Current Context" name="template_pca10040" decimalNodes="" octalNodes="" unsignedNodes=""/> <RegisterWindow visibleNodes="CPU - Current Context/r0;CPU - Current Context/r1;CPU - Current Context/r2;CPU - Current Context/r3;CPU - Current Context/r4;CPU - Current Context/r5;CPU - Current Context/r6;CPU - Current Context/r7;CPU - Current Context/r8;CPU - Current Context/r9;CPU - Current Context/r10;CPU - Current Context/r11;CPU - Current Context/r12;CPU - Current Context/sp(r13);CPU - Current Context/lr(r14);CPU - Current Context/pc(r15);CPU - Current Context/apsr;CPU/r0;CPU/r1;CPU/r2;CPU/r3;CPU/r4;CPU/r5;CPU/r6;CPU/r7;CPU/r8;CPU/r9;CPU/r10;CPU/r11;CPU/r12;CPU/sp(r13);CPU/lr(r14);CPU/pc(r15);CPU/xpsr;CPU/msp;CPU/psp;CPU/cfbp;CPU/internal" binaryNodes="" asciiNodes="" openNodes="CPU - Current Context" name="template_pca10040" decimalNodes="" octalNodes="" unsignedNodes=""/>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<Watches active="0" update="Never"/> <Watches active="0" update="Never"/>
</Watch4> </Watch4>
<Files> <Files>
<SessionOpenFile windowGroup="DockEditLeft" x="0" y="121" useTextEdit="1" useBinaryEdit="0" left="0" path="../../../main.c" selected="0" top="116" codecName="Default"/> <SessionOpenFile windowGroup="DockEditLeft" x="0" y="56" useTextEdit="1" useBinaryEdit="0" left="0" path="../../../main.c" selected="1" top="47" codecName="Default"/>
</Files> </Files>
<ARMCrossStudioWindow activeProject="template_pca10040" fileDialogDefaultFilter="*.h" autoConnectTarget="J-Link" buildConfiguration="Release" sessionSettings="" debugSearchFileMap="" fileDialogInitialDirectory="/home/aapo/Documents/SEGGER Embedded Studio for ARM Projects/nRF5SDK153059ac345/nRF5_SDK_15.3.0_59ac345/modules/nrfx/hal" debugSearchPath="" autoConnectCapabilities="3711"/> <ARMCrossStudioWindow activeProject="template_pca10040" fileDialogDefaultFilter="*.h" autoConnectTarget="J-Link" buildConfiguration="Release" sessionSettings="" debugSearchFileMap="" fileDialogInitialDirectory="/home/aapo/Documents/SEGGER Embedded Studio for ARM Projects/nRF5SDK153059ac345/nRF5_SDK_15.3.0_59ac345/modules/nrfx/hal" debugSearchPath="" autoConnectCapabilities="3199"/>
</session> </session>
...@@ -69,7 +69,7 @@ void temp_timeout_handler(nrf_timer_event_t event_type, void* p_context) { ...@@ -69,7 +69,7 @@ void temp_timeout_handler(nrf_timer_event_t event_type, void* p_context) {
* Function for initializing the timer. * Function for initializing the timer.
*/ */
uint32_t init_timers() { uint32_t init_timers() {
uint32_t time_ms = 5000000; //Time(in milliseconds) between consecutive compare events. uint32_t time_ms = 5000; //Time(in milliseconds) between consecutive compare events.
uint32_t time_ticks; uint32_t time_ticks;
uint32_t err_code = NRF_SUCCESS; uint32_t err_code = NRF_SUCCESS;
const nrf_drv_timer_t TIMER_TEMP = NRF_DRV_TIMER_INSTANCE(0); const nrf_drv_timer_t TIMER_TEMP = NRF_DRV_TIMER_INSTANCE(0);
...@@ -97,7 +97,7 @@ int main(void) { ...@@ -97,7 +97,7 @@ int main(void) {
//init_timers(); //init_timers();
while(true) { while(true) {
bsp_board_led_invert(0); // blink led1 bsp_board_led_invert(0); // blink led1
nrf_delay_ms(50000); // do a busy wait nrf_delay_ms(500); // do a busy wait
//__WFE(); // sleep until an event wakes us up //__WFE(); // sleep until an event wakes us up
//__SEV(); // sleep until an event wakes us up //__SEV(); // sleep until an event wakes us up
//__WFE(); // sleep until an event wakes us up //__WFE(); // sleep until an event wakes us up
......
This diff is collapsed.
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<session> <session>
<Bookmarks/> <Bookmarks/>
<Breakpoints groups="Breakpoints" active_group="Breakpoints"> <Breakpoints groups="Breakpoints" active_group="Breakpoints">
<BreakpointListItem trigger="" line="99" counter="0" hardwareBreakpoint="" isFunctionBreakpoint="false" action="" expression="" group="Breakpoints" type="Breakpoint" state="2" filename="../../../main.c" useHWbreakpoint="false"/>
<Exceptions set="MemManage;UsageFault_Coprocessor;UsageFault_CheckingError;UsageFault_StateError;BusFault;ExceptionEntryReturnFault;HardFault"/> <Exceptions set="MemManage;UsageFault_Coprocessor;UsageFault_CheckingError;UsageFault_StateError;BusFault;ExceptionEntryReturnFault;HardFault"/>
</Breakpoints> </Breakpoints>
<ExecutionProfileWindow/> <ExecutionProfileWindow/>
...@@ -68,7 +67,7 @@ ...@@ -68,7 +67,7 @@
<Watches active="0" update="Never"/> <Watches active="0" update="Never"/>
</Watch4> </Watch4>
<Files> <Files>
<SessionOpenFile windowGroup="DockEditLeft" x="32" y="76" useTextEdit="1" useBinaryEdit="0" left="0" path="../../../main.c" selected="1" top="72" codecName="Default"/> <SessionOpenFile windowGroup="DockEditLeft" x="1" y="104" useTextEdit="1" useBinaryEdit="0" left="0" path="../../../main.c" selected="1" top="60" codecName="Default"/>
</Files> </Files>
<ARMCrossStudioWindow activeProject="ex3" fileDialogDefaultFilter="*.h" autoConnectTarget="J-Link" buildConfiguration="Release" sessionSettings="" debugSearchFileMap="" fileDialogInitialDirectory="/home/aapo/Documents/SEGGER Embedded Studio for ARM Projects/nRF5SDK153059ac345/nRF5_SDK_15.3.0_59ac345/modules/nrfx/hal" debugSearchPath="" autoConnectCapabilities="3711"/> <ARMCrossStudioWindow activeProject="ex3" fileDialogDefaultFilter="*.h" autoConnectTarget="J-Link" buildConfiguration="Release" sessionSettings="" debugSearchFileMap="" fileDialogInitialDirectory="/home/aapo/Documents/SEGGER Embedded Studio for ARM Projects/nRF5SDK153059ac345/nRF5_SDK_15.3.0_59ac345/modules/nrfx/hal" debugSearchPath="" autoConnectCapabilities="3199"/>
</session> </session>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment