Skip to content

Qr scanner refactor #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
isage wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Qr scanner refactor #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b6aa55
Fix qr threads race condition and improve qr scan accuracy
isage Apr 22, 2025
9960466
Migrate downloads to curl
isage Apr 22, 2025
4183679
Update CMakeLists.txt
isage Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,9 @@ add_dependencies(VitaShell usbdevice.skprx-self)

target_link_libraries(VitaShell
${CMAKE_CURRENT_BINARY_DIR}/modules/user/libVitaShellUser_stub_weak.a
curl
ssl
crypto
ftpvita
vita2d
vorbisfile
Expand Down
12 changes: 8 additions & 4 deletions browser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,10 +470,14 @@ int shortCuts() {
}

// QR
if (current_pad[PAD_CIRCLE] && enabledQR()) {
startQR();
initMessageDialog(MESSAGE_DIALOG_QR_CODE, language_container[QR_SCANNING]);
setDialogStep(DIALOG_STEP_QR);
if (current_pad[PAD_CIRCLE]/* && enabledQR()*/) {
initQR();
if (enabledQR())
{
startQR();
initMessageDialog(MESSAGE_DIALOG_QR_CODE, language_container[QR_SCANNING]);
setDialogStep(DIALOG_STEP_QR);
}
}

return 0;
Expand Down
1 change: 1 addition & 0 deletions file.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ typedef struct {
uint64_t max;
void (* SetProgress)(uint64_t value, uint64_t max);
int (* cancelHandler)();
SceUID fp;
} FileProcessParam;

typedef struct FileListEntry {
Expand Down
11 changes: 0 additions & 11 deletions init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,6 @@ static void initNet() {
sceNetInit(&param);
sceNetCtlInit();

sceSslInit(300 * 1024);
sceHttpInit(40 * 1024);

sceHttpsDisableOption(SCE_HTTPS_FLAG_SERVER_VERIFY);

sceNetAdhocInit();

SceNetAdhocctlAdhocId adhocId;
Expand All @@ -305,8 +300,6 @@ static void initNet() {
static void finishNet() {
sceNetAdhocctlTerm();
sceNetAdhocTerm();
sceSslTerm();
sceHttpTerm();
sceNetCtlTerm();
sceNetTerm();
free(net_memory);
Expand Down Expand Up @@ -363,7 +356,6 @@ void initVitaShell() {
sceSysmoduleLoadModule(SCE_SYSMODULE_MUSIC_EXPORT);
sceSysmoduleLoadModule(SCE_SYSMODULE_PHOTO_EXPORT);
sceSysmoduleLoadModule(SCE_SYSMODULE_NET);
sceSysmoduleLoadModule(SCE_SYSMODULE_HTTPS);
sceSysmoduleLoadModule(SCE_SYSMODULE_PSPNET_ADHOC);
sceSysmoduleLoadModule(SCE_SYSMODULE_SQLITE);

Expand All @@ -372,7 +364,6 @@ void initVitaShell() {
initVita2dLib();
initSceAppUtil();
initNet();
initQR();
initSQLite();

// Init power tick thread
Expand Down Expand Up @@ -437,13 +428,11 @@ void finishVitaShell() {
finishNet();
finishSceAppUtil();
finishVita2dLib();
finishQR();
vitaAudioShutdown();

// Unload modules
sceSysmoduleUnloadModule(SCE_SYSMODULE_SQLITE);
sceSysmoduleUnloadModule(SCE_SYSMODULE_PSPNET_ADHOC);
sceSysmoduleUnloadModule(SCE_SYSMODULE_HTTPS);
sceSysmoduleUnloadModule(SCE_SYSMODULE_NET);
sceSysmoduleUnloadModule(SCE_SYSMODULE_PHOTO_EXPORT);
sceSysmoduleUnloadModule(SCE_SYSMODULE_MUSIC_EXPORT);
Expand Down
2 changes: 2 additions & 0 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,6 +951,7 @@ int dialogSteps() {
if (msg_result == MESSAGE_DIALOG_RESULT_FINISHED) {
setDialogStep(DIALOG_STEP_QR_WAITING);
stopQR();
finishQR();
SceUID thid = sceKernelCreateThread("qr_scan_thread", (SceKernelThreadEntry)qr_scan_thread, 0x10000100, 0x100000, 0, 0, NULL);
if (thid >= 0)
sceKernelStartThread(thid, 0, NULL);
Expand Down Expand Up @@ -988,6 +989,7 @@ int dialogSteps() {
case DIALOG_STEP_QR_DOWNLOADED_VPK:
{
if (msg_result == MESSAGE_DIALOG_RESULT_FINISHED) {

initMessageDialog(MESSAGE_DIALOG_PROGRESS_BAR, language_container[INSTALLING]);
setDialogStep(DIALOG_STEP_INSTALL_CONFIRMED_QR);
}
Expand Down
Loading