From 9ac62c0496161cbde09edb7c9ffae7988f984e5f Mon Sep 17 00:00:00 2001 From: AngeDieu <106985774+AngeDieu@users.noreply.github.com> Date: Sat, 11 Nov 2023 18:27:58 +0100 Subject: [PATCH 1/2] add factorial to toolbox -> combinatorics (#348) * add factorial to toolbox -> combinatorics * Update math_toolbox.cpp removed newline for format purpose --- apps/math_toolbox.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/math_toolbox.cpp b/apps/math_toolbox.cpp index 1d4900c9785..6548cea2e2a 100644 --- a/apps/math_toolbox.cpp +++ b/apps/math_toolbox.cpp @@ -38,7 +38,8 @@ const ToolboxMessageTree complexChildren[] = { const ToolboxMessageTree combinatoricsChildren[] = { ToolboxMessageTree::Leaf(I18n::Message::BinomialCommandWithArg, I18n::Message::Combination), - ToolboxMessageTree::Leaf(I18n::Message::PermuteCommandWithArg, I18n::Message::Permutation) + ToolboxMessageTree::Leaf(I18n::Message::PermuteCommandWithArg, I18n::Message::Permutation), + ToolboxMessageTree::Leaf(I18n::Message::FactorialCommandWithArg, I18n::Message::Factorial) }; const ToolboxMessageTree normalDistributionChildren[] = { From 458c9316f13b1db264d2243292831886262308d7 Mon Sep 17 00:00:00 2001 From: Yaya-Cout Date: Thu, 23 Nov 2023 19:21:10 +0100 Subject: [PATCH 2/2] [Ion][DFU] Restore compatibility with NumWorks website Revert product string descriptor change --- ion/src/device/shared/usb/calculator.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ion/src/device/shared/usb/calculator.h b/ion/src/device/shared/usb/calculator.h index 29a7203c6b4..97c5f12813e 100644 --- a/ion/src/device/shared/usb/calculator.h +++ b/ion/src/device/shared/usb/calculator.h @@ -93,7 +93,7 @@ class Calculator : public Device { &m_webUSBPlatformDescriptor), m_languageStringDescriptor(), m_manufacturerStringDescriptor("NumWorks"), - m_productStringDescriptor("Upsilon Calculator"), + m_productStringDescriptor("NumWorks Calculator"), m_serialNumberStringDescriptor(serialNumber), m_interfaceStringDescriptor(stringDescriptor()), //m_interfaceStringDescriptor("@SRAM/0x20000000/01*256Ke"),