diff options
| author | Matthias Hannig <matthias@hannig.cc> | 2018-03-06 22:22:45 +0100 |
|---|---|---|
| committer | Matthias Hannig <matthias@hannig.cc> | 2018-03-06 22:22:45 +0100 |
| commit | 6aaaa0b4aee83613937e84cdcc0fa920689424a8 (patch) | |
| tree | 2d8cdb6eb57f2f755d3d7c4d457dafe60ac1b6e8 | |
| parent | f40a69915fecc760ab1656ea8ef7b0c2a722ea69 (diff) | |
| download | olsndot-6aaaa0b4aee83613937e84cdcc0fa920689424a8.tar.gz olsndot-6aaaa0b4aee83613937e84cdcc0fa920689424a8.tar.bz2 olsndot-6aaaa0b4aee83613937e84cdcc0fa920689424a8.zip | |
fnord23
| -rw-r--r-- | firmware/.Makefile.swp | bin | 0 -> 12288 bytes | |||
| -rw-r--r-- | firmware/.gitignore | 2 | ||||
| -rw-r--r-- | firmware/Makefile | 2 | ||||
| -rw-r--r-- | firmware/main.c | 4 | ||||
| -rw-r--r-- | firmware/openocd.cfg | 4 | ||||
| -rw-r--r-- | firmware/openocd_jaseg.cfg | 10 |
6 files changed, 18 insertions, 4 deletions
diff --git a/firmware/.Makefile.swp b/firmware/.Makefile.swp Binary files differnew file mode 100644 index 0000000..6880f64 --- /dev/null +++ b/firmware/.Makefile.swp diff --git a/firmware/.gitignore b/firmware/.gitignore index b33e1ea..4c5ab8e 100644 --- a/firmware/.gitignore +++ b/firmware/.gitignore @@ -10,4 +10,4 @@ sources.c sources.tar.xz sources.tar.xz.zip -STM32Cube +STM32Cube* diff --git a/firmware/Makefile b/firmware/Makefile index ce1d221..3af133b 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -32,7 +32,7 @@ cmsis_exports.c: $(CMSIS_DEV_PATH)/Include/stm32f030x6.h $(CMSIS_PATH)/Include/c python3 gen_cmsis_exports.py $^ > $@ sources.tar.xz: main.c Makefile - tar -caf $@ $^ + tar -cf $@ $^ # don't ask... sources.tar.xz.zip: sources.tar.xz diff --git a/firmware/main.c b/firmware/main.c index a7cbbef..e6ea233 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -53,7 +53,9 @@ void do_transpose(void); * |<----------------NBITS---------------->| |<>|--ignored * | (MSB) brightness data (LSB) | |<>|--ignored */ -uint32_t brightness[32] = { 0 }; +uint32_t brightness[32] = { + 0x2222, 0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222,0x2222 +}; /* Bit-golfed modulation data generated from the above values by the main loop, ready to be sent out to the shift * registers. diff --git a/firmware/openocd.cfg b/firmware/openocd.cfg index 2dc74f0..fcbeb8d 100644 --- a/firmware/openocd.cfg +++ b/firmware/openocd.cfg @@ -5,6 +5,8 @@ interface jlink #adapter_khz 10000 transport select swd -source /usr/share/openocd/scripts/target/stm32f0x.cfg +# source /usr/share/openocd/scripts/target/stm32f0x.cfg +# source [find interface/jlink.cfg] +source [find target/stm32f0x.cfg] #flash bank sysflash.alias stm32f0x 0x00000000 0 0 0 $_TARGETNAME diff --git a/firmware/openocd_jaseg.cfg b/firmware/openocd_jaseg.cfg new file mode 100644 index 0000000..2dc74f0 --- /dev/null +++ b/firmware/openocd_jaseg.cfg @@ -0,0 +1,10 @@ +telnet_port 4444 +gdb_port 3333 + +interface jlink +#adapter_khz 10000 +transport select swd + +source /usr/share/openocd/scripts/target/stm32f0x.cfg + +#flash bank sysflash.alias stm32f0x 0x00000000 0 0 0 $_TARGETNAME |