Merge branch 'master' of http://128.243.70.77/UoN_EEE/Robot_Wars

Christopher Stone
2 parents 0da9d1e6 03c11d81
Showing 1 changed file with 12 additions and 4 deletions Show diff stats
robots/little_john/telemetry/code/monitor/version1/main.py
@@ -20,7 +20,10 @@ from series import Series
 from plot import Plot
 from getdata import getData
  
-logging.basicConfig(format='%(levelname)s:\t%(message)s', level=logging.DEBUG)
+print('   Error:       Module          Function        Message') 
+# WHY WON'T THIS PRINT AT THE TOP
+format_string = '%(levelname)8s:\t%(module)-10s \t%(funcName)s \t%(message)s'
+logging.basicConfig(format=format_string, level=logging.DEBUG)
 logging.info("Logging system active")
 starttime = time.time()
  
@@ -36,14 +39,19 @@ else:
     os = 'Other'
 logging.info('OS = ' + os)
  
+data_points_series_1 = 150
+data_points_series_2 = 150
  
-testseries = Series(points=150, xauto=True, ylimits=(0, 1024),
+testseries = Series(points=data_points_series_1, xauto=True,
+                    ylimits=(0, 1024),
                     title="Data from serial (time)",
                     xname="Time (s)", yname="ADC output")
-testseries2 = Series(points=150, xlimits=(0, 1024), ylimits=(0, 1024),
+logging.info('Series 1 has ' + str(data_points_series_1) + ' data points')
+testseries2 = Series(points=data_points_series_2, xlimits=(0, 1024),
+                     ylimits=(0, 1024),
                      title="Data from serial (xy)",
                      xname="ADC0 output", yname="ADC7 output")
-
+logging.info('Series 2 has ' + str(data_points_series_2) + ' data points')
 plots = []
 plots.append(Plot(testseries))
 plots.append(Plot(testseries2))