@@ -289,9 +289,9 | |||||
289 | def __getControlModuleStatus_new(self, cmd, type): |
|
289 | def __getControlModuleStatus_new(self, cmd, type): | |
290 |
|
290 | |||
291 | cm_lst = self.__gettingDataFromControlModules(self, cmd, rx_buffer = type) |
|
291 | cm_lst = self.__gettingDataFromControlModules(self, cmd, rx_buffer = type) | |
292 |
out_ |
|
292 | out_str = self.__processingCMdata(in_data = cm_lst, type = type) | |
293 |
|
293 | |||
294 |
return |
|
294 | return out_str | |
295 |
|
295 | |||
296 | def __gettingDataFromControlModules(self, cmd, rx_buffer): |
|
296 | def __gettingDataFromControlModules(self, cmd, rx_buffer): | |
297 |
|
297 | |||
@@ -318,46 +318,112 | |||||
318 |
|
318 | |||
319 | def __TwoComparation(self, in_lst): |
|
319 | def __TwoComparation(self, in_lst): | |
320 |
|
320 | |||
321 | cm_up =[] |
|
321 | ||
322 |
|
|
322 | file = [] | |
323 |
relay |
|
323 | relay = [] | |
324 |
|
|
324 | status = [] | |
325 |
|
325 | mode = '0' | ||
326 | for i in in_lst: |
|
326 | cnt = 0 | |
327 | if len(i) == 8: |
|
327 | ||
328 | relay_up.append("-") |
|
328 | if mode == '0': | |
329 | relay_dw.append("-") |
|
329 | ||
330 | cm_up.append("-") |
|
330 | for i in in_lst: | |
331 |
|
|
331 | if len(i) == 8: | |
332 | continue |
|
332 | file.append("xxxxxx") | |
333 |
relay |
|
333 | relay.append("xxxxxx") | |
334 | relay_dw.append(i[17:20]) |
|
334 | else: | |
335 |
|
|
335 | file.append(i[14:20]) | |
336 |
|
|
336 | relay.append(i[21:27]) | |
337 |
|
337 | #Loop to generate a status | ||
338 | comp_up = [] |
|
338 | for i in range(64): | |
339 | comp_dw = [] |
|
339 | if file[i] == "xxxxxx": | |
340 |
|
340 | status.append("xx") | ||
|
341 | continue | |||
|
342 | ||||
|
343 | if cmp(file[i],relay[i]) == 0: | |||
|
344 | cnt = cnt + 1 | |||
|
345 | ||||
|
346 | if cmp(file[i][0:3],relay[i][0:3]) == 0: | |||
|
347 | cnt = cnt + 1 | |||
|
348 | ||||
|
349 | if cmp(file[i][3:6],relay[i][3:6]) == 0: | |||
|
350 | cnt = cnt + 2 | |||
|
351 | ||||
|
352 | if cnt == 4: | |||
|
353 | status.append("00") | |||
|
354 | elif cnt == 0: | |||
|
355 | status.append("11") | |||
|
356 | elif cnt == 1: | |||
|
357 | status.append("11") | |||
|
358 | else: | |||
|
359 | status.append("01") | |||
|
360 | ||||
|
361 | else: | |||
|
362 | ||||
|
363 | cm_up =[] | |||
|
364 | cm_dw =[] | |||
|
365 | relay_up =[] | |||
|
366 | relay_dw =[] | |||
|
367 | ||||
|
368 | for i in in_lst: | |||
|
369 | if len(i) == 8: | |||
|
370 | relay_up.append("-") | |||
|
371 | relay_dw.append("-") | |||
|
372 | cm_up.append("-") | |||
|
373 | cm_dw.append("-") | |||
|
374 | continue | |||
|
375 | relay_up.append(i[14:17]) | |||
|
376 | relay_dw.append(i[17:20]) | |||
|
377 | cm_up.append(i[21:24]) | |||
|
378 | cm_dw.append(i[24:27]) | |||
|
379 | ||||
|
380 | comp_up = [] | |||
|
381 | comp_dw = [] | |||
|
382 | ||||
|
383 | for i in range(64): | |||
|
384 | if len(relay_up == 1): | |||
|
385 | comp_up.append('x') | |||
|
386 | else: | |||
|
387 | if cmp(relay_up[i], cm_up[i]) == 0: | |||
|
388 | comp_up.append('0') | |||
|
389 | else: | |||
|
390 | comp_up.append('1') | |||
|
391 | ||||
|
392 | for i in range(64): | |||
|
393 | if len(relay_dw == 1): | |||
|
394 | comp_dw.append('x') | |||
|
395 | else: | |||
|
396 | if cmp(relay_dw[i], cm_dw[i]) == 0: | |||
|
397 | comp_dw.append('0') | |||
|
398 | else: | |||
|
399 | comp_dw.append('1') | |||
|
400 | ||||
|
401 | # Example: | |||
|
402 | # comp_up = [1,0,x,1,1,1 ..,1,0,1,x] | |||
|
403 | # | |||
|
404 | print comp_up | |||
|
405 | print comp_dw | |||
|
406 | ||||
|
407 | #Doing final format | |||
|
408 | return self.__FinalFormat(data1 = file, data2 = relay, data3 = status) | |||
|
409 | ||||
|
410 | def __FinalFormat(self,data1,data2,data3): | |||
|
411 | ||||
|
412 | header = "Device\tFile\tRelay\tStatus\n" | |||
|
413 | body = "" | |||
341 | for i in range(64): |
|
414 | for i in range(64): | |
342 |
if |
|
415 | if i<9: | |
343 | comp_up.append('x') |
|
416 | device = "CM0" + str(i+1) | |
344 | else: |
|
417 | else: | |
345 | if cmp(relay_up[i], cm_up[i]) == 0: |
|
418 | device = "CM" + str(i+1) | |
346 | comp_up.append('0') |
|
|||
347 | else: |
|
|||
348 | comp_up.append('1') |
|
|||
349 |
|
||||
350 | for i in range(len(relay_dw)): |
|
|||
351 | comp_dw.append('x') |
|
|||
352 | if cmp(relay_dw[i], cm_dw[i]) == 0: |
|
|||
353 | comp_dw.append('0') |
|
|||
354 | else: |
|
|||
355 | comp_dw.append('1') |
|
|||
356 |
|
419 | |||
357 | print comp_up |
|
420 | line = device + '\t' + data1[i] + '\t' + data2[i] + '\t' + data3[i] + '\n' | |
358 | print comp_dw |
|
421 | body = body + line | |
359 |
|
422 | |||
360 |
|
423 | report = header + body | ||
|
424 | ||||
|
425 | return report | |||
|
426 | ||||
361 | def __ThreeComparation(self, in_lst): |
|
427 | def __ThreeComparation(self, in_lst): | |
362 | pass |
|
428 | pass | |
363 |
|
429 | |||
@@ -508,6 +574,7 | |||||
508 | self.__writeFile(filename, ' ' + str(i + 1) + '\t\t' + tmp[2]) |
|
574 | self.__writeFile(filename, ' ' + str(i + 1) + '\t\t' + tmp[2]) | |
509 | tmp = self.phase[i].split('\n',3) |
|
575 | tmp = self.phase[i].split('\n',3) | |
510 | self.__writeFile(filename, '\t\t' + tmp[2] + '\n') |
|
576 | self.__writeFile(filename, '\t\t' + tmp[2] + '\n') | |
|
577 | ||||
511 |
|
578 | |||
512 | if __name__ == '__main__': |
|
579 | if __name__ == '__main__': | |
513 |
|
580 |
General Comments 0
You need to be logged in to leave comments.
Login now