Merge branch 'master' of https://github.com/AA6KL/NanoVNA

Author: hugen79

Font7x13b.c

@@ -150,7 +150,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 Font7x13b.c Font5x7.c flash.c adc.c
 
 #       $(TESTSRC) \
 

Makefile

@@ -29,7 +29,8 @@
 
 static uint16_t reverse_bits(uint16_t x, int n) {
 	uint16_t result = 0;
-	for (int i = 0; i < n; i++, x >>= 1)
+	int i;
+	for (i = 0; i < n; i++, x >>= 1)
 		result = (result << 1) | (x & 1U);
 	return result;
 }
@@ -44,8 +45,10 @@ static void fft256(float array[][2], const uint8_t dir) {
 
 	const uint8_t real =   dir & 1;
 	const uint8_t imag = ~real & 1;
+	uint16_t i;
+	uint16_t size;
 
-	for (uint16_t i = 0; i < n; i++) {
+	for (i = 0; i < n; i++) {
 		uint16_t j = reverse_bits(i, levels);
 		if (j > i) {
 			float temp = array[i][real];
@@ -58,11 +61,13 @@ static void fft256(float array[][2], const uint8_t dir) {
 	}
 
 	// Cooley-Tukey decimation-in-time radix-2 FFT
-	for (uint16_t size = 2; size <= n; size *= 2) {
+	for (size = 2; size <= n; size *= 2) {
 		uint16_t halfsize = size / 2;
 		uint16_t tablestep = n / size;
-		for (uint16_t i = 0; i < n; i += size) {
-			for (uint16_t j = i, k = 0; j < i + halfsize; j++, k += tablestep) {
+		uint16_t i;
+		for (i = 0; i < n; i += size) {
+			uint16_t j, k;
+			for (j = i, k = 0; j < i + halfsize; j++, k += tablestep) {
 				uint16_t l = j + halfsize;
 				float tpre =  array[l][real] * cos(2 * M_PI * k / 256) + array[l][imag] * sin(2 * M_PI * k / 256);
 				float tpim = -array[l][real] * sin(2 * M_PI * k / 256) + array[l][imag] * cos(2 * M_PI * k / 256);

fft.h

@@ -463,19 +463,20 @@ ili9341_read_memory_continue(int len, uint16_t* out)
     ili9341_read_memory_raw(0x3E, len, out);
 }
 
+#if !defined(ST7796S)
 void
 ili9341_drawchar_5x7(uint8_t ch, int x, int y, uint16_t fg, uint16_t bg)
 {
   #if defined(ILI9488) 
   ili9341_drawchar_size(ch, x, y, fg, bg, 1);
   #else
   uint16_t *buf = spi_buffer;
-  uint8_t bits;
+  uint16_t bits;
   int c, r;
   for(c = 0; c < 7; c++) {
     bits = x5x7_bits[(ch * 7) + c];
     for (r = 0; r < 5; r++) {
-      *buf++ = (0x80 & bits) ? fg : bg;
+      *buf++ = (0x8000 & bits) ? fg : bg;
       bits <<= 1;
     }
   }
@@ -493,16 +494,25 @@ ili9341_drawstring_5x7(const char *str, int x, int y, uint16_t fg, uint16_t bg)
   }
 }
 
+void
+ili9341_drawstring_5x7_inv(const char *str, int x, int y, uint16_t fg, uint16_t bg, bool invert)
+{
+  if (invert)
+    ili9341_drawstring_5x7(str, x, y, bg, fg);
+  else
+    ili9341_drawstring_5x7(str, x, y, fg, bg);
+}
+
 void
 ili9341_drawchar_size(uint8_t ch, int x, int y, uint16_t fg, uint16_t bg, uint8_t size)
 {
   uint16_t *buf = spi_buffer;
-  uint8_t bits;
+  uint16_t bits;
   int c, r;
   for(c = 0; c < 7*size; c++) {
     bits = x5x7_bits[(ch * 7) + (c / size)];
     for (r = 0; r < 5*size; r++) {
-      *buf++ = (0x80 & bits) ? fg : bg;
+      *buf++ = (0x8000 & bits) ? fg : bg;
       if (r % size == (size-1)) {
           bits <<= 1;
       }
@@ -521,6 +531,73 @@ ili9341_drawstring_size(const char *str, int x, int y, uint16_t fg, uint16_t bg,
   }
 }
 
+#else
+void
+ili9341_drawchar_7x13(uint8_t ch, int x, int y, uint16_t fg, uint16_t bg)
+{
+  uint16_t *buf = spi_buffer;
+  uint16_t bits;
+  int c, r;
+  for(c = 0; c < 13; c++) {
+    bits = x7x13b_bits[(ch * 13) + c];
+    for (r = 0; r < 7; r++) {
+      *buf++ = (0x8000 & bits) ? fg : bg;
+      bits <<= 1;
+    }
+  }
+  ili9341_bulk(x, y, 7, 13);
+}
+
+void
+ili9341_drawstring_7x13(const char *str, int x, int y, uint16_t fg, uint16_t bg)
+{
+  while (*str) {
+    ili9341_drawchar_7x13(*str, x, y, fg, bg);
+    x += 7;
+    str++;
+  }
+}
+
+void
+ili9341_drawstring_7x13_inv(const char *str, int x, int y, uint16_t fg, uint16_t bg, bool invert)
+{
+  if (invert)
+    ili9341_drawstring_7x13(str, x, y, bg, fg);
+  else
+    ili9341_drawstring_7x13(str, x, y, fg, bg);
+}
+
+
+void
+ili9341_drawchar_size(uint8_t ch, int x, int y, uint16_t fg, uint16_t bg, uint8_t size)
+{
+  uint16_t *buf = spi_buffer;
+  uint16_t bits;
+  int c, r;
+  for(c = 0; c < 13*size; c++) {
+    bits = x7x13b_bits[(ch * 13) + (c / size)];
+    for (r = 0; r < 7*size; r++) {
+      *buf++ = (0x8000 & bits) ? fg : bg;
+      if (r % size == (size-1)) {
+          bits <<= 1;
+      }
+    }
+  }
+  ili9341_bulk(x, y, 7*size, 13*size);
+}
+
+void
+ili9341_drawstring_size(const char *str, int x, int y, uint16_t fg, uint16_t bg, uint8_t size)
+{
+  while (*str) {
+    ili9341_drawchar_size(*str, x, y, fg, bg, size);
+    x += 7 * size;
+    str++;
+  }
+}
+#endif
+
+
 #define SWAP(x,y) do { int z=x; x = y; y = z; } while(0)
 
 void
@@ -605,7 +682,7 @@ ili9341_test(int mode)
   int i;
   uint16_t x0, x1, y0, y1;
   int c;
-  int r;
+  // int r;
   switch (mode) {
   default:
 #if 1
@@ -647,14 +724,14 @@ ili9341_test(int mode)
     ili9341_fill(0, 0, LCD_WIDTH, LCD_HEIGHT, 0);
     x0 = (uint16_t) my_rand() % LCD_WIDTH;
     y0 = (uint16_t) my_rand() % LCD_HEIGHT-4;
-    if ((x0>=LCD_WIDTH) || (y0>=LCD_HEIGHT) || (x0<0) || (y0<0)) {
+    if ((x0>=LCD_WIDTH) || (y0>=LCD_HEIGHT)) {
       return;
     }
-    r  = (int) my_rand() % 100;
+    //r  = (int) my_rand() % 100;
     for (i=0; i<100; i++) {
       x1 = (uint16_t) my_rand() % LCD_WIDTH;
       y1 = (uint16_t) my_rand() % LCD_HEIGHT-4;
-      if ((x1>=LCD_WIDTH) || (y1>=LCD_HEIGHT) || (x1<0) || (y1<0)) {
+      if ((x1>=LCD_WIDTH) || (y1>=LCD_HEIGHT)) {
 	return;
       }
       //c = RGB565(255,255,255);

ili9341.c

@@ -620,7 +620,8 @@ config_t config = {
   .menu_normal_color = 0xffff,
   .menu_active_color = 0x7777,
   .trace_color =       { RGB565(0,255,255), RGB565(255,0,40), RGB565(0,0,255), RGB565(50,255,0) },
-  .touch_cal =         { 693, 605, 124, 171 },  //{ 620, 600, 160, 190 },
+//  .touch_cal =         { 693, 605, 124, 171 },  // 2.4 inch LCD panel
+  .touch_cal =         { 338, 522, 153, 192 },  // 2.8 inch LCD panel
   .default_loadcal =   0,
   .harmonic_freq_threshold = 300000000,
   .checksum =          0
@@ -850,6 +851,9 @@ void
 set_sweep_frequency(int type, int32_t freq)
 {
   int cal_applied = cal_status & CALSTAT_APPLY;
+  // negative value indicate overflow, do nothing
+  if (freq < 0)
+    return;
   switch (type) {
   case ST_START:
     freq_mode_startstop();
@@ -1792,6 +1796,7 @@ set_domain_mode(int mode) // accept DOMAIN_FREQ or DOMAIN_TIME
   if (mode != (domain_mode & DOMAIN_MODE)) {
     domain_mode = (domain_mode & ~DOMAIN_MODE) | (mode & DOMAIN_MODE);
     redraw_request |= REDRAW_FREQUENCY;
+    uistat.lever_mode = LM_MARKER;
   }
 }
 

main.c

@@ -40,7 +40,7 @@ void adc_start_analog_watchdogd(ADC_TypeDef *adc, uint32_t chsel);
 #define LCD_WIDTH 480
 #define LCD_HEIGHT 320
 //#define SWEEP_POINTS 201
-#define LINE_SPACE 10
+#define LINE_SPACE 15
 #define X_SPACE 5
 #define YSTEP LINE_SPACE
 //#define SPI_BUFFER_SIZE 2048
@@ -182,7 +182,12 @@ extern void tlv320aic3204_select(int channel);
 #define OFFSETX 15
 #define OFFSETY 0
 #define WIDTH (LCD_WIDTH-GRIDY)
-#define HEIGHT (LCD_HEIGHT-7)
+#if defined(ILI9488) || defined(ILI9486) || defined(ST7796S)
+#define FONT_HEIGHT 13
+#else
+#define FONT_HEIGHT 7
+#endif
+#define HEIGHT (LCD_HEIGHT-FONT_HEIGHT)
 
 #define CELLOFFSETX 5
 #define AREA_WIDTH_NORMAL (WIDTH + CELLOFFSETX*2)
@@ -191,8 +196,11 @@ extern int area_width;
 extern int area_height;
 
 // font
-
+#if !defined(ST7796S)
 extern const uint8_t x5x7_bits [];
+#else
+extern const uint16_t x7x13b_bits [];
+#endif
 extern const uint8_t numfont20x22[][22 * 3];
 
 #define S_PI    "\034"
@@ -328,8 +336,15 @@ void ili9341_init(void);
 void ili9341_test(int mode);
 void ili9341_bulk(int x, int y, int w, int h);
 void ili9341_fill(int x, int y, int w, int h, int color);
+#if !defined(ST7796S)
 void ili9341_drawchar_5x7(uint8_t ch, int x, int y, uint16_t fg, uint16_t bg);
 void ili9341_drawstring_5x7(const char *str, int x, int y, uint16_t fg, uint16_t bg);
+void ili9341_drawstring_5x7_inv(const char *str, int x, int y, uint16_t fg, uint16_t bg, bool inv);
+#else
+void ili9341_drawchar_7x13(uint8_t ch, int x, int y, uint16_t fg, uint16_t bg);
+void ili9341_drawstring_7x13(const char *str, int x, int y, uint16_t fg, uint16_t bg);
+void ili9341_drawstring_7x13_inv(const char *str, int x, int y, uint16_t fg, uint16_t bg, bool inv);
+#endif
 void ili9341_drawchar_size(uint8_t ch, int x, int y, uint16_t fg, uint16_t bg, uint8_t size);
 void ili9341_drawstring_size(const char *str, int x, int y, uint16_t fg, uint16_t bg, uint8_t size);
 void ili9341_drawfont(uint8_t ch, const font_t *font, int x, int y, uint16_t fg, uint16_t bg);
@@ -397,12 +412,18 @@ void clear_all_config_prop_data(void);
  * ui.c
  */
 
+// lever_mode
+enum {
+  LM_MARKER, LM_SEARCH, LM_CENTER, LM_SPAN
+};
+
 typedef struct {
   int8_t digit; /* 0~5 */
   int8_t digit_mode;
   int8_t current_trace; /* 0..3 */
   uint32_t value; // for editing at numeric input area
   uint32_t previous_value;
+  uint8_t lever_mode;
 } uistat_t;
 
 extern uistat_t uistat;