Merge branch 'superOS-master' into superOS-dev

AngeDieu · Nov 25, 2023 · 142fdc0 · 142fdc0
2 parents 86aa962 + 96a0d73
commit 142fdc0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/apps/math_toolbox.cpp b/apps/math_toolbox.cpp
@@ -38,9 +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::FactorialCommandWithArg,
-  I18n::Message::Factorial)
+  ToolboxMessageTree::Leaf(I18n::Message::PermuteCommandWithArg, I18n::Message::Permutation),
+  ToolboxMessageTree::Leaf(I18n::Message::FactorialCommandWithArg, I18n::Message::Factorial)
 };
 
 const ToolboxMessageTree normalDistributionChildren[] = {

diff --git 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"),