Skip to content

Update to .net10 and tag sharing. #15

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
bambuman merged 10 commits into from
Dec 23, 2025
Merged

Update to .net10 and tag sharing. #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fda7ebc
Read full tag from nfc.
noismaster Dec 23, 2025
9421ea4
Upload nfc tag.
noismaster Dec 23, 2025
df469f0
action on tag-sharing
noismaster Dec 23, 2025
af3b1a2
Fix build
noismaster Dec 23, 2025
01b0168
Stamp from build enviorment variable
noismaster Dec 23, 2025
dd3365a
change hmac injection
noismaster Dec 23, 2025
6712cfb
fix build
noismaster Dec 23, 2025
4261c77
Update SpoolManDB external filament json
noismaster Dec 23, 2025
7a44b66
Seperate FindExternalFilament into two
noismaster Dec 23, 2025
c6ed5ad
Fix missing http client, set "Upload tag info to public DB" as experi…
noismaster Dec 23, 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
20 changes: 18 additions & 2 deletions .github/workflows/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: CI Build

on:
push:
branches: [ main ]
branches: [ main, tag-sharing ]
paths-ignore:
- '**/*.md'
- '**/*.gitignore'
- '**/*.gitattributes'
pull_request:
branches: [ main ]
branches: [ main, tag-sharing ]
workflow_dispatch:

permissions:
Expand All @@ -35,6 +35,14 @@ jobs:

- name: Checkout
uses: actions/checkout@v4

- name: Inject Production Secrets
shell: pwsh
run: |
$clientFile = "${{ github.workspace }}/src/BambuMan.Shared/TagApiService.cs"
(Get-Content $clientFile) `
-replace '___HMAC_SECRET_PLACEHOLDER___', '${{ secrets.ANDROID_HMAC_KEY }}' |
Set-Content $clientFile

- name: Decode keystore file
run: |
Expand Down Expand Up @@ -79,6 +87,14 @@ jobs:

- name: Checkout
uses: actions/checkout@v4

- name: Inject Production Secrets
shell: pwsh
run: |
$clientFile = "${{ github.workspace }}/src/BambuMan.Shared/TagApiService.cs"
(Get-Content $clientFile) `
-replace '___HMAC_SECRET_PLACEHOLDER___', '${{ secrets.ANDROID_HMAC_KEY }}' |
Set-Content $clientFile

- name: Setup .NET 10
uses: actions/setup-dotnet@v4
Expand Down
2 changes: 1 addition & 1 deletion src/BambuMan.Desktop/BambuMan.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ApplicationIcon>appiconv2.ico</ApplicationIcon>
<SignAssembly>False</SignAssembly>
<AssemblyName>BambuMan</AssemblyName>
<PublishDir>bin\Release\net9.0-windows\publish\win-x64\</PublishDir>
<PublishDir>bin\Release\net10.0-windows\publish\win-x64\</PublishDir>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>false</SelfContained>
<PublishSingleFile>true</PublishSingleFile>
Expand Down
12 changes: 11 additions & 1 deletion src/BambuMan.Desktop/MainForm.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

131 changes: 72 additions & 59 deletions src/BambuMan.Desktop/MainForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using BambuMan.Shared;
using BambuMan.Shared.Enums;
using Microsoft.Win32;
using Newtonsoft.Json;
using SpoolMan.Api.Model;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using LogLevel = BambuMan.Shared.Enums.LogLevel;

namespace BambuMan.Desktop;
Expand All @@ -18,12 +18,14 @@ public partial class MainForm : Form
private const string RegKeyLogSpoolmanApi = "LogSpoolmanApi";
private const string RegKeySpoolmanUrl = "SpoolmanUrl";
private const string RegKeyUnknownFilamentEnabled = "UnknownFilamentEnabled";
private const string RegKeyFullTagScanAndUpload = "FullTagScanAndUpload";

private const string RegKeyPrice = "Price";
private const string RegKeyLocation = "Location";

private readonly NfcReader? nfcReader;
private readonly SpoolmanManager? spoolmanManager;
private readonly TagApiService? tagApiService;
private Spool? currentSpool;
private BambuFillamentInfo? currentBambuFillamentInfo;

Expand All @@ -40,6 +42,7 @@ public MainForm()
writeJsonFilesOnReadToolStripMenuItem.Checked = GetRegistryValue(RegKeyWriteJsonFiles, false);
logSpoolmanApiToolStripMenuItem.Checked = GetRegistryValue(RegKeyLogSpoolmanApi, false);
unknownFilamentEnabledToolStripMenuItem.Checked = GetRegistryValue(RegKeyUnknownFilamentEnabled, true);
fullTagScanAndUploadToolStripMenuItem.Checked = GetRegistryValue(RegKeyFullTagScanAndUpload, false);
txtSpoolmanUrl.Text = GetRegistryValue(RegKeySpoolmanUrl, string.Empty);
nudPrice.Value = GetRegistryValue(RegKeyPrice, 12.0m);
txtLocation.Text = GetRegistryValue(RegKeyLocation, string.Empty);
Expand All @@ -48,7 +51,8 @@ public MainForm()
{
ShowLogs = showNfcLogsToolStripMenuItem.Checked,
ShowApduCommands = showADBCommandsToolStripMenuItem.Checked,
WriteJsonFiles = writeJsonFilesOnReadToolStripMenuItem.Checked
WriteJsonFiles = writeJsonFilesOnReadToolStripMenuItem.Checked,
FullTagScanAndUpload = fullTagScanAndUploadToolStripMenuItem.Checked,
};

nfcReader.OnLogMessage += NfcReaderOnOnLogMessage;
Expand All @@ -66,6 +70,8 @@ public MainForm()
spoolmanManager.OnStatusChanged += SpoolmanManagerOnStatusChanged;
spoolmanManager.OnLogMessage += SpoolmanManagerOnLogMessage;
spoolmanManager.OnSpoolFound += SpoolmanManagerOnSpoolFound;

tagApiService = new TagApiService(new HttpClient()) { LogAction = AppendText };
}

protected override async void OnLoad(EventArgs e)
Expand Down Expand Up @@ -97,6 +103,7 @@ private async void NfcReaderOnOnSpoolFound(BambuFillamentInfo info)
AppendText(LogLevel.Information, json);

if (spoolmanManager != null) await spoolmanManager.InventorySpool(info, dtpBuyDate.Value, nudPrice.Value, txtLotNr.Text, txtLocation.Text);
if (fullTagScanAndUploadToolStripMenuItem.Checked && tagApiService != null) await tagApiService.UploadNfcTagAsync(info);
}
catch (Exception ex)
{
Expand Down Expand Up @@ -229,6 +236,12 @@ private void unknownFilamentEnabledToolStripMenuItem_CheckStateChanged(object se
if (spoolmanManager != null) spoolmanManager.UnknownFilamentEnabled = value;
}

private void fullTagScanAndUploadToolStripMenuItem_CheckStateChanged(object sender, EventArgs e)
{
var value = SetRegistryValue(RegKeyFullTagScanAndUpload, fullTagScanAndUploadToolStripMenuItem.Checked);
if (nfcReader != null) nfcReader.FullTagScanAndUpload = value;
}

private void nudPrice_ValueChanged(object sender, EventArgs e)
{
SetRegistryValue(RegKeyPrice, nudPrice.Value);
Expand Down Expand Up @@ -334,79 +347,79 @@ private async void testTagToolStripMenuItem_Click(object sender, EventArgs e)
{
#region Decode raw files

// try
// {
// var files = new DirectoryInfo(@"C:\_Repos\_bambuman\Bambu-Lab-RFID-Library\bin").GetFiles("*", SearchOption.AllDirectories);
// try
// {
// var files = new DirectoryInfo(@"C:\_Repos\_bambuman\Bambu-Lab-RFID-Library\bin").GetFiles("*", SearchOption.AllDirectories);

// var classes = new List<string>();
// var classes = new List<string>();

// foreach (var materialGroup in files.GroupBy(x => x.Directory?.Parent?.Parent?.Name ?? ""))
// {
// var className = ConvertToCamelCase(materialGroup.Key);
// foreach (var materialGroup in files.GroupBy(x => x.Directory?.Parent?.Parent?.Name ?? ""))
// {
// var className = ConvertToCamelCase(materialGroup.Key);

// var methods = new List<string>();
// var methods = new List<string>();

// foreach (var typeGroup in materialGroup.GroupBy(x => x.Directory?.Parent?.Name ?? ""))
// {
// var methodName = ConvertToCamelCase(typeGroup.Key);
// foreach (var typeGroup in materialGroup.GroupBy(x => x.Directory?.Parent?.Name ?? ""))
// {
// var methodName = ConvertToCamelCase(typeGroup.Key);

// var dataFile = typeGroup.First();
// var dataFile = typeGroup.First();

// var data = await File.ReadAllBytesAsync(dataFile.FullName);
// var data = await File.ReadAllBytesAsync(dataFile.FullName);

// var blockData = new byte[20][];
// var blockData = new byte[20][];

// var blockNum = 0;
// var blockNum = 0;

// for (var i = 0; i < 5; i++)
// {
// for (var ii = 0; ii < 3; ii++)
// {
// blockData[blockNum] = data.Skip(blockNum * 16).Take(16).ToArray();
// //SendCmd("Read Binary: ", reader, [0xFF, 0xB0, 0x00, (byte)blockNum, 0x10]) ?? [16];
// blockNum++;
// }
// for (var i = 0; i < 5; i++)
// {
// for (var ii = 0; ii < 3; ii++)
// {
// blockData[blockNum] = data.Skip(blockNum * 16).Take(16).ToArray();
// //SendCmd("Read Binary: ", reader, [0xFF, 0xB0, 0x00, (byte)blockNum, 0x10]) ?? [16];
// blockNum++;
// }

// blockNum++;
// }
// blockNum++;
// }

// var info = new BambuFillamentInfo();
// info.ParseData(blockData, true);
// var info = new BambuFillamentInfo();
// info.ParseData(blockData, true);

// var infoJson = JsonConvert.SerializeObject(info, Formatting.None);
// var infoJson = JsonConvert.SerializeObject(info, Formatting.None);

// methods.Add(@$"
// [Fact(DisplayName = ""{methodName}"")]
// public async Task {methodName}()
// {{
// var json = ""{infoJson.Replace("\"", "\\\"")}"";
// methods.Add(@$"
// [Fact(DisplayName = ""{methodName}"")]
// public async Task {methodName}()
// {{
// var json = ""{infoJson.Replace("\"", "\\\"")}"";

// var (_, external) = await GetExternalFilament(json);

// Assert.Equal(""{typeGroup.Key}"", external?.Name);
// Assert.Equal(""{info.DetailedFilamentType}"", external?.Material);
// }}");
// }
// var (_, external) = await GetExternalFilament(json);

// Assert.Equal(""{typeGroup.Key}"", external?.Name);
// Assert.Equal(""{info.DetailedFilamentType}"", external?.Material);
// }}");
// }

// classes.Add(@$"namespace BambuMan.Shared.Test.Filaments
//{{
// [Trait(""Category"", ""{materialGroup.Key}"")]
// public class {className}Test : BaseTest
// {{
//{string.Join("\r\n", methods)}
// }}
//}}
//");
// }

// classes.Add(@$"namespace BambuMan.Shared.Test.Filaments
//{{
// [Trait(""Category"", ""{materialGroup.Key}"")]
// public class {className}Test : BaseTest
// {{
//{string.Join("\r\n", methods)}
// }}
//}}
//");
// }

// File.WriteAllText("D:\\tests.txt", string.Join("\r\n", classes));
// }
// catch (Exception ex)
// {
// AppendText(LogLevel.Error, ex.ToString());
// }

// File.WriteAllText("D:\\tests.txt", string.Join("\r\n", classes));
// }
// catch (Exception ex)
// {
// AppendText(LogLevel.Error, ex.ToString());
// }

#endregion

Expand All @@ -420,7 +433,7 @@ private async void testTagToolStripMenuItem_Click(object sender, EventArgs e)
//var json = "{\"SerialNumber\":\"5B1449F6\",\"TagManufacturerData\":\"8AgEAATrOVf5DLaQ\",\"MaterialVariantIdentifier\":\"A16-G0\",\"UniqueMaterialIdentifier\":\"FA16\",\"FilamentType\":\"PLA\",\"DetailedFilamentType\":\"PLA Wood\",\"Color\":\"918669FF\",\"SpoolWeight\":1000,\"FilamentDiameter\":1.75,\"DryingTemperature\":60,\"DryingTime\":6,\"BedTemperatureType\":0,\"BedTemperature\":0,\"MaxTemperatureForHotend\":230,\"MinTemperatureForHotend\":190,\"XCamInfo\":\"AAAAAAAAAAAAAAAA\",\"NozzleDiameter\":0.2,\"TrayUid\":\"4663E9ADF9CC454380EB58CE627BFE72\",\"SpoolWidth\":1536,\"ProductionDateTime\":\"2025-03-11T00:38:00\",\"ProductionDateTimeShort\":\"25_03_11_00\",\"FilamentLength\":330,\"FormatIdentifier\":2,\"ColorCount\":1,\"SecondColor\":\"00000000\",\"SkuStart\":\"A16-G0-1.75-1000\"}";
//var json = "{\"SerialNumber\":\"C3DB40A2\",\"TagManufacturerData\":\"+ggEAARS8na7x5uQ\",\"MaterialVariantIdentifier\":\"A00-D0\",\"UniqueMaterialIdentifier\":\"FA00\",\"FilamentType\":\"PLA\",\"DetailedFilamentType\":\"PLA Basic\",\"Color\":\"8E9089FF\",\"SpoolWeight\":1000,\"FilamentDiameter\":1.75,\"DryingTemperature\":55,\"DryingTime\":8,\"BedTemperatureType\":0,\"BedTemperature\":0,\"MaxTemperatureForHotend\":230,\"MinTemperatureForHotend\":190,\"XCamInfo\":\"0AfQB+gD6AOamRk/\",\"NozzleDiameter\":0.2,\"TrayUid\":\"F1FACEE5124249F6AEB7DCEC0AAE0C4F\",\"SpoolWidth\":2875,\"ProductionDateTime\":\"2025-01-20T19:14:00\",\"ProductionDateTimeShort\":\"20250120\",\"FilamentLength\":330,\"FormatIdentifier\":2,\"ColorCount\":1,\"SecondColor\":\"00000000\",\"SkuStart\":\"A00-D0-1.75-1000\"}";
//var json = "{\"SerialNumber\":\"83EC9A1C\",\"TagManufacturerData\":\"6QgEAAR8EZ2x4zmQ\",\"MaterialVariantIdentifier\":\"A17-R1\",\"UniqueMaterialIdentifier\":\"FA17\",\"FilamentType\":\"PLA\",\"DetailedFilamentType\":\"PLA Translucent\",\"Color\":\"F5B6CD80\",\"SpoolWeight\":1000,\"FilamentDiameter\":1.75,\"DryingTemperature\":55,\"DryingTime\":8,\"BedTemperatureType\":0,\"BedTemperature\":0,\"MaxTemperatureForHotend\":240,\"MinTemperatureForHotend\":200,\"XCamInfo\":\"AAAAAAAAAAAAAAAA\",\"NozzleDiameter\":0.2,\"TrayUid\":\"2DC9E553D1924FA89FBB893C9E921DBA\",\"SpoolWidth\":666,\"ProductionDateTime\":\"2024-12-20T09:40:00\",\"ProductionDateTimeShort\":\"20241220\",\"FilamentLength\":345,\"FormatIdentifier\":2,\"ColorCount\":1,\"SecondColor\":\"00000000\",\"SkuStart\":\"A17-R1-1.75-1000\"}";

var json = "{\"SerialNumber\":\"5B1449F6\",\"TagManufacturerData\":\"8AgEAATrOVf5DLaQ\",\"MaterialVariantIdentifier\":\"A16-G0\",\"UniqueMaterialIdentifier\":\"FA16\",\"FilamentType\":\"PLA\",\"DetailedFilamentType\":\"PLA Wood\",\"Color\":\"918669FF\",\"SpoolWeight\":1000,\"FilamentDiameter\":1.75,\"DryingTemperature\":60,\"DryingTime\":6,\"BedTemperatureType\":0,\"BedTemperature\":0,\"MaxTemperatureForHotend\":230,\"MinTemperatureForHotend\":190,\"XCamInfo\":\"AAAAAAAAAAAAAAAA\",\"NozzleDiameter\":0.2,\"TrayUid\":\"4663E9ADF9CC454380EB58CE627BFE72\",\"SpoolWidth\":1536,\"ProductionDateTime\":\"2025-03-11T00:38:00\",\"ProductionDateTimeShort\":\"25_03_11_00\",\"FilamentLength\":330,\"FormatIdentifier\":2,\"ColorCount\":1,\"SecondColor\":\"00000000\",\"SkuStart\":\"A16-G0-1.75-1000\"}";

var bambuFillamentInfo = JsonConvert.DeserializeObject<BambuFillamentInfo>(json);
Expand Down
Loading