Experimenting with volt meter display.

Works well. Not sure where to put the A/D checking. Not in the main
loop. Perhaps a dedicated function where we only go if a jumper is
closed.

Author: nseidle

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

@@ -35,7 +35,11 @@ SevSeg myDisplay; //Create an instance of the object
 //OpenSegment uses PNP and NPN transistors to drive larger displays
 #define S7S            1
 #define OPENSEGMENT    2
-#define DISPLAY_TYPE OPENSEGMENT
+#define DISPLAY_TYPE S7S
+
+//Global variables for the analog pins
+unsigned int analogValue6 = 0;
+unsigned int analogValue7 = 0;
 
 // Struct for circular data buffer data received over UART, SPI and I2C are all sent into a single buffer
 struct dataBuffer
@@ -98,6 +102,7 @@ void setup()
   setupUART();   // initialize UART stuff (interrupts, enable, baud)
   setupSPI();    // Initialize SPI stuff (enable, mode, interrupts)
   setupTWI();    // Initialize I2C stuff (address, interrupt, enable)
+  setupAnalog(); // Initialize the analog inputs
 
   interrupts();  // Turn interrupts on, and les' go
 
@@ -113,8 +118,34 @@ void setup()
 // The display is constantly PWM'd in the loop()
 void loop()
 {
-//  long myTimer = millis();    
+  analogValue6 = analogRead(A6);
+  analogValue7 = analogRead(A7);
+  
+  //Serial.print("A6: ");
+  //Serial.print(analogValue6);
+  //Serial.print(" A7: ");
+  //Serial.print(analogValue7);
+
+  //Do calculation for 1st voltage meter
+  float fvoltage6 = ((analogValue6 * 50) / (float)1024);
+  int voltage6 = round(fvoltage6);
+  display.digits[0] = voltage6 / 10;
+  display.digits[1] = voltage6 % 10;
+
+  //Do calculation for 2nd voltage meter
+  float fvoltage7 = ((analogValue7 * 50) / (float)1024);
+  int voltage7 = round(fvoltage7);
+  display.digits[2] = voltage7 / 10;
+  display.digits[3] = voltage7 % 10;
+
+  display.decimals = ((1<<DECIMAL1) | (1<<DECIMAL3)); //Turn on the decimals next to digit1 and digit3
+
   myDisplay.DisplayString(display.digits, display.decimals); //(numberToDisplay, decimal point location)
+  
+  
+  
+//  long myTimer = millis();    
+//  myDisplay.DisplayString(display.digits, display.decimals); //(numberToDisplay, decimal point location)
 //  Serial.print("Timer: ");
 //  Serial.println(millis() - myTimer);
 }
@@ -382,6 +413,14 @@ void setupUART()
   }
 
 }
+
+//This sets up the two analog inputs
+void setupAnalog()
+{
+  pinMode(A6, INPUT);
+  pinMode(A7, INPUT);
+}
+
 // setupSPI(): Initialize SPI, sets up hardware pins and enables spi and receive interrupt
 // SPI is set to MODE 0 (CPOL=0, CPHA=0), slave mode, LSB first
 void setupSPI()
@@ -451,6 +490,8 @@ void checkEmergencyReset(void)
     constantDisplay("0-00", 500);
     constantDisplay("-000", 500);
   }
+  
+  //Once we breakout of this loop (pin on RX is removed), system will init with new default settings
 }
 
 //Given a string, displays it costantly for a given amount of time

firmware/Serial 7-Segment Display/Serial_7_Segment_Display_Firmware/settings.h

@@ -18,6 +18,15 @@
 #define BAUD_500000	10
 #define BAUD_1000000	11
 
+//Bit locations for the decimal, apostrophe and colon control
+//From https://github.com/sparkfun/Serial7SegmentDisplay/wiki/Special-Commands#wiki-decimal
+#define APOSTROPHE  5
+#define COLON       4
+#define DECIMAL4    3
+#define DECIMAL3    2
+#define DECIMAL2    1
+#define DECIMAL1    0
+
 const int TWI_ADDRESS_DEFAULT = 0x71;
 const int BAUD_DEFAULT  = BAUD_9600;  // 9600 for 8MHz, 2x speed
 const int BRIGHTNESS_DEFAULT = 100;  // 100%, full brightness