diff --git a/README.md b/README.md index 07b25d011..ab9fdf3c4 100644 --- a/README.md +++ b/README.md @@ -24,3 +24,7 @@ We welcome contributions. For smaller changes just open a pull request straight ## License NumWorks Epsilon is released under a [CC BY-NC-SA License](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode). NumWorks is a registered trademark. + +# Personal Changelog + +- Revert: https://github.com/numworks/epsilon/commit/267d27f1145922b61b6171e14284534fa2256f0c \ No newline at end of file diff --git a/apps/calculation/calculation.cpp b/apps/calculation/calculation.cpp index b04d232a1..f9f06e2a9 100644 --- a/apps/calculation/calculation.cpp +++ b/apps/calculation/calculation.cpp @@ -55,7 +55,7 @@ void Calculation::setContent(const char * c, Context * context, Expression ansEx } Expression exactOutput; Expression approximateOutput; - PoincareHelpers::ParseAndSimplifyAndApproximate(m_inputText, &exactOutput, &approximateOutput, *context, false); + PoincareHelpers::ParseAndSimplifyAndApproximate(m_inputText, &exactOutput, &approximateOutput, *context); /// FALSE TO DISABLE LITERAL CALCULATION PoincareHelpers::Serialize(exactOutput, m_exactOutputText, sizeof(m_exactOutputText)); PoincareHelpers::Serialize(approximateOutput, m_approximateOutputText, sizeof(m_approximateOutputText)); } @@ -214,7 +214,7 @@ Calculation::EqualSign Calculation::exactAndApproximateDisplayedOutputsAreEqual( constexpr int bufferSize = Constant::MaxSerializedExpressionSize; char buffer[bufferSize]; Preferences * preferences = Preferences::sharedPreferences(); - Expression exactOutputExpression = PoincareHelpers::ParseAndSimplify(m_exactOutputText, *context, false); + Expression exactOutputExpression = PoincareHelpers::ParseAndSimplify(m_exactOutputText, *context); /// FALSE TO DISABLE LITERAL CALCULATION if (exactOutputExpression.isUninitialized()) { exactOutputExpression = Undefined::Builder(); } diff --git a/epsilon.elf b/epsilon.elf new file mode 100755 index 000000000..772662e4f Binary files /dev/null and b/epsilon.elf differ diff --git a/scripts/targets.device.mak b/scripts/targets.device.mak index 52ba503c1..e0aa9600d 100644 --- a/scripts/targets.device.mak +++ b/scripts/targets.device.mak @@ -34,7 +34,7 @@ @echo "===============================" .PHONY: %_flash -%_flash: %.bin +%_flash: ./build/device/%.bin @echo "DFU $@" @echo "INFO About to flash your device. Please plug your device to your computer" @echo " using an USB cable and press the RESET button the back of your device."