Commit c6c72a69 authored by David Košenina's avatar David Košenina

permissiong, fx3 write message box, menu text

parent ffd9d7da
......@@ -142,9 +142,9 @@ else()
endif()
if(SCOPEFUN_WINDOWS)
install( DIRECTORY "${CMAKE_SOURCE_DIR}/bin/data" DESTINATION "." )
install( DIRECTORY "${CMAKE_SOURCE_DIR}/bin/locale" DESTINATION "." )
install( DIRECTORY "${CMAKE_SOURCE_DIR}/bin/api" DESTINATION "." )
install( DIRECTORY "${CMAKE_SOURCE_DIR}/bin/data" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ DESTINATION "." )
install( DIRECTORY "${CMAKE_SOURCE_DIR}/bin/locale" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ DESTINATION "." )
install( DIRECTORY "${CMAKE_SOURCE_DIR}/bin/api" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ DESTINATION "." )
endif()
# macosx packing
......
......@@ -94,33 +94,33 @@ Osciloskop::Osciloskop( wxWindow* parent, wxWindowID id, const wxString& title,
m_menu5 = new wxMenu();
wxMenuItem* m_menuItemReadEEPROM;
m_menuItemReadEEPROM = new wxMenuItem( m_menu5, wxID_ANY, wxString( _("Read FX3") ) , wxEmptyString, wxITEM_NORMAL );
m_menuItemReadEEPROM = new wxMenuItem( m_menu5, wxID_ANY, wxString( _("Read FX3 Firmware") ) , wxEmptyString, wxITEM_NORMAL );
m_menu5->Append( m_menuItemReadEEPROM );
wxMenuItem* m_menuItemWriteEEPROM;
m_menuItemWriteEEPROM = new wxMenuItem( m_menu5, wxID_ANY, wxString( _("Write FX3") ) , wxEmptyString, wxITEM_NORMAL );
m_menuItemWriteEEPROM = new wxMenuItem( m_menu5, wxID_ANY, wxString( _("Write FX3 Firmware") ) , wxEmptyString, wxITEM_NORMAL );
m_menu5->Append( m_menuItemWriteEEPROM );
m_menu5->AppendSeparator();
wxMenuItem* m_menuItem12;
m_menuItem12 = new wxMenuItem( m_menu5, wxID_ANY, wxString( _("Auto Callibrate ( save to EEPROM and hardware2.json )") ) , wxEmptyString, wxITEM_NORMAL );
m_menuItem12 = new wxMenuItem( m_menu5, wxID_ANY, wxString( _("Auto Callibrate") ) , wxEmptyString, wxITEM_NORMAL );
m_menu5->Append( m_menuItem12 );
m_menu5->AppendSeparator();
wxMenuItem* m_menuItemWriteCallibrate;
m_menuItemWriteCallibrate = new wxMenuItem( m_menu5, wxID_ANY, wxString( _("Write Callibration ( load from hardware2.json )") ) , wxEmptyString, wxITEM_NORMAL );
m_menuItemWriteCallibrate = new wxMenuItem( m_menu5, wxID_ANY, wxString( _("Write Callibration") ) , wxEmptyString, wxITEM_NORMAL );
m_menu5->Append( m_menuItemWriteCallibrate );
wxMenuItem* m_menuItemReadCallibrate;
m_menuItemReadCallibrate = new wxMenuItem( m_menu5, wxID_ANY, wxString( _("Read Callibration ( save to hardware2.json )") ) , wxEmptyString, wxITEM_NORMAL );
m_menuItemReadCallibrate = new wxMenuItem( m_menu5, wxID_ANY, wxString( _("Read Callibration") ) , wxEmptyString, wxITEM_NORMAL );
m_menu5->Append( m_menuItemReadCallibrate );
m_menu5->AppendSeparator();
wxMenuItem* m_menuItemResetEEPROM;
m_menuItemResetEEPROM = new wxMenuItem( m_menu5, wxID_ANY, wxString( _("Erase") ) , wxEmptyString, wxITEM_NORMAL );
m_menuItemResetEEPROM = new wxMenuItem( m_menu5, wxID_ANY, wxString( _("Erase FX3 Firmware") ) , wxEmptyString, wxITEM_NORMAL );
m_menu5->Append( m_menuItemResetEEPROM );
m_menubar1->Append( m_menu5, _("EEPROM") );
......
......@@ -27,7 +27,7 @@
<property name="ui_table">UI</property>
<property name="use_enum">0</property>
<property name="use_microsoft_bom">0</property>
<object class="Frame" expanded="0">
<object class="Frame" expanded="1">
<property name="aui_managed">0</property>
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
<property name="bg">255,255,255</property>
......@@ -60,7 +60,7 @@
<event name="OnIdle">OnIdle</event>
<event name="OnSetFocus">OnSetFocus</event>
<event name="OnSize">OnSize</event>
<object class="wxMenuBar" expanded="0">
<object class="wxMenuBar" expanded="1">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
......@@ -331,7 +331,7 @@
<property name="help"></property>
<property name="id">wxID_ANY</property>
<property name="kind">wxITEM_NORMAL</property>
<property name="label">Read FX3</property>
<property name="label">Read FX3 Firmware</property>
<property name="name">m_menuItemReadEEPROM</property>
<property name="permission">none</property>
<property name="shortcut"></property>
......@@ -345,7 +345,7 @@
<property name="help"></property>
<property name="id">wxID_ANY</property>
<property name="kind">wxITEM_NORMAL</property>
<property name="label">Write FX3</property>
<property name="label">Write FX3 Firmware</property>
<property name="name">m_menuItemWriteEEPROM</property>
<property name="permission">none</property>
<property name="shortcut"></property>
......@@ -363,7 +363,7 @@
<property name="help"></property>
<property name="id">wxID_ANY</property>
<property name="kind">wxITEM_NORMAL</property>
<property name="label">Auto Callibrate ( save to EEPROM and hardware2.json )</property>
<property name="label">Auto Callibrate</property>
<property name="name">m_menuItem12</property>
<property name="permission">none</property>
<property name="shortcut"></property>
......@@ -381,7 +381,7 @@
<property name="help"></property>
<property name="id">wxID_ANY</property>
<property name="kind">wxITEM_NORMAL</property>
<property name="label">Write Callibration ( load from hardware2.json )</property>
<property name="label">Write Callibration</property>
<property name="name">m_menuItemWriteCallibrate</property>
<property name="permission">none</property>
<property name="shortcut"></property>
......@@ -395,7 +395,7 @@
<property name="help"></property>
<property name="id">wxID_ANY</property>
<property name="kind">wxITEM_NORMAL</property>
<property name="label">Read Callibration ( save to hardware2.json )</property>
<property name="label">Read Callibration</property>
<property name="name">m_menuItemReadCallibrate</property>
<property name="permission">none</property>
<property name="shortcut"></property>
......@@ -413,7 +413,7 @@
<property name="help"></property>
<property name="id">wxID_ANY</property>
<property name="kind">wxITEM_NORMAL</property>
<property name="label">Erase</property>
<property name="label">Erase FX3 Firmware</property>
<property name="name">m_menuItemResetEEPROM</property>
<property name="permission">none</property>
<property name="shortcut"></property>
......@@ -670,8 +670,10 @@ int ThreadApi::writeUsbToEEPROM(OscHardware* hw)
function(afUploadFxx);
function(afCloseUsb);
function(afOpenUsb);
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_INFORMATION, "Writting FX3 will start.", "Please wait and do not disconnect USB.",0 );
function(afEEPROMWrite);
wait();
}
int iret = result(afEEPROMWrite);
if (iret == SCOPEFUN_SUCCESS)
......@@ -3185,7 +3187,6 @@ void OsciloscopeManager::onCallibrateFrameCaptured(OsciloscopeFrame& frame, int
{
callibrate.mode = acStartMessageBox;
callibrate.active = 0;
// settings.getHardware()->save();
callibrate.debug << "acSaveSettings: \n";
FORMAT_BUFFER();
FORMAT_PATH("data/callibrate/debug.log");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment