Skip to content

Commit 6230ffc

Browse files
committed
Removed analog feature in order to try to unite branches.
1 parent 7339323 commit 6230ffc

File tree

2 files changed

+0
-31
lines changed

2 files changed

+0
-31
lines changed

firmware/Serial 7-Segment Display/Arduino_Examples/S7S_Example_Serial_Predator/S7S_Example_Serial_Predator.ino

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
http://github.com/sparkfun/Serial7SegmentDisplay/wiki/Special-Commands#wiki-baud
1616
1717
To get this code to work, attached an Serial7Segment to an Arduino Uno using the following pins:
18-
Pin 7 on Uno (software serial RX) to TX on Serial7Segment
1918
Pin 8 on Uno to RX on Serial7Segment
2019
VIN to PWR
2120
GND to GND
@@ -40,8 +39,6 @@
4039

4140
SoftwareSerial Serial7Segment(7, 8); //RX pin, TX pin
4241

43-
int cycles = 0;
44-
4542
void setup() {
4643

4744
Serial.begin(9600);

firmware/Serial 7-Segment Display/Serial_7_Segment_Display_Firmware/Serial_7_Segment_Display_Firmware.ino

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -118,35 +118,7 @@ void setup()
118118
// The display is constantly PWM'd in the loop()
119119
void loop()
120120
{
121-
/*analogValue6 = analogRead(A6);
122-
analogValue7 = analogRead(A7);*/
123-
124-
//Serial.print("A6: ");
125-
//Serial.print(analogValue6);
126-
//Serial.print(" A7: ");
127-
//Serial.print(analogValue7);
128-
129-
//Do calculation for 1st voltage meter
130-
/*float fvoltage6 = ((analogValue6 * 50) / (float)1024);
131-
int voltage6 = round(fvoltage6);
132-
display.digits[0] = voltage6 / 10;
133-
display.digits[1] = voltage6 % 10;
134-
135-
//Do calculation for 2nd voltage meter
136-
float fvoltage7 = ((analogValue7 * 50) / (float)1024);
137-
int voltage7 = round(fvoltage7);
138-
display.digits[2] = voltage7 / 10;
139-
display.digits[3] = voltage7 % 10;
140-
141-
display.decimals = ((1<<DECIMAL1) | (1<<DECIMAL3)); //Turn on the decimals next to digit1 and digit3
142-
myDisplay.DisplayString(display.digits, display.decimals); //(numberToDisplay, decimal point location)
143-
*/
144-
145-
146-
// long myTimer = millis();
147121
myDisplay.DisplayString(display.digits, display.decimals); //(numberToDisplay, decimal point location)
148-
// Serial.print("Timer: ");
149-
// Serial.println(millis() - myTimer);
150122
}
151123

152124
// This is effectively the UART0 byte received interrupt routine

0 commit comments

Comments
 (0)