Skip to content

Commit

Permalink
Update to DiSlord version 1.2.14 code for better and faster display.
Browse files Browse the repository at this point in the history 
You can check NanoVNA-D for detailed update logs.
https://github.com/DiSlord/NanoVNA-D/
  • Loading branch information
@hugen79
hugen79 committed Aug 31, 2022
1 parent 8c13c99 commit 9b44119
Show file tree
Hide file tree
Showing 57 changed files with 8,861 additions and 3,466 deletions.
2 changes: 1 addition & 1 deletion FatFs/ffconf_072.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@


#define FF_USE_LFN 0
#define FF_MAX_LFN 32
#define FF_MAX_LFN 22
/* The FF_USE_LFN switches the support for LFN (long file name).
/
/ 0: Disable LFN. FF_MAX_LFN has no effect.
Expand Down
2 changes: 1 addition & 1 deletion FatFs/ffconf_303.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@


#define FF_USE_LFN 1
#define FF_MAX_LFN 32
#define FF_MAX_LFN 22
/* The FF_USE_LFN switches the support for LFN (long file name).
/
/ 0: Disable LFN. FF_MAX_LFN has no effect.
Expand Down
1,730 changes: 1,730 additions & 0 deletions Font11x14.c
View file

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions Font5x7.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#if 0
// Font definitions for header
#define FONT_START_CHAR 0x17
#define FONT_START_CHAR 0x16
#define FONT_WIDTH 5
#define FONT_WIDTH_MASK 0x07
#define FONT_GET_HEIGHT 7
Expand All @@ -46,7 +46,7 @@
#define CW_07 (8 - 7)
#define CW_08 (8 - 8)

#if FONT_START_CHAR!=0x17
#if FONT_START_CHAR!=0x16
#error "Need set correct offset in x5x7_bits font"
#endif

Expand Down Expand Up @@ -251,17 +251,17 @@ const uint8_t x5x7_bits[] =
0b00100000, // | * |
0b00100000, // | * |
0b00100000, // | * |

// Char 0x16 width = 6
0b00000000|CW_06, // | |
0b11000000, // |** |
0b11110000, // |**** |
0b00011100, // | *** |
0b11110000, // |**** |
0b11000000, // |** |
0b00000000, // | |
#endif

// Char 0x16 width = 8
0b00000000|CW_08, // | |
0b00000110, // | ** |
0b00000110, // | ** |
0b01000110, // | * ** |
0b11111110, // |******* |
0b11111110, // |******* |
0b01000000, // | * |

// Char "\029" width = 6
0b00000000|CW_06, // | |
0b00100000, // | * |
Expand All @@ -280,8 +280,8 @@ const uint8_t x5x7_bits[] =
0b11000000, // |** |
0b10000000, // |* |

// Char "\031" width = 7
0b00000000|CW_07, // | |
// Char "\031" width = 8
0b00000000|CW_08, // | |
0b01101100, // | ** ** |
0b10110010, // |* ** * |
0b10010010, // |* * * |
Expand Down Expand Up @@ -326,12 +326,12 @@ const uint8_t x5x7_bits[] =
0b10000000, // |* |

// Char "\036" width = 6
0b00000000|CW_06, // | |
0b01110000, // | *** |
0b01110000|CW_06, // | *** |
0b10001000, // |* * |
0b10001000, // |* * |
0b10001000, // |* * |
0b01010000, // | * * |
0b01010000, // | * * |
0b11011000, // |** ** |

// Char "\037" width = 5
Expand Down
208 changes: 104 additions & 104 deletions Font6x10.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#if 0
// Font definitions for header
#define FONT_START_CHAR 0x17
#define FONT_START_CHAR 0x16
#define FONT_WIDTH 6
#define FONT_WIDTH_MASK 0x07
#define FONT_GET_HEIGHT 10
Expand All @@ -46,7 +46,7 @@
#define CW_07 (8 - 7)
#define CW_08 (8 - 8)

#if FONT_START_CHAR!=0x17
#if FONT_START_CHAR!=0x16
#error "Need set correct offset in x6x10_bits font"
#endif

Expand Down Expand Up @@ -174,162 +174,162 @@ const uint8_t x6x10_bits[] =
0b00110000, // | ** |
0b00111100, // | **** |

// Char 0x0A width = 3
0b11001000|CW_03, // |** * |
0b11001100, // |** ** |
0b01001000, // | * * |
0b01111000, // | **** |
0b00110000, // | ** |
// Char top '+' width = 4
0b00000000|CW_04, // | |
0b01000000, // | * |
0b11100000, // |*** |
0b01000000, // | * |
0b00000000, // | |
0b00000000, // | |
0b00111100, // | **** |
0b00011000, // | ** |
0b00011000, // | ** |
0b00011000, // | ** |

// Char 0x0B width = 7
0b00110000|CW_07, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |
0b11110000, // |**** |
0b11110000, // |**** |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |

// Char 0x0C width = 7
0b00000000|CW_07, // | |
// Char top '-' width = 4
0b00000000|CW_04, // | |
0b00000000, // | |
0b11100000, // |*** |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b11110000, // |**** |
0b11110000, // |**** |
0b00110000, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |

// Char 0x0D width = 7
0b00000000|CW_07, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00111110, // | ***** |
0b00111110, // | ***** |
0b00110000, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |

// Char '0x0E width = 7
0b00110000|CW_07, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |
0b00111110, // | ***** |
0b00111110, // | ***** |
// Char top '0' width = 5
0b01100000|CW_05, // | ** |
0b10010000, // |* * |
0b10010000, // |* * |
0b10010000, // |* * |
0b01100000, // | ** |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |

// Char 0x0F width = 7
0b00110000|CW_07, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |
0b11111110, // |******* |
0b11111110, // |******* |
0b00110000, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |

// Char 0x10 width = 7
0b00000000|CW_07, // | |
0b11111110, // |******* |
0b11111110, // |******* |
// Char top '1' width = 5
0b00100000|CW_05, // | * |
0b01100000, // | ** |
0b00100000, // | * |
0b00100000, // | * |
0b01110000, // | *** |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |

// Char top '2' width = 5
0b01100000|CW_05, // | ** |
0b10010000, // |* * |
0b00100000, // | * |
0b01000000, // | * |
0b11110000, // |**** |
0b00000000, // | |
0b00000000, // | |

// Char 0x12 width = 7
0b00000000|CW_07, // | |
0b00000000, // | |
0b00000000, // | |
0b11111110, // |******* |
0b11111110, // |******* |
0b00000000, // | |

// Char top '3' width = 5
0b11100000|CW_05, // |*** |
0b00010000, // | * |
0b01100000, // | ** |
0b00010000, // | * |
0b11100000, // |*** |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |

// Char 0x13 width = 7
0b00000000|CW_07, // | |
// Char top '4' width = 5
0b10010000|CW_05, // |* * |
0b10010000, // |* * |
0b11110000, // |**** |
0b00010000, // | * |
0b00010000, // | * |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b11111110, // |******* |
0b11111110, // |******* |
0b00000000, // | |

// Char top '5' width = 5
0b11110000|CW_05, // |**** |
0b10000000, // |* |
0b11100000, // |*** |
0b00010000, // | * |
0b11100000, // |*** |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |

// Char 0x14 width = 7
0b00000000|CW_07, // | |
// Char top '6' width = 5
0b01100000|CW_05, // | ** |
0b10000000, // |* |
0b11100000, // |*** |
0b10010000, // |* * |
0b01100000, // | ** |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b11111110, // |******* |
0b11111110, // |******* |

// Char top '7' width = 5
0b11110000|CW_05, // |**** |
0b00010000, // | * |
0b00100000, // | * |
0b01000000, // | * |
0b01000000, // | * |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |

// Char 0x15 width = 7
0b00000000|CW_07, // | |
// Char top '8' width = 5
0b01100000|CW_05, // | ** |
0b10010000, // |* * |
0b01100000, // | ** |
0b10010000, // |* * |
0b01100000, // | ** |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |

// Char top '9' width = 5
0b01100000|CW_05, // | ** |
0b10010000, // |* * |
0b01110000, // | *** |
0b00010000, // | * |
0b01100000, // | ** |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
#endif

// Char 0x16 width = 8
0b00000000|CW_08, // | |
0b00000110, // | ** |
0b00000110, // | ** |
0b00000110, // | ** |
0b00100110, // | * ** |
0b01100110, // | ** ** |
0b11111110, // |******* |
0b11111110, // |******* |

// Char 0x16 width = 7
0b00110000|CW_07, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |
0b00111110, // | ***** |
0b00111110, // | ***** |
0b00110000, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |

// Char 0x17 width = 7
0b00110000|CW_07, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |
0b11110000, // |**** |
0b11110000, // |**** |
0b00110000, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |
0b00110000, // | ** |
#endif
0b01100000, // | ** |
0b00100000, // | * |

// Char "\029" width = 6
0b00000000|CW_06, // | |
Expand Down Expand Up @@ -416,8 +416,8 @@ const uint8_t x6x10_bits[] =
0b10000000, // |* |

// Char "\036" width = 6
0b00000000|CW_06, // | |
0b01110000, // | *** |
0b01110000|CW_06, // | *** |
0b10001000, // |* * |
0b10001000, // |* * |
0b10001000, // |* * |
0b10001000, // |* * |
Expand Down Expand Up @@ -595,8 +595,8 @@ const uint8_t x6x10_bits[] =
0b00100000, // | * |
0b01000000, // | * |

// Char '-' width = 7
0b00000000|CW_07, // | |
// Char '-' width = 6
0b00000000|CW_06, // | |
0b00000000, // | |
0b00000000, // | |
0b00000000, // | |
Expand Down
Loading

0 comments on commit 9b44119

Please sign in to comment.