diff --git a/ubitx.h b/ubitx.h
index 4304650..32ec2b9 100644
--- a/ubitx.h
+++ b/ubitx.h
@@ -43,11 +43,6 @@ it uses an ILI9341 display controller and an XPT2046 touch controller.
#define TFT_DC 9
#define TFT_CS 10
#define CS_PIN 8 //this is the pin to select the touch controller on spi interface
-// MOSI=11, MISO=12, SCK=13
-
-//XPT2046_Touchscreen ts(CS_PIN);
-
-//Adafruit_ILI9341 tft = Adafruit_ILI9341(TFT_CS, TFT_DC);
/**
* The Arduino, unlike C/C++ on a regular computer with gigabytes of RAM, has very little memory.
@@ -60,7 +55,7 @@ it uses an ILI9341 display controller and an XPT2046 touch controller.
* the input and output from the USB port. We must keep a count of the bytes used while reading
* the serial port as we can easily run out of buffer space. This is done in the serial_in_count variable.
*/
-extern char c[30], b[30];
+extern char c[30], b[30];
extern char printBuff[2][20]; //mirrors what is showing on the two lines of the display
extern int count; //to generally count ticks, loops, etc
diff --git a/ubitx_v6.3.1_code.ino b/ubitx_v6.3.1_code.ino
index 4d162c4..d2518d1 100644
--- a/ubitx_v6.3.1_code.ino
+++ b/ubitx_v6.3.1_code.ino
@@ -45,74 +45,6 @@
code). Here are some defines and declarations used by Jerry's routines:
*/
-
-/**
- * We need to carefully pick assignment of pin for various purposes.
- * There are two sets of completely programmable pins on the Raduino.
- * First, on the top of the board, in line with the LCD connector is an 8-pin connector
- * that is largely meant for analog inputs and front-panel control. It has a regulated 5v output,
- * ground and six pins. Each of these six pins can be individually programmed
- * either as an analog input, a digital input or a digital output.
- * The pins are assigned as follows (left to right, display facing you):
- * Pin 1 (Violet), A7, SPARE
- * Pin 2 (Blue), A6, KEYER (DATA)
- * Pin 3 (Green), +5v
- * Pin 4 (Yellow), Gnd
- * Pin 5 (Orange), A3, PTT
- * Pin 6 (Red), A2, F BUTTON
- * Pin 7 (Brown), A1, ENC B
- * Pin 8 (Black), A0, ENC A
- *Note: A5, A4 are wired to the Si5351 as I2C interface
- * *
- * Though, this can be assigned anyway, for this application of the Arduino, we will make the following
- * assignment
- * A2 will connect to the PTT line, which is the usually a part of the mic connector
- * A3 is connected to a push button that can momentarily ground this line. This will be used for RIT/Bandswitching, etc.
- * A6 is to implement a keyer, it is reserved and not yet implemented
- * A7 is connected to a center pin of good quality 100K or 10K linear potentiometer with the two other ends connected to
- * ground and +5v lines available on the connector. This implments the tuning mechanism
- */
-
-#define ENC_A (A0)
-#define ENC_B (A1)
-#define FBUTTON (A2)
-#define PTT (A3)
-#define ANALOG_KEYER (A6)
-#define ANALOG_SPARE (A7)
-
-
-/** pin assignments
-14 T_IRQ 2 std changed
-13 T_DOUT (parallel to SOD/MOSI, pin 9 of display)
-12 T_DIN (parallel to SDI/MISO, pin 6 of display)
-11 T_CS 9 (we need to specify this)
-10 T_CLK (parallel to SCK, pin 7 of display)
-9 SDO(MSIO) 12 12 (spi)
-8 LED A0 8 (not needed, permanently on +3.3v) (resistor from 5v,
-7 SCK 13 13 (spi)
-6 SDI 11 11 (spi)
-5 D/C A3 7 (changable)
-4 RESET A4 9 (not needed, permanently +5v)
-3 CS A5 10 (changable)
-2 GND GND
-1 VCC VCC
-
-The model is called tjctm24028-spi
-it uses an ILI9341 display controller and an XPT2046 touch controller.
-*/
-
-#define TFT_DC 9
-#define TFT_CS 10
-
-//#define TIRQ_PIN 2
-#define CS_PIN 8
-
-// MOSI=11, MISO=12, SCK=13
-
-//XPT2046_Touchscreen ts(CS_PIN);
-
-//Adafruit_ILI9341 tft = Adafruit_ILI9341(TFT_CS, TFT_DC);
-
/**
* The Arduino, unlike C/C++ on a regular computer with gigabytes of RAM, has very little memory.
* We have to be very careful with variables that are declared inside the functions as they are
@@ -124,26 +56,7 @@ it uses an ILI9341 display controller and an XPT2046 touch controller.
* the input and output from the USB port. We must keep a count of the bytes used while reading
* the serial port as we can easily run out of buffer space. This is done in the serial_in_count variable.
*/
-char c[30], b[30];
-char printBuff[2][20]; //mirrors what is showing on the two lines of the display
-int count = 0; //to generally count ticks, loops, etc
-
-/**
- * The second set of 16 pins on the Raduino's bottom connector are have the three clock outputs and the digital lines to control the rig.
- * This assignment is as follows :
- * Pin 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
- * GND +5V CLK0 GND GND CLK1 GND GND CLK2 GND D2 D3 D4 D5 D6 D7
- * These too are flexible with what you may do with them, for the Raduino, we use them to :
- * - TX_RX line : Switches between Transmit and Receive after sensing the PTT or the morse keyer
- * - CW_KEY line : turns on the carrier for CW
- */
-
-#define TX_RX (7)
-#define CW_TONE (6)
-#define TX_LPF_A (5)
-#define TX_LPF_B (4)
-#define TX_LPF_C (3)
-#define CW_KEY (2)
+char c[30], b[30];
/**
* These are the indices where these user changable settinngs are stored in the EEPROM
@@ -193,7 +106,6 @@ int count = 0; //to generally count ticks, loops, etc
* 12 MHz where its fifth harmonic beats with the arduino's 16 Mhz oscillator's fourth harmonic
*/
-
#define INIT_USB_FREQ (11059200l)
// limits the tuning and working range of the ubitx between 3 MHz and 30 MHz
#define LOWEST_FREQ (100000l)