Commit 754cd7fd335adcb06cc7da5f81f1185a2d742c87
1 parent
90aad4d4
Exists in
master
updated split syntax and fase data generation
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
robots/little_john/telemetry/code/monitor/version1/getdata.py
| @@ -15,7 +15,7 @@ def getData(starttime, datafeed, testseries, testseries2, fake=False): | @@ -15,7 +15,7 @@ def getData(starttime, datafeed, testseries, testseries2, fake=False): | ||
| 15 | # two seperate functions, only one of which is run. | 15 | # two seperate functions, only one of which is run. |
| 16 | if fake: | 16 | if fake: |
| 17 | timefromstart = (time.time()-starttime) | 17 | timefromstart = (time.time()-starttime) |
| 18 | - values = [timefromstart, 100*math.sin(timefromstart)] | 18 | + values = [timefromstart, 100 + 100*math.sin(timefromstart)] |
| 19 | # logging.info("Generated test data: " + str(values)) | 19 | # logging.info("Generated test data: " + str(values)) |
| 20 | testseries.addpoint(values) | 20 | testseries.addpoint(values) |
| 21 | testseries2.addpoint(values) | 21 | testseries2.addpoint(values) |
| @@ -27,7 +27,7 @@ def getData(starttime, datafeed, testseries, testseries2, fake=False): | @@ -27,7 +27,7 @@ def getData(starttime, datafeed, testseries, testseries2, fake=False): | ||
| 27 | 27 | ||
| 28 | try: | 28 | try: |
| 29 | if os == 'Windows': | 29 | if os == 'Windows': |
| 30 | - values = incoming.strip().split(b", ") | 30 | + values = incoming.strip().split(b', ') |
| 31 | else: | 31 | else: |
| 32 | values = incoming.strip() | 32 | values = incoming.strip() |
| 33 | values = values.split(b', ') | 33 | values = values.split(b', ') |