summaryrefslogtreecommitdiff
path: root/keyboard
diff options
context:
space:
mode:
authorJun Wako <wakojun@gmail.com>2015-01-03 20:21:23 +0900
committerJun Wako <wakojun@gmail.com>2015-01-04 17:21:43 +0900
commit4acde45102cbf7b29f524c227bcd1c11aa83ebc0 (patch)
tree65a9ade43a1b7e8f0a3b731830606b553ca6fe53 /keyboard
parentd5e5dbd0aa28477884940ce045da09a9168859d8 (diff)
Fix linker script for NVIC vector on RAM
Diffstat (limited to 'keyboard')
-rw-r--r--keyboard/infinity/infinity.ld2
-rw-r--r--keyboard/infinity/main.cpp21
2 files changed, 7 insertions, 16 deletions
diff --git a/keyboard/infinity/infinity.ld b/keyboard/infinity/infinity.ld
index 5f699a536f..decdaa26e0 100644
--- a/keyboard/infinity/infinity.ld
+++ b/keyboard/infinity/infinity.ld
@@ -9,7 +9,7 @@ MEMORY
{
/* Infinity blootloader uses 4KB */
FLASH (rx) : ORIGIN = 4K, LENGTH = 128K - 4K
- RAM (rwx) : ORIGIN = 0x1FFFE000, LENGTH = 16K
+ RAM (rwx) : ORIGIN = 0x1FFFE0F8, LENGTH = 16K - 0xF8
}
/* Linker script to place sections and symbol values. Should be used together
diff --git a/keyboard/infinity/main.cpp b/keyboard/infinity/main.cpp
index 7db59cdfb9..f28840d3ef 100644
--- a/keyboard/infinity/main.cpp
+++ b/keyboard/infinity/main.cpp
@@ -5,25 +5,16 @@
#include "PinNames.h"
-//DigitalOut led(PTA19);
-
int main() {
gpio_t led;
gpio_init_out(&led, PTA19);
while(1) {
- gpio_write(&led, 1);
- wait_ms(500);
- gpio_write(&led, 0);
- wait_ms(500);
- }
-/*
- SIM->SCGC6 |= SIM_SCGC5_PORTA_MASK;
- PORTA->PCR[19] = PORT_PCR_SRE_MASK | PORT_PCR_DSE_MASK | PORT_PCR_MUX(1);
- PTA->PDDR |= (1<<19);
- PTA->PSOR |= (1<<19);
- while(1) {
- PTA->PTOR |= (1<<19);
wait_ms(500);
+ uint32_t delay = 0xf;
+ while (delay--) {
+ uint32_t delay2 = 0xffff;
+ while (delay2--) ;
+ }
+ gpio_write(&led, !gpio_read(&led));
}
-*/
}