Skip to content

Commit 08f1962

Browse files
committed
fix: formatting
fix: test build
1 parent ee675ca commit 08f1962

File tree

2 files changed

+62
-56
lines changed

2 files changed

+62
-56
lines changed

src/ir_Electrolux.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#endif
1616
#include "IRremoteESP8266.h"
1717
#include "IRsend.h"
18-
#include "map"
1918
#ifdef UNIT_TEST
2019
#include "IRsend_test.h"
2120
#endif

tools/serial_parser.py

Lines changed: 62 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,43 @@
33
import serial.tools
44
import serial.tools.list_ports
55

6+
67
def substring_after(str: str, searchStr: str):
7-
return str[str.index(searchStr) + len(searchStr):]
8+
return str[str.index(searchStr) + len(searchStr) :]
9+
810

911
def getPort():
1012
ports = sorted(serial.tools.list_ports.comports())
1113
print("Available ports to listing:")
1214
for id, portInfo in enumerate(ports):
13-
print("{}. - {}: {} [{}]".format(id, portInfo.device, portInfo.description, portInfo.hwid))
15+
print(
16+
"{}. - {}: {} [{}]".format(
17+
id, portInfo.device, portInfo.description, portInfo.hwid
18+
)
19+
)
1420
print("Select port: ", end="")
1521
selectId = int(input())
1622
if selectId < len(ports) and selectId >= 0:
17-
return ports[selectId]
23+
return ports[selectId]
1824
else:
19-
print("Unrecognized port number")
20-
return getPort()
21-
25+
print("Unrecognized port number")
26+
return getPort()
27+
28+
2229
zero = 756
2330
one = 2149
2431
space = 752
2532
interv = 0.2
2633

34+
2735
def getBitFromInterv(value: int):
28-
if(value > zero - zero * interv and value < zero + zero * interv):
29-
return 0
30-
elif(value > one - one * interv and value < one + one * interv):
31-
return 1
32-
else:
33-
return 2
36+
if value > zero - zero * interv and value < zero + zero * interv:
37+
return 0
38+
elif value > one - one * interv and value < one + one * interv:
39+
return 1
40+
else:
41+
return 2
42+
3443

3544
def bitListToInt(bitlist):
3645
out = 0
@@ -44,8 +53,8 @@ def main():
4453
print("Selected port:" + port.device)
4554

4655
ser = serial.Serial(
47-
port=port.device,
48-
baudrate=115200,
56+
port=port.device,
57+
baudrate=115200,
4958
)
5059

5160
zSum = 0
@@ -56,44 +65,42 @@ def main():
5665
sCnt = 0
5766

5867
while True:
59-
try:
60-
dataStr = ser.readline().decode()
61-
except:
62-
continue
63-
#print(dataStr)
64-
if("uint16_t rawData" in dataStr):
65-
dataStrArray = str(dataStr[dataStr.index('{') + 1:dataStr.index('}')]).split(",")
66-
data = [int(i.strip()) for i in dataStrArray]
67-
data = data[2:]
68-
clearData = [i for idi, i in enumerate(data) if idi % 2 == 1]
69-
bitData = [getBitFromInterv(i) for i in data]
70-
clearBitData = [getBitFromInterv(i) for i in clearData]
71-
72-
73-
74-
for idd, d in enumerate(data):
75-
if(idd % 2 == 0):
76-
sSum += d
77-
sCnt += 1
78-
else:
79-
if(getBitFromInterv(d) == 0):
80-
zSum += d
81-
zCnt += 1
82-
elif(getBitFromInterv(d) == 1):
83-
oSum += d
84-
oCnt += 1
85-
86-
# print("zero = " + str(zSum/zCnt) + " one = " + str(oSum/oCnt) + " space = " + str(sSum/sCnt))\
87-
88-
89-
90-
# print("Data = ", end="")
91-
# print(data)
92-
# print("0b"+ "".join([str(i) for i in bitData]))
93-
# print("ClearData = ", end="")
94-
#print(clearData)
95-
print("".join([str(i) for i in clearBitData]))
96-
97-
98-
if __name__ == '__main__':
99-
main()
68+
try:
69+
dataStr = ser.readline().decode()
70+
except:
71+
continue
72+
# print(dataStr)
73+
if "uint16_t rawData" in dataStr:
74+
dataStrArray = str(
75+
dataStr[dataStr.index("{") + 1 : dataStr.index("}")]
76+
).split(",")
77+
data = [int(i.strip()) for i in dataStrArray]
78+
data = data[2:]
79+
clearData = [i for idi, i in enumerate(data) if idi % 2 == 1]
80+
bitData = [getBitFromInterv(i) for i in data]
81+
clearBitData = [getBitFromInterv(i) for i in clearData]
82+
83+
for idd, d in enumerate(data):
84+
if idd % 2 == 0:
85+
sSum += d
86+
sCnt += 1
87+
else:
88+
if getBitFromInterv(d) == 0:
89+
zSum += d
90+
zCnt += 1
91+
elif getBitFromInterv(d) == 1:
92+
oSum += d
93+
oCnt += 1
94+
95+
# print("zero = " + str(zSum/zCnt) + " one = " + str(oSum/oCnt) + " space = " + str(sSum/sCnt))\
96+
97+
# print("Data = ", end="")
98+
# print(data)
99+
# print("0b"+ "".join([str(i) for i in bitData]))
100+
# print("ClearData = ", end="")
101+
# print(clearData)
102+
print("".join([str(i) for i in clearBitData]))
103+
104+
105+
if __name__ == "__main__":
106+
main()

0 commit comments

Comments
 (0)