Initial commit, based on .tar.gz file as provided by 3DR , see SOURCE file.

This commit is contained in:
Buzz 2017-07-28 17:02:51 +10:00
commit 291de87220
10 changed files with 575 additions and 0 deletions

View File

@ -0,0 +1,22 @@
Copyright 2014-2016 3D Robotics
Licensed under the Apache License, Version 2.0 (the "License");
you may not use these files except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
~~~~
Contributors prior to public release:
* John Finley
* Will Silva
* Tim Ryan
* Hamish Willee

View File

@ -0,0 +1,202 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

45
sololink-python/README.md Normal file
View File

@ -0,0 +1,45 @@
WARNING - WORK IN PROGRESS
```
This code is known to be broken and/or incomplete. IT DOES NOT WORK.
We are actively working on fixing it, and we really, really do not recommend you download it just yet.
We will remove this warning from the repository when it is no longer required.
```
pip -i install requirements.txt
python setup.py build
# sololink-python
This is a Python interface for SoloLink.
## Overview
*sololink-python* is used by the ShotManager button manager to get information about Controller (Artoo) button events (A,B,Pause,Fly), to get and remap RC stick values (from PWM into the more easily processed -1 to 1 range), and to send information for display on the Controller (for example, the current shot if in a shot or the mode).
## Dependencies (upstream and downstream)
This project is dependent on:
* SoloLink - This contains all the *3DR-created* software in the Yocto image running on the Companion Computer (i.MX6).
The project is a dependency of:
* ShotManager - ShotManager is a Python application that governs smart shots, GoPro control, and some Solo Controller (Artoo) functionality.
* meta-3dr - This contains the central definition of how the whole i.MX6 Yocto image is constructed. It contains [Bitbake](https://www.yoctoproject.org/tools-resources/projects/bitbake) recipes for the different included software, including ShotManager, SoloLink etc.
## Developer Setup
sololink-python is tested as part of ShotManager (for example, RC Mapping is tested as part of `/shotmanager/sim/TestRC.py`.)
## Resources
* The API is documented in-source.

1
sololink-python/SOURCE Normal file
View File

@ -0,0 +1 @@
This source code was released by 3DR in the file: sololink-python_1.3.0_5e25ed54.tar.gz

View File

@ -0,0 +1,2 @@
posix_ipc

27
sololink-python/setup.py Normal file
View File

@ -0,0 +1,27 @@
from setuptools import setup, Extension
import platform
version = '1.3.0'
setup(name='sololink',
zip_safe=True,
version=version,
description='Python interface for SoloLink',
long_description='Python interface for SoloLink',
url='https://github.com/3drobotics/sololink-python',
author='3D Robotics',
install_requires=[
'posix_ipc',
],
author_email='will.silva@3drobotics.com, jfinley@3drobotics.com,',
classifiers=[
'Development Status :: 4 - Beta',
'Environment :: Console',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.7',
'Topic :: Scientific/Engineering',
],
packages=[
'sololink'
],
ext_modules=[])

View File

View File

@ -0,0 +1,148 @@
import struct
"""
Button Message as received from the controller's button message server.
Start
Byte Size Description
0 8 Timestamp, usec since epoch
8 1 Button ID
9 1 Button event
10 2 Buttons-pressed mask
12 (packet length)
The buttons-pressed mask indicates all of the buttons that are pressed at
the time of the event, e.g. if it is 0x0012, then the "A" (1 << 4 = 0x0010)
and "Fly" (1 << 1 = 0x0002) buttons are pressed.
The timestamp is in microseconds since the Unix epoch. Note that it is set
when the message is first created on the controller, whose time may not be
synchronized to anything in particular. At the moment it is only useful when
comparing event timestamps to each other.
"""
LENGTH = 12
# Button IDs
# match artoo/src/io.h and SoloLink/flightcode/stm32/ButtonEventHandler.h
ButtonPower = 0
ButtonFly = 1
ButtonRTL = 2
ButtonLoiter = 3
ButtonA = 4
ButtonB = 5
ButtonPreset1 = 6
ButtonPreset2 = 7
ButtonCameraClick = 8
# index of each name expected to match IDs above
ButtonName = ["Power", "Fly", "RTL", "Loiter", "A", "B",
"Preset1", "Preset2", "CameraClick"]
# Button Events
# match artoo/src/button.h and SoloLink/flightcode/stm32/ButtonEventHandler.h
Press = 0
Release = 1
ClickRelease = 2
Hold = 3
LongHold = 4
DoubleClick = 5
# index of each name expected to match events above
EventName = ["Press", "Release", "ClickRelease",
"Hold", "LongHold", "DoubleClick"]
# packet type ids
# starting these at 2000 to avoid any collisions with app_packet,
# even though they are different connections so it won't matter
ARTOO_MSG_BUTTON_EVENT = 2000
ARTOO_MSG_SET_BUTTON_STRING = 2001
ARTOO_MSG_SET_SHOT_STRING = 2002
# values for bitmask to send to Artoo
ARTOO_BITMASK_ENABLED = 1
ARTOO_BITMASK_HIGHLIGHTED = 2
# Returns tuple:
# (timestamp_us, button_id, button_event, pressed_mask)
def unpack(s):
if len(s) != LENGTH:
return None
return struct.unpack("<QBBH", s)
# Reads message from stream and returns it.
# 's' is expected to be a stream-oriented socket
# returned message is tuple:
# (timestamp_us, button_id, button_event, pressed_mask)
# Buffer for accumulated data. It has been observed that we can get multiple
# events in the same socket read. It is possible that we could get a message
# split across two socket reads (although that has not been observed).
msg_buf = ""
# Debug flags
msg_buf_short = 0 # if nonzero, have seen msg_buf with this many bytes
msg_buf_long = 0 # if nonzero, have seen msg_buf with this many bytes
def recv(s):
global msg_buf
global msg_buf_short
global msg_buf_long
while True:
# debug
if len(msg_buf) > 0 and len(msg_buf) < 12:
msg_buf_short = len(msg_buf)
elif len(msg_buf) > 12:
msg_buf_long = len(msg_buf)
# got enough data yet?
if len(msg_buf) >= 12:
# return the first 12 bytes in the buffer
msg = msg_buf[:12]
msg_buf = msg_buf[12:]
return struct.unpack("<QBBH", msg)
else:
# not enough yet; wait for more
data = s.recv(1024)
if data is None:
# this case has not been observed to happen
continue
elif data == "":
# this happens if the other end closes
return None
else:
# append it to what we have then loop back and check for
# complete message
msg_buf = msg_buf + data
# end if
# end while
# Sends a button string to Artoo
# in the format (little-endian):
# Message ID : 4 bytes
# Length: N (4 bytes)
# Button ID: unsigned char
# Button event: unsigned char
# shot ID: signed char (-1 for none)
# bitmask: char :
# Lowest bit is "enabled" where "disabled" is greyed out on Artoo
# 2nd lowest bit is "lit up"
# string descriptor: n bytes
def sendArtooString(s, button_id, shot, mask, artooStr):
length = 4 + len(artooStr)
packstr = "<IIBBbb%ds"%(len(artooStr),)
pkt = struct.pack(packstr, ARTOO_MSG_SET_BUTTON_STRING, length, button_id,
Press, shot, mask, artooStr)
s.send(pkt)
# Sends a shot string to Artoo
# in the format (little-endian):
# Message ID : 4 bytes
# Length: N (4 bytes)
# string descriptor: n bytes
def sendShotString(s, shotStr):
length = len(shotStr)
packstr = "<II%ds"%(len(shotStr),)
pkt = struct.pack(packstr, ARTOO_MSG_SET_SHOT_STRING, length, shotStr)
s.send(pkt)

View File

@ -0,0 +1,80 @@
#!/usr/bin/env python
import mmap
import posix_ipc
import rc_pkt
# see rc_remap_sample.py for usage
# must match rc_ipc.c
shm_name = "/rc_shm"
sem_name = "/rc_sem"
# must match sizeof(struct rc_pkt)
shm_size = rc_pkt.LENGTH
shm = None
sem = None
shm_file = None
def attach():
global shm
global sem
global shm_file
# create/attach shared memory
try:
shm = posix_ipc.SharedMemory(shm_name, posix_ipc.O_CREAT, size=shm_size)
except:
print "rc_shm.attach: ERROR creating shared memory", shm_name
return False
shm_file = mmap.mmap(shm.fd, shm.size)
shm.close_fd()
# create/attach semaphore
try:
sem = posix_ipc.Semaphore(sem_name, posix_ipc.O_CREAT)
except:
print "rc_shm.attach: ERROR creating semaphore", sem_name
return False
return True
# pkt is a tuple (timestamp, sequence, channels[])
def put(pkt):
if shm_file is None or sem is None:
#print "rc_shm.put: must attach first"
return False
# convert from tuple to string
p = rc_pkt.pack(pkt)
if p is None:
return False
# write to shared memory
sem.acquire()
shm_file.seek(0)
shm_file.write(p)
sem.release()
return True
# return pkt or None
# pkt is returned as a tuple (timestamp, sequence, channels[])
def get():
if shm_file is None or sem is None:
#print "rc_shm.get: must attach first"
return False
sem.acquire()
shm_file.seek(0)
s = shm_file.read(shm_size)
sem.release()
return rc_pkt.unpack(s)
def detach():
global shm
global sem
global shm_file
if shm_file:
shm_file.close()
shm_file = None
shm = None
sem = None

View File

@ -0,0 +1,48 @@
import struct
"""
RC packet sent over network looks as follows. All fields are little-endian.
Start
Byte Size Description
0 8 Timestamp, usec since some epoch
8 2 Sequence number
10 2 Channel 1
12 2 Channel 2
14 2 Channel 3
16 2 Channel 4
18 2 Channel 5
20 2 Channel 6
22 2 Channel 7
24 2 Channel 8
26 (packet length)
"""
LENGTH = 26
# Input is binary packet (string)
# Output is tuple (timestamp, sequence, channels[])
def unpack(s):
if len(s) != LENGTH:
return None
ts, seq = struct.unpack("<QH", s[:10])
ch = []
for i in range(10, 26, 2):
ch.extend(struct.unpack("<H", s[i:i+2]))
return (ts, seq, ch)
# Input is tuple (timestamp, sequence, channels[])
# Output is binary packet (string)
def pack(p):
if type(p) != tuple or len(p) != 3 or \
(type(p[0]) != int and type(p[0]) != long) or \
(type(p[1]) != int and type(p[1]) != long) or \
type(p[2]) != list or len(p[2]) != 8:
print "expect tuple, 3:", type(p), len(p)
print "expect int/long, int/long, list:", type(p[0]), type(p[1]), type(p[2])
print "expect 8:", len(p[2])
return None
s = struct.pack('<QHHHHHHHHH', p[0], p[1],
p[2][0], p[2][1], p[2][2], p[2][3],
p[2][4], p[2][5], p[2][6], p[2][7])
return s