committed by
Andre Bernet
parent
541aa459cf
commit
bd968bd60f
@@ -25,6 +25,7 @@ set(COMPANION_OSX_APP_BUNDLE_NAME "OpenTX Companion ${VERSION_MAJOR}.${VERSION_M
|
|||||||
# the binary (default homebrew path)
|
# the binary (default homebrew path)
|
||||||
set(DFU_UTIL_PATH "/usr/local/bin/dfu-util")
|
set(DFU_UTIL_PATH "/usr/local/bin/dfu-util")
|
||||||
set(AVRDUDE_PATH "/usr/local/bin/avrdude")
|
set(AVRDUDE_PATH "/usr/local/bin/avrdude")
|
||||||
|
set(AVRDUDE_CONF "/usr/local/etc/avrdude.conf")
|
||||||
|
|
||||||
option(ALLOW_NIGHTLY_BUILDS "Allow nightly builds download / update") # Disabled by default
|
option(ALLOW_NIGHTLY_BUILDS "Allow nightly builds download / update") # Disabled by default
|
||||||
if(ALLOW_NIGHTLY_BUILDS)
|
if(ALLOW_NIGHTLY_BUILDS)
|
||||||
@@ -524,9 +525,13 @@ IF(APPLE)
|
|||||||
# Copy dfu-util and avrdude, resolve symlink first
|
# Copy dfu-util and avrdude, resolve symlink first
|
||||||
get_filename_component(DFU_UTIL_ABSOLUTE_PATH ${DFU_UTIL_PATH} REALPATH)
|
get_filename_component(DFU_UTIL_ABSOLUTE_PATH ${DFU_UTIL_PATH} REALPATH)
|
||||||
get_filename_component(AVRDUDE_ABSOLUTE_PATH ${AVRDUDE_PATH} REALPATH)
|
get_filename_component(AVRDUDE_ABSOLUTE_PATH ${AVRDUDE_PATH} REALPATH)
|
||||||
|
get_filename_component(AVRDUDECONF_ABSOLUTE_PATH ${AVRDUDE_CONF} REALPATH)
|
||||||
install(PROGRAMS ${DFU_UTIL_ABSOLUTE_PATH} ${AVRDUDE_ABSOLUTE_PATH} DESTINATION ${companion_res_dir} COMPONENT Runtime)
|
install(PROGRAMS ${DFU_UTIL_ABSOLUTE_PATH} ${AVRDUDE_ABSOLUTE_PATH} DESTINATION ${companion_res_dir} COMPONENT Runtime)
|
||||||
|
install(FILES ${AVRDUDECONF_ABSOLUTE_PATH} DESTINATION ${companion_res_dir} COMPONENT Runtime)
|
||||||
|
|
||||||
set(bundle_tools_path "\${CMAKE_INSTALL_PREFIX}/${companion_res_dir}/dfu-util;\${CMAKE_INSTALL_PREFIX}/${companion_res_dir}/avrdude")
|
set(bundle_tools_path "\${CMAKE_INSTALL_PREFIX}/${companion_res_dir}/dfu-util;\${CMAKE_INSTALL_PREFIX}/${companion_res_dir}/avrdude")
|
||||||
|
|
||||||
|
|
||||||
# Include depencies (adding frameworks, fixing the embbeded libraries)
|
# Include depencies (adding frameworks, fixing the embbeded libraries)
|
||||||
# I get write errors without setting BU_CHMOD_BUNDLE_ITEMS even though it is
|
# I get write errors without setting BU_CHMOD_BUNDLE_ITEMS even though it is
|
||||||
# technically a hack (that is already is in the Bundle library ...)
|
# technically a hack (that is already is in the Bundle library ...)
|
||||||
|
|||||||
@@ -105,6 +105,18 @@ burnConfigDialog::~burnConfigDialog()
|
|||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QStringList burnConfigDialog::getAvrdudeArgs()
|
||||||
|
{
|
||||||
|
QStringList args = avrArgs;
|
||||||
|
if (!avrPort.isEmpty())
|
||||||
|
args << "-P" << avrPort;
|
||||||
|
|
||||||
|
#if defined(__APPLE__)
|
||||||
|
args << "-C" << QFileInfo(QApplication::applicationDirPath() + "/../Resources/avrdude.conf").absoluteFilePath();
|
||||||
|
#endif
|
||||||
|
return args;
|
||||||
|
}
|
||||||
|
|
||||||
void burnConfigDialog::getSettings()
|
void burnConfigDialog::getSettings()
|
||||||
{
|
{
|
||||||
avrLoc = g.avrdudeLocation();
|
avrLoc = g.avrdudeLocation();
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ public:
|
|||||||
QString getAVRDUDE() {return avrLoc;}
|
QString getAVRDUDE() {return avrLoc;}
|
||||||
QString getSAMBA() {return sambaLoc;}
|
QString getSAMBA() {return sambaLoc;}
|
||||||
QString getDFU() {return dfuLoc;}
|
QString getDFU() {return dfuLoc;}
|
||||||
QStringList getAvrdudeArgs() { QStringList args = avrArgs; if (!avrPort.isEmpty()) args << "-P" << avrPort; return args; }
|
QStringList getAvrdudeArgs();
|
||||||
QStringList getDFUArgs() {return dfuArgs;}
|
QStringList getDFUArgs() {return dfuArgs;}
|
||||||
QString getProgrammer() {return avrProgrammer;}
|
QString getProgrammer() {return avrProgrammer;}
|
||||||
QString getMCU() {return avrMCU;}
|
QString getMCU() {return avrMCU;}
|
||||||
|
|||||||
Reference in New Issue
Block a user