Rename to simpleSA

renamed to simpleSA
This commit is contained in:
M0WID 2020-08-15 19:50:26 +01:00
parent 7c629e68a1
commit 6a2fea6a7a
10 changed files with 22 additions and 17 deletions

2
cmd.h
View File

@ -12,7 +12,7 @@
#ifndef _CMD_H_ #ifndef _CMD_H_
#define _CMD_H_ // Prevent double inclusion #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 "PE4302.h" // Class definition for thePE4302 attenuator
#include "Si4432.h" // Class definition for the Si4432 transceiver #include "Si4432.h" // Class definition for the Si4432 transceiver
#include "preferences.h" // For saving the "setting" structure #include "preferences.h" // For saving the "setting" structure

View File

@ -5,7 +5,7 @@
#ifndef _MARKERS_H_ // Prevent double include #ifndef _MARKERS_H_ // Prevent double include
#define _MARKERS_H_ #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 #define MARKER_COUNT 4 // MUST be set to '4' for now

View File

@ -12,7 +12,7 @@
#include <Arduino.h> // General Arduino definitions #include <Arduino.h> // General Arduino definitions
#include <Wire.h> // I2C library #include <Wire.h> // I2C library
#include <SPI.h> // Serial Peripheral Interface library #include <SPI.h> // 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 * In order to save GPIO pins on the ESP32, Glenn (VK3PE) and I decided to use a

View File

@ -16,7 +16,7 @@
#include "Arduino.h" // Basic Arduino definitions #include "Arduino.h" // Basic Arduino definitions
#include <Preferences.h> // Preferences library header #include <Preferences.h> // Preferences library header
#include "preferences.h" // Our function prototypes #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 extern Preferences preferences; // The Preferences object - Created in the main file

View File

@ -13,7 +13,7 @@
* Version 1.0 - Just add comments and try to figure out how it all works! * 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 config_t config; // Default colors, touch screen calibration, etc.
extern settings_t setting; // Scan limits and other scan parameters extern settings_t setting; // Scan limits and other scan parameters

View File

@ -1,5 +1,5 @@
/* /*
* "JMP_tinySA.ino_V3.0" * "simpleSA.ino"
* *
* This is the main program file for the "TinySA for ESP32" (spectrum analyzer) * 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 * New menu for tracking generator accessed from Output Menu
* SPI now runs at 16MHz (was at 1MHz - oops!) * SPI now runs at 16MHz (was at 1MHz - oops!)
* Additional functions in ui.cmd to allow signed frequency entry. * 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 <Arduino.h> // Basic Arduino definitions #include <Arduino.h> // Basic Arduino definitions
#include <SPI.h> // Serial Peripheral Interface library #include <SPI.h> // Serial Peripheral Interface library
#include <Wire.h> // I2C library #include <Wire.h> // I2C library
@ -142,7 +147,7 @@
#if USE_WIFI // M0WID - We need the following if using WiFi #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 <WiFi.h> // ESP32 WiFi support library #include <WiFi.h> // ESP32 WiFi support library
#include <AsyncTCP.h> // Asynchronous TCP library for Espressif MCUs #include <AsyncTCP.h> // Asynchronous TCP library for Espressif MCUs
#include "SPIFFS.h" // ESP32 built-in "file system" #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 * 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. * the "TFT_eSPI" library.
* *
* These are based on using HSPI (spi2) for display and VSPI (spi3) for the SI4432s * 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 * 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]; uint8_t myData[DISPLAY_POINTS+1];
@ -716,7 +721,7 @@ bool fsStatus = false; // True if SPIFFS loads ok
startAP (); // Start it up startAP (); // Start it up
#else // Connect to the router using SSID #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 Serial.println ( "Connecting..." ); // Indicate trying to connect
@ -764,7 +769,7 @@ bool fsStatus = false; // True if SPIFFS loads ok
// tft.println("Setup Complete"); // 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 ShowMenu (); // Display the menu of commands on serial monitor

View File

@ -1,5 +1,5 @@
/* /*
* "TinySA_wifi.cpp" * "simpleSA_wifi.cpp"
* *
* Trial wifi charting functionality to see if WiFi affects the scan results * 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/ * 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 "Si4432.h" // Si4432 definitions
#include "Cmd.h" // Command processing functions #include "Cmd.h" // Command processing functions

View File

@ -8,7 +8,7 @@
#define TINYSA_WIFI_H_ // Prevent double inclusion #define TINYSA_WIFI_H_ // Prevent double inclusion
#include "Arduino.h" // Basic Arduino definitions #include "Arduino.h" // Basic Arduino definitions
#include "tinySA.h" // Program definitions #include "simpleSA.h" // Program definitions
#include "Si4432.h" // RF module definitions #include "Si4432.h" // RF module definitions
#include <WiFi.h> // WiFi library #include <WiFi.h> // WiFi library

2
ui.cpp
View File

@ -28,7 +28,7 @@
#include <SPI.h> // SPI Bus handling library #include <SPI.h> // SPI Bus handling library
#include "tinySA.h" #include "simpleSA.h"
#include "ui.h" // User interface definitions and prototypes #include "ui.h" // User interface definitions and prototypes
#include "Cmd.h" // Command processing functions #include "Cmd.h" // Command processing functions
#include "preferences.h" // Save/recall functions #include "preferences.h" // Save/recall functions

2
ui.h
View File

@ -6,7 +6,7 @@
*/ */
#include <Arduino.h> // Standard stuff #include <Arduino.h> // 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 #include "preferences.h" // Things to save in flash memory
#ifndef _UI_H_ #ifndef _UI_H_