Skip to content

Commit

Permalink
disabled updates checks
Browse files Browse the repository at this point in the history
  • Loading branch information
krios-fabteam committed Nov 24, 2018
1 parent fb316bf commit 0546cdc
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 9 deletions.
10 changes: 5 additions & 5 deletions fabui/application/controllers/Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,8 @@ public function saveNetworkSettings($action = 'connect')
storeNetworkSettings($net_type, $iface, $mode, $address, $netmask, $gateway);

//update social feeds
downloadAllFeeds();
downloadAllFilamentsFeeds();
//downloadAllFeeds();
//downloadAllFilamentsFeeds();
break;
case "wlan":
if($action == 'connect')
Expand Down Expand Up @@ -408,8 +408,8 @@ public function saveNetworkSettings($action = 'connect')
configureWireless($iface, $ssid, $password, $psk, $mode, $address, $netmask, $gateway, $ap_channel);
storeNetworkSettings($net_type, $iface, $mode, $address, $netmask, $gateway, $ssid, $password, $psk);
//update social feeds
downloadAllFeeds();
downloadAllFilamentsFeeds();
//downloadAllFeeds();
//downloadAllFilamentsFeeds();
}
else if($action == 'disconnect')
{
Expand All @@ -434,7 +434,7 @@ public function saveNetworkSettings($action = 'connect')
$result = false;
}
writeNetworkInfo();
reload_myfabtotum();
//reload_myfabtotum();
//$this->output->set_content_type('application/json')->set_output(json_encode($result));
$this->output->set_content_type('application/json')->set_output(json_encode(getInterfaces()));
}
Expand Down
6 changes: 5 additions & 1 deletion fabui/application/controllers/Updates.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public function index()
function updateStatus()
{
//load helpers, config
/*
$this->load->helper(array('update_helper', 'file', 'os_helper'));
$this->config->load('fabtotum');
//get remote bundles status
Expand All @@ -66,7 +67,10 @@ function updateStatus()
write_file($this->config->item('updates_json_file'), json_encode($bundlesStatus));
}else{
$bundlesStatus['remote_connection'] = false;
}
}*/

$bundlesStatus['remote_connection'] = false;

$this->output->set_content_type('application/json')->set_output(json_encode($bundlesStatus));
}
/**
Expand Down
4 changes: 2 additions & 2 deletions fabui/application/helpers/fabtotum_helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ function createDefaultSettings()
'z_max_offset' => 241.5,
'settings_type' => 'default',
'hardware' => array(
'head' => 'printing_head',
'feeder' => 'built_in_feeder',
'head' => 'printing_head_pro',
'feeder' => 'printing_head_pro',
'camera' => array('version' => 'camera_v1', 'available' => false),
'bed' => array('enable'=> true)
),
Expand Down
5 changes: 5 additions & 0 deletions fabui/application/helpers/os_helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,11 @@ function downloadRemoteFile($remoteUrl, $path, $timeout=30, $do_internet_check=t
*/
function getRemoteFile($url, $do_internet_check=true, $headers = array(), $timeout=30, $ssl=false )
{
/**
* disable connections
**/
return false;

if($do_internet_check)
{
if(!isInternetAvaialable())
Expand Down
2 changes: 2 additions & 0 deletions fabui/application/helpers/update_helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ function getUpdateStatus()
$plugins['installed'] = getInstalledPlugins();
$plugins['need_update'] = false;

$isInternet = false;

if($isInternet){ //check only if internet is available
$remoteMeta = getSystemRemoteVersions();
$remoteBundles = $remoteMeta['bundles'];
Expand Down
2 changes: 1 addition & 1 deletion fabui/ext/py/fabtotum/fabui/macros/printing.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def end_additive_safe_zone(app, args = None, lang='en_US.UTF-8'):
setLanguage(lang)
app.macro("M121", "ok", 2, _("Force endstops"), verbose=False )
app.macro("G90", "ok", 2, _("Setting abs position"), verbose=False)
app.macro("G0 X210 Y210 Z240 F10000", "ok", 100, _("Moving to safe zone"), verbose=False)
app.macro("G0 X150 Y170 Z240 F10000", "ok", 100, _("Moving to safe zone"), verbose=False)
app.macro("G27 Z0", "ok", 100, _("Zeroing Z axis"), verbose=False)
app.macro("M400", "ok", 200, _("Waiting for all moves to finish") )
app.macro("M18", "ok", 2, _("Motors off"), verbose=False )
Expand Down

1 comment on commit 0546cdc

@PaoloP74
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Grazie.

Please sign in to comment.