Skip to content

Commit

Permalink
Release version: 0.986
Browse files Browse the repository at this point in the history
  • Loading branch information
enrico-fabteam committed Mar 1, 2017
1 parent 9c35199 commit e8783fa
Show file tree
Hide file tree
Showing 866 changed files with 288,870 additions and 288,839 deletions.
19 changes: 19 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,23 @@
# FABTOTUM USER INTERFACE

### Version 0.986 - 2017-03-01

#### General
* Fixed and improved Nozzle Height calibration
* Minor bugfixes

#### Firmware
* Head state is not reset after M999: this makes possible (again) to use other machine functions while the head is disabled after an error occurred.
* Fixed G28 not setting X/Y as homed after G28 without arguments
* Lowered min heater temperature down to 10 degrees
* Setting laser power to 0 actually turns off the laser beam
* Ambient color correctly reset after homing

See complete changelog [here] (https://github.com/FABtotum/FABlin#version-1000972)

==================================================================


### Version 0.98 - 2017-01-23

#### General
Expand Down
20 changes: 10 additions & 10 deletions api/.htaccess
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
RewriteEngine on
RewriteBase /api/
#RewriteCond $1 !^(index\.php|assets|application|down|robots|upload|ajax|temp|slic3r|\.txt\.json)
#RewriteRule ^(.*)$ /fabui/index.php/$1 [L]
RewriteRule ^files/([A-Za-z0-9-]+)/?$ file_upload.php?location=$1 [NC]
RewriteRule ^version/?$ connection_test.php [NC]


php_value upload_max_filesize 512M
php_value post_max_size 512M
RewriteEngine on
RewriteBase /api/
#RewriteCond $1 !^(index\.php|assets|application|down|robots|upload|ajax|temp|slic3r|\.txt\.json)
#RewriteRule ^(.*)$ /fabui/index.php/$1 [L]
RewriteRule ^files/([A-Za-z0-9-]+)/?$ file_upload.php?location=$1 [NC]
RewriteRule ^version/?$ connection_test.php [NC]


php_value upload_max_filesize 512M
php_value post_max_size 512M
php_value memory_limit 512M
34 changes: 17 additions & 17 deletions api/connection_test.php
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?php
require_once $_SERVER['DOCUMENT_ROOT'] . '/fabui/ajax/config.php';
$post_key = $_SERVER['HTTP_X_API_KEY'];
$_units = json_decode(file_get_contents(CONFIG_UNITS), TRUE);
$_upload_api_keys = isset($_units['api']['keys']) ? $_units['api']['keys']: '';
foreach ($_upload_api_keys as $user => $key){
if ($key == $post_key){
return http_response_code(200);
}
}
// if($key == $_upload_api_key){
// ;
// }else{


// }
return http_response_code(401);
<?php
require_once $_SERVER['DOCUMENT_ROOT'] . '/fabui/ajax/config.php';
$post_key = $_SERVER['HTTP_X_API_KEY'];
$_units = json_decode(file_get_contents(CONFIG_UNITS), TRUE);
$_upload_api_keys = isset($_units['api']['keys']) ? $_units['api']['keys']: '';
foreach ($_upload_api_keys as $user => $key){
if ($key == $post_key){
return http_response_code(200);
}
}
// if($key == $_upload_api_key){
// ;
// }else{


// }
return http_response_code(401);
?>
82 changes: 41 additions & 41 deletions api/factory.php
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
<?php
/**
*
* @author Krios Mane
* @version 0.1
* @license https://opensource.org/licenses/GPL-3.0
*
*/


include '/var/www/lib/config.php';
include '/var/www/lib/utilities.php';
include "/var/www/lib/serial.php";


$command = isset($_GET['code']) ? trim($_GET['code']) : '';
$callback = $_GET['callback'];


if($command == ''){
header('Content-Type: application/json; charset=utf-8');
echo $callback.'('.json_encode(array('command' => '', 'output' => 'Command not set')).')';
exit();
}

//load serial class
$ini_array = parse_ini_file(SERIAL_INI);
$serial = new Serial();
$serial->deviceSet($ini_array['port']);
$serial->confBaudRate($ini_array['baud']);
$serial->confParity("none");
$serial->confCharacterLength(8);
$serial->confStopBits(1);
$serial->deviceOpen();
//send command
$serial->sendMessage($command.PHP_EOL);
$reply = $serial->readPort();
$serial->serialflush();
$serial->deviceClose();
header('Content-Type: application/json; charset=utf-8');
echo $callback.'('.json_encode(array('command' => $command, 'output' => $reply)).')';
<?php
/**
*
* @author Krios Mane
* @version 0.1
* @license https://opensource.org/licenses/GPL-3.0
*
*/


include '/var/www/lib/config.php';
include '/var/www/lib/utilities.php';
include "/var/www/lib/serial.php";


$command = isset($_GET['code']) ? trim($_GET['code']) : '';
$callback = $_GET['callback'];


if($command == ''){
header('Content-Type: application/json; charset=utf-8');
echo $callback.'('.json_encode(array('command' => '', 'output' => 'Command not set')).')';
exit();
}

//load serial class
$ini_array = parse_ini_file(SERIAL_INI);
$serial = new Serial();
$serial->deviceSet($ini_array['port']);
$serial->confBaudRate($ini_array['baud']);
$serial->confParity("none");
$serial->confCharacterLength(8);
$serial->confStopBits(1);
$serial->deviceOpen();
//send command
$serial->sendMessage($command.PHP_EOL);
$reply = $serial->readPort();
$serial->serialflush();
$serial->deviceClose();
header('Content-Type: application/json; charset=utf-8');
echo $callback.'('.json_encode(array('command' => $command, 'output' => $reply)).')';
?>
Loading

0 comments on commit e8783fa

Please sign in to comment.