Skip to content
Snippets Groups Projects
Commit c376bfe8 authored by Florent Langlois's avatar Florent Langlois
Browse files

remove Utils lib

parent 5d76f99a
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.15) ...@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.15)
project(${PROJECT_NAME} CXX) project(${PROJECT_NAME} CXX)
find_package(yat4tango CONFIG REQUIRED) find_package(yat4tango CONFIG REQUIRED)
find_package(utils CONFIG REQUIRED)
if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows") if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
find_package(crashreporting2 CONFIG) find_package(crashreporting2 CONFIG)
endif() endif()
...@@ -21,7 +20,6 @@ set(includedirs ...@@ -21,7 +20,6 @@ set(includedirs
add_executable(${EXECUTABLE_NAME} ${sources}) add_executable(${EXECUTABLE_NAME} ${sources})
target_include_directories(${EXECUTABLE_NAME} PRIVATE ${includedirs}) target_include_directories(${EXECUTABLE_NAME} PRIVATE ${includedirs})
target_link_libraries(${EXECUTABLE_NAME} PRIVATE yat4tango::yat4tango) target_link_libraries(${EXECUTABLE_NAME} PRIVATE yat4tango::yat4tango)
target_link_libraries(${EXECUTABLE_NAME} PRIVATE utils::utils)
if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows") if (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
target_link_libraries(${EXECUTABLE_NAME} PRIVATE crashreporting2::crashreporting2) target_link_libraries(${EXECUTABLE_NAME} PRIVATE crashreporting2::crashreporting2)
endif() endif()
......
...@@ -3,7 +3,7 @@ from conan import ConanFile ...@@ -3,7 +3,7 @@ from conan import ConanFile
class SimulatedMotorRecipe(ConanFile): class SimulatedMotorRecipe(ConanFile):
name = "simulatedmotor" name = "simulatedmotor"
executable = "ds_SimulatedMotor" executable = "ds_SimulatedMotor"
version = "2.0.2" version = "2.0.3"
package_type = "application" package_type = "application"
user = "soleil" user = "soleil"
python_requires = "base/[>=1.0]@soleil/stable" python_requires = "base/[>=1.0]@soleil/stable"
...@@ -22,6 +22,5 @@ class SimulatedMotorRecipe(ConanFile): ...@@ -22,6 +22,5 @@ class SimulatedMotorRecipe(ConanFile):
def requirements(self): def requirements(self):
self.requires("yat4tango/[>=1.0]@soleil/stable") self.requires("yat4tango/[>=1.0]@soleil/stable")
self.requires("utils/[>=1.0]@soleil/stable")
if self.settings.os == "Linux": if self.settings.os == "Linux":
self.requires("crashreporting2/[>=1.0]@soleil/stable") self.requires("crashreporting2/[>=1.0]@soleil/stable")
...@@ -61,7 +61,6 @@ static const char *RcsId = "$Id: $"; ...@@ -61,7 +61,6 @@ static const char *RcsId = "$Id: $";
#include <tango.h> #include <tango.h>
#include "PogoHelper.h" #include "PogoHelper.h"
#include "Tools.h"
#include <SimulatedMotor.h> #include <SimulatedMotor.h>
#include <SimulatedMotorClass.h> #include <SimulatedMotorClass.h>
#include <float.h> #include <float.h>
...@@ -593,8 +592,6 @@ void SimulatedMotor::write_accuracy(Tango::WAttribute &attr) ...@@ -593,8 +592,6 @@ void SimulatedMotor::write_accuracy(Tango::WAttribute &attr)
INFO_STREAM << "accuracy <- " << attr_accuracy_write; INFO_STREAM << "accuracy <- " << attr_accuracy_write;
} }
//+------------------------------------------------------------------ //+------------------------------------------------------------------
/** /**
* method: SimulatedMotor::forward * method: SimulatedMotor::forward
...@@ -608,9 +605,7 @@ void SimulatedMotor::write_accuracy(Tango::WAttribute &attr) ...@@ -608,9 +605,7 @@ void SimulatedMotor::write_accuracy(Tango::WAttribute &attr)
//+------------------------------------------------------------------ //+------------------------------------------------------------------
void SimulatedMotor::forward() void SimulatedMotor::forward()
{ {
DEBUG_STREAM << "SimulatedMotor::forward(): entering... !" << endl; INFO_STREAM << "SimulatedMotor::forward(): entering... !" << endl;
INFO_STREAM << "Command called: forward";
if (*attr_positionLocked_read == true) if (*attr_positionLocked_read == true)
{ {
...@@ -635,9 +630,7 @@ void SimulatedMotor::forward() ...@@ -635,9 +630,7 @@ void SimulatedMotor::forward()
//+------------------------------------------------------------------ //+------------------------------------------------------------------
void SimulatedMotor::backward() void SimulatedMotor::backward()
{ {
DEBUG_STREAM << "SimulatedMotor::backward(): entering... !" << endl; INFO_STREAM << "SimulatedMotor::backward(): entering... !" << endl;
INFO_STREAM << "Command called: backward";
if (*attr_positionLocked_read == true) if (*attr_positionLocked_read == true)
{ {
...@@ -661,9 +654,7 @@ void SimulatedMotor::backward() ...@@ -661,9 +654,7 @@ void SimulatedMotor::backward()
//+------------------------------------------------------------------ //+------------------------------------------------------------------
void SimulatedMotor::stop() void SimulatedMotor::stop()
{ {
DEBUG_STREAM << "SimulatedMotor::stop(): entering... !" << endl; INFO_STREAM << "SimulatedMotor::stop(): entering... !" << endl;
INFO_STREAM << "Command called: stop";
yat::Message * msg = new yat::Message(MSG_STOP, DEFAULT_MSG_PRIORITY, true); yat::Message * msg = new yat::Message(MSG_STOP, DEFAULT_MSG_PRIORITY, true);
m_task->wait_msg_handled(msg); // handle message synchronously (ensure exiting backward() in STANDBY state) m_task->wait_msg_handled(msg); // handle message synchronously (ensure exiting backward() in STANDBY state)
...@@ -681,9 +672,7 @@ void SimulatedMotor::stop() ...@@ -681,9 +672,7 @@ void SimulatedMotor::stop()
//+------------------------------------------------------------------ //+------------------------------------------------------------------
void SimulatedMotor::motor_on() void SimulatedMotor::motor_on()
{ {
DEBUG_STREAM << "SimulatedMotor::motor_on(): entering... !" << endl; INFO_STREAM << "SimulatedMotor::motor_on(): entering... !" << endl;
INFO_STREAM << "Command called: motor_on";
if (get_state() == Tango::STANDBY) return; if (get_state() == Tango::STANDBY) return;
...@@ -703,9 +692,7 @@ void SimulatedMotor::motor_on() ...@@ -703,9 +692,7 @@ void SimulatedMotor::motor_on()
//+------------------------------------------------------------------ //+------------------------------------------------------------------
void SimulatedMotor::motor_off() void SimulatedMotor::motor_off()
{ {
DEBUG_STREAM << "SimulatedMotor::motor_off(): entering... !" << endl; INFO_STREAM << "SimulatedMotor::motor_off(): entering... !" << endl;
INFO_STREAM << "Command called: motor_off";
yat::Message * msg = new yat::Message(MSG_OFF); yat::Message * msg = new yat::Message(MSG_OFF);
m_task->post(msg); m_task->post(msg);
...@@ -762,7 +749,7 @@ Tango::DevState SimulatedMotor::dev_state() ...@@ -762,7 +749,7 @@ Tango::DevState SimulatedMotor::dev_state()
default: default:
{ {
device_status << GetDeviceState(device_state); device_status << Tango::DevStateName[device_state];
} }
} }
...@@ -787,7 +774,7 @@ Tango::DevState SimulatedMotor::dev_state() ...@@ -787,7 +774,7 @@ Tango::DevState SimulatedMotor::dev_state()
//+------------------------------------------------------------------ //+------------------------------------------------------------------
void SimulatedMotor::force_state(Tango::DevString argin) void SimulatedMotor::force_state(Tango::DevString argin)
{ {
DEBUG_STREAM << "SimulatedMotor::force_state(): entering... !" << endl; INFO_STREAM << "SimulatedMotor::force_state(): entering... !" << endl;
// Find the index of the given string // Find the index of the given string
yat::String state_in = argin; yat::String state_in = argin;
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment