diff --git a/cmd.h b/cmd.h index 59c868a..70f51f3 100644 --- a/cmd.h +++ b/cmd.h @@ -12,7 +12,7 @@ #ifndef _CMD_H_ #define _CMD_H_ // Prevent double inclusion -#include "tinySA.h" // General program definitions +#include "simpleSA.h" // General program definitions #include "PE4302.h" // Class definition for thePE4302 attenuator #include "Si4432.h" // Class definition for the Si4432 transceiver #include "preferences.h" // For saving the "setting" structure diff --git a/marker.h b/marker.h index 9d9d1f4..41c53e9 100644 --- a/marker.h +++ b/marker.h @@ -5,7 +5,7 @@ #ifndef _MARKERS_H_ // Prevent double include #define _MARKERS_H_ -#include "tinySA.h" // Definitions needed by the whole program +#include "simpleSA.h" // Definitions needed by the whole program #define MARKER_COUNT 4 // MUST be set to '4' for now diff --git a/pE4302.h b/pE4302.h index fb649c4..1cb7638 100644 --- a/pE4302.h +++ b/pE4302.h @@ -12,7 +12,7 @@ #include // General Arduino definitions #include // I2C library #include // Serial Peripheral Interface library -#include "tinySA.h" +#include "simpleSA.h" /* * In order to save GPIO pins on the ESP32, Glenn (VK3PE) and I decided to use a diff --git a/preferences.cpp b/preferences.cpp index 0763cf9..593586a 100644 --- a/preferences.cpp +++ b/preferences.cpp @@ -16,7 +16,7 @@ #include "Arduino.h" // Basic Arduino definitions #include // Preferences library header #include "preferences.h" // Our function prototypes -#include "tinySA.h" // General program-wide definitions and stuff +#include "simpleSA.h" // General program-wide definitions and stuff extern Preferences preferences; // The Preferences object - Created in the main file diff --git a/preferences.h b/preferences.h index decd1fb..19ac3df 100644 --- a/preferences.h +++ b/preferences.h @@ -13,7 +13,7 @@ * Version 1.0 - Just add comments and try to figure out how it all works! */ -#include "tinySA.h" // Definitions for the entire program +#include "simpleSA.h" // Definitions for the entire program extern config_t config; // Default colors, touch screen calibration, etc. extern settings_t setting; // Scan limits and other scan parameters diff --git a/simpleSA.ino b/simpleSA.ino index f4de8a5..4e163d7 100644 --- a/simpleSA.ino +++ b/simpleSA.ino @@ -1,5 +1,5 @@ /* - * "JMP_tinySA.ino_V3.0" + * "simpleSA.ino" * * This is the main program file for the "TinySA for ESP32" (spectrum analyzer) * @@ -127,10 +127,15 @@ * New menu for tracking generator accessed from Output Menu * SPI now runs at 16MHz (was at 1MHz - oops!) * Additional functions in ui.cmd to allow signed frequency entry. + * + * Moved to github for trial + * Added initial changes for bandscope mode + * Added indication of tracking generator on/off + * Renamed to simpleSA */ -#include "tinySA.h" // Definitions needed by the whole program +#include "simpleSA.h" // Definitions needed by the whole program #include // Basic Arduino definitions #include // Serial Peripheral Interface library #include // I2C library @@ -142,7 +147,7 @@ #if USE_WIFI // M0WID - We need the following if using WiFi - #include "TinySA_wifi.h" // Our WiFI definitions + #include "simpleSA_wifi.h" // Our WiFI definitions #include // ESP32 WiFi support library #include // Asynchronous TCP library for Espressif MCUs #include "SPIFFS.h" // ESP32 built-in "file system" @@ -158,7 +163,7 @@ /* * Note the actual definitions for display and touch screen pins used are defined - * in the file "M0WID_Setup_ILI9341_TinySA.h" in the "User_Setups" directory of + * in the file "M0WID_Setup_ILI9341_simpleSA.h" in the "User_Setups" directory of * the "TFT_eSPI" library. * * These are based on using HSPI (spi2) for display and VSPI (spi3) for the SI4432s @@ -425,7 +430,7 @@ uint32_t sweepCount; // Used to inhibit handling Wifi until /* * These arrays contain the data for the various scan points; they are used in - * here and in the "TinySA_wifi" modules: + * here and in the "simpleSA_wifi" modules: */ uint8_t myData[DISPLAY_POINTS+1]; @@ -716,7 +721,7 @@ bool fsStatus = false; // True if SPIFFS loads ok startAP (); // Start it up #else // Connect to the router using SSID - // and password defined in TinySA.h + // and password defined in simpleSA.h Serial.println ( "Connecting..." ); // Indicate trying to connect @@ -764,7 +769,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 Version %s Initialization Complete\n", PROGRAM_VERSION ); ShowMenu (); // Display the menu of commands on serial monitor diff --git a/simpleSA_wifi.cpp b/simpleSA_wifi.cpp index 3a9faa5..7dc8c61 100644 --- a/simpleSA_wifi.cpp +++ b/simpleSA_wifi.cpp @@ -1,5 +1,5 @@ /* - * "TinySA_wifi.cpp" + * "simpleSA_wifi.cpp" * * Trial wifi charting functionality to see if WiFi affects the scan results * Based on example here https://circuits4you.com/2019/01/11/esp8266-data-logging-with-real-time-graphs/ @@ -15,7 +15,7 @@ */ -#include "TinySA_wifi.h" // WiFi definitions +#include "simpleSA_wifi.h" // WiFi definitions #include "Si4432.h" // Si4432 definitions #include "Cmd.h" // Command processing functions diff --git a/simpleSA_wifi.h b/simpleSA_wifi.h index 0bcd3d4..eb60e1e 100644 --- a/simpleSA_wifi.h +++ b/simpleSA_wifi.h @@ -8,7 +8,7 @@ #define TINYSA_WIFI_H_ // Prevent double inclusion #include "Arduino.h" // Basic Arduino definitions -#include "tinySA.h" // Program definitions +#include "simpleSA.h" // Program definitions #include "Si4432.h" // RF module definitions #include // WiFi library diff --git a/ui.cpp b/ui.cpp index d3137e7..c24cd6e 100644 --- a/ui.cpp +++ b/ui.cpp @@ -28,7 +28,7 @@ #include // SPI Bus handling library -#include "tinySA.h" +#include "simpleSA.h" #include "ui.h" // User interface definitions and prototypes #include "Cmd.h" // Command processing functions #include "preferences.h" // Save/recall functions diff --git a/ui.h b/ui.h index 6e404c6..0a86b9d 100644 --- a/ui.h +++ b/ui.h @@ -6,7 +6,7 @@ */ #include // Standard stuff -#include "tinySA.h" // General definitions for the program +#include "simpleSA.h" // General definitions for the program #include "preferences.h" // Things to save in flash memory #ifndef _UI_H_