From 9fbafaf23e8a1013223573774792f55452c04841 Mon Sep 17 00:00:00 2001 From: atc1441 Date: Wed, 17 Jul 2024 00:07:45 +0200 Subject: [PATCH] Changed repo to new repo organization in source --- ESP32_AP-Flasher/src/contentmanager.cpp | 2 +- ESP32_AP-Flasher/src/tag_db.cpp | 2 +- ESP32_AP-Flasher/src/web.cpp | 2 +- ESP32_AP-Flasher/wwwroot/flash.js | 2 +- ESP32_AP-Flasher/wwwroot/index.html | 6 +++--- ESP32_AP-Flasher/wwwroot/jsontemplate-demo.html | 2 +- ESP32_AP-Flasher/wwwroot/main.js | 4 ++-- ESP32_AP-Flasher/wwwroot/ota.js | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ESP32_AP-Flasher/src/contentmanager.cpp b/ESP32_AP-Flasher/src/contentmanager.cpp index 26de55ab..b41464f1 100644 --- a/ESP32_AP-Flasher/src/contentmanager.cpp +++ b/ESP32_AP-Flasher/src/contentmanager.cpp @@ -1171,7 +1171,7 @@ char *epoch_to_display(time_t utc) { #ifdef CONTENT_CAL bool getCalFeed(String &filename, JsonObject &cfgobj, tagRecord *&taginfo, imgParam &imageParams) { // google apps scripts method to retrieve calendar - // see https://github.com/jjwbruijn/OpenEPaperLink/wiki/Google-Apps-Scripts for description + // see https://github.com/OpenEPaperLink/OpenEPaperLink/wiki/Google-Apps-Scripts for description wsLog("get calendar"); diff --git a/ESP32_AP-Flasher/src/tag_db.cpp b/ESP32_AP-Flasher/src/tag_db.cpp index 90f50ac3..8c2b2e57 100644 --- a/ESP32_AP-Flasher/src/tag_db.cpp +++ b/ESP32_AP-Flasher/src/tag_db.cpp @@ -337,7 +337,7 @@ void initAPconfig() { // default wifi power 8.5 dbM // see https://github.com/espressif/arduino-esp32/blob/master/libraries/WiFi/src/WiFiGeneric.h#L111 config.wifiPower = APconfig.containsKey("wifipower") ? APconfig["wifipower"] : 34; - config.repo = APconfig.containsKey("repo") ? APconfig["repo"].as() : String("jjwbruijn/OpenEPaperLink"); + config.repo = APconfig.containsKey("repo") ? APconfig["repo"].as() : String("OpenEPaperLink/OpenEPaperLink"); config.env = APconfig.containsKey("env") ? APconfig["env"].as() : String(STR(BUILD_ENV_NAME)); if (APconfig["timezone"]) { strlcpy(config.timeZone, APconfig["timezone"], sizeof(config.timeZone)); diff --git a/ESP32_AP-Flasher/src/web.cpp b/ESP32_AP-Flasher/src/web.cpp index fdb4b467..4272ce6f 100644 --- a/ESP32_AP-Flasher/src/web.cpp +++ b/ESP32_AP-Flasher/src/web.cpp @@ -478,7 +478,7 @@ void init_web() { server.on("/led_flash", HTTP_GET, [](AsyncWebServerRequest *request) { // color picker: https://roger-random.github.io/RGB332_color_wheel_three.js/ // http GET to /led_flash?mac=000000000000&pattern=000000000000000000000000 - // see https://github.com/jjwbruijn/OpenEPaperLink/wiki/Led-control + // see https://github.com/OpenEPaperLink/OpenEPaperLink/wiki/Led-control if (request->hasParam("mac")) { String dst = request->getParam("mac")->value(); uint8_t mac[8]; diff --git a/ESP32_AP-Flasher/wwwroot/flash.js b/ESP32_AP-Flasher/wwwroot/flash.js index aa634c15..b8453c7b 100644 --- a/ESP32_AP-Flasher/wwwroot/flash.js +++ b/ESP32_AP-Flasher/wwwroot/flash.js @@ -154,7 +154,7 @@ async function checkTagFW() { print(`File ${fwfile} found`, "green"); } else { print(`File ${fwfile} not found. Downloading...`, "red"); - await fetchAndPost("https://raw.githubusercontent.com/jjwbruijn/OpenEPaperLink/master/binaries/Tag/Tag_FW_Pack.bin", "Tag_FW_Pack.bin", fwfile); + await fetchAndPost("https://raw.githubusercontent.com/OpenEPaperLink/OpenEPaperLink/master/binaries/Tag/Tag_FW_Pack.bin", "Tag_FW_Pack.bin", fwfile); } } else { print(`error checking file ${file.path}: ${response.status}`, "red"); diff --git a/ESP32_AP-Flasher/wwwroot/index.html b/ESP32_AP-Flasher/wwwroot/index.html index 2d52661d..b4f0a582 100644 --- a/ESP32_AP-Flasher/wwwroot/index.html +++ b/ESP32_AP-Flasher/wwwroot/index.html @@ -238,7 +238,7 @@ It sets the mac automatically, tries to recognize the type, and starts flashing. Currently, Solum M2 tags only.



- Using OEPL-Flasher.py, you have full control over the flashing of the tag.
+ Using OEPL-Flasher.py, you have full control over the flashing of the tag.
Use the --ip argument to connect to the flasher.

Usage:
@@ -486,8 +486,8 @@ options:


- Github OpenEPaperLink
- OpenEPaperLink Wiki
+ Github OpenEPaperLink
+ OpenEPaperLink Wiki

diff --git a/ESP32_AP-Flasher/wwwroot/jsontemplate-demo.html b/ESP32_AP-Flasher/wwwroot/jsontemplate-demo.html index e0cb0e68..63ae0c7d 100644 --- a/ESP32_AP-Flasher/wwwroot/jsontemplate-demo.html +++ b/ESP32_AP-Flasher/wwwroot/jsontemplate-demo.html @@ -9,7 +9,7 @@

demo Json template form

You can use this as an example how to push json templates to a tag by an external server/script. Make sure your json is valid. Check the syntax on https://jsonlint.com/.
- Documentation: https://github.com/jjwbruijn/OpenEPaperLink/wiki/Json-template

+ Documentation: https://github.com/OpenEPaperLink/OpenEPaperLink/wiki/Json-template

diff --git a/ESP32_AP-Flasher/wwwroot/main.js b/ESP32_AP-Flasher/wwwroot/main.js index 0a67aad6..b4ca9b8b 100644 --- a/ESP32_AP-Flasher/wwwroot/main.js +++ b/ESP32_AP-Flasher/wwwroot/main.js @@ -656,7 +656,7 @@ $('#cfgautoupdate').onclick = async function () { formData.append("mac", mac); formData.append("alias", $('#cfgalias').value); - var repo = apConfig.repo || 'jjwbruijn/OpenEPaperLink'; + var repo = apConfig.repo || 'OpenEPaperLink/OpenEPaperLink'; var infourl = "https://raw.githubusercontent.com/" + repo + "/master/binaries/Tag/tagotaversions.json"; var info = ""; await fetch(infourl, { method: 'GET' }).then(await function (response) { return response.json(); }).then(await function (json) { info = json; }); @@ -1352,7 +1352,7 @@ $('#activefilter').addEventListener('click', (event) => { const downloadTagtype = async (hwtype) => { try { console.log("download tagtype " + hwtype); - let repo = apConfig.repo || 'jjwbruijn/OpenEPaperLink'; + let repo = apConfig.repo || 'OpenEPaperLink/OpenEPaperLink'; let url = "https://raw.githubusercontent.com/" + repo + "/master/resources/tagtypes/" + hwtype + ".json"; console.log(url); diff --git a/ESP32_AP-Flasher/wwwroot/ota.js b/ESP32_AP-Flasher/wwwroot/ota.js index f643730a..d9450b2b 100644 --- a/ESP32_AP-Flasher/wwwroot/ota.js +++ b/ESP32_AP-Flasher/wwwroot/ota.js @@ -1,4 +1,4 @@ -var repo = apConfig.repo || 'jjwbruijn/OpenEPaperLink'; +var repo = apConfig.repo || 'OpenEPaperLink/OpenEPaperLink'; var repoUrl = 'https://api.github.com/repos/' + repo + '/releases'; const $ = document.querySelector.bind(document);