Skip to content

Commit 15154a7

Browse files
idolpxidolpx
committed
change qrManager back to global
1 parent e1ab7fa commit 15154a7

File tree

6 files changed

+42
-42
lines changed

6 files changed

+42
-42
lines changed

‎lib/device/iwm/fuji.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1551,7 +1551,7 @@ void iwmFuji::iwm_ctrl_qrcode_input()
15511551
Debug_printf("FUJI: QRCODE INPUT (len: %d)\n", data_len);
15521552
std::vector<uint8_t> data(data_len, 0);
15531553
std::copy(&data_buffer[0], &data_buffer[0] + data_len, data.begin());
1554-
_qrManager.data += std::string((const char *)data.data(), data_len);
1554+
qrManager.data += std::string((const char *)data.data(), data_len);
15551555
}
15561556

15571557
void iwmFuji::iwm_ctrl_qrcode_encode()
@@ -1563,32 +1563,32 @@ void iwmFuji::iwm_ctrl_qrcode_encode()
15631563
Debug_printf("FUJI: QRCODE ENCODE\n");
15641564
Debug_printf("QR Version: %d, ECC: %d, Shorten: %s\n", version, ecc_mode, shorten ? "Y" : "N");
15651565

1566-
std::string url = _qrManager.data;
1566+
std::string url = qrManager.data;
15671567

15681568
if (shorten) {
15691569
url = fnHTTPD.shorten_url(url);
15701570
}
15711571

1572-
_qrManager.version(version);
1573-
_qrManager.ecc((qr_ecc_t)ecc_mode);
1574-
_qrManager.output_mode = QR_OUTPUT_MODE_BINARY;
1575-
_qrManager.encode();
1572+
qrManager.version(version);
1573+
qrManager.ecc((qr_ecc_t)ecc_mode);
1574+
qrManager.output_mode = QR_OUTPUT_MODE_BINARY;
1575+
qrManager.encode();
15761576

1577-
_qrManager.data.clear();
1577+
qrManager.data.clear();
15781578

1579-
if (!_qrManager.code.size())
1579+
if (!qrManager.code.size())
15801580
{
15811581
Debug_printf("QR code encoding failed\n");
15821582
return;
15831583
}
15841584

1585-
Debug_printf("Resulting QR code is: %u modules\n", _qrManager.code.size());
1585+
Debug_printf("Resulting QR code is: %u modules\n", qrManager.code.size());
15861586
}
15871587

15881588
void iwmFuji::iwm_stat_qrcode_length()
15891589
{
15901590
Debug_printf("FUJI: QRCODE LENGTH\n");
1591-
size_t len = _qrManager.code.size();
1591+
size_t len = qrManager.code.size();
15921592
data_buffer[0] = (uint8_t)(len >> 0);
15931593
data_buffer[1] = (uint8_t)(len >> 8);
15941594
data_len = 2;
@@ -1601,11 +1601,11 @@ void iwmFuji::iwm_ctrl_qrcode_output()
16011601
uint8_t output_mode = data_buffer[0];
16021602
Debug_printf("Output mode: %i\n", output_mode);
16031603

1604-
size_t len = _qrManager.code.size();
1604+
size_t len = qrManager.code.size();
16051605

1606-
if (len && (output_mode != _qrManager.output_mode)) {
1607-
_qrManager.output_mode = (ouput_mode_t)output_mode;
1608-
_qrManager.encode();
1606+
if (len && (output_mode != qrManager.output_mode)) {
1607+
qrManager.output_mode = (ouput_mode_t)output_mode;
1608+
qrManager.encode();
16091609
}
16101610
}
16111611

@@ -1614,11 +1614,11 @@ void iwmFuji::iwm_stat_qrcode_output()
16141614
Debug_printf("FUJI: QRCODE OUTPUT STAT\n");
16151615
memset(data_buffer, 0, sizeof(data_buffer));
16161616

1617-
data_len = _qrManager.code.size();
1618-
memcpy(data_buffer, &_qrManager.code[0], data_len);
1617+
data_len = qrManager.code.size();
1618+
memcpy(data_buffer, &qrManager.code[0], data_len);
16191619

1620-
_qrManager.code.clear();
1621-
_qrManager.code.shrink_to_fit();
1620+
qrManager.code.clear();
1621+
qrManager.code.shrink_to_fit();
16221622
}
16231623

16241624
#endif /* BUILD_APPLE */

‎lib/device/iwm/fuji.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ class iwmFuji : public iwmDevice
145145
Hash::Algorithm algorithm = Hash::Algorithm::UNKNOWN;
146146
bool hash_is_hex_output = false;
147147

148-
QRManager _qrManager = QRManager();
149-
150148
protected:
151149
void iwm_dummy_command(); // control 0xAA
152150
void iwm_hello_world(); // status 0xAA

‎lib/device/sio/fuji.cpp‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
sioFuji theFuji; // global fuji device object
4545

46-
//QRManager sioFuji::_qrManager = QRManager();
46+
//QRManager sioFuji::qrManager = QRManager();
4747

4848
#ifdef ESP_PLATFORM
4949
std::unique_ptr<sioNetwork, PSRAMDeleter<sioNetwork>> sioNetDevs[MAX_NETWORK_DEVICES];
@@ -2203,7 +2203,7 @@ void sioFuji::sio_qrcode_input()
22032203

22042204
std::vector<unsigned char> p(len);
22052205
bus_to_peripheral(p.data(), len);
2206-
_qrManager.data += std::string((const char *)p.data(), len);
2206+
qrManager.data += std::string((const char *)p.data(), len);
22072207
sio_complete();
22082208
}
22092209

@@ -2217,27 +2217,27 @@ void sioFuji::sio_qrcode_encode()
22172217
Debug_printf("FUJI: QRCODE ENCODE\n");
22182218
Debug_printf("QR Version: %d, ECC: %d, Shorten: %s\n", version, ecc_mode, shorten ? "Y" : "N");
22192219

2220-
std::string url = _qrManager.data;
2220+
std::string url = qrManager.data;
22212221

22222222
if (shorten) {
22232223
url = fnHTTPD.shorten_url(url);
22242224
}
22252225

2226-
_qrManager.version(version);
2227-
_qrManager.ecc((qr_ecc_t)ecc_mode);
2228-
_qrManager.output_mode = QR_OUTPUT_MODE_ATASCII;
2229-
_qrManager.encode();
2226+
qrManager.version(version);
2227+
qrManager.ecc((qr_ecc_t)ecc_mode);
2228+
qrManager.output_mode = QR_OUTPUT_MODE_ATASCII;
2229+
qrManager.encode();
22302230

2231-
_qrManager.data.clear();
2231+
qrManager.data.clear();
22322232

2233-
if (!_qrManager.code.size())
2233+
if (!qrManager.code.size())
22342234
{
22352235
Debug_printf("QR code encoding failed\n");
22362236
sio_error();
22372237
return;
22382238
}
22392239

2240-
Debug_printf("Resulting QR code is: %u modules\n", _qrManager.code.size());
2240+
Debug_printf("Resulting QR code is: %u modules\n", qrManager.code.size());
22412241
sio_complete();
22422242
}
22432243

@@ -2247,15 +2247,15 @@ void sioFuji::sio_qrcode_length()
22472247
uint8_t output_mode = sio_get_aux();
22482248
Debug_printf("Output mode: %i\n", output_mode);
22492249

2250-
size_t len = _qrManager.size();
2250+
size_t len = qrManager.size();
22512251

22522252
// A bit gross to have a side effect from length command, but not enough aux bytes
22532253
// to specify version, ecc, *and* output mode for the encode command. Also can't
22542254
// just wait for output command, because output mode determines buffer length,
2255-
if (len && (output_mode != _qrManager.output_mode)) {
2256-
_qrManager.output_mode = (ouput_mode_t)output_mode;
2257-
_qrManager.encode();
2258-
len = _qrManager.code.size();
2255+
if (len && (output_mode != qrManager.output_mode)) {
2256+
qrManager.output_mode = (ouput_mode_t)output_mode;
2257+
qrManager.encode();
2258+
len = qrManager.code.size();
22592259
}
22602260

22612261
uint8_t response[4] = {
@@ -2287,20 +2287,20 @@ void sioFuji::sio_qrcode_output()
22872287
Debug_printf("Refusing to send a zero byte buffer. Aborting\n");
22882288
return;
22892289
}
2290-
else if (len > _qrManager.size())
2290+
else if (len > qrManager.size())
22912291
{
2292-
Debug_printf("Requested %u bytes, but buffer is only %u bytes, aborting.\n", len, _qrManager.code.size());
2292+
Debug_printf("Requested %u bytes, but buffer is only %u bytes, aborting.\n", len, qrManager.code.size());
22932293
return;
22942294
}
22952295
else
22962296
{
22972297
Debug_printf("Requested %u bytes\n", len);
22982298
}
22992299

2300-
bus_to_computer(&_qrManager.code[0], len, false);
2300+
bus_to_computer(&qrManager.code[0], len, false);
23012301

2302-
_qrManager.code.clear();
2303-
_qrManager.code.shrink_to_fit();
2302+
qrManager.code.clear();
2303+
qrManager.code.shrink_to_fit();
23042304
}
23052305

23062306

‎lib/device/sio/fuji.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ class sioFuji : public virtualDevice
114114

115115
Hash::Algorithm algorithm = Hash::Algorithm::UNKNOWN;
116116

117-
QRManager _qrManager = QRManager();
118-
119117
protected:
120118
void sio_reset_fujinet(); // 0xFF
121119
void sio_net_get_ssid(); // 0xFE

‎lib/qrcode/qrmanager.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
#include "qrcode.h"
1414

15+
QRManager qrManager;
16+
1517
std::vector<uint8_t> QRManager::encode(const void* input, uint16_t length, uint8_t version, qr_ecc_t ecc)
1618
{
1719
code = std::vector<uint8_t>();

‎lib/qrcode/qrmanager.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,6 @@ class QRManager {
132132
std::vector<uint8_t> code;
133133
};
134134

135+
extern QRManager qrManager;
136+
135137
#endif /* QRCODE_MANAGER_H */

0 commit comments

Comments
 (0)