Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions IMAGES/flowchart_xiao_odmr.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added IMAGES/odmr_xiao_flowchart.pptx
Binary file not shown.
Binary file added IMAGES/~$odmr_xiao_flowchart.pptx
Binary file not shown.
10 changes: 5 additions & 5 deletions Production_Files/Software/ODMR_Server/src/version_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
#define __VERSION_INFO_H__

#define FIRMWARE_VERSION "1.0.0"
#define BUILD_DATE "2026-04-17"
#define BUILD_TIME "15:00:34"
#define BUILD_TIMESTAMP "20260417150034"
#define GIT_HASH "b846413"
#define GIT_BRANCH "main"
#define BUILD_DATE "2026-05-21"
#define BUILD_TIME "20:56:51"
#define BUILD_TIMESTAMP "20260521205651"
#define GIT_HASH "f1d6d8b"
#define GIT_BRANCH "fix-listoferrors"

// Combined version string
#define VERSION_STRING "v" FIRMWARE_VERSION " (" BUILD_DATE " " BUILD_TIME " - " GIT_HASH ")"
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

27 changes: 24 additions & 3 deletions Production_Files/Software/ODMR_Server/src/website_html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,21 @@

<!-- ░░ Main content ░░------------------------------------------------------ -->
<main class="container">

<!-- Firmware flash notice -->
<div class="alert mb-4" role="alert"
style="background:linear-gradient(135deg,var(--uc2-blue,#0266a0),#0a4d8e);color:#fff;border:none;">
<div class="d-flex align-items-center gap-3 flex-wrap">
<div>
<strong data-lang-key="flash_notice_title">&#x1F527; Neue Firmware verfügbar!</strong>&nbsp;
<span data-lang-key="flash_notice_text">Flashen Sie die aktuelle Version direkt im Browser auf youseetoo.github.io:</span>
</div>
<a href="https://youseetoo.github.io/odmr/" target="_blank" rel="noopener"
class="btn btn-light btn-sm" style="white-space:nowrap;color:#0a4d8e;font-weight:600;"
data-lang-key="flash_notice_btn">Firmware flashen →</a>
</div>
</div>

<section class="mb-5">
<h1 class="display-5 mb-3" data-lang-key="welcome_title">Low-Cost Experimente mit NV-Zentren</h1>

Expand Down Expand Up @@ -289,7 +304,10 @@ <h2 class="h4 mb-3" data-lang-key="quantumminilabs_title">Das QuantumMiniLabs Pr
safety_power: "Stromversorgung vor Verkabelungsänderungen trennen",
quantumminilabs_title: "Das QuantumMiniLabs Projekt",
quantumminilabs_text: "Das QuantumMiniLabs-Projekt entwickelt ein Open-Source-Ökosystem, das kostengünstige, skalierbare, modulare und reparable Quantentechnologie-Experimente ermöglicht. Das Ziel ist es, das System an 100 Bildungsstandorten in Deutschland einzusetzen.",
quantumminilabs_vision: "QuantumMiniLabs bietet die erste erschwingliche DIY-Plattform für Experimente mit Quantensystemen der zweiten Generation. NV-Diamanten ermöglichen stabile Experimente bei Raumtemperatur."
quantumminilabs_vision: "QuantumMiniLabs bietet die erste erschwingliche DIY-Plattform für Experimente mit Quantensystemen der zweiten Generation. NV-Diamanten ermöglichen stabile Experimente bei Raumtemperatur.",
flash_notice_title: "\uD83D\uDD27 Neue Firmware verfügbar!",
flash_notice_text: "Flashen Sie die aktuelle Version direkt im Browser auf youseetoo.github.io:",
flash_notice_btn: "Firmware flashen \u2192"
},
en: {
nav_start: "Start",
Expand Down Expand Up @@ -345,7 +363,10 @@ <h2 class="h4 mb-3" data-lang-key="quantumminilabs_title">Das QuantumMiniLabs Pr
safety_power: "Disconnect power before changing connections",
quantumminilabs_title: "The QuantumMiniLabs Project",
quantumminilabs_text: "The QuantumMiniLabs project is developing an open-source ecosystem that enables low-cost, scalable, modular, and repairable quantum tech experiments. The goal is to deploy the system at 100 educational locations across Germany.",
quantumminilabs_vision: "QuantumMiniLabs offer the first affordable DIY platform for experimenting with second-generation quantum systems. NV diamonds allow for stable experiments at room temperature."
quantumminilabs_vision: "QuantumMiniLabs offer the first affordable DIY platform for experimenting with second-generation quantum systems. NV diamonds allow for stable experiments at room temperature.",
flash_notice_title: "\uD83D\uDD27 New Firmware Available!",
flash_notice_text: "Flash the latest version directly in your browser at youseetoo.github.io:",
flash_notice_btn: "Flash Firmware \u2192"
}
};

Expand Down Expand Up @@ -387,7 +408,7 @@ <h2 class="h4 mb-3" data-lang-key="quantumminilabs_title">Das QuantumMiniLabs Pr
const r = await fetch('/webserial_check');
const d = await r.json();
if (!d.webserial_enabled) wsNav.style.display = 'none';
} catch(e) { wsNav.style.display = 'none'; }
} catch(e) { /* hosted site – keep WebSerial nav visible */ }
})();

// Fetch and display version information
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -969,7 +969,7 @@ <h2 class="h4 mb-3" data-lang-key="project_partners">Projekt &amp; Partner</h2>
const r = await fetch('/webserial_check');
const d = await r.json();
if (!d.webserial_enabled) wsNav.style.display = 'none';
} catch(e) { wsNav.style.display = 'none'; }
} catch(e) { /* hosted site – keep WebSerial nav visible */ }
})();

// Fetch and display version information
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ <h4 id="tutorialStepTitle"></h4>
(async function(){
const ws=ById('webSerialNavItem'); if(!ws) return;
if(!('serial' in navigator)){ws.style.display='none';return;}
try{const r=await fetch('/webserial_check');const d=await r.json();if(!d.webserial_enabled)ws.style.display='none';}catch(e){ws.style.display='none';}
try{const r=await fetch('/webserial_check');const d=await r.json();if(!d.webserial_enabled)ws.style.display='none';}catch(e){/* hosted site – keep WebSerial nav visible */}
})();
// Version
fetch('/version').then(r=>r.ok?r.json():Promise.reject())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,7 @@ <h2>Durchgeführte Messungen</h2>
const r = await fetch('/webserial_check');
const d = await r.json();
if (!d.webserial_enabled) wsNav.style.display = 'none';
} catch(e) { wsNav.style.display = 'none'; }
} catch(e) { /* hosted site – keep WebSerial nav visible */ }
})();

// Initialize parameter summary
Expand Down
Loading
Loading