diff --git a/SigLo.ino b/SigLo.ino index 8a44931..fbfaa7e 100644 --- a/SigLo.ino +++ b/SigLo.ino @@ -143,9 +143,9 @@ void doSigGenLow () uint16_t attenuation = sigGenSetting.Calibration - sigGenSetting.Power; if (attenuation > ATTENUATOR_RANGE ) { - int16_t diff = sigGenSetting.Calibration - ATTENUATOR_RANGE - sigGenSetting.Power; - sgRXDrive = RX_SI4432_MAX_DRIVE - (int16_t)(diff/3) ; - attenuation = ATTENUATOR_RANGE - diff%3; + int16_t diff = attenuation - ATTENUATOR_RANGE; + sgRXDrive = RX_SI4432_MAX_DRIVE - (int16_t)( (diff-1)/3 ) - 1 ; + attenuation = ATTENUATOR_RANGE - 2 + (diff-1)%3; } SetSGRxDrive(sgRXDrive); att.SetAtten(attenuation); diff --git a/cmd.cpp b/cmd.cpp index 0b7b906..c652e60 100644 --- a/cmd.cpp +++ b/cmd.cpp @@ -204,7 +204,7 @@ int msgCount = ELEMENTS ( msgTable); void ShowMenu () { - Serial.printf ( "\nTiny Spectrum Analyzer Version %s - User Commands:\n\n", PROGRAM_VERSION ); + Serial.printf ( "\nsimpleSA Spectrum Analyzer %s - User Commands:\n\n", PROGRAM_VERSION ); Serial.println ( "Sweep Settings:\n" ); Serial.print ( " START.........Sweep start frequency, currently: " ); diff --git a/data/about.html b/data/about.html index 64bbb17..9b87ab5 100644 --- a/data/about.html +++ b/data/about.html @@ -1,7 +1,7 @@  - [TinySA] + [simpleSA] @@ -46,18 +46,18 @@

About

- The TinySA has been developed by Erik PD0EK. - This version has been adapted to run on the ESP32 DevKit module by Dave M0WID and John WA2FZW. + This simpleSA running on an ESP32 has been adapted by Dave M0WID and John WA2FZW.
+ It was based on an early prototype design of the TinySA by Erik PD0EK.
Information can be found at https://groups.io/g/HBTE

-
- To reboot click -
+
+ To reboot click +
- + diff --git a/data/index.html b/data/index.html index e1db512..e3498d6 100644 --- a/data/index.html +++ b/data/index.html @@ -60,6 +60,8 @@
Signal Generator

+ +
@@ -72,10 +74,10 @@ - Hz -   -   - + Hz   + +
+
@@ -217,10 +219,9 @@
- - - - + + pts + ms
@@ -244,7 +245,7 @@ dB
- + dBm
@@ -322,8 +323,9 @@
Pings:
-
Refresh Interval: +
Refresh: + ms
@@ -525,7 +527,7 @@ var chartSA = new CanvasJS.Chart("chartSA", }, axisY: { - title: "dB", + title: "dBm", titleFontSize: 24, gridThickness: 1, gridColor: "WhiteSmoke", diff --git a/data/styles.css b/data/styles.css index b9c8b63..0a30fd8 100644 --- a/data/styles.css +++ b/data/styles.css @@ -22,7 +22,7 @@ } .norm { - width: 100%; + width: 95%; height: 3vh; font-family: Arial, Helvetica, sans-serif; margin-top: 5px; @@ -127,6 +127,14 @@ input[type="number"] { background-color: lightgrey; } +.sweep-display { + border: 0; + text-align: right; + width: 65px; + display: inline-block; + background-color: lightgrey; +} + .message-display { border: 0; text-align: left; @@ -156,7 +164,7 @@ input[type="number"] { border: solid 1px grey; text-align: right; text-align-last: right; - width: 75px; + width: 77px; display: inline-block; } @@ -181,10 +189,22 @@ input[type="number"] { text-align-last: left; } -.set-button { +.inc-button { width: 60px; + height: 30px; font-size: 14px; - background-color: lightgrey; + float: right; + margin-right:60px; + margin-top:3px; +} + +.on-button { + width: 60px; + height: 33px; + font-size: 14px; + float: right; + margin-right:0px; + margin-top:3px; } .setting { @@ -212,6 +232,7 @@ input[type="number"] { margin: 0; padding: 0; letter-spacing: -10px; + width: 500px; } .sigFreqLabel { diff --git a/si4432.cpp b/si4432.cpp index abeaf62..82e9c77 100644 --- a/si4432.cpp +++ b/si4432.cpp @@ -272,7 +272,7 @@ const char* unit[4] = { "RX", "TX", "TGIF", "TGLO" }; // For debugging WriteByte ( REG_OFC1, SW_RESET ); // Always perform a system reset - while ( millis() - startTime < 10000 ) // Try for 10 seconds + while ( millis() - startTime < 2000 ) // Try for 2 seconds { regRead = ReadByte ( REG_IS2 ); diff --git a/simpleSA.h b/simpleSA.h index 3cec149..244df2b 100644 --- a/simpleSA.h +++ b/simpleSA.h @@ -32,7 +32,7 @@ #define PROGRAM_NAME "simpleSA" // These are for the WiFi interface -#define PROGRAM_VERSION "0.03" // Current version - beta! +#define PROGRAM_VERSION "Version 0.1" // Current version - beta! /* diff --git a/simpleSA.ino b/simpleSA.ino index ef7d584..9c3a010 100644 --- a/simpleSA.ino +++ b/simpleSA.ino @@ -127,11 +127,20 @@ * Additional functions in ui.cmd to allow signed frequency entry. * * Version 3.0f Changes by M0WID + * + * Version 0.03 * renamed simpleSA. Doesn't seem that simple to me! * First go at bandscope mode * VSPI reduced to 10Mhz as some boards will not run at 16MHz * Put onto github - lets see how it works! Version numbering changed - still in beta! * + * Version 0.1 + * Tracking generator now can be used as a signal generator + * Web page for signal generator + * RX sweep for testing the SI4432 FIR filters + * Output range of signal generator increased by also reducing SI4432 output power as well as uing attenuator + * Storage feature - temporary only not to disk - added to web page traces + * X grid lines added to web chart */ @@ -682,6 +691,8 @@ bool fsStatus = false; // True if SPIFFS loads ok // delay(2); // tgIF_OK = tg_if.Init ( config.tgIF_capacitance ); + tft.setCursor(0,180); + tft.println ( "Initializing track gen IF SI4432" ); if ( tg_if.Init ( config.tgIF_capacitance ) ) { tft.println ("Tracking IF initialised"); @@ -718,6 +729,9 @@ bool fsStatus = false; // True if SPIFFS loads ok // // Tracking gen LO present - initialise it, but not in TX mode yet // pinMode (SI_TG_LO_CS, OUTPUT); // delay(2); + + tft.println ( "Initializing track gen LO SI4432" ); + tgLO_OK = tg_lo.Init ( config.tgLO_capacitance ); if ( tgLO_OK ) tft.println ("Tracking LO initialised"); @@ -814,7 +828,7 @@ bool fsStatus = false; // True if SPIFFS loads ok // tft.println("Setup Complete"); - Serial.printf ( "\nTinySA Version %s Initialization Complete\n", PROGRAM_VERSION ); + Serial.printf ( "\nsimpleSA %s Initialization Complete\n", PROGRAM_VERSION ); ShowMenu (); // Display the menu of commands on serial monitor diff --git a/simpleSA_wifi.h b/simpleSA_wifi.h index 114fd25..1536272 100644 --- a/simpleSA_wifi.h +++ b/simpleSA_wifi.h @@ -33,7 +33,7 @@ #include #include -#define SSID_NAME "TinySA" // Name of access point +#define SSID_NAME "simpleSA" // Name of access point /* diff --git a/ui.cpp b/ui.cpp index ca0ccb7..bb37242 100644 --- a/ui.cpp +++ b/ui.cpp @@ -1171,8 +1171,7 @@ void ShowSplash ( void ) tft.setFreeFont ( &FreeSansBold9pt7b ); // Select Free Serif 9 point font tft.drawString ( "By WA2FZW, M0WID,", 160, 60 ); tft.drawString ( "VK3PE and G3ZQC", 160, 80 ); - tft.drawString ( "Version", 160, 100 ); - tft.drawString ( PROGRAM_VERSION, 220, 100 ); + tft.drawString ( PROGRAM_VERSION, 160, 100 ); tft.drawString ( "Original tinySA by Erik (PD0EK)", 160, 120 ); tft.setTextDatum ( TL_DATUM ); // Back to default top left