Skip to content

Commit 9c9686c

Browse files
committed
removed sData
ouput dictionary
1 parent ff96c93 commit 9c9686c

File tree

4 files changed

+20
-49
lines changed

4 files changed

+20
-49
lines changed

SimConnect/SimConnect.py

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ def millis():
1919
return int(round(time.time() * 1000))
2020

2121

22-
class sData(dict):
23-
__getattr__ = dict.__getitem__
24-
__setattr__ = dict.__setitem__
25-
__delattr__ = dict.__delitem__
26-
27-
2822
class Request:
2923
def __init__(
3024
self,
@@ -1120,22 +1114,12 @@ def set_data(self, _Request, _data):
11201114
pObjData
11211115
)
11221116

1123-
def get_data(self, _Request, _format=False):
1117+
def get_data(self, _Request):
11241118
if self.out_data[_Request.DATA_REQUEST_ID] is None:
11251119
return None
1126-
if _format:
1127-
map = {}
1128-
else:
1129-
map = sData
1120+
map = {}
11301121
for od in _Request.outData:
1131-
if _format:
1132-
map[od] = self.out_data[_Request.DATA_REQUEST_ID][_Request.outData[od]]
1133-
else:
1134-
setattr(
1135-
sData,
1136-
od,
1137-
self.out_data[_Request.DATA_REQUEST_ID][_Request.outData[od]],
1138-
)
1122+
map[od] = self.out_data[_Request.DATA_REQUEST_ID][_Request.outData[od]]
11391123
return map
11401124

11411125
def send_event(self, evnt, data=DWORD(0)):

flask_server.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
sm = SimConnect()
1111

1212
# create Request
13-
myRequest = sm.new_request(time=2000) # set auto data collection time @ 2s
13+
myRequest = sm.new_request()
1414

1515
# add required definitions output data name, definition from SDK
1616
myRequest.add('Altitude', (b'Plane Altitude', b'feet'))
@@ -224,11 +224,10 @@ def json_add_data():
224224

225225
attempts = 0
226226
data = None
227-
227+
sm.request_data(myRequest)
228228
while data is None and attempts < 20:
229-
sm.RequestData(myRequest)
230-
sm.Run()
231-
data = sm.GetData(myRequest, True)
229+
sm.run()
230+
data = sm.get_data(myRequest)
232231
if data is None:
233232
sleep(0.5)
234233
attempts = attempts + 1

local_example.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,25 +67,25 @@
6767
data = sm.get_data(myRequest)
6868
if data is not None:
6969
print("Lat=%f Lon=%f Alt=%f Kohlsman=%.2f" % (
70-
data.Latitude,
71-
data.Longitude,
72-
data.Altitude,
73-
data.Kohlsman
70+
data["Latitude"],
71+
data["Longitude"],
72+
data["Altitude"],
73+
data["Kohlsman"]
7474
))
7575

7676
# check for data from myRequest2
7777
data = sm.get_data(myRequest2)
7878
if data is not None:
7979
print("Alt=%f GEAR=%d" % (
80-
data.ALTITUDE,
81-
data.GEAR
80+
data["ALTITUDE"],
81+
data["GEAR"]
8282
))
8383

8484
# check for data from THROTTLERequest
8585
data = sm.get_data(THROTTLERequest)
8686
if data is not None:
8787
print("THROTTLE: %f" % (
88-
data.THROTTLE
88+
data["THROTTLE"]
8989
))
9090

9191
sm.exit()

reporter.py

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,21 @@
66

77
# create Request
88
myRequest = sm.new_request(time=2000) # set auto data collection time @ 2s
9-
109
# add required definitions output data name, definition from SDK
1110
myRequest.add('Altitude', (b'Plane Altitude', b'feet'))
1211
myRequest.add('Latitude', (b'Plane Latitude', b'degrees'))
1312
myRequest.add('Longitude', (b'Plane Longitude', b'degrees'))
1413
myRequest.add('Kohlsman', (b'Kohlsman setting hg', b'inHg'))
1514

1615
while 1:
17-
sm.RequestData(myRequest)
18-
sm.Run()
19-
data = sm.GetData(myRequest)
20-
21-
16+
sm.request_data(myRequest)
17+
sm.run()
2218

19+
data = sm.get_data(myRequest)
2320
if data is not None:
24-
25-
data_dictionary = {
26-
"Altitude": data.Altitude,
27-
"Latitude": data.Latitude,
28-
"Longitude": data.Longitude,
29-
"Kohlsman": data.Kohlsman
30-
}
31-
32-
print (data_dictionary)
21+
print(data)
3322
else:
34-
print ("Data is none")
35-
36-
sleep (1)
23+
print("Data is none")
3724

25+
sleep(1)
3826
sm.Exit()

0 commit comments

Comments
 (0)