Subversion Repositories HomeAutomation

Rev

Rev 826 | Rev 828 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed

Rev 826 Rev 827
Line 32... Line 32...
32
	config_inc_lines = config_inc.readlines()
32
	config_inc_lines = config_inc.readlines()
33
	config_inc.close()
33
	config_inc.close()
34
	
34
	
35
	for line in config_inc_lines:
35
	for line in config_inc_lines:
36
		line = line.strip("\n").strip(" ")
36
		line = line.strip("\n").strip(" ")
-
 
37
		
37
		if line.find(moduleName + "_ID") != -1:
38
		if line.find(moduleName + "_ID") != -1:
38
			parts = line.split("=")
39
			parts = line.split("=")
39
			return parts[1].strip(" ")
40
			return parts[1].strip(" ")
40
	
41
	
41
	return -1;
42
	return -1;
42
 
43
 
43
 
44
 
44
def getFreeModuleId(moduleName):
45
def getFreeModuleId(moduleName):
45
	takenIds = []
46
	takenIds = []
46
	
47
 
47
	for applicationName in os.listdir("../"):
48
	for applicationName in os.listdir("../"):
-
 
49
		
48
		if applicationName[0] != '.' and os.path.exists("../" + applicationName + "/config.inc"):
50
		if applicationName[0] != '.' and os.path.exists("../" + applicationName + "/config.inc"):
49
			takenId = parseModuleIdFromFile(moduleName, "../" + applicationName + "/config.inc")
51
			takenId = parseModuleIdFromFile(moduleName, "../" + applicationName + "/config.inc")
50
			
-
 
51
			if takenId != -1 and takenId != "<ID>":
52
			if takenId != -1 and takenId != "<ID>":
52
				takenIds.append(int(takenId, 16))
53
				takenIds.append(int(takenId, 16))
53
 
54
 
54
	if len(takenIds) == 0:
55
	if len(takenIds) == 0:
55
		return "0x01"
56
		return "0x01"
Line 59... Line 60...
59
	lastId = 0
60
	lastId = 0
60
 
61
 
61
	for takenId in takenIds:
62
	for takenId in takenIds:
62
		if takenId != lastId+1:
63
		if takenId != lastId+1:
63
			return hex(lastId+1)
64
			return hex(lastId+1)
-
 
65
		lastId = takenId
64
 
66
 
65
	return hex(lastId+1)
67
	return hex(lastId+1)
66
	
68
	
67
 
69
 
68
def compileMainFile():
70
def compileMainFile():