Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
c848019
Compressed 5x7 font to 8 bit and removed unneeded characters to get s…
reald Sep 22, 2019
c7e7fdb
Increased font size in menus
reald Sep 23, 2019
55f7fa1
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Sep 23, 2019
f5a8e89
increase font size
reald Sep 23, 2019
995f559
more parts with bigger font
reald Sep 27, 2019
087aa42
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Sep 27, 2019
b3ce142
remove compiler warnings
reald Sep 27, 2019
e7fd9da
minor update
reald Sep 28, 2019
c94d744
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Sep 28, 2019
21ccc1b
remove compiler warnings
reald Sep 28, 2019
7d354e3
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Sep 28, 2019
9df281d
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Sep 28, 2019
ce9fed2
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Sep 29, 2019
9bfc012
Update ui.c
jharwinbarrozo Oct 2, 2019
3045828
Added USER_CALL for personalization
jharwinbarrozo Oct 2, 2019
ac2deb6
Added DV2JBs as USER_CALL
jharwinbarrozo Oct 2, 2019
acb3609
bigger fonts, beta version
reald Oct 3, 2019
8027c83
Merge https://github.com/jharwinbarrozo/NanoVNA
reald Oct 3, 2019
601e829
feat: owner name
reald Oct 3, 2019
6a26cda
fix: swr string
reald Oct 4, 2019
181b909
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Oct 5, 2019
80c4486
feat: Removed tiny font to free flash space
reald Oct 5, 2019
5fd7299
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Oct 6, 2019
281bfaf
fix: merge conflict
reald Oct 6, 2019
626cab4
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Oct 8, 2019
2a0ae4e
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Oct 8, 2019
654deb5
merged upstream, compiles with 8px font
reald Oct 10, 2019
57a8c53
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Oct 11, 2019
887108e
too much cost for sin_table
cho45 Oct 11, 2019
9dc1810
fix: position of edelay with 8px font
reald Oct 12, 2019
a1e5d0c
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Oct 13, 2019
d007b86
first official release with 8px font
reald Oct 13, 2019
0c5d88f
fix: workaround overwrite issue
reald Oct 13, 2019
5c01f72
feat: bigger space between marker infos
reald Oct 13, 2019
6fe5006
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Oct 16, 2019
572b114
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Oct 17, 2019
ca6a03b
update doc
reald Oct 18, 2019
df6bf23
Update README.md
reald Oct 18, 2019
ee17355
Update README.md
reald Oct 18, 2019
68e602a
Update README.md
reald Oct 20, 2019
06c45d9
Merge pull request #76 from cho45/reduce-flash0-usage
edy555 Oct 21, 2019
6fc4548
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Oct 21, 2019
5bbd768
update version info
reald Oct 21, 2019
c243ea4
smith chart value more sqished
reald Oct 22, 2019
a8b9d51
feat: big info for ch0
reald Oct 26, 2019
641ad4f
feat: ch0 infoscreen
reald Oct 26, 2019
5d58d28
fix: hide menu after info screen toggled
reald Oct 26, 2019
e565459
fix: x position of infoscreen slightly moved
reald Oct 28, 2019
93a3971
save flash space
reald Oct 29, 2019
1b93e7a
minor update
reald Nov 6, 2019
e800a42
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Nov 6, 2019
38d449a
minor change
reald Nov 6, 2019
7f776ab
feat: save info screen status in config
reald Nov 6, 2019
6cb481d
feat: provide md5 and sha256 checksums for build
reald Nov 9, 2019
a28d9d1
fix: invert active trace
reald Nov 9, 2019
c2183aa
feat: create dfu file with release
reald Nov 9, 2019
4b81e2e
feat: checksum for .dfu file
reald Nov 10, 2019
d6ab302
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Nov 17, 2019
010df99
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Nov 20, 2019
cf2be16
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Nov 23, 2019
4ac467f
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Nov 25, 2019
2a5b3c3
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Nov 30, 2019
c34212a
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Nov 30, 2019
9fb936e
feat: delta symbol
reald Nov 30, 2019
1081bf7
Merge branch 'master' of git://github.com/ttrftech/NanoVNA
reald Dec 10, 2019
d5deb0d
compressed version info
reald Dec 10, 2019
417fde0
feat: removed one config save space to gain more program flash
reald Dec 10, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,565 changes: 0 additions & 2,565 deletions Font5x7.c

This file was deleted.

196 changes: 196 additions & 0 deletions Font8x8.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,196 @@
#include <stdint.h>

const uint8_t x8x8_bits[][8]={
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, /* nul */
{0x00,0x20,0x50,0x50,0x88,0x88,0xFC,0x00}, /* delta */
{0x00,0x50,0xa0,0x50,0xa0,0x50,0xa0,0x00}, /* multiline marker */
{0x00,0x20,0x40,0xF8,0xF8,0x40,0x20,0x00}, /* left arrow */
{0x00,0x20,0x10,0xF8,0xF8,0x10,0x20,0x00}, /* right arrow */
{0x00,0x00,0xFE,0x6C,0x6C,0x6C,0x6C,0x00}, /* pi */
{0x00,0x00,0xCC,0xCC,0xCC,0x7C,0x0C,0x06}, /* micro */
{0x7C,0xC6,0xC6,0xC6,0x6C,0x6C,0xEE,0x00}, /* omega */
{0x70,0xD8,0xD8,0x70,0x00,0x00,0x00,0x00}, /* degree */
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, /* 0x20 ' ' */
{0x60,0xF0,0xF0,0x60,0x60,0x00,0x60,0x00}, /* 0x21 '!' */
{0xD8,0xD8,0xD8,0x00,0x00,0x00,0x00,0x00}, /* 0x22 '"' */
{0x6C,0x6C,0xFE,0x6C,0xFE,0x6C,0x6C,0x00}, /* 0x23 '#' */
{0x30,0x7C,0xC0,0x78,0x0C,0xF8,0x30,0x00}, /* 0x24 '$' */
{0x00,0xC6,0xCC,0x18,0x30,0x66,0xC6,0x00}, /* 0x25 '%' */
{0x38,0x6C,0x38,0x76,0xDC,0xCC,0x76,0x00}, /* 0x26 '&' */
{0x60,0x60,0xC0,0x00,0x00,0x00,0x00,0x00}, /* 0x27 ''' */
{0x30,0x60,0xC0,0xC0,0xC0,0x60,0x30,0x00}, /* 0x28 '(' */
{0xC0,0x60,0x30,0x30,0x30,0x60,0xC0,0x00}, /* 0x29 ')' */
{0x00,0x66,0x3C,0xFF,0x3C,0x66,0x00,0x00}, /* 0x2A '*' */
{0x00,0x30,0x30,0xFC,0x30,0x30,0x00,0x00}, /* 0x2B '+' */
{0x00,0x00,0x00,0x00,0x00,0xE0,0x60,0xC0}, /* 0x2C ',' */
{0x00,0x00,0x00,0xFC,0x00,0x00,0x00,0x00}, /* 0x2D '-' */
{0x00,0x00,0x00,0x00,0x00,0xC0,0xC0,0x00}, /* 0x2E '.' */
{0x06,0x0C,0x18,0x30,0x60,0xC0,0x80,0x00}, /* 0x2F '/' */
{0x78,0xCC,0xCC,0xCC,0xCC,0xCC,0x78,0x00}, /* 0x30 '0' */
{0x30,0xF0,0x30,0x30,0x30,0x30,0xFC,0x00}, /* 0x31 '1' */
{0x78,0xCC,0x0C,0x38,0x60,0xCC,0xFC,0x00}, /* 0x32 '2' */
{0x78,0xCC,0x0C,0x38,0x0C,0xCC,0x78,0x00}, /* 0x33 '3' */
{0x1C,0x3C,0x6C,0xCC,0xFE,0x0C,0x0C,0x00}, /* 0x34 '4' */
{0xFC,0xC0,0xF8,0x0C,0x0C,0xCC,0x78,0x00}, /* 0x35 '5' */
{0x38,0x60,0xC0,0xF8,0xCC,0xCC,0x78,0x00}, /* 0x36 '6' */
{0xFC,0xCC,0x0C,0x18,0x30,0x60,0x60,0x00}, /* 0x37 '7' */
{0x78,0xCC,0xCC,0x78,0xCC,0xCC,0x78,0x00}, /* 0x38 '8' */
{0x78,0xCC,0xCC,0x7C,0x0C,0x18,0x70,0x00}, /* 0x39 '9' */
{0x00,0x00,0xC0,0xC0,0x00,0xC0,0xC0,0x00}, /* 0x3A ':' */
{0x00,0x00,0x60,0x60,0x00,0xE0,0x60,0xC0}, /* 0x3B ';' */
{0x18,0x30,0x60,0xC0,0x60,0x30,0x18,0x00}, /* 0x3C '<' */
{0x00,0x00,0xFC,0x00,0xFC,0x00,0x00,0x00}, /* 0x3D '=' */
{0xC0,0x60,0x30,0x18,0x30,0x60,0xC0,0x00}, /* 0x3E '>' */
{0x78,0xCC,0x0C,0x18,0x30,0x00,0x30,0x00}, /* 0x3F '?' */
{0x7C,0xC6,0xDE,0xDE,0xDE,0xC0,0x78,0x00}, /* 0x40 '@' */
{0x30,0x78,0xCC,0xCC,0xFC,0xCC,0xCC,0x00}, /* 0x41 'A' */
{0xFC,0x66,0x66,0x7C,0x66,0x66,0xFC,0x00}, /* 0x42 'B' */
{0x3C,0x66,0xC0,0xC0,0xC0,0x66,0x3C,0x00}, /* 0x43 'C' */
{0xFC,0x6C,0x66,0x66,0x66,0x6C,0xFC,0x00}, /* 0x44 'D' */
{0xFE,0x62,0x68,0x78,0x68,0x62,0xFE,0x00}, /* 0x45 'E' */
{0xFE,0x62,0x68,0x78,0x68,0x60,0xF0,0x00}, /* 0x46 'F' */
{0x3C,0x66,0xC0,0xC0,0xCE,0x66,0x3E,0x00}, /* 0x47 'G' */
{0xCC,0xCC,0xCC,0xFC,0xCC,0xCC,0xCC,0x00}, /* 0x48 'H' */
{0xF0,0x60,0x60,0x60,0x60,0x60,0xF0,0x00}, /* 0x49 'I' */
{0x1E,0x0C,0x0C,0x0C,0xCC,0xCC,0x78,0x00}, /* 0x4A 'J' */
{0xE6,0x66,0x6C,0x78,0x6C,0x66,0xE6,0x00}, /* 0x4B 'K' */
{0xF0,0x60,0x60,0x60,0x62,0x66,0xFE,0x00}, /* 0x4C 'L' */
{0xC6,0xEE,0xFE,0xD6,0xC6,0xC6,0xC6,0x00}, /* 0x4D 'M' */
{0xC6,0xE6,0xF6,0xDE,0xCE,0xC6,0xC6,0x00}, /* 0x4E 'N' */
{0x38,0x6C,0xC6,0xC6,0xC6,0x6C,0x38,0x00}, /* 0x4F 'O' */
{0xFC,0x66,0x66,0x7C,0x60,0x60,0xF0,0x00}, /* 0x50 'P' */
{0x78,0xCC,0xCC,0xCC,0xDC,0x78,0x1C,0x00}, /* 0x51 'Q' */
{0xFC,0x66,0x66,0x7C,0x78,0x6C,0xE6,0x00}, /* 0x52 'R' */
{0x78,0xCC,0xE0,0x38,0x1C,0xCC,0x78,0x00}, /* 0x53 'S' */
{0xFC,0xB4,0x30,0x30,0x30,0x30,0x78,0x00}, /* 0x54 'T' */
{0xCC,0xCC,0xCC,0xCC,0xCC,0xCC,0xFC,0x00}, /* 0x55 'U' */
{0xCC,0xCC,0xCC,0xCC,0xCC,0x78,0x30,0x00}, /* 0x56 'V' */
{0xC6,0xC6,0xC6,0xD6,0xFE,0xEE,0xC6,0x00}, /* 0x57 'W' */
{0xC6,0xC6,0x6C,0x38,0x6C,0xC6,0xC6,0x00}, /* 0x58 'X' */
{0xCC,0xCC,0xCC,0x78,0x30,0x30,0x78,0x00}, /* 0x59 'Y' */
{0xFE,0xCC,0x98,0x30,0x62,0xC6,0xFE,0x00}, /* 0x5A 'Z' */
{0xF0,0xC0,0xC0,0xC0,0xC0,0xC0,0xF0,0x00}, /* 0x5B '[' */
{0xC0,0x60,0x30,0x18,0x0C,0x06,0x02,0x00}, /* 0x5C '\' */
{0xF0,0x30,0x30,0x30,0x30,0x30,0xF0,0x00}, /* 0x5D ']' */
{0x10,0x38,0x6C,0xC6,0x00,0x00,0x00,0x00}, /* 0x5E '^' */
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF}, /* 0x5F '_' */
{0xC0,0xC0,0x60,0x00,0x00,0x00,0x00,0x00}, /* 0x60 '`' */
{0x00,0x00,0x78,0x0C,0x7C,0xCC,0x76,0x00}, /* 0x61 'a' */
{0xE0,0x60,0x7C,0x66,0x66,0x66,0xBC,0x00}, /* 0x62 'b' */
{0x00,0x00,0x78,0xCC,0xC0,0xCC,0x78,0x00}, /* 0x63 'c' */
{0x1C,0x0C,0x0C,0x7C,0xCC,0xCC,0x76,0x00}, /* 0x64 'd' */
{0x00,0x00,0x78,0xCC,0xFC,0xC0,0x78,0x00}, /* 0x65 'e' */
{0x38,0x6C,0x60,0xF0,0x60,0x60,0xF0,0x00}, /* 0x66 'f' */
{0x00,0x00,0x76,0xCC,0xCC,0x7C,0x0C,0xF8}, /* 0x67 'g' */
{0xE0,0x60,0x6C,0x76,0x66,0x66,0xE6,0x00}, /* 0x68 'h' */
{0x60,0x00,0xE0,0x60,0x60,0x60,0xF0,0x00}, /* 0x69 'i' */
{0x18,0x00,0x78,0x18,0x18,0x18,0xD8,0x70}, /* 0x6A 'j' */
{0xE0,0x60,0x66,0x6C,0x78,0x6C,0xE6,0x00}, /* 0x6B 'k' */
{0xE0,0x60,0x60,0x60,0x60,0x60,0xF0,0x00}, /* 0x6C 'l' */
{0x00,0x00,0xEC,0xFE,0xD6,0xC6,0xC6,0x00}, /* 0x6D 'm' */
{0x00,0x00,0xF8,0xCC,0xCC,0xCC,0xCC,0x00}, /* 0x6E 'n' */
{0x00,0x00,0x78,0xCC,0xCC,0xCC,0x78,0x00}, /* 0x6F 'o' */
{0x00,0x00,0xDC,0x66,0x66,0x7C,0x60,0xF0}, /* 0x70 'p' */
{0x00,0x00,0x76,0xCC,0xCC,0x7C,0x0C,0x1E}, /* 0x71 'q' */
{0x00,0x00,0xD8,0x6C,0x6C,0x60,0xF0,0x00}, /* 0x72 'r' */
{0x00,0x00,0x7C,0xC0,0x78,0x0C,0xF8,0x00}, /* 0x73 's' */
{0x20,0x60,0xF8,0x60,0x60,0x68,0x30,0x00}, /* 0x74 't' */
{0x00,0x00,0xCC,0xCC,0xCC,0xCC,0x76,0x00}, /* 0x75 'u' */
{0x00,0x00,0xCC,0xCC,0xCC,0x78,0x30,0x00}, /* 0x76 'v' */
{0x00,0x00,0xC6,0xC6,0xD6,0xFE,0x6C,0x00}, /* 0x77 'w' */
{0x00,0x00,0xC6,0x6C,0x38,0x6C,0xC6,0x00}, /* 0x78 'x' */
{0x00,0x00,0xCC,0xCC,0xCC,0x7C,0x0C,0xF8}, /* 0x79 'y' */
{0x00,0x00,0xFC,0x98,0x30,0x64,0xFC,0x00}, /* 0x7A 'z' */
{0x1C,0x30,0x30,0xE0,0x30,0x30,0x1C,0x00}, /* 0x7B '{' */
{0xC0,0xC0,0xC0,0x00,0xC0,0xC0,0xC0,0x00}, /* 0x7C '|' */
{0xE0,0x30,0x30,0x1C,0x30,0x30,0xE0,0x00}, /* 0x7D '}' */
{0x76,0xDC,0x00,0x00,0x00,0x00,0x00,0x00}, /* 0x7E '~' */
{0x10,0x38,0x6C,0xC6,0xC6,0xC6,0xFE,0x00}, /* 0x7F '' */
};



static const uint8_t x8x8_len[] = {
1 /* nul */ | 6<<4, /* delta */
5 /* multil. */ | 6<<4, /* left */
6 /* right */ | 8<<4, /* pi */
8 /* micro */ | 8<<4, /* omega */
6 /* degree */ | 4<<4, /* 0x20 ' ' */
5 /* 0x21 '!' */ | 6<<4, /* 0x22 '"' */
8 /* 0x23 '#' */ | 7<<4, /* 0x24 '$' */
8 /* 0x25 '%' */ | 8<<4, /* 0x26 '&' */
4 /* 0x27 ''' */ | 5<<4, /* 0x28 '(' */
5 /* 0x29 ')' */ | 9<<4, /* 0x2A '*' */
7 /* 0x2B '+' */ | 4<<4, /* 0x2C ',' */
7 /* 0x2D '-' */ | 3<<4, /* 0x2E '.' */
8 /* 0x2F '/' */ | 7<<4, /* 0x30 '0' */
7 /* 0x31 '1' */ | 7<<4, /* 0x32 '2' */
7 /* 0x33 '3' */ | 8<<4, /* 0x34 '4' */
7 /* 0x35 '5' */ | 7<<4, /* 0x36 '6' */
7 /* 0x37 '7' */ | 7<<4, /* 0x38 '8' */
7 /* 0x39 '9' */ | 3<<4, /* 0x3A ':' */
4 /* 0x3B ';' */ | 6<<4, /* 0x3C '<' */
7 /* 0x3D '=' */ | 6<<4, /* 0x3E '>' */
7 /* 0x3F '?' */ | 8<<4, /* 0x40 '@' */
7 /* 0x41 'A' */ | 8<<4, /* 0x42 'B' */
8 /* 0x43 'C' */ | 8<<4, /* 0x44 'D' */
8 /* 0x45 'E' */ | 8<<4, /* 0x46 'F' */
8 /* 0x47 'G' */ | 7<<4, /* 0x48 'H' */
5 /* 0x49 'I' */ | 8<<4, /* 0x4A 'J' */
8 /* 0x4B 'K' */ | 8<<4, /* 0x4C 'L' */
8 /* 0x4D 'M' */ | 8<<4, /* 0x4E 'N' */
8 /* 0x4F 'O' */ | 8<<4, /* 0x50 'P' */
7 /* 0x51 'Q' */ | 8<<4, /* 0x52 'R' */
7 /* 0x53 'S' */ | 7<<4, /* 0x54 'T' */
7 /* 0x55 'U' */ | 7<<4, /* 0x56 'V' */
8 /* 0x57 'W' */ | 8<<4, /* 0x58 'X' */
7 /* 0x59 'Y' */ | 8<<4, /* 0x5A 'Z' */
5 /* 0x5B '[' */ | 8<<4, /* 0x5C '\' */
5 /* 0x5D ']' */ | 8<<4, /* 0x5E '^' */
9 /* 0x5F '_' */ | 4<<4, /* 0x60 '`' */
8 /* 0x61 'a' */ | 8<<4, /* 0x62 'b' */
7 /* 0x63 'c' */ | 8<<4, /* 0x64 'd' */
7 /* 0x65 'e' */ | 7<<4, /* 0x66 'f' */
8 /* 0x67 'g' */ | 8<<4, /* 0x68 'h' */
5 /* 0x69 'i' */ | 6<<4, /* 0x6A 'j' */
8 /* 0x6B 'k' */ | 5<<4, /* 0x6C 'l' */
8 /* 0x6D 'm' */ | 7<<4, /* 0x6E 'n' */
7 /* 0x6F 'o' */ | 8<<4, /* 0x70 'p' */
8 /* 0x71 'q' */ | 7<<4, /* 0x72 'r' */
7 /* 0x73 's' */ | 6<<4, /* 0x74 't' */
8 /* 0x75 'u' */ | 7<<4, /* 0x76 'v' */
8 /* 0x77 'w' */ | 8<<4, /* 0x78 'x' */
7 /* 0x79 'y' */ | 7<<4, /* 0x7A 'z' */
7 /* 0x7B '{' */ | 3<<4, /* 0x7C '|' */
7 /* 0x7D '}' */ | 8<<4, /* 0x7E '~' */
8 /* 0x7F '' */ | 0<<4
};



uint8_t x8x8_map_char_table(uint8_t ch)
{
if ( ch > 0x7f )
{
/* limit to largest character */
ch = 0x7f - 32 + 9;
}
else if ( ch >= 32 )
{
/* normal character */
ch = ch - 32 + 9;
}
else
{
/* special character */
}

return ch;
}



uint8_t x8x8_get_len(uint8_t ch)
{
return (x8x8_len[ch/2] >> 4*(ch%2) ) & 0x0f;
}
9 changes: 8 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ CSRC = $(STARTUPSRC) \
$(STREAMSSRC) \
$(SHELLSRC) \
usbcfg.c \
main.c si5351.c tlv320aic3204.c dsp.c plot.c ui.c ili9341.c numfont20x22.c Font5x7.c flash.c adc.c
main.c si5351.c tlv320aic3204.c dsp.c plot.c ui.c ili9341.c numfont20x22.c Font8x8.c flash.c adc.c

# $(TESTSRC) \

Expand Down Expand Up @@ -228,6 +228,13 @@ include $(RULESPATH)/rules.mk
flash: build/ch.bin
dfu-util -d 0483:df11 -a 0 -s 0x08000000:leave -D build/ch.bin

release: build/ch.hex build/ch.bin build/ch.dmp
dfu-tool convert dfuse ./build/ch.hex ./build/ch.dfu
dfu-tool set-product ./build/ch.dfu df11
dfu-tool set-vendor ./build/ch.dfu 0483
cd build; md5sum ch.* > md5.txt; sha256sum ch.* > sha256.txt
zip -j -r build/nanovna_$(VERSION).zip build/ch* build/sha256.txt build/md5.txt

dfu:
-@printf "reset dfu\r" >/dev/cu.usbmodem401

Expand Down
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ NanoVNA - Very tiny handheld Vector Network Analyzer
[release]: https://github.com/ttrftech/NanoVNA/releases

<div align="center">
<img src="/doc/nanovna.jpg" width="480px">
<p><img src="/doc/nanovna.jpg" width="320px">
<img src="/doc/nanovna_screen.jpg" width="320px">
<img src="/doc/nanovna_infoscreen.jpg" width="320px"></p>
</div>

# About
Expand All @@ -17,7 +19,10 @@ standalone with lcd display, portable device with battery. This
project aim to provide an RF gadget but useful instrument for
enthusiast.

This repository contains source of NanoVNA firmware.
This repository contains source of NanoVNA firmware with a more readable font than the original.

## Binary releases
From time to time there are binary releases so you don´t have to compile the firmware by yourself. See https://github.com/reald/NanoVNA/releases

## Prepare ARM Cross Tools

Expand All @@ -44,7 +49,7 @@ Download arm cross tools from [here](https://developer.arm.com/tools-and-softwar

Fetch source and submodule.

$ git clone https://github.com/ttrftech/NanoVNA.git
$ git clone https://github.com/reald/NanoVNA.git
$ cd NanoVNA
$ git submodule update --init --recursive

Expand Down Expand Up @@ -114,3 +119,4 @@ Hardware design material is disclosed to prevent bad quality clone. Please let m

* [@hugen79](https://github.com/hugen79)
* [@cho45](https://github.com/cho45)
* DL9CAT
4 changes: 2 additions & 2 deletions STM32F072xB.ld
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
*/
MEMORY
{
flash0 : org = 0x08000000, len = 96k
flash0 : org = 0x08000000, len = 102k
flash1 : org = 0x00000000, len = 0
flash2 : org = 0x00000000, len = 0
flash3 : org = 0x00000000, len = 0
flash4 : org = 0x00000000, len = 0
flash5 : org = 0x00000000, len = 0
flash6 : org = 0x00000000, len = 0
flash7 : org = 0x08018000, len = 32k
flash7 : org = 0x08019800, len = 26k
ram0 : org = 0x20000000, len = 16k
ram1 : org = 0x00000000, len = 0
ram2 : org = 0x00000000, len = 0
Expand Down
Binary file added doc/nanovna_infoscreen.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/nanovna_screen.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 15 additions & 3 deletions flash.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,11 @@ checksum(const void *start, size_t len)

#define FLASH_PAGESIZE 0x800

#if SAVEAREA_MAX==5
const uint32_t save_config_area = 0x08018000;
#else
const uint32_t save_config_area = 0x08019800;
#endif

int
config_save(void)
Expand All @@ -97,7 +101,7 @@ config_save(void)
/* erase flash pages */
flash_erase_page((uint32_t)dst);

/* write to flahs */
/* write to flash */
while(count-- > 0) {
flash_program_half_word((uint32_t)dst, *src++);
dst++;
Expand All @@ -122,10 +126,14 @@ config_recall(void)
return 0;
}

#define SAVEAREA_MAX 5


const uint32_t saveareas[] =
{ 0x08018800, 0x0801a000, 0x0801b800, 0x0801d000, 0x0801e800 };
{
#if SAVEAREA_MAX==5
0x08018800,
#endif
0x0801a000, 0x0801b800, 0x0801d000, 0x0801e800 };

int16_t lastsaveid = 0;

Expand Down Expand Up @@ -210,7 +218,11 @@ caldata_ref(int id)
return src;
}

#if SAVEAREA_MAX==5
const uint32_t save_config_prop_area_size = 0x8000;
#else
const uint32_t save_config_prop_area_size = 0x6800;
#endif

void
clear_all_config_prop_data(void)
Expand Down
Loading