From 088b3ad37eace8355771da47f4a7e8c044eb90de Mon Sep 17 00:00:00 2001
From: Nicholas Dal Porto <macmaniac5@comcast.net>
Date: Sun, 29 Oct 2017 22:07:29 -0700
Subject: [PATCH 1/2] Swapped units on bandwidth monitoring to Megabits rather
 than Megabytes, so utilization is more easily quantified.

---
 field/bandwidth_monitor.go | 4 ++--
 templates/fta_display.html | 4 ++--
 templates/match_play.html  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/field/bandwidth_monitor.go b/field/bandwidth_monitor.go
index 129752a..65ed0b2 100644
--- a/field/bandwidth_monitor.go
+++ b/field/bandwidth_monitor.go
@@ -117,7 +117,7 @@ func (monitor *BandwidthMonitor) updateStationBandwidth(station string, oidIndex
 		return
 	}
 	lastToRobotBytesForPort := uint32(monitor.lastToRobotBytes[toOid].(wapsnmp.Counter))
-	dsConn.MBpsToRobot = float64(toRobotBytesForPort-lastToRobotBytesForPort) / 1024 / 1024 / secondsSinceLast
+	dsConn.MBpsToRobot = float64(toRobotBytesForPort-lastToRobotBytesForPort) / 1024 / 128 / secondsSinceLast
 
 	fromOid := monitor.fromRobotOids[oidIndex].String()
 	if _, ok := fromRobotBytes[fromOid]; !ok {
@@ -130,5 +130,5 @@ func (monitor *BandwidthMonitor) updateStationBandwidth(station string, oidIndex
 		return
 	}
 	lastFromRobotBytesForPort := uint32(monitor.lastFromRobotBytes[fromOid].(wapsnmp.Counter))
-	dsConn.MBpsFromRobot = float64(fromRobotBytesForPort-lastFromRobotBytesForPort) / 1024 / 1024 / secondsSinceLast
+	dsConn.MBpsFromRobot = float64(fromRobotBytesForPort-lastFromRobotBytesForPort) / 1024 / 128 / secondsSinceLast
 }
diff --git a/templates/fta_display.html b/templates/fta_display.html
index 689a35b..b6e78b1 100644
--- a/templates/fta_display.html
+++ b/templates/fta_display.html
@@ -12,7 +12,7 @@
       <div class="col-lg-6 well well-darkred">
         <div class="row form-group">
           <div class="col-xs-3">Red Teams</div>
-          <div class="col-xs-1" data-toggle="tooltip" title="Driver Station (Tx/Rx MB/s)">DS</div>
+          <div class="col-xs-1" data-toggle="tooltip" title="Driver Station (Tx/Rx Mbits/s)">DS</div>
           <div class="col-xs-1" data-toggle="tooltip" title="Radio Status">Rad</div>
           <div class="col-xs-1" data-toggle="tooltip" title="Robot Status/Time Since Last Link">Rio</div>
           <div class="col-xs-1" data-toggle="tooltip" title="Battery">Bat</div>
@@ -27,7 +27,7 @@
       <div class="col-lg-6 well well-darkblue">
         <div class="row form-group hidden-xs">
           <div class="col-xs-3">Blue Teams</div>
-          <div class="col-xs-1" data-toggle="tooltip" title="Driver Station (Tx/Rx MB/s)">DS</div>
+          <div class="col-xs-1" data-toggle="tooltip" title="Driver Station (Tx/Rx Mbits/s)">DS</div>
           <div class="col-xs-1" data-toggle="tooltip" title="Radio Status">Rad</div>
           <div class="col-xs-1" data-toggle="tooltip" title="Robot Status/Time Since Last Link">Rio</div>
           <div class="col-xs-1" data-toggle="tooltip" title="Battery">Bat</div>
diff --git a/templates/match_play.html b/templates/match_play.html
index a09a197..1cabbf7 100644
--- a/templates/match_play.html
+++ b/templates/match_play.html
@@ -63,7 +63,7 @@
       <div class="col-lg-6 well well-darkblue">
         <div class="row form-group">
           <div class="col-lg-4">Blue Teams</div>
-          <div class="col-lg-2" data-toggle="tooltip" title="Driver Station (Tx/Rx MB/s)">DS</div>
+          <div class="col-lg-2" data-toggle="tooltip" title="Driver Station (Tx/Rx Mbits/s)">DS</div>
           <div class="col-lg-2" data-toggle="tooltip" title="Robot">R</div>
           <div class="col-lg-2" data-toggle="tooltip" title="Battery">B</div>
           <div class="col-lg-2" data-toggle="tooltip" title="Bypass/Disable">Byp</div>
@@ -75,7 +75,7 @@
       <div class="col-lg-6 well well-darkred">
         <div class="row form-group">
           <div class="col-lg-4">Red Teams</div>
-          <div class="col-lg-2" data-toggle="tooltip" title="Driver Station (Tx/Rx MB/s)">DS</div>
+          <div class="col-lg-2" data-toggle="tooltip" title="Driver Station (Tx/Rx Mbits/s)">DS</div>
           <div class="col-lg-2" data-toggle="tooltip" title="Robot">R</div>
           <div class="col-lg-2" data-toggle="tooltip" title="Battery">B</div>
           <div class="col-lg-2" data-toggle="tooltip" title="Bypass/Disable">Byp</div>

From d12eaef712e3b6663e8dc795982ec412c7fdd0ac Mon Sep 17 00:00:00 2001
From: Nicholas Dal Porto <macmaniac5@comcast.net>
Date: Sun, 29 Oct 2017 22:10:28 -0700
Subject: [PATCH 2/2] fixed logs so .csv is properly formatted with radio
 column.

---
 field/team_match_log.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/field/team_match_log.go b/field/team_match_log.go
index 348939c..1172056 100644
--- a/field/team_match_log.go
+++ b/field/team_match_log.go
@@ -36,7 +36,7 @@ func NewTeamMatchLog(teamId int, match *model.Match) (*TeamMatchLog, error) {
 	}
 
 	log := TeamMatchLog{log.New(logFile, "", 0), logFile}
-	log.logger.Println("matchTimeSec,packetType,teamId,allianceStation,robotLinked,auto,enabled," +
+	log.logger.Println("matchTimeSec,packetType,teamId,allianceStation,radioLinked,robotLinked,auto,enabled," +
 		"emergencyStop,batteryVoltage,missedPacketCount,dsRobotTripTimeMs")
 
 	return &log, nil
@@ -44,7 +44,7 @@ func NewTeamMatchLog(teamId int, match *model.Match) (*TeamMatchLog, error) {
 
 // Adds a line to the log when a packet is received.
 func (log *TeamMatchLog) LogDsPacket(matchTimeSec float64, packetType int, dsConn *DriverStationConnection) {
-	log.logger.Printf("%f,%d,%d,%s,%v,%v,%v,%v,%f,%d,%d", matchTimeSec, packetType, dsConn.TeamId,
+	log.logger.Printf("%f,%d,%d,%s,%v,%v,%v,%v,%v,%f,%d,%d", matchTimeSec, packetType, dsConn.TeamId,
 		dsConn.AllianceStation, dsConn.RadioLinked, dsConn.RobotLinked, dsConn.Auto, dsConn.Enabled, dsConn.Estop,
 		dsConn.BatteryVoltage, dsConn.MissedPacketCount, dsConn.DsRobotTripTimeMs)
 }