Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a24d4e5

Browse files
committed
JK: fix
1 parent 8076bca commit a24d4e5

File tree

4 files changed

+38
-23
lines changed

4 files changed

+38
-23
lines changed

.vscode/launch.json

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,34 @@
55
"version": "0.2.0",
66
"configurations": [
77
{
8-
"name": "Python Debugger: main.py",
8+
"name": "Raspberry - Python Debugger: main.py",
99
"type": "debugpy",
1010
"request": "launch",
1111
"program": "main.py",
1212
"console": "integratedTerminal",
1313
"sudo": true,
1414
},
1515
{
16-
"name": "Python Debugger: Current File",
16+
"name": "Raspberry - Python Debugger: Current File",
1717
"type": "debugpy",
1818
"request": "launch",
1919
"program": "${file}",
2020
"console": "integratedTerminal",
2121
"sudo": true,
22+
},
23+
{
24+
"name": "Windows - Python Debugger: main.py",
25+
"type": "debugpy",
26+
"request": "launch",
27+
"program": "main.py",
28+
"console": "integratedTerminal",
29+
},
30+
{
31+
"name": "Windows - Python Debugger: Current File",
32+
"type": "debugpy",
33+
"request": "launch",
34+
"program": "${file}",
35+
"console": "integratedTerminal",
2236
}
2337
]
2438
}

Advertiser/AdvertiserMicroPython.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
except ImportError as err:
1515
print(err)
1616

17-
class AdvertiserMicoPython(Advertiser) :
17+
class AdvertiserMicroPython(Advertiser) :
1818
"""
1919
Advertiser using bluetooth library from MicroPython
2020
"""

consoletest.py

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,26 @@
22

33
# to run: python -i consoletest.py
44

5-
try:
6-
from Tracer.Tracer import Tracer
7-
from Tracer.TracerConsole import TracerConsole
5+
print('consoletest')
86

9-
from Advertiser.AdvertiserHCITool import AdvertiserHCITool
10-
from Advertiser.AdvertiserBluez import AdvertiserBluez
11-
12-
from MouldKing.MouldKing import MouldKing
13-
except ImportError:
14-
from Tracer import Tracer
15-
from TracerConsole import TracerConsole
7+
import sys
8+
import time
169

17-
from AdvertiserHCITool import AdvertiserHCITool
18-
from AdvertiserBluez import AdvertiserBluez
10+
sys.path.append("Tracer")
11+
from Tracer.Tracer import Tracer
12+
from Tracer.TracerConsole import TracerConsole
1913

20-
from MouldKing import MouldKing
14+
sys.path.append("Advertiser")
15+
#from Advertiser.AdvertiserHCITool import AdvertiserHCITool
16+
#from Advertiser.AdvertiserBluez import AdvertiserBluez
17+
#from Advertiser.AdvertiserDBus import AdvertiserDBus
18+
from Advertiser.AdvertiserMicroPython import AdvertiserMicroPython
2119

22-
import time
23-
import numpy as np
20+
sys.path.append("MouldKing")
21+
from MouldKing.MouldKing import MouldKing
22+
from MouldKing.Module6_0 import Module6_0
23+
from MouldKing.MouldKingCrypt import MouldKingCrypt
24+
from MouldKing.MouldKing_6 import MouldKing_6
2425

2526
# instantiate Advertiser
2627
tracer = TracerConsole()
@@ -29,8 +30,9 @@
2930
MouldKing.Module6_0.SetTracer(tracer)
3031

3132
# Set Advertiser for all MouldKing Hubs 6.0
32-
# advertiser = MouldKing.Module6_0.SetAdvertiser(AdvertiserHCITool())
33-
advertiser = MouldKing.Module6_0.SetAdvertiser(AdvertiserBluez())
33+
#advertiser = MouldKing.Module6_0.SetAdvertiser(AdvertiserHCITool())
34+
#advertiser = MouldKing.Module6_0.SetAdvertiser(AdvertiserBluez())
35+
advertiser = MouldKing.Module6_0.SetAdvertiser(AdvertiserMicroPython())
3436

3537
# save pre-instantiated objects in local variables
3638
hub0 = MouldKing.Module6_0.Device0

main.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import sys
66
import time
7-
#import threading
87

98
sys.path.append("Tracer")
109
from Tracer.Tracer import Tracer
@@ -14,7 +13,7 @@
1413
#from Advertiser.AdvertiserHCITool import AdvertiserHCITool
1514
#from Advertiser.AdvertiserBluez import AdvertiserBluez
1615
#from Advertiser.AdvertiserDBus import AdvertiserDBus
17-
from Advertiser.AdvertiserMicroPython import AdvertiserMicoPython
16+
from Advertiser.AdvertiserMicroPython import AdvertiserMicroPython
1817

1918
sys.path.append("MouldKing")
2019
from MouldKing.MouldKing import MouldKing
@@ -32,7 +31,7 @@
3231
#advertiser = MouldKing.Module6_0.SetAdvertiser(AdvertiserHCITool())
3332
#advertiser = MouldKing.Module6_0.SetAdvertiser(AdvertiserBluez())
3433
#advertiser = MouldKing.Module6_0.SetAdvertiser(AdvertiserDBus())
35-
advertiser = MouldKing.Module6_0.SetAdvertiser(AdvertiserMicoPython())
34+
advertiser = MouldKing.Module6_0.SetAdvertiser(AdvertiserMicroPython())
3635

3736
# save pre-instantiated objects in local variables
3837
mk6_0 = MouldKing.Module6_0.Device0

0 commit comments

Comments
 (0)