ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2025-12-06 03:31:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove double code from plot.c

Browse source 
Update battery icon
This commit is contained in:
DiSlord 2020-04-26 01:07:09 +03:00
parent 49b52213cf
commit 3dab9cadfd
1 changed files with 15 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
plot.c
View file

@ -474,7 +474,7 @@ swr(const float *v)
} }
static float static float
resitance(const float *v) resistance(const float *v)
{ {
float z0 = 50; float z0 = 50;
float d = z0 / ((1-v[0])*(1-v[0])+v[1]*v[1]); float d = z0 / ((1-v[0])*(1-v[0])+v[1]*v[1]);
@ -514,22 +514,6 @@ groupdelay_from_array(int i, float array[POINTS_COUNT][2])
return groupdelay(array[bottom], array[top], deltaf); return groupdelay(array[bottom], array[top], deltaf);
} }
static float
gamma2resistance(const float v[2])
{
float z0 = 50;
float d = z0 / ((1-v[0])*(1-v[0])+v[1]*v[1]);
return ((1+v[0])*(1-v[0]) - v[1]*v[1]) * d;
}
static float
gamma2reactance(const float v[2])
{
float z0 = 50;
float d = z0 / ((1-v[0])*(1-v[0])+v[1]*v[1]);
return 2*v[1] * d;
}
static index_t static index_t
trace_into_index(int t, int i, float array[POINTS_COUNT][2]) trace_into_index(int t, int i, float array[POINTS_COUNT][2])
{ {
@ -562,7 +546,7 @@ trace_into_index(int t, int i, float array[POINTS_COUNT][2])
v-= coeff[1] * scale; v-= coeff[1] * scale;
break; break;
case TRC_R: case TRC_R:
v-= resitance(coeff) * scale; v-= resistance(coeff) * scale;
break; break;
case TRC_X: case TRC_X:
v-= reactance(coeff) * scale; v-= reactance(coeff) * scale;
@ -663,11 +647,11 @@ trace_get_value_string(int t, char *buf, int len, float array[POINTS_COUNT][2],
break; break;
case TRC_R: case TRC_R:
format = "%.2F"S_OHM; format = "%.2F"S_OHM;
v = gamma2resistance(coeff); v = resistance(coeff);
break; break;
case TRC_X: case TRC_X:
format = "%.2F"S_OHM; format = "%.2F"S_OHM;
v = gamma2reactance(coeff); v = reactance(coeff);
break; break;
case TRC_SMITH: case TRC_SMITH:
format_smith_value(buf, len, coeff, frequencies[i]); format_smith_value(buf, len, coeff, frequencies[i]);
@ -723,11 +707,11 @@ trace_get_value_string_delta(int t, char *buf, int len, float array[POINTS_COUNT
break; break;
case TRC_R: case TRC_R:
format = "%.2F"S_OHM; format = "%.2F"S_OHM;
v = gamma2resistance(coeff); v = resistance(coeff);
break; break;
case TRC_X: case TRC_X:
format = "%.2F"S_OHM; format = "%.2F"S_OHM;
v = gamma2reactance(coeff); v = reactance(coeff);
break; break;
//case TRC_ADMIT: //case TRC_ADMIT:
case TRC_POLAR: case TRC_POLAR:
@ -1666,7 +1650,7 @@ draw_cal_status(void)
// Draw battery level // Draw battery level
#define BATTERY_TOP_LEVEL 4100 #define BATTERY_TOP_LEVEL 4100
#define BATTERY_BOTTOM_LEVEL 3100 #define BATTERY_BOTTOM_LEVEL 3200
#define BATTERY_WARNING_LEVEL 3300 #define BATTERY_WARNING_LEVEL 3300
static void draw_battery_status(void) static void draw_battery_status(void)
@ -1683,16 +1667,19 @@ static void draw_battery_status(void)
// Prepare battery bitmap image // Prepare battery bitmap image
// Battery top // Battery top
int x = 0; int x = 0;
string_buf[x++] = 0b00000000;
string_buf[x++] = 0b00111100;
string_buf[x++] = 0b00111100; string_buf[x++] = 0b00111100;
string_buf[x++] = 0b00100100;
string_buf[x++] = 0b11111111; string_buf[x++] = 0b11111111;
// string_buf[x++] = 0b10000001;
// Fill battery status // Fill battery status
for (int power=BATTERY_TOP_LEVEL; power > BATTERY_BOTTOM_LEVEL; power-=100) for (int power=BATTERY_TOP_LEVEL; power > BATTERY_BOTTOM_LEVEL; ){
if ((x&3) == 0) {string_buf[x++] = 0b10000001; continue;}
string_buf[x++] = (power > vbat) ? 0b10000001 : // Empty line string_buf[x++] = (power > vbat) ? 0b10000001 : // Empty line
0b11111111; // Full line 0b10111101; // Full line
power-=100;
}
// Battery bottom // Battery bottom
// string_buf[x++] = 0b10000001; string_buf[x++] = 0b10000001;
string_buf[x++] = 0b11111111; string_buf[x++] = 0b11111111;
// Draw battery // Draw battery
blit8BitWidthBitmap(1, 1, 8, x, string_buf); blit8BitWidthBitmap(1, 1, 8, x, string_buf);