Skip to content

Commit

Permalink
Merge pull request #9 from Vourhey/master
Browse files Browse the repository at this point in the history
Bump version
  • Loading branch information
Vourhey authored Sep 2, 2019
2 parents 0a35ae1 + de05bb7 commit 1817039
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 16 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2018, Robonomics platform by Airalab
Copyright (c) 2019, Robonomics platform by Airalab
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
4 changes: 2 additions & 2 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
mkRosPackage rec {
name = "${pname}-${version}";
pname = "de_direct";
version = "master";
version = "0.1.0";

src = ./.;

propagatedBuildInputs = [ robonomics_comm pkgs.python37Packages.flask-restful ];

meta = with stdenv.lib; {
description = "DE direct";
homepage = http://github.com/vourhey/de_direct;
homepage = http://github.com/DroneEmployee/de_direct;
license = licenses.bsd3;
maintainers = [ maintainers.vourhey ];
};
Expand Down
4 changes: 2 additions & 2 deletions launch/composer.launch
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<param name="server_address" value="$(arg server_address)" />

<!-- default dirs are <install dir>/storage.shelve and /tmp/droneid -->
<!-- <param name="per_dir" value="/home/vadim/shelve" /> -->
<!-- <param name="tmp_dir" value="/home/vadim/dronid" /> -->
<!-- <param name="per_dir" value="shelve" /> -->
<!-- <param name="tmp_dir" value="dronid" /> -->
</node>
</launch>
5 changes: 3 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?xml version="1.0"?>
<package format="2">
<name>de_direct</name>
<version>0.0.0</version>
<version>0.1.0</version>
<description>The de_direct package</description>
<maintainer email="[email protected]">Alisher A. Khassanov</maintainer>
<author>Vadim Manaenko</author>
<maintainer email="[email protected]">Vadim Manaenko</maintainer>
<license>BSD3</license>

<buildtool_depend>catkin</buildtool_depend>
Expand Down
Binary file modified robonomics/objective.bag
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ model: {
"multihash": "QmYVEPMfzSf2GXhA2heLrnhr931xmnXBEfy79Zrk9Aeskv"
}
objective: {
"multihash": "QmSmvDniFg1N47TXM6py35F13aANg4jWen713bWMRbWzB5"
"multihash": "QmQdUYdQT9F46kvdoCWPYaVZhJ9nJ7UP9tueDbFKs55Vzw"
}
token: {
"address": "0x966EbbFD7ECbCF44b1e05341976e0652CFA01360"
Expand Down
8 changes: 0 additions & 8 deletions scripts/agent_node
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,6 @@ from robonomics_liability.srv import *
# This package
from de_direct.ipfs_utils import ipfs_download

'''
pilot_reg
self.current_job['success'] = True
'''


class Agent:
liability = None

Expand Down

0 comments on commit 1817039

Please sign in to comment.