Skip to content

Commit 6979df3

Browse files
luoweiyuanhlym123
luoweiyuan
authored and
hlym123
committed
startup: Rename access code state variables.
Signed-off-by: luoweiyuan <luoweiyuan@m5stack.com> Signed-off-by: hlym123 <lwylwt@qq.com>
1 parent 7bbb829 commit 6979df3

20 files changed

Lines changed: 202 additions & 202 deletions

File tree

‎m5stack/modules/startup/basic/apps/dev.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ def on_view(self):
8888
self._nick_label, self._nick_value = self._create_row("Nickname:", 110)
8989

9090
self._set_value(self._mac_value, self._state.get("mac", "-"))
91-
self._set_value(self._code_value, self._state.get("pair_code", ""), fallback="")
91+
self._set_value(self._code_value, self._state.get("access_code", ""), fallback="")
9292
self._set_value(self._nick_value, self._state.get("nick_name", ""), fallback="")
93-
print_access_info(self._state.get("nick_name", ""), self._state.get("pair_code", ""))
93+
print_access_info(self._state.get("nick_name", ""), self._state.get("access_code", ""))
9494

9595
self._bar_img = widgets.Image(use_sprite=False)
9696
self._bar_img.set_pos(0, self._origin_y + 164)
@@ -130,15 +130,15 @@ async def on_run(self):
130130
while True:
131131
new_state = self._collect_state()
132132

133-
if new_state["pair_code"] != self._state.get("pair_code"):
134-
self._state["pair_code"] = new_state["pair_code"]
135-
self._set_value(self._code_value, new_state["pair_code"], fallback="")
136-
print_access_info(self._state.get("nick_name", ""), new_state["pair_code"])
133+
if new_state["access_code"] != self._state.get("access_code"):
134+
self._state["access_code"] = new_state["access_code"]
135+
self._set_value(self._code_value, new_state["access_code"], fallback="")
136+
print_access_info(self._state.get("nick_name", ""), new_state["access_code"])
137137

138138
if new_state["nick_name"] != self._state.get("nick_name"):
139139
self._state["nick_name"] = new_state["nick_name"]
140140
self._set_value(self._nick_value, new_state["nick_name"], fallback="")
141-
print_access_info(new_state["nick_name"], self._state.get("pair_code", ""))
141+
print_access_info(new_state["nick_name"], self._state.get("access_code", ""))
142142

143143
t = self._get_bar_src()
144144
if t != self._status_bar_src:
@@ -250,7 +250,7 @@ def _get_mac():
250250
return binascii.hexlify(machine.unique_id()).decode("utf-8").upper()
251251

252252
@staticmethod
253-
def _get_pair_code():
253+
def _get_access_code():
254254
if _HAS_SERVER is True:
255255
try:
256256
if M5Things.status() == 2:
@@ -272,7 +272,7 @@ def _get_nick_name():
272272
def _collect_state(self):
273273
return {
274274
"mac": self._get_mac(),
275-
"pair_code": self._get_pair_code(),
275+
"access_code": self._get_access_code(),
276276
"nick_name": self._get_nick_name(),
277277
}
278278

‎m5stack/modules/startup/cardputer/apps/dev.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ def on_view(self):
7575
self._nick_label, self._nick_value = self._create_row("Nickname:", _ROW_NICK_Y)
7676

7777
self._set_value(self._mac_value, self._state.get("mac", "-"))
78-
self._set_value(self._code_value, self._state.get("pair_code", ""), fallback="")
78+
self._set_value(self._code_value, self._state.get("access_code", ""), fallback="")
7979
self._set_value(self._nick_value, self._state.get("nick_name", ""), fallback="")
80-
print_access_info(self._state.get("nick_name", ""), self._state.get("pair_code", ""))
80+
print_access_info(self._state.get("nick_name", ""), self._state.get("access_code", ""))
8181

8282
def on_ready(self):
8383
super().on_ready()
@@ -90,15 +90,15 @@ async def on_run(self):
9090
self._state["status_src"] = new_state["status_src"]
9191
self._status_img.set_src(new_state["status_src"])
9292

93-
if new_state["pair_code"] != self._state.get("pair_code"):
94-
self._state["pair_code"] = new_state["pair_code"]
95-
self._set_value(self._code_value, new_state["pair_code"], fallback="")
96-
print_access_info(self._state.get("nick_name", ""), new_state["pair_code"])
93+
if new_state["access_code"] != self._state.get("access_code"):
94+
self._state["access_code"] = new_state["access_code"]
95+
self._set_value(self._code_value, new_state["access_code"], fallback="")
96+
print_access_info(self._state.get("nick_name", ""), new_state["access_code"])
9797

9898
if new_state["nick_name"] != self._state.get("nick_name"):
9999
self._state["nick_name"] = new_state["nick_name"]
100100
self._set_value(self._nick_value, new_state["nick_name"], fallback="")
101-
print_access_info(new_state["nick_name"], self._state.get("pair_code", ""))
101+
print_access_info(new_state["nick_name"], self._state.get("access_code", ""))
102102

103103
await asyncio.sleep_ms(1500)
104104

@@ -157,7 +157,7 @@ def _get_status_src():
157157
return res.DEVELOP_OFFLINE_IMG
158158

159159
@staticmethod
160-
def _get_pair_code():
160+
def _get_access_code():
161161
if _HAS_SERVER is True:
162162
try:
163163
if M5Things.status() == 2:
@@ -180,6 +180,6 @@ def _collect_state(self):
180180
return {
181181
"mac": self._get_mac(),
182182
"status_src": self._get_status_src(),
183-
"pair_code": self._get_pair_code(),
183+
"access_code": self._get_access_code(),
184184
"nick_name": self._get_nick_name(),
185185
}

‎m5stack/modules/startup/cardputeradv/apps/dev.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def on_view(self):
7676
self._nick_label, self._nick_value = self._create_row("Nickname", 101)
7777

7878
self._set_value(self._mac_value, self._state.get("mac", "-"))
79-
self._set_value(self._code_value, self._state.get("pair_code", ""), fallback="")
79+
self._set_value(self._code_value, self._state.get("access_code", ""), fallback="")
8080
self._set_value(self._nick_value, self._state.get("nick_name", "-"))
8181

8282
def on_ready(self):
@@ -90,10 +90,10 @@ async def on_run(self):
9090
self._state["status_src"] = new_state["status_src"]
9191
self._status_img.set_src(new_state["status_src"])
9292

93-
if new_state["pair_code"] != self._state.get("pair_code"):
94-
self._state["pair_code"] = new_state["pair_code"]
95-
self._set_value(self._code_value, new_state["pair_code"], fallback="")
96-
print_access_info(self._state.get("nick_name", ""), new_state["pair_code"])
93+
if new_state["access_code"] != self._state.get("access_code"):
94+
self._state["access_code"] = new_state["access_code"]
95+
self._set_value(self._code_value, new_state["access_code"], fallback="")
96+
print_access_info(self._state.get("nick_name", ""), new_state["access_code"])
9797

9898
if new_state["nick_name"] != self._state.get("nick_name"):
9999
self._state["nick_name"] = new_state["nick_name"]
@@ -156,7 +156,7 @@ def _get_status_src():
156156
return res.DEVELOP_OFFLINE_IMG
157157

158158
@staticmethod
159-
def _get_pair_code():
159+
def _get_access_code():
160160
if _HAS_SERVER is True:
161161
try:
162162
if M5Things.status() == 2:
@@ -179,6 +179,6 @@ def _collect_state(self):
179179
return {
180180
"mac": self._get_mac(),
181181
"status_src": self._get_status_src(),
182-
"pair_code": self._get_pair_code(),
182+
"access_code": self._get_access_code(),
183183
"nick_name": self._get_nick_name(),
184184
}

‎m5stack/modules/startup/core2/apps/dev.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ def on_view(self):
7272
self._nick_label, self._nick_value = self._create_row("Nickname:", 110)
7373

7474
self._set_value(self._mac_value, self._state.get("mac", "-"))
75-
self._set_value(self._code_value, self._state.get("pair_code", ""), fallback="")
75+
self._set_value(self._code_value, self._state.get("access_code", ""), fallback="")
7676
self._set_value(self._nick_value, self._state.get("nick_name", ""), fallback="")
77-
print_access_info(self._state.get("nick_name", ""), self._state.get("pair_code", ""))
77+
print_access_info(self._state.get("nick_name", ""), self._state.get("access_code", ""))
7878

7979
self._lcd.push(self._origin_x, self._origin_y)
8080

@@ -83,16 +83,16 @@ async def on_run(self):
8383
new_state = self._collect_state()
8484
refresh = False
8585

86-
if new_state["pair_code"] != self._state.get("pair_code"):
87-
self._state["pair_code"] = new_state["pair_code"]
88-
self._set_value(self._code_value, new_state["pair_code"], fallback="")
89-
print_access_info(self._state.get("nick_name", ""), new_state["pair_code"])
86+
if new_state["access_code"] != self._state.get("access_code"):
87+
self._state["access_code"] = new_state["access_code"]
88+
self._set_value(self._code_value, new_state["access_code"], fallback="")
89+
print_access_info(self._state.get("nick_name", ""), new_state["access_code"])
9090
refresh = True
9191

9292
if new_state["nick_name"] != self._state.get("nick_name"):
9393
self._state["nick_name"] = new_state["nick_name"]
9494
self._set_value(self._nick_value, new_state["nick_name"], fallback="")
95-
print_access_info(new_state["nick_name"], self._state.get("pair_code", ""))
95+
print_access_info(new_state["nick_name"], self._state.get("access_code", ""))
9696
refresh = True
9797

9898
if refresh:
@@ -165,7 +165,7 @@ def _get_mac():
165165
return binascii.hexlify(machine.unique_id()).decode("utf-8").upper()
166166

167167
@staticmethod
168-
def _get_pair_code():
168+
def _get_access_code():
169169
if _HAS_SERVER is True:
170170
try:
171171
if M5Things.status() == 2:
@@ -187,6 +187,6 @@ def _get_nick_name():
187187
def _collect_state(self):
188188
return {
189189
"mac": self._get_mac(),
190-
"pair_code": self._get_pair_code(),
190+
"access_code": self._get_access_code(),
191191
"nick_name": self._get_nick_name(),
192192
}

‎m5stack/modules/startup/cores3/apps/dev.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ def on_view(self):
7272
self._nick_label, self._nick_value = self._create_row("Nickname:", 110)
7373

7474
self._set_value(self._mac_value, self._state.get("mac", "-"))
75-
self._set_value(self._code_value, self._state.get("pair_code", ""), fallback="")
75+
self._set_value(self._code_value, self._state.get("access_code", ""), fallback="")
7676
self._set_value(self._nick_value, self._state.get("nick_name", ""), fallback="")
77-
print_access_info(self._state.get("nick_name", ""), self._state.get("pair_code", ""))
77+
print_access_info(self._state.get("nick_name", ""), self._state.get("access_code", ""))
7878

7979
self._lcd.push(self._origin_x, self._origin_y)
8080

@@ -83,16 +83,16 @@ async def on_run(self):
8383
new_state = self._collect_state()
8484
refresh = False
8585

86-
if new_state["pair_code"] != self._state.get("pair_code"):
87-
self._state["pair_code"] = new_state["pair_code"]
88-
self._set_value(self._code_value, new_state["pair_code"], fallback="")
89-
print_access_info(self._state.get("nick_name", ""), new_state["pair_code"])
86+
if new_state["access_code"] != self._state.get("access_code"):
87+
self._state["access_code"] = new_state["access_code"]
88+
self._set_value(self._code_value, new_state["access_code"], fallback="")
89+
print_access_info(self._state.get("nick_name", ""), new_state["access_code"])
9090
refresh = True
9191

9292
if new_state["nick_name"] != self._state.get("nick_name"):
9393
self._state["nick_name"] = new_state["nick_name"]
9494
self._set_value(self._nick_value, new_state["nick_name"], fallback="")
95-
print_access_info(new_state["nick_name"], self._state.get("pair_code", ""))
95+
print_access_info(new_state["nick_name"], self._state.get("access_code", ""))
9696
refresh = True
9797

9898
if refresh:
@@ -165,7 +165,7 @@ def _get_mac():
165165
return binascii.hexlify(machine.unique_id()).decode("utf-8").upper()
166166

167167
@staticmethod
168-
def _get_pair_code():
168+
def _get_access_code():
169169
if _HAS_SERVER is True:
170170
try:
171171
if M5Things.status() == 2:
@@ -187,6 +187,6 @@ def _get_nick_name():
187187
def _collect_state(self):
188188
return {
189189
"mac": self._get_mac(),
190-
"pair_code": self._get_pair_code(),
190+
"access_code": self._get_access_code(),
191191
"nick_name": self._get_nick_name(),
192192
}

‎m5stack/modules/startup/dial/apps/dev.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ async def on_run(self):
169169
self._draw_page_bg(self._bg_src)
170170
refresh = True
171171

172-
for key in ("server", "mac", "nick_name", "pair_code"):
172+
for key in ("server", "mac", "nick_name", "access_code"):
173173
if new_state[key] != self._state.get(key):
174174
self._state[key] = new_state[key]
175175
refresh = True
@@ -206,12 +206,12 @@ def _redraw_labels(self):
206206
self._access_label.set_text("Access code:")
207207
self._set_value(
208208
self._code_value_label,
209-
self._state.get("pair_code", ""),
209+
self._state.get("access_code", ""),
210210
fallback="",
211211
)
212212
self._nick_title_label.set_text("Nickname:")
213213
self._set_value(self._nick_value_label, self._state.get("nick_name", ""), fallback="")
214-
print_access_info(self._state.get("nick_name", ""), self._state.get("pair_code", ""))
214+
print_access_info(self._state.get("nick_name", ""), self._state.get("access_code", ""))
215215

216216
def _refresh_status_bar(self):
217217
if not hasattr(self, "_status_bar"):
@@ -266,7 +266,7 @@ def _collect_state(self):
266266
"server": self._get_server(),
267267
"mac": self._get_mac(),
268268
"nick_name": self._get_nick_name(),
269-
"pair_code": self._get_access_code(),
269+
"access_code": self._get_access_code(),
270270
}
271271

272272
def _is_wifi_connected(self):

‎m5stack/modules/startup/dinmeter/apps/dev.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ def on_view(self):
7575
self._nick_label, self._nick_value = self._create_row("Nickname:", _ROW_NICK_Y)
7676

7777
self._set_value(self._mac_value, self._state.get("mac", "-"))
78-
self._set_value(self._code_value, self._state.get("pair_code", ""), fallback="")
78+
self._set_value(self._code_value, self._state.get("access_code", ""), fallback="")
7979
self._set_value(self._nick_value, self._state.get("nick_name", ""), fallback="")
80-
print_access_info(self._state.get("nick_name", ""), self._state.get("pair_code", ""))
80+
print_access_info(self._state.get("nick_name", ""), self._state.get("access_code", ""))
8181

8282
def on_ready(self):
8383
super().on_ready()
@@ -90,17 +90,17 @@ async def on_run(self):
9090
self._state["status_src"] = new_state["status_src"]
9191
self._status_img.set_src(new_state["status_src"])
9292

93-
if new_state["pair_code"] != self._state.get("pair_code"):
94-
self._state["pair_code"] = new_state["pair_code"]
95-
self._set_value(self._code_value, new_state["pair_code"], fallback="")
96-
print_access_info(self._state.get("nick_name", ""), new_state["pair_code"])
93+
if new_state["access_code"] != self._state.get("access_code"):
94+
self._state["access_code"] = new_state["access_code"]
95+
self._set_value(self._code_value, new_state["access_code"], fallback="")
96+
print_access_info(self._state.get("nick_name", ""), new_state["access_code"])
9797
self._nick_label.set_text("Nickname:")
9898
self._set_value(self._nick_value, self._state.get("nick_name", ""), fallback="")
9999

100100
if new_state["nick_name"] != self._state.get("nick_name"):
101101
self._state["nick_name"] = new_state["nick_name"]
102102
self._set_value(self._nick_value, new_state["nick_name"], fallback="")
103-
print_access_info(new_state["nick_name"], self._state.get("pair_code", ""))
103+
print_access_info(new_state["nick_name"], self._state.get("access_code", ""))
104104

105105
await asyncio.sleep_ms(1500)
106106

@@ -159,7 +159,7 @@ def _get_status_src():
159159
return res.DEVELOP_OFFLINE_IMG
160160

161161
@staticmethod
162-
def _get_pair_code():
162+
def _get_access_code():
163163
if _HAS_SERVER is True:
164164
try:
165165
if M5Things.status() == 2:
@@ -182,6 +182,6 @@ def _collect_state(self):
182182
return {
183183
"mac": self._get_mac(),
184184
"status_src": self._get_status_src(),
185-
"pair_code": self._get_pair_code(),
185+
"access_code": self._get_access_code(),
186186
"nick_name": self._get_nick_name(),
187187
}

‎m5stack/modules/startup/fire/apps/dev.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ def on_view(self):
9494
self._nick_label, self._nick_value = self._create_row("Nickname:", 110)
9595

9696
self._set_value(self._mac_value, self._state.get("mac", "-"))
97-
self._set_value(self._code_value, self._state.get("pair_code", ""), fallback="")
97+
self._set_value(self._code_value, self._state.get("access_code", ""), fallback="")
9898
self._set_value(self._nick_value, self._state.get("nick_name", ""), fallback="")
99-
print_access_info(self._state.get("nick_name", ""), self._state.get("pair_code", ""))
99+
print_access_info(self._state.get("nick_name", ""), self._state.get("access_code", ""))
100100

101101
self._bar_img = widgets.Image(use_sprite=False, parent=self._lcd)
102102
self._bar_img.set_pos(0, 164)
@@ -138,16 +138,16 @@ async def on_run(self):
138138
while True:
139139
new_state = self._collect_state()
140140

141-
if new_state["pair_code"] != self._state.get("pair_code"):
142-
self._state["pair_code"] = new_state["pair_code"]
143-
self._set_value(self._code_value, new_state["pair_code"], fallback="")
144-
print_access_info(self._state.get("nick_name", ""), new_state["pair_code"])
141+
if new_state["access_code"] != self._state.get("access_code"):
142+
self._state["access_code"] = new_state["access_code"]
143+
self._set_value(self._code_value, new_state["access_code"], fallback="")
144+
print_access_info(self._state.get("nick_name", ""), new_state["access_code"])
145145
refresh_bg = True
146146

147147
if new_state["nick_name"] != self._state.get("nick_name"):
148148
self._state["nick_name"] = new_state["nick_name"]
149149
self._set_value(self._nick_value, new_state["nick_name"], fallback="")
150-
print_access_info(new_state["nick_name"], self._state.get("pair_code", ""))
150+
print_access_info(new_state["nick_name"], self._state.get("access_code", ""))
151151
refresh_bg = True
152152

153153
t = self._get_bar_src()
@@ -246,7 +246,7 @@ def _get_mac():
246246
return binascii.hexlify(machine.unique_id()).decode("utf-8").upper()
247247

248248
@staticmethod
249-
def _get_pair_code():
249+
def _get_access_code():
250250
if _HAS_SERVER is True:
251251
try:
252252
if M5Things.status() == 2:
@@ -268,7 +268,7 @@ def _get_nick_name():
268268
def _collect_state(self):
269269
return {
270270
"mac": self._get_mac(),
271-
"pair_code": self._get_pair_code(),
271+
"access_code": self._get_access_code(),
272272
"nick_name": self._get_nick_name(),
273273
}
274274

0 commit comments

Comments
 (0)