Merge pull request #107 from conorrussomanno/development

Development

OpenBCI_GUI/W_TimeSeries.pde

@@ -472,7 +472,7 @@ class ChannelBar{
       if (is_railed[channelNumber-1].is_railed == true) {
         voltageValue.string = "RAILED";
       } else if (is_railed[channelNumber-1].is_railed_warn == true) {
-        voltageValue.string = "NEAR RAILED";
+        voltageValue.string = "NEAR RAILED - " + String.format(getFmt(val),val) + " uVrms";
       }
     }
 

OpenBCI_GUI/WidgetManager.pde

@@ -46,7 +46,11 @@ void setupWidgets(PApplet _this, ArrayList<Widget> w){
   w_accelerometer = new W_accelerometer(_this);
   w_accelerometer.setTitle("Accelerometer");
   addWidget(w_accelerometer, w);
+<<<<<<< HEAD
+
+=======
   //
+>>>>>>> e9b30d1441fde495039667b13c4215370dea102e
   // w_networking = new W_networking(_this);
   // w_networking.setTitle("Networking");
   // addWidget(w_networking, w);