Skip to content

Add Libra Colour / Elipsa 2E support, fix config persistence, UTF-8 rendering, and page-turn buttons #12

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

Merged
Ashex merged 1 commit into from
Mar 22, 2026
Merged

Add Libra Colour / Elipsa 2E support, fix config persistence, UTF-8 rendering, and page-turn buttons #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,29 @@ exec >>"${LOG}" 2>&1

hydrate_probe_env

# Clara Colour (spaColour/393): snow protocol, needs mirror_x
if [ -z "${APP_TOUCH_MIRROR_X}" ] && \
{ [ "${APP_CODENAME}" = "spaColour" ] || [ "${APP_PRODUCT_ID}" = "393" ]; } && \
[ "${APP_TOUCH_PROTOCOL}" = "snow" ]; then
APP_TOUCH_MIRROR_X=1
fi

# Libra Colour (monza/390): standard multitouch, needs mirror_y (not mirror_x)
if [ -z "${APP_TOUCH_MIRROR_Y}" ] && \
{ [ "${APP_CODENAME}" = "monza" ] || [ "${APP_PRODUCT_ID}" = "390" ]; }; then
APP_TOUCH_MIRROR_Y=1
fi

# Elipsa 2E (condor/389): standard multitouch, needs mirror_y (not mirror_x)
if [ -z "${APP_TOUCH_MIRROR_Y}" ] && \
{ [ "${APP_CODENAME}" = "condor" ] || [ "${APP_PRODUCT_ID}" = "389" ]; }; then
APP_TOUCH_MIRROR_Y=1
fi

if [ -z "${APP_TOUCH_MIRROR_X}" ]; then
APP_TOUCH_MIRROR_X=0
fi

if [ -z "${APP_TOUCH_MIRROR_Y}" ]; then
APP_TOUCH_MIRROR_Y=0
fi
Expand Down Expand Up @@ -158,6 +175,11 @@ stop_watchdog() {
cleanup_app_mode() {
echo "sKeets cleanup at $(date), rebooting..."
stop_watchdog
# Flush all pending writes and give the eMMC controller time to commit
# them to persistent storage. Without this delay FAT32 metadata can be
# lost on reboot, causing files to disappear or be renamed to FSCK*.
sync
sleep 2
sync
reboot
}
Expand Down
62 changes: 57 additions & 5 deletions src/kobo/bootstrap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,15 @@ bool file_exists(const char* path) {
}

Bsky::Session load_saved_session() {
const char* config_path = skeets_config_path();
std::fprintf(stderr, "bootstrap: load_saved_session: config_path='%s'\n", config_path);

Bsky::Session session;
config_t* config = config_open(skeets_config_path());
if (!config) return session;
config_t* config = config_open(config_path);
if (!config) {
std::fprintf(stderr, "bootstrap: load_saved_session: config_open returned NULL\n");
return session;
}

session.handle = config_get_str(config, "handle", "");
session.access_jwt = config_get_str(config, "access_jwt", "");
Expand All @@ -82,6 +88,14 @@ Bsky::Session load_saved_session() {
session.appview_url = config_get_str(config,
"appview_url",
config_get_str(config, "appview", kDefaultAppView));

std::fprintf(stderr, "bootstrap: load_saved_session: loaded handle='%s' did='%s' pds='%s' has_access=%zu has_refresh=%zu\n",
session.handle.empty() ? "(empty)" : session.handle.c_str(),
session.did.empty() ? "(empty)" : session.did.c_str(),
session.pds_url.empty() ? "(empty)" : session.pds_url.c_str(),
session.access_jwt.size(),
session.refresh_jwt.size());

config_free(config);
return session;
}
Expand All @@ -91,16 +105,36 @@ bool has_saved_session(const Bsky::Session& session) {
}

void save_session(const Bsky::Session& session) {
config_t* config = config_open(skeets_config_path());
if (!config) return;
const char* config_path = skeets_config_path();

if (session.handle.empty() && session.access_jwt.empty() && session.did.empty()) {
std::fprintf(stderr, "bootstrap: save_session: SKIPPING — session is empty (would overwrite valid config)\n");
return;
}

std::fprintf(stderr, "bootstrap: save_session: saving handle='%s' did='%s' pds='%s' access_len=%zu refresh_len=%zu\n",
session.handle.c_str(), session.did.c_str(), session.pds_url.c_str(),
session.access_jwt.size(), session.refresh_jwt.size());

config_t* config = config_open(config_path);
if (!config) {
std::fprintf(stderr, "bootstrap: save_session: config_open returned NULL for '%s'\n", config_path);
return;
}

config_set_str(config, "handle", session.handle.c_str());
config_set_str(config, "access_jwt", session.access_jwt.c_str());
config_set_str(config, "refresh_jwt", session.refresh_jwt.c_str());
config_set_str(config, "did", session.did.c_str());
config_set_str(config, "pds_url", session.pds_url.c_str());
config_set_str(config, "appview_url", session.appview_url.c_str());
config_save(config);

int result = config_save(config);
if (result != 0) {
std::fprintf(stderr, "bootstrap: save_session: config_save FAILED for '%s' (result=%d)\n", config_path, result);
} else {
std::fprintf(stderr, "bootstrap: save_session: config_save succeeded for '%s'\n", config_path);
}
config_free(config);
}

Expand Down Expand Up @@ -143,16 +177,22 @@ skeets_bootstrap_result_t make_error_result(const std::string& error_message, bo
} // namespace

skeets_bootstrap_result_t skeets_run_bootstrap() {
std::fprintf(stderr, "bootstrap: skeets_run_bootstrap: starting\n");

if (skeets_ensure_data_dirs() != 0) {
std::fprintf(stderr, "bootstrap: skeets_run_bootstrap: failed to create data dirs\n");
return make_error_result("Failed to create rewrite data directories", false);
}

std::fprintf(stderr, "bootstrap: skeets_run_bootstrap: loading saved session\n");
Bsky::Session saved_session = load_saved_session();

Bsky::Session restored_session;
std::string saved_session_error;
if (has_saved_session(saved_session)) {
std::fprintf(stderr, "bootstrap: skeets_run_bootstrap: found saved session, attempting restore\n");
if (restore_saved_session_with_retry(saved_session, restored_session, saved_session_error)) {
std::fprintf(stderr, "bootstrap: skeets_run_bootstrap: session restore succeeded\n");
save_session(restored_session);
skeets_bootstrap_result_t result;
result.state = skeets_bootstrap_state_t::session_restored;
Expand All @@ -163,21 +203,31 @@ skeets_bootstrap_result_t skeets_run_bootstrap() {
result.used_saved_session = true;
return result;
}
std::fprintf(stderr, "bootstrap: skeets_run_bootstrap: session restore failed: %s\n", saved_session_error.c_str());
} else {
std::fprintf(stderr, "bootstrap: skeets_run_bootstrap: no saved session found\n");
}

std::fprintf(stderr, "bootstrap: skeets_run_bootstrap: checking for login.txt\n");
bool found_login_file = false;
const skeets_login_txt_t login = read_login_txt(found_login_file);
if (!found_login_file) {
std::fprintf(stderr, "bootstrap: skeets_run_bootstrap: no login.txt found\n");
if (has_saved_session(saved_session)) {
std::fprintf(stderr, "bootstrap: skeets_run_bootstrap: returning error (had session but restore failed)\n");
return make_error_result(saved_session_error.empty() ? "Saved session resume failed" : saved_session_error, false);
}
std::fprintf(stderr, "bootstrap: skeets_run_bootstrap: returning waiting for login\n");
return make_waiting_result();
}

std::fprintf(stderr, "bootstrap: skeets_run_bootstrap: login.txt found, handle='%s'\n", login.handle.c_str());
if (login.handle.empty() || login.password.empty()) {
std::fprintf(stderr, "bootstrap: skeets_run_bootstrap: login.txt missing handle or password\n");
return make_error_result("login.txt is missing required handle or password fields", true);
}

std::fprintf(stderr, "bootstrap: skeets_run_bootstrap: attempting createSession\n");
bool created = false;
std::string error_message;
Bsky::Session created_session;
Expand All @@ -194,6 +244,7 @@ skeets_bootstrap_result_t skeets_run_bootstrap() {
return make_error_result(error_message.empty() ? "Login failed" : error_message, true);
}

std::fprintf(stderr, "bootstrap: skeets_run_bootstrap: createSession succeeded, saving session\n");
created_session.appview_url = login.appview_url.empty() ? kDefaultAppView : login.appview_url;
save_session(created_session);

Expand All @@ -204,6 +255,7 @@ skeets_bootstrap_result_t skeets_run_bootstrap() {
result.detail = "Session tokens were saved under the rewrite app root.";
result.authenticated = true;
result.consumed_login_file = true;
std::fprintf(stderr, "bootstrap: skeets_run_bootstrap: returning success\n");
return result;
}

Expand Down
21 changes: 20 additions & 1 deletion src/kobo/diag_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,30 @@ skeets_input_protocol_t detect_input_protocol() {
int run_input_diag() {
std::fprintf(stderr, "rewrite diag: input.begin\n");

// Query actual framebuffer dimensions instead of hardcoding a single device's resolution.
int fb_width = 0;
int fb_height = 0;
{
skeets_framebuffer_t probe_fb;
std::string fb_err;
if (skeets_framebuffer_open(probe_fb, &fb_err)) {
fb_width = probe_fb.info.screen_width;
fb_height = probe_fb.info.screen_height;
skeets_framebuffer_close(probe_fb);
std::fprintf(stderr, "rewrite diag: input.detected_fb=%dx%d\n", fb_width, fb_height);
} else {
fb_width = 1072;
fb_height = 1448;
std::fprintf(stderr, "rewrite diag: input.fb_probe_failed=%s (using %dx%d fallback)\n",
fb_err.c_str(), fb_width, fb_height);
}
}

skeets_input_t input;
input.debug_raw_events = true;
input.raw_event_log_budget = 64;
std::string error_message;
if (!skeets_input_open(input, 1072, 1448, detect_input_protocol(), &error_message)) {
if (!skeets_input_open(input, fb_width, fb_height, detect_input_protocol(), &error_message)) {
std::fprintf(stderr, "rewrite diag: input.open_failed=%s\n", error_message.c_str());
return 5;
}
Expand Down
Loading
Loading