Update FiveAxisStrategy.cpp

[ITorubarov]

Изменён порядок вычислений: сначала c_offset, затем a_offset (вычисляемый с учётом предварительного поворота шаблона на угол c_offset). c_offset вычисляется через синус, а не тангенс, для пущей точности. Я ничего не сломал, пока двигал строки?

In order for a Pull request to be accepted it must meet certain standards and guidelines.

In addition to following the Coding-Standards it is suggested the following be adopted.

• There must be a detailed description of the change, why it was added and what the use case is, and a link to the documentation to use it in the wiki if applicable.
• Do not commit changes to the FirmwareBin directory or any binary files in the repository. (this is hard to reverse once done)
• Only one feature per pull request, if you change multiple files with unrelated changes it will be rejected.
• Do not make gratuitous changes. If your coding style is different from the one adopted by most of the Smoothie codebase, do not make changes to suit your style. Peoples styles differ, and the new code you write may reflect your coding style, that is ok, but changing existing code to match your style is not ok. Doing so will delay the acceptance of your code, or have it rejected entirely.
• Maintain backwards compatibility. Do not make changes that will break other peoples systems, it is not acceptable to force everyone to change their config files to accommodate your change. If necessary add new configs to enable your change if it is breaking backward compatibility.
• Do not make changes that are specific to your setup. Smoothie needs to work in many different environments.
• Do not make changes that customize messages specific to your company or implementation. You are welcome to do this in your own fork and binary, it is not ok to try to merge that into the upstream repository.
• Test your changes is as many different configurations as you can, eg different arm solutions. In the Pull request state what tests have been done and what tests need to be done.
• Do not reformat the Config Samples to suit your style.
• Add examples of your config entries to the ConfigSamples/Snippets folder, only change existing config samples if absolutely necessary
• If you must correct existing comments (like correct spelling mistakes or typos) then submit them as separate pull requests
• Make sure your Pull request is against the current edge branch, and passes the Travis CI.
• All comments and code must be in English, this includes names of functions.

It may seem like a pain to follow these rules, but it takes the maintainers valuable time and effort to review and test pull requests, these guidelines help reduce that effort.

[frylock34]

Есть ошибки сборки

/__w/Stereotech-Firmware/Stereotech-Firmware/gcc-arm-none-eabi/arm-none-eabi/include/c++/4.8.3/tuple:648:9: note:   template argument deduction/substitution failed:
modules/tools/zprobe/FiveAxisStrategy.cpp:379:22: note:   'std::tuple<float, float, float>' is not derived from 'const std::pair<_T1, _T2>'
     std::tie(x2, y2) = actual_probe_points[1];
                      ^
In file included from modules/tools/zprobe/FiveAxisStrategy.h:6:0,
                 from modules/tools/zprobe/FiveAxisStrategy.cpp:1:
/__w/Stereotech-Firmware/Stereotech-Firmware/gcc-arm-none-eabi/arm-none-eabi/include/c++/4.8.3/tuple:657:9: note: template<class _U1, class _U2> std::tuple<_T1, _T2>& std::tuple<_T1, _T2>::operator=(std::pair<_U1, _U2>&&) [with _U1 = _U1; _U2 = _U2; _T1 = float&; _T2 = float&]
         operator=(pair<_U1, _U2>&& __in)
         ^
/__w/Stereotech-Firmware/Stereotech-Firmware/gcc-arm-none-eabi/arm-none-eabi/include/c++/4.8.3/tuple:657:9: note:   template argument deduction/substitution failed:
modules/tools/zprobe/FiveAxisStrategy.cpp:379:22: note:   'std::tuple<float, float, float>' is not derived from 'std::pair<_T1, _T2>'
     std::tie(x2, y2) = actual_probe_points[1];

Они из-за того, что actual_probe_points[1] - кортеж размерностью 3, и ты пытаешься свести его в кортеж размерностью 2. надо добавить третью координату, например

float y1, y2, x1, x2, z1, z2; 
std::tie(x2, y2, z2) = ...