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

Merge branch 'master' of https://github.com/ttrftech/NanoVNA into ttrftech-master

Browse source 
# Conflicts:
#	main.c
#	plot.c
#	si5351.c
This commit is contained in:
qrp73 2019-10-08 04:09:24 +03:00
parent 0218234e70 3fc17e18f9
commit 9a2ccb5faa
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
main.c
View file

@ -39,10 +39,13 @@ static void apply_edelay_at(int i);
static void cal_interpolate(int s); static void cal_interpolate(int s);
void update_frequencies(void); void update_frequencies(void);
void set_frequencies(uint32_t start, uint32_t stop, int16_t points); void set_frequencies(uint32_t start, uint32_t stop, int16_t points);
<<<<<<< HEAD
void apply_edelay_at(int i); void apply_edelay_at(int i);
void set_frequencies(uint32_t start, uint32_t stop, int16_t points); void set_frequencies(uint32_t start, uint32_t stop, int16_t points);
void update_frequencies(void); void update_frequencies(void);
=======
>>>>>>> 3fc17e18f900c6bb31fb1e72bab345adf576c15c
bool sweep(bool break_on_operation); bool sweep(bool break_on_operation);

7
plot.c
View file

@ -713,10 +713,17 @@ static void trace_get_value_string(
chsnprintf(buf, len, "%.3fj", coeff[i][1]); chsnprintf(buf, len, "%.3fj", coeff[i][1]);
break; break;
case TRC_R: case TRC_R:
<<<<<<< HEAD
gamma2resistance(buf, len, coeff[i]); gamma2resistance(buf, len, coeff[i]);
break; break;
case TRC_X: case TRC_X:
gamma2reactance(buf, len, coeff[i]); gamma2reactance(buf, len, coeff[i]);
=======
gamma2resistance(buf, len, coeff);
break;
case TRC_X:
gamma2reactance(buf, len, coeff);
>>>>>>> 3fc17e18f900c6bb31fb1e72bab345adf576c15c
break; break;
//case TRC_ADMIT: //case TRC_ADMIT:
case TRC_POLAR: case TRC_POLAR:

5
si5351.c
View file

@ -330,7 +330,12 @@ int current_band = -1;
* CLK2: fixed 8MHz * CLK2: fixed 8MHz
*/ */
#define CLK2_FREQUENCY 8000000L #define CLK2_FREQUENCY 8000000L
<<<<<<< HEAD
int si5351_set_frequency_with_offset(uint32_t freq, int offset, uint8_t drive_strength) int si5351_set_frequency_with_offset(uint32_t freq, int offset, uint8_t drive_strength)
=======
int
si5351_set_frequency_with_offset(uint32_t freq, int offset, uint8_t drive_strength)
>>>>>>> 3fc17e18f900c6bb31fb1e72bab345adf576c15c
{ {
int band; int band;
int delay = 3; int delay = 3;