mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-29 14:52:12 +01:00
Merge remote-tracking branch 'upstream/next' into LP-291_port_UAVOMSPBridge_from_dRonin
This commit is contained in:
commit
e12967e45a
5
.gitattributes
vendored
5
.gitattributes
vendored
@ -32,3 +32,8 @@
|
||||
/Makefile text eol=lf
|
||||
|
||||
# More attributes are defined in per-directory .gitattributes which override this file
|
||||
|
||||
# Not needed in source distribution for building GCS
|
||||
/artwork/ export-ignore
|
||||
/flight/ export-ignore
|
||||
/hardware/ export-ignore
|
||||
|
@ -7,9 +7,9 @@ dist: trusty
|
||||
before_install:
|
||||
- sudo add-apt-repository ppa:librepilot/tools -y
|
||||
- sudo apt-get update -q
|
||||
- sudo apt-get install -y libudev-dev libusb-1.0-0-dev libsdl1.2-dev python libopenscenegraph-dev qt56-meta-minimal qt56svg qt56script qt56serialport qt56multimedia qt56translations qt56tools
|
||||
- sudo apt-get install -y libudev-dev libusb-1.0-0-dev libsdl1.2-dev python libopenscenegraph-dev libosgearth-dev qt56-meta-minimal qt56svg qt56script qt56serialport qt56multimedia qt56translations qt56tools
|
||||
|
||||
script: . /opt/qt56/bin/qt56-env.sh && make gcs CCACHE=ccache GCS_EXTRA_CONF=osg
|
||||
script: . /opt/qt56/bin/qt56-env.sh && make gcs CCACHE=ccache GCS_EXTRA_CONF='osg osgearth'
|
||||
|
||||
git:
|
||||
depth: 500
|
||||
|
15
Makefile
15
Makefile
@ -235,7 +235,8 @@ endif
|
||||
FLIGHT_OUT_DIR := $(BUILD_DIR)/firmware
|
||||
DIRS += $(FLIGHT_OUT_DIR)
|
||||
|
||||
include $(ROOT_DIR)/flight/Makefile
|
||||
# Might not be here in source package
|
||||
-include $(ROOT_DIR)/flight/Makefile
|
||||
|
||||
##############################
|
||||
#
|
||||
@ -382,12 +383,13 @@ $(DIST_TAR): $(DIST_VER_INFO) .git/index | $(DIST_DIR)
|
||||
@$(ECHO) " SOURCE FOR DISTRIBUTION $(call toprel, $(DIST_TAR))"
|
||||
$(V1) git archive --prefix="$(PACKAGE_NAME)/" -o "$(DIST_TAR)" HEAD
|
||||
$(V1) tar --append --file="$(DIST_TAR)" \
|
||||
--owner=root --group=root --mtime="`git show -s --format=%ci`" \
|
||||
--transform='s,.*version-info.json,$(PACKAGE_NAME)/version-info.json,' \
|
||||
$(call toprel, "$(DIST_VER_INFO)")
|
||||
|
||||
$(DIST_TAR_GZ): $(DIST_TAR)
|
||||
@$(ECHO) " SOURCE FOR DISTRIBUTION $(call toprel, $(DIST_TAR_GZ))"
|
||||
$(V1) gzip -kf "$(DIST_TAR)"
|
||||
$(V1) gzip -knf "$(DIST_TAR)"
|
||||
|
||||
.PHONY: dist_tar_gz
|
||||
dist_tar_gz: $(DIST_TAR_GZ)
|
||||
@ -399,12 +401,13 @@ dist: dist_tar_gz
|
||||
$(FW_DIST_TAR): $(PACKAGE_FW_TARGETS) | $(DIST_DIR)
|
||||
@$(ECHO) " FIRMWARE FOR DISTRIBUTION $(call toprel, $(FW_DIST_TAR))"
|
||||
$(V1) tar -c --file="$(FW_DIST_TAR)" --directory=$(FLIGHT_OUT_DIR) \
|
||||
--owner=root --group=root --mtime="`git show -s --format=%ci`" \
|
||||
--transform='s,^,firmware/,' \
|
||||
$(foreach fw_targ,$(PACKAGE_FW_TARGETS),$(fw_targ)/$(fw_targ).opfw)
|
||||
|
||||
$(FW_DIST_TAR_GZ): $(FW_DIST_TAR)
|
||||
@$(ECHO) " FIRMWARE FOR DISTRIBUTION $(call toprel, $(FW_DIST_TAR_GZ))"
|
||||
$(V1) gzip -kf "$(FW_DIST_TAR)"
|
||||
$(V1) gzip -knf "$(FW_DIST_TAR)"
|
||||
|
||||
.PHONY: fw_dist_tar_gz
|
||||
fw_dist_tar_gz: $(FW_DIST_TAR_GZ)
|
||||
@ -493,8 +496,10 @@ build-info: | $(BUILD_DIR)
|
||||
#
|
||||
##############################
|
||||
|
||||
CONFIG_OPTS := $(addsuffix \n,$(MAKEOVERRIDES))
|
||||
CONFIG_OPTS := $(addprefix override$(SPACE),$(CONFIG_OPTS))
|
||||
CONFIG_OPTS := $(subst \$(SPACE),%SPACE_PLACEHOLDER%,$(MAKEOVERRIDES))
|
||||
CONFIG_OPTS := $(addprefix override%SPACE_PLACEHOLDER%,$(CONFIG_OPTS))
|
||||
CONFIG_OPTS := $(subst $(SPACE),\n,$(CONFIG_OPTS))\n
|
||||
CONFIG_OPTS := $(subst %SPACE_PLACEHOLDER%,$(SPACE),$(CONFIG_OPTS))
|
||||
|
||||
.PHONY: config_new
|
||||
config_new:
|
||||
|
@ -6,7 +6,8 @@
|
||||
* @brief OpenPilot System libraries are available to all OP modules.
|
||||
* @{
|
||||
* @file alarms.c
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||
* @brief Library for setting and clearing system alarms
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
*
|
||||
@ -281,6 +282,107 @@ SystemAlarmsAlarmOptions AlarmsGetHighestSeverity()
|
||||
return highest;
|
||||
}
|
||||
|
||||
|
||||
static const char *const systemalarms_severity_names[] = {
|
||||
[SYSTEMALARMS_ALARM_UNINITIALISED] = "UNINITIALISED",
|
||||
[SYSTEMALARMS_ALARM_OK] = "OK",
|
||||
[SYSTEMALARMS_ALARM_WARNING] = "WARNING",
|
||||
[SYSTEMALARMS_ALARM_CRITICAL] = "CRITICAL",
|
||||
[SYSTEMALARMS_ALARM_ERROR] = "ERROR"
|
||||
};
|
||||
|
||||
static const char *const systemalarms_alarm_names[] = {
|
||||
[SYSTEMALARMS_ALARM_SYSTEMCONFIGURATION] = "CONFIG",
|
||||
[SYSTEMALARMS_ALARM_BOOTFAULT] = "BOOT",
|
||||
[SYSTEMALARMS_ALARM_OUTOFMEMORY] = "MEM",
|
||||
[SYSTEMALARMS_ALARM_STACKOVERFLOW] = "STACK",
|
||||
[SYSTEMALARMS_ALARM_CPUOVERLOAD] = "CPU",
|
||||
[SYSTEMALARMS_ALARM_EVENTSYSTEM] = "EVENT",
|
||||
[SYSTEMALARMS_ALARM_TELEMETRY] = "TELEMETRY",
|
||||
[SYSTEMALARMS_ALARM_RECEIVER] = "INPUT",
|
||||
[SYSTEMALARMS_ALARM_MANUALCONTROL] = "MANUAL",
|
||||
[SYSTEMALARMS_ALARM_ACTUATOR] = "ACTUATOR",
|
||||
[SYSTEMALARMS_ALARM_ATTITUDE] = "ATTI",
|
||||
[SYSTEMALARMS_ALARM_SENSORS] = "SENSOR",
|
||||
[SYSTEMALARMS_ALARM_MAGNETOMETER] = "MAG",
|
||||
[SYSTEMALARMS_ALARM_AIRSPEED] = "AIRSPD",
|
||||
[SYSTEMALARMS_ALARM_STABILIZATION] = "STAB",
|
||||
[SYSTEMALARMS_ALARM_GUIDANCE] = "GUIDANCE",
|
||||
[SYSTEMALARMS_ALARM_PATHPLAN] = "PLAN",
|
||||
[SYSTEMALARMS_ALARM_BATTERY] = "BATT",
|
||||
[SYSTEMALARMS_ALARM_FLIGHTTIME] = "TIME",
|
||||
[SYSTEMALARMS_ALARM_I2C] = "I2C",
|
||||
[SYSTEMALARMS_ALARM_GPS] = "GPS",
|
||||
};
|
||||
|
||||
static const char *const systemalarms_extendedalarmstatus_names[] = {
|
||||
[SYSTEMALARMS_EXTENDEDALARMSTATUS_REBOOTREQUIRED] = "CFG:REBOOT",
|
||||
[SYSTEMALARMS_EXTENDEDALARMSTATUS_FLIGHTMODE] = "CFG:FLIGHTMODE",
|
||||
[SYSTEMALARMS_EXTENDEDALARMSTATUS_UNSUPPORTEDCONFIG_ONESHOT] = "CFG:ONESHOT",
|
||||
[SYSTEMALARMS_EXTENDEDALARMSTATUS_BADTHROTTLEORCOLLECTIVEINPUTRANGE] = "CFG:THR-COL",
|
||||
};
|
||||
|
||||
size_t AlarmString(SystemAlarmsData *alarm, char *buffer, size_t buffer_size, SystemAlarmsAlarmOptions level, SystemAlarmsAlarmOptions *highestSeverity)
|
||||
{
|
||||
size_t pos = 0;
|
||||
|
||||
PIOS_STATIC_ASSERT(NELEMENTS(systemalarms_alarm_names) == SYSTEMALARMS_ALARM_NUMELEM);
|
||||
|
||||
for (unsigned severity = SYSTEMALARMS_ALARM_ERROR; severity >= level; --severity) {
|
||||
// should we prepend severity level here? No, not for now.
|
||||
|
||||
for (unsigned i = 0; i < SYSTEMALARMS_ALARM_NUMELEM; ++i) {
|
||||
if ((SystemAlarmsAlarmToArray(alarm->Alarm)[i] == severity)
|
||||
&& (systemalarms_alarm_names[i])) {
|
||||
if (highestSeverity) { // they are already sorted by severity as we are processing in specific order
|
||||
*highestSeverity = severity;
|
||||
highestSeverity = 0;
|
||||
}
|
||||
|
||||
// in which case should we dig into extended alarm status?
|
||||
// looks like SYSTEMALARMS_ALARM_SYSTEMCONFIGURATION sets most of the extended alarms
|
||||
// except SYSTEMALARMS_ALARM_BOOTFAULT which also sets SYSTEMALARMS_EXTENDEDALARMSTATUS_REBOOTREQUIRED
|
||||
|
||||
const char *current_msg = systemalarms_alarm_names[i];
|
||||
|
||||
switch (i) {
|
||||
case SYSTEMALARMS_ALARM_SYSTEMCONFIGURATION:
|
||||
if (alarm->ExtendedAlarmStatus.SystemConfiguration < NELEMENTS(systemalarms_extendedalarmstatus_names)) {
|
||||
current_msg = systemalarms_extendedalarmstatus_names[alarm->ExtendedAlarmStatus.SystemConfiguration];
|
||||
}
|
||||
break;
|
||||
|
||||
case SYSTEMALARMS_ALARM_BOOTFAULT:
|
||||
if (alarm->ExtendedAlarmStatus.BootFault < NELEMENTS(systemalarms_extendedalarmstatus_names)) {
|
||||
current_msg = systemalarms_extendedalarmstatus_names[alarm->ExtendedAlarmStatus.BootFault];
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
int current_len = strlen(current_msg);
|
||||
|
||||
if ((pos + current_len + 1) > buffer_size) {
|
||||
break;
|
||||
}
|
||||
|
||||
memcpy(buffer + pos, current_msg, current_len);
|
||||
|
||||
pos += current_len;
|
||||
|
||||
buffer[pos++] = ',';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (pos > 0) {
|
||||
--pos; // get rid of that trailing separator.
|
||||
}
|
||||
|
||||
buffer[pos] = 0;
|
||||
|
||||
return pos; // return length of the string in buffer. Actual bytes written is +1
|
||||
}
|
||||
|
||||
/**
|
||||
* @}
|
||||
* @}
|
||||
|
@ -5,7 +5,8 @@
|
||||
* @addtogroup OpenPilotLibraries OpenPilot System Libraries
|
||||
* @{
|
||||
* @file alarms.h
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||
* @brief Include file of the alarm library
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
*
|
||||
@ -48,6 +49,8 @@ int32_t AlarmsHasErrors();
|
||||
int32_t AlarmsHasCritical();
|
||||
SystemAlarmsAlarmOptions AlarmsGetHighestSeverity();
|
||||
|
||||
size_t AlarmString(SystemAlarmsData *alarm, char *buffer, size_t buffer_size, SystemAlarmsAlarmOptions level, SystemAlarmsAlarmOptions *highestSeverity);
|
||||
|
||||
#endif // ALARMS_H
|
||||
|
||||
/**
|
||||
|
@ -2,11 +2,14 @@
|
||||
******************************************************************************
|
||||
*
|
||||
* @file paths.c
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
*
|
||||
* @brief Library path manipulation
|
||||
*
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
*
|
||||
* @addtogroup LibrePilotLibraries LibrePilot Libraries Navigation
|
||||
*****************************************************************************/
|
||||
/*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -61,6 +64,7 @@ void path_progress(PathDesiredData *path, float *cur_point, struct path_status *
|
||||
|
||||
break;
|
||||
case PATHDESIRED_MODE_GOTOENDPOINT:
|
||||
case PATHDESIRED_MODE_AUTOTAKEOFF: // needed for pos hold at end of takeoff
|
||||
return path_endpoint(path, cur_point, status, mode3D);
|
||||
|
||||
break;
|
||||
|
@ -1,16 +1,15 @@
|
||||
/**
|
||||
******************************************************************************
|
||||
* @addtogroup OpenPilotLibraries OpenPilot Libraries
|
||||
* @{
|
||||
* @addtogroup Navigation
|
||||
* @brief setups RTH/PH and other pathfollower/pathplanner status
|
||||
* @{
|
||||
*
|
||||
* @file plan.c
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2014.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
*
|
||||
* @brief setups RTH/PH and other pathfollower/pathplanner status
|
||||
*
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
*
|
||||
* @addtogroup LibrePilotLibraries LibrePilot Libraries Navigation
|
||||
******************************************************************************/
|
||||
/*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -43,6 +42,7 @@
|
||||
#include <stabilizationbank.h>
|
||||
#include <stabilizationdesired.h>
|
||||
#include <sin_lookup.h>
|
||||
#include <sanitycheck.h>
|
||||
#include <statusvtolautotakeoff.h>
|
||||
|
||||
#define UPDATE_EXPECTED 0.02f
|
||||
@ -170,158 +170,35 @@ void plan_setup_returnToBase()
|
||||
PathDesiredSet(&pathDesired);
|
||||
}
|
||||
|
||||
|
||||
// Vtol AutoTakeoff invocation from flight mode requires the following sequence:
|
||||
// 1. Arming must be done whilst in the AutoTakeOff flight mode
|
||||
// 2. If the AutoTakeoff flight mode is selected and already armed, requires disarming first
|
||||
// 3. Wait for armed state
|
||||
// 4. Once the user increases the throttle position to above 50%, then and only then initiate auto-takeoff.
|
||||
// 5. Whilst the throttle is < 50% before takeoff, all stick inputs are being ignored.
|
||||
// 6. If during the autotakeoff sequence, at any stage, if the throttle stick position reduces to less than 10%, landing is initiated.
|
||||
|
||||
static StatusVtolAutoTakeoffControlStateOptions autotakeoffState = STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_WAITFORARMED;
|
||||
|
||||
#define AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MIN 2.0f
|
||||
#define AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MAX 50.0f
|
||||
static void plan_setup_AutoTakeoff_helper(PathDesiredData *pathDesired)
|
||||
void plan_setup_AutoTakeoff()
|
||||
{
|
||||
PathDesiredData pathDesired;
|
||||
|
||||
memset(&pathDesired, 0, sizeof(PathDesiredData));
|
||||
PositionStateData positionState;
|
||||
|
||||
PositionStateGet(&positionState);
|
||||
float velocity_down;
|
||||
float autotakeoff_height;
|
||||
|
||||
FlightModeSettingsAutoTakeOffVelocityGet(&velocity_down);
|
||||
FlightModeSettingsAutoTakeOffHeightGet(&autotakeoff_height);
|
||||
autotakeoff_height = fabsf(autotakeoff_height);
|
||||
if (autotakeoff_height < AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MIN) {
|
||||
autotakeoff_height = AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MIN;
|
||||
} else if (autotakeoff_height > AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MAX) {
|
||||
autotakeoff_height = AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MAX;
|
||||
}
|
||||
autotakeoff_height = fabsf(autotakeoff_height);
|
||||
|
||||
pathDesired.Start.North = positionState.North;
|
||||
pathDesired.Start.East = positionState.East;
|
||||
pathDesired.Start.Down = positionState.Down;
|
||||
pathDesired.ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_NORTH] = 0.0f;
|
||||
pathDesired.ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_EAST] = 0.0f;
|
||||
pathDesired.ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_DOWN] = 0.0f;
|
||||
pathDesired.ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_CONTROLSTATE] = 0.0f;
|
||||
|
||||
pathDesired->Start.North = positionState.North;
|
||||
pathDesired->Start.East = positionState.East;
|
||||
pathDesired->Start.Down = positionState.Down;
|
||||
pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_NORTH] = 0.0f;
|
||||
pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_EAST] = 0.0f;
|
||||
pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_DOWN] = -velocity_down;
|
||||
pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_CONTROLSTATE] = (float)autotakeoffState;
|
||||
pathDesired.End.North = positionState.North;
|
||||
pathDesired.End.East = positionState.East;
|
||||
pathDesired.End.Down = positionState.Down - autotakeoff_height;
|
||||
|
||||
pathDesired->End.North = positionState.North;
|
||||
pathDesired->End.East = positionState.East;
|
||||
pathDesired->End.Down = positionState.Down - autotakeoff_height;
|
||||
|
||||
pathDesired->StartingVelocity = 0.0f;
|
||||
pathDesired->EndingVelocity = 0.0f;
|
||||
pathDesired->Mode = PATHDESIRED_MODE_AUTOTAKEOFF;
|
||||
}
|
||||
|
||||
#define AUTOTAKEOFF_INFLIGHT_THROTTLE_CHECK_LIMIT 0.2f
|
||||
void plan_setup_AutoTakeoff()
|
||||
{
|
||||
autotakeoffState = STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_WAITFORARMED;
|
||||
// We only allow takeoff if the state transition of disarmed to armed occurs
|
||||
// whilst in the autotake flight mode
|
||||
FlightStatusData flightStatus;
|
||||
FlightStatusGet(&flightStatus);
|
||||
StabilizationDesiredData stabiDesired;
|
||||
StabilizationDesiredGet(&stabiDesired);
|
||||
|
||||
// Are we inflight?
|
||||
if (flightStatus.Armed && stabiDesired.Thrust > AUTOTAKEOFF_INFLIGHT_THROTTLE_CHECK_LIMIT) {
|
||||
// ok assume already in flight and just enter position hold
|
||||
// if we are not actually inflight this will just be a violent autotakeoff
|
||||
autotakeoffState = STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_POSITIONHOLD;
|
||||
plan_setup_positionHold();
|
||||
} else {
|
||||
if (flightStatus.Armed) {
|
||||
autotakeoffState = STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_REQUIREUNARMEDFIRST;
|
||||
// Note that if this mode was invoked unintentionally whilst in flight, effectively
|
||||
// all inputs get ignored and the vtol continues to fly to its previous
|
||||
// stabi command.
|
||||
}
|
||||
PathDesiredData pathDesired;
|
||||
// re-initialise in setup stage
|
||||
memset(&pathDesired, 0, sizeof(PathDesiredData));
|
||||
plan_setup_AutoTakeoff_helper(&pathDesired);
|
||||
PathDesiredSet(&pathDesired);
|
||||
}
|
||||
}
|
||||
|
||||
#define AUTOTAKEOFF_THROTTLE_LIMIT_TO_ALLOW_TAKEOFF_START 0.3f
|
||||
#define AUTOTAKEOFF_THROTTLE_ABORT_LIMIT 0.1f
|
||||
void plan_run_AutoTakeoff()
|
||||
{
|
||||
StatusVtolAutoTakeoffControlStateOptions priorState = autotakeoffState;
|
||||
|
||||
switch (autotakeoffState) {
|
||||
case STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_REQUIREUNARMEDFIRST:
|
||||
{
|
||||
FlightStatusData flightStatus;
|
||||
FlightStatusGet(&flightStatus);
|
||||
if (!flightStatus.Armed) {
|
||||
autotakeoffState = STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_WAITFORMIDTHROTTLE;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_WAITFORARMED:
|
||||
{
|
||||
FlightStatusData flightStatus;
|
||||
FlightStatusGet(&flightStatus);
|
||||
if (flightStatus.Armed) {
|
||||
autotakeoffState = STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_WAITFORMIDTHROTTLE;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_WAITFORMIDTHROTTLE:
|
||||
{
|
||||
ManualControlCommandData cmd;
|
||||
ManualControlCommandGet(&cmd);
|
||||
|
||||
if (cmd.Throttle > AUTOTAKEOFF_THROTTLE_LIMIT_TO_ALLOW_TAKEOFF_START) {
|
||||
autotakeoffState = STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_INITIATE;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_INITIATE:
|
||||
{
|
||||
ManualControlCommandData cmd;
|
||||
ManualControlCommandGet(&cmd);
|
||||
|
||||
if (cmd.Throttle < AUTOTAKEOFF_THROTTLE_ABORT_LIMIT) {
|
||||
autotakeoffState = STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_ABORT;
|
||||
plan_setup_land();
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_ABORT:
|
||||
{
|
||||
FlightStatusData flightStatus;
|
||||
FlightStatusGet(&flightStatus);
|
||||
if (!flightStatus.Armed) {
|
||||
autotakeoffState = STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_WAITFORARMED;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_POSITIONHOLD:
|
||||
// nothing to do. land has been requested. stay here for forever until mode change.
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (autotakeoffState != STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_ABORT &&
|
||||
autotakeoffState != STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_POSITIONHOLD) {
|
||||
if (priorState != autotakeoffState) {
|
||||
PathDesiredData pathDesired;
|
||||
// re-initialise in setup stage
|
||||
memset(&pathDesired, 0, sizeof(PathDesiredData));
|
||||
plan_setup_AutoTakeoff_helper(&pathDesired);
|
||||
PathDesiredSet(&pathDesired);
|
||||
}
|
||||
}
|
||||
pathDesired.StartingVelocity = 0.0f;
|
||||
pathDesired.EndingVelocity = 0.0f;
|
||||
pathDesired.Mode = PATHDESIRED_MODE_AUTOTAKEOFF;
|
||||
PathDesiredSet(&pathDesired);
|
||||
}
|
||||
|
||||
static void plan_setup_land_helper(PathDesiredData *pathDesired)
|
||||
|
@ -61,23 +61,25 @@ static int8_t counter;
|
||||
#endif
|
||||
|
||||
// Private constants
|
||||
#define MAX_QUEUE_SIZE 2
|
||||
#define MAX_QUEUE_SIZE 2
|
||||
|
||||
#if defined(PIOS_ACTUATOR_STACK_SIZE)
|
||||
#define STACK_SIZE_BYTES PIOS_ACTUATOR_STACK_SIZE
|
||||
#define STACK_SIZE_BYTES PIOS_ACTUATOR_STACK_SIZE
|
||||
#else
|
||||
#define STACK_SIZE_BYTES 1312
|
||||
#define STACK_SIZE_BYTES 1312
|
||||
#endif
|
||||
|
||||
#define TASK_PRIORITY (tskIDLE_PRIORITY + 4) // device driver
|
||||
#define FAILSAFE_TIMEOUT_MS 100
|
||||
#define MAX_MIX_ACTUATORS ACTUATORCOMMAND_CHANNEL_NUMELEM
|
||||
#define TASK_PRIORITY (tskIDLE_PRIORITY + 4) // device driver
|
||||
#define FAILSAFE_TIMEOUT_MS 100
|
||||
#define MAX_MIX_ACTUATORS ACTUATORCOMMAND_CHANNEL_NUMELEM
|
||||
|
||||
#define CAMERA_BOOT_DELAY_MS 7000
|
||||
#define CAMERA_BOOT_DELAY_MS 7000
|
||||
|
||||
#define ACTUATOR_ONESHOT125_CLOCK 2000000
|
||||
#define ACTUATOR_ONESHOT125_PULSE_SCALE 4
|
||||
#define ACTUATOR_PWM_CLOCK 1000000
|
||||
#define ACTUATOR_ONESHOT_CLOCK 12000000
|
||||
#define ACTUATOR_ONESHOT125_PULSE_FACTOR 1.5f
|
||||
#define ACTUATOR_ONESHOT42_PULSE_FACTOR 0.5f
|
||||
#define ACTUATOR_MULTISHOT_PULSE_FACTOR 0.24f
|
||||
#define ACTUATOR_PWM_CLOCK 1000000
|
||||
// Private types
|
||||
|
||||
|
||||
@ -938,8 +940,16 @@ static bool set_channel(uint8_t mixer_channel, uint16_t value)
|
||||
uint8_t mode = pinsMode[actuatorSettings.ChannelAddr[mixer_channel]];
|
||||
switch (mode) {
|
||||
case ACTUATORSETTINGS_BANKMODE_ONESHOT125:
|
||||
// Remap 1000-2000 range to 125-250
|
||||
PIOS_Servo_Set(actuatorSettings.ChannelAddr[mixer_channel], value / ACTUATOR_ONESHOT125_PULSE_SCALE);
|
||||
// Remap 1000-2000 range to 125-250µs
|
||||
PIOS_Servo_Set(actuatorSettings.ChannelAddr[mixer_channel], value * ACTUATOR_ONESHOT125_PULSE_FACTOR);
|
||||
break;
|
||||
case ACTUATORSETTINGS_BANKMODE_ONESHOT42:
|
||||
// Remap 1000-2000 range to 41,666-83,333µs
|
||||
PIOS_Servo_Set(actuatorSettings.ChannelAddr[mixer_channel], value * ACTUATOR_ONESHOT42_PULSE_FACTOR);
|
||||
break;
|
||||
case ACTUATORSETTINGS_BANKMODE_MULTISHOT:
|
||||
// Remap 1000-2000 range to 5-25µs
|
||||
PIOS_Servo_Set(actuatorSettings.ChannelAddr[mixer_channel], (value * ACTUATOR_MULTISHOT_PULSE_FACTOR) - 180);
|
||||
break;
|
||||
default:
|
||||
PIOS_Servo_Set(actuatorSettings.ChannelAddr[mixer_channel], value);
|
||||
@ -991,8 +1001,10 @@ static void actuator_update_rate_if_changed(bool force_update)
|
||||
}
|
||||
switch (actuatorSettings.BankMode[i]) {
|
||||
case ACTUATORSETTINGS_BANKMODE_ONESHOT125:
|
||||
case ACTUATORSETTINGS_BANKMODE_ONESHOT42:
|
||||
case ACTUATORSETTINGS_BANKMODE_MULTISHOT:
|
||||
freq[i] = 100; // Value must be small enough so CCr isn't update until the PIOS_Servo_Update is triggered
|
||||
clock[i] = ACTUATOR_ONESHOT125_CLOCK; // Setup an 2MHz timer clock
|
||||
clock[i] = ACTUATOR_ONESHOT_CLOCK; // Setup an 12MHz timer clock
|
||||
break;
|
||||
case ACTUATORSETTINGS_BANKMODE_PWMSYNC:
|
||||
freq[i] = 100;
|
||||
|
@ -332,11 +332,8 @@ static void AttitudeTask(__attribute__((unused)) void *parameters)
|
||||
} else {
|
||||
// Do not update attitude data in simulation mode
|
||||
if (!AttitudeStateReadOnly()) {
|
||||
PERF_TIMED_SECTION_START(counterAtt);
|
||||
updateAttitude(&accelState, &gyros);
|
||||
PERF_TIMED_SECTION_END(counterAtt);
|
||||
}
|
||||
PERF_MEASURE_PERIOD(counterPeriod);
|
||||
AlarmsClear(SYSTEMALARMS_ALARM_ATTITUDE);
|
||||
}
|
||||
vTaskDelayUntil(&lastSysTime, sensor_period_ms / portTICK_PERIOD_MS);
|
||||
@ -606,17 +603,41 @@ static inline void apply_accel_filter(const float *raw, float *filtered)
|
||||
|
||||
__attribute__((optimize("O3"))) static void updateAttitude(AccelStateData *accelStateData, GyroStateData *gyrosData)
|
||||
{
|
||||
float dT = PIOS_DELTATIME_GetAverageSeconds(&dtconfig);
|
||||
static uint32_t samples = 0;
|
||||
static float gyros_accum[3];
|
||||
static float accels_accum[3];
|
||||
|
||||
|
||||
// Bad practice to assume structure order, but saves memory
|
||||
float *gyros = &gyrosData->x;
|
||||
float *accels = &accelStateData->x;
|
||||
|
||||
if (samples < ATTITUDE_SENSORS_DOWNSAMPLE - 1) {
|
||||
gyros_accum[0] += gyros[0];
|
||||
gyros_accum[1] += gyros[1];
|
||||
gyros_accum[2] += gyros[2];
|
||||
accels_accum[0] += accels[0];
|
||||
accels_accum[1] += accels[1];
|
||||
accels_accum[2] += accels[2];
|
||||
samples++;
|
||||
return;
|
||||
}
|
||||
float dT = PIOS_DELTATIME_GetAverageSeconds(&dtconfig);
|
||||
PERF_TIMED_SECTION_START(counterAtt);
|
||||
float inv_samples_count = 1.0f / (float)samples;
|
||||
samples = 0;
|
||||
gyros_accum[0] *= inv_samples_count;
|
||||
gyros_accum[1] *= inv_samples_count;
|
||||
gyros_accum[2] *= inv_samples_count;
|
||||
accels_accum[0] *= inv_samples_count;
|
||||
accels_accum[1] *= inv_samples_count;
|
||||
accels_accum[2] *= inv_samples_count;
|
||||
|
||||
float grot[3];
|
||||
float accel_err[3];
|
||||
|
||||
// Apply smoothing to accel values, to reduce vibration noise before main calculations.
|
||||
apply_accel_filter(accels, accels_filtered);
|
||||
apply_accel_filter(accels_accum, accels_filtered);
|
||||
|
||||
// Rotate gravity unit vector to body frame, filter and cross with accels
|
||||
grot[0] = -(2 * (q[1] * q[3] - q[0] * q[2]));
|
||||
@ -658,18 +679,18 @@ __attribute__((optimize("O3"))) static void updateAttitude(AccelStateData *accel
|
||||
|
||||
// Correct rates based on error, integral component dealt with in updateSensors
|
||||
const float kpInvdT = accelKp / dT;
|
||||
gyros[0] += accel_err[0] * kpInvdT;
|
||||
gyros[1] += accel_err[1] * kpInvdT;
|
||||
gyros[2] += accel_err[2] * kpInvdT;
|
||||
gyros_accum[0] += accel_err[0] * kpInvdT;
|
||||
gyros_accum[1] += accel_err[1] * kpInvdT;
|
||||
gyros_accum[2] += accel_err[2] * kpInvdT;
|
||||
|
||||
{ // scoping variables to save memory
|
||||
// Work out time derivative from INSAlgo writeup
|
||||
// Also accounts for the fact that gyros are in deg/s
|
||||
float qdot[4];
|
||||
qdot[0] = (-q[1] * gyros[0] - q[2] * gyros[1] - q[3] * gyros[2]) * dT * (M_PI_F / 180.0f / 2.0f);
|
||||
qdot[1] = (q[0] * gyros[0] - q[3] * gyros[1] + q[2] * gyros[2]) * dT * (M_PI_F / 180.0f / 2.0f);
|
||||
qdot[2] = (q[3] * gyros[0] + q[0] * gyros[1] - q[1] * gyros[2]) * dT * (M_PI_F / 180.0f / 2.0f);
|
||||
qdot[3] = (-q[2] * gyros[0] + q[1] * gyros[1] + q[0] * gyros[2]) * dT * (M_PI_F / 180.0f / 2.0f);
|
||||
qdot[0] = (-q[1] * gyros_accum[0] - q[2] * gyros_accum[1] - q[3] * gyros_accum[2]) * dT * (M_PI_F / 180.0f / 2.0f);
|
||||
qdot[1] = (q[0] * gyros_accum[0] - q[3] * gyros_accum[1] + q[2] * gyros_accum[2]) * dT * (M_PI_F / 180.0f / 2.0f);
|
||||
qdot[2] = (q[3] * gyros_accum[0] + q[0] * gyros_accum[1] - q[1] * gyros_accum[2]) * dT * (M_PI_F / 180.0f / 2.0f);
|
||||
qdot[3] = (-q[2] * gyros_accum[0] + q[1] * gyros_accum[1] + q[0] * gyros_accum[2]) * dT * (M_PI_F / 180.0f / 2.0f);
|
||||
|
||||
// Take a time step
|
||||
q[0] = q[0] + qdot[0];
|
||||
@ -711,6 +732,10 @@ __attribute__((optimize("O3"))) static void updateAttitude(AccelStateData *accel
|
||||
Quaternion2RPY(&attitudeState.q1, &attitudeState.Roll);
|
||||
|
||||
AttitudeStateSet(&attitudeState);
|
||||
gyros_accum[0] = gyros_accum[1] = gyros_accum[2] = 0.0f;
|
||||
accels_accum[0] = accels_accum[1] = accels_accum[2] = 0.0f;
|
||||
PERF_TIMED_SECTION_END(counterAtt);
|
||||
PERF_MEASURE_PERIOD(counterPeriod);
|
||||
}
|
||||
|
||||
static void settingsUpdatedCb(__attribute__((unused)) UAVObjEvent *objEv)
|
||||
|
@ -1,16 +1,14 @@
|
||||
/**
|
||||
******************************************************************************
|
||||
* @addtogroup OpenPilotModules OpenPilot Modules
|
||||
* @{
|
||||
* @addtogroup ManualControl
|
||||
* @brief Interpretes the control input in ManualControlCommand
|
||||
* @{
|
||||
*
|
||||
* @file pathfollowerhandler.c
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2014.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
*
|
||||
* @brief Interpretes the control input in ManualControlCommand
|
||||
*
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
*
|
||||
* @addtogroup LibrePilotModules LibrePilot Modules ManualControl
|
||||
******************************************************************************/
|
||||
/*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -140,9 +138,6 @@ void pathFollowerHandler(bool newinit)
|
||||
plan_run_VelocityRoam();
|
||||
}
|
||||
break;
|
||||
case FLIGHTSTATUS_FLIGHTMODE_AUTOTAKEOFF:
|
||||
plan_run_AutoTakeoff();
|
||||
break;
|
||||
case FLIGHTSTATUS_FLIGHTMODE_AUTOCRUISE:
|
||||
plan_run_AutoCruise();
|
||||
break;
|
||||
|
280
flight/modules/PathFollower/fixedwingautotakeoffcontroller.cpp
Normal file
280
flight/modules/PathFollower/fixedwingautotakeoffcontroller.cpp
Normal file
@ -0,0 +1,280 @@
|
||||
/*
|
||||
******************************************************************************
|
||||
*
|
||||
* @file FixedWingAutoTakeoffController.cpp
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @brief Fixed wing fly controller implementation
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
*
|
||||
* @addtogroup LibrePilot LibrePilotModules Modules PathFollower Navigation
|
||||
*
|
||||
*****************************************************************************/
|
||||
/*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
extern "C" {
|
||||
#include <openpilot.h>
|
||||
|
||||
#include <pid.h>
|
||||
#include <sin_lookup.h>
|
||||
#include <pathdesired.h>
|
||||
#include <fixedwingpathfollowersettings.h>
|
||||
#include <flightstatus.h>
|
||||
#include <pathstatus.h>
|
||||
#include <stabilizationdesired.h>
|
||||
#include <velocitystate.h>
|
||||
#include <positionstate.h>
|
||||
#include <attitudestate.h>
|
||||
}
|
||||
|
||||
// C++ includes
|
||||
#include "fixedwingautotakeoffcontroller.h"
|
||||
|
||||
// Private constants
|
||||
|
||||
// pointer to a singleton instance
|
||||
FixedWingAutoTakeoffController *FixedWingAutoTakeoffController::p_inst = 0;
|
||||
|
||||
|
||||
// Called when mode first engaged
|
||||
void FixedWingAutoTakeoffController::Activate(void)
|
||||
{
|
||||
if (!mActive) {
|
||||
setState(FW_AUTOTAKEOFF_STATE_LAUNCH);
|
||||
}
|
||||
FixedWingFlyController::Activate();
|
||||
}
|
||||
|
||||
/**
|
||||
* fixed wing autopilot
|
||||
* use fixed attitude heading towards destination waypoint
|
||||
*/
|
||||
void FixedWingAutoTakeoffController::UpdateAutoPilot()
|
||||
{
|
||||
if (state < FW_AUTOTAKEOFF_STATE_SIZE) {
|
||||
(this->*runFunctionTable[state])();
|
||||
} else {
|
||||
setState(FW_AUTOTAKEOFF_STATE_LAUNCH);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* getAirspeed helper function
|
||||
*/
|
||||
float FixedWingAutoTakeoffController::getAirspeed(void)
|
||||
{
|
||||
VelocityStateData v;
|
||||
float yaw;
|
||||
|
||||
VelocityStateGet(&v);
|
||||
AttitudeStateYawGet(&yaw);
|
||||
|
||||
// current ground speed projected in forward direction
|
||||
float groundspeedProjection = v.North * cos_lookup_deg(yaw) + v.East * sin_lookup_deg(yaw);
|
||||
|
||||
// note that airspeedStateBias is ( calibratedAirspeed - groundspeedProjection ) at the time of measurement,
|
||||
// but thanks to accelerometers, groundspeedProjection reacts faster to changes in direction
|
||||
// than airspeed and gps sensors alone
|
||||
return groundspeedProjection + indicatedAirspeedStateBias;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* setState - state transition including initialization
|
||||
*/
|
||||
void FixedWingAutoTakeoffController::setState(FixedWingAutoTakeoffControllerState_T setstate)
|
||||
{
|
||||
if (state < FW_AUTOTAKEOFF_STATE_SIZE && setstate != state) {
|
||||
state = setstate;
|
||||
(this->*initFunctionTable[state])();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* setAttitude - output function to steer plane
|
||||
*/
|
||||
void FixedWingAutoTakeoffController::setAttitude(bool unsafe)
|
||||
{
|
||||
StabilizationDesiredData stabDesired;
|
||||
|
||||
stabDesired.Roll = 0.0f;
|
||||
stabDesired.Yaw = initYaw;
|
||||
if (unsafe) {
|
||||
stabDesired.Pitch = fixedWingSettings->LandingPitch;
|
||||
stabDesired.Thrust = 0.0f;
|
||||
} else {
|
||||
stabDesired.Pitch = fixedWingSettings->TakeOffPitch;
|
||||
stabDesired.Thrust = fixedWingSettings->ThrustLimit.Max;
|
||||
}
|
||||
stabDesired.StabilizationMode.Roll = STABILIZATIONDESIRED_STABILIZATIONMODE_ATTITUDE;
|
||||
stabDesired.StabilizationMode.Pitch = STABILIZATIONDESIRED_STABILIZATIONMODE_ATTITUDE;
|
||||
stabDesired.StabilizationMode.Yaw = STABILIZATIONDESIRED_STABILIZATIONMODE_ATTITUDE;
|
||||
stabDesired.StabilizationMode.Thrust = STABILIZATIONDESIRED_STABILIZATIONMODE_MANUAL;
|
||||
|
||||
StabilizationDesiredSet(&stabDesired);
|
||||
if (unsafe) {
|
||||
AlarmsSet(SYSTEMALARMS_ALARM_GUIDANCE, SYSTEMALARMS_ALARM_WARNING);
|
||||
pathStatus->Status = PATHSTATUS_STATUS_CRITICAL;
|
||||
} else {
|
||||
AlarmsSet(SYSTEMALARMS_ALARM_GUIDANCE, SYSTEMALARMS_ALARM_OK);
|
||||
}
|
||||
|
||||
// calculate fractional progress based on altitude
|
||||
float downPos;
|
||||
PositionStateDownGet(&downPos);
|
||||
if (fabsf(pathDesired->End.Down - pathDesired->Start.Down) < 1e-3f) {
|
||||
pathStatus->fractional_progress = 1.0f;
|
||||
pathStatus->error = 0.0f;
|
||||
} else {
|
||||
pathStatus->fractional_progress = (downPos - pathDesired->Start.Down) / (pathDesired->End.Down - pathDesired->Start.Down);
|
||||
}
|
||||
pathStatus->error = fabsf(downPos - pathDesired->End.Down);
|
||||
|
||||
PathStatusSet(pathStatus);
|
||||
}
|
||||
|
||||
/**
|
||||
* check if situation is unsafe
|
||||
*/
|
||||
bool FixedWingAutoTakeoffController::isUnsafe(void)
|
||||
{
|
||||
bool abort = false;
|
||||
float speed = getAirspeed();
|
||||
|
||||
if (speed > maxVelocity) {
|
||||
maxVelocity = speed;
|
||||
}
|
||||
// too much total deceleration (crash, insufficient climbing power, ...)
|
||||
if (speed < maxVelocity - fixedWingSettings->SafetyCutoffLimits.MaxDecelerationDeltaMPS) {
|
||||
abort = true;
|
||||
}
|
||||
AttitudeStateData attitude;
|
||||
AttitudeStateGet(&attitude);
|
||||
// too much bank angle
|
||||
if (fabsf(attitude.Roll) > fixedWingSettings->SafetyCutoffLimits.RollDeg) {
|
||||
abort = true;
|
||||
}
|
||||
if (fabsf(attitude.Pitch - fixedWingSettings->TakeOffPitch) > fixedWingSettings->SafetyCutoffLimits.PitchDeg) {
|
||||
abort = true;
|
||||
}
|
||||
float deltayaw = attitude.Yaw - initYaw;
|
||||
if (deltayaw > 180.0f) {
|
||||
deltayaw -= 360.0f;
|
||||
}
|
||||
if (deltayaw < -180.0f) {
|
||||
deltayaw += 360.0f;
|
||||
}
|
||||
if (fabsf(deltayaw) > fixedWingSettings->SafetyCutoffLimits.YawDeg) {
|
||||
abort = true;
|
||||
}
|
||||
return abort;
|
||||
}
|
||||
|
||||
|
||||
// init inactive does nothing
|
||||
void FixedWingAutoTakeoffController::init_inactive(void) {}
|
||||
|
||||
// init launch resets private variables to start values
|
||||
void FixedWingAutoTakeoffController::init_launch(void)
|
||||
{
|
||||
// find out vector direction of *runway* (if any)
|
||||
// and align, otherwise just stay straight ahead
|
||||
pathStatus->path_direction_north = 0.0f;
|
||||
pathStatus->path_direction_east = 0.0f;
|
||||
pathStatus->path_direction_down = 0.0f;
|
||||
pathStatus->correction_direction_north = 0.0f;
|
||||
pathStatus->correction_direction_east = 0.0f;
|
||||
pathStatus->correction_direction_down = 0.0f;
|
||||
if (fabsf(pathDesired->Start.North - pathDesired->End.North) < 1e-3f &&
|
||||
fabsf(pathDesired->Start.East - pathDesired->End.East) < 1e-3f) {
|
||||
AttitudeStateYawGet(&initYaw);
|
||||
} else {
|
||||
initYaw = RAD2DEG(atan2f(pathDesired->End.East - pathDesired->Start.East, pathDesired->End.North - pathDesired->Start.North));
|
||||
if (initYaw < -180.0f) {
|
||||
initYaw += 360.0f;
|
||||
}
|
||||
if (initYaw > 180.0f) {
|
||||
initYaw -= 360.0f;
|
||||
}
|
||||
}
|
||||
|
||||
maxVelocity = getAirspeed();
|
||||
}
|
||||
|
||||
// init climb does nothing
|
||||
void FixedWingAutoTakeoffController::init_climb(void) {}
|
||||
|
||||
// init hold does nothing
|
||||
void FixedWingAutoTakeoffController::init_hold(void) {}
|
||||
|
||||
// init abort does nothing
|
||||
void FixedWingAutoTakeoffController::init_abort(void) {}
|
||||
|
||||
|
||||
// run inactive does nothing
|
||||
// no state transitions
|
||||
void FixedWingAutoTakeoffController::run_inactive(void) {}
|
||||
|
||||
// run launch tries to takeoff - indicates safe situation with engine power (for hand launch)
|
||||
// run launch checks for:
|
||||
// 1. min velocity for climb
|
||||
void FixedWingAutoTakeoffController::run_launch(void)
|
||||
{
|
||||
// state transition
|
||||
if (maxVelocity > fixedWingSettings->SafetyCutoffLimits.MaxDecelerationDeltaMPS) {
|
||||
setState(FW_AUTOTAKEOFF_STATE_CLIMB);
|
||||
}
|
||||
|
||||
setAttitude(isUnsafe());
|
||||
}
|
||||
|
||||
// run climb climbs with max power
|
||||
// run climb checks for:
|
||||
// 1. min altitude for hold
|
||||
// 2. critical situation for abort (different than launch)
|
||||
void FixedWingAutoTakeoffController::run_climb(void)
|
||||
{
|
||||
bool unsafe = isUnsafe();
|
||||
float downPos;
|
||||
|
||||
PositionStateDownGet(&downPos);
|
||||
|
||||
if (unsafe) {
|
||||
// state transition 2
|
||||
setState(FW_AUTOTAKEOFF_STATE_ABORT);
|
||||
} else if (downPos < pathDesired->End.Down) {
|
||||
// state transition 1
|
||||
setState(FW_AUTOTAKEOFF_STATE_HOLD);
|
||||
}
|
||||
|
||||
setAttitude(unsafe);
|
||||
}
|
||||
|
||||
// run hold loiters like in position hold
|
||||
// no state transitions (FlyController does exception handling)
|
||||
void FixedWingAutoTakeoffController::run_hold(void)
|
||||
{
|
||||
// parent controller will do perfect position hold in autotakeoff mode
|
||||
FixedWingFlyController::UpdateAutoPilot();
|
||||
}
|
||||
|
||||
// run abort descends with wings level, engine off (like land)
|
||||
// no state transitions
|
||||
void FixedWingAutoTakeoffController::run_abort(void)
|
||||
{
|
||||
setAttitude(true);
|
||||
}
|
@ -2,10 +2,13 @@
|
||||
******************************************************************************
|
||||
*
|
||||
* @file FixedWingFlyController.cpp
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @brief Fixed wing fly controller implementation
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
*
|
||||
* @addtogroup LibrePilot LibrePilotModules Modules PathFollower Navigation
|
||||
*
|
||||
*****************************************************************************/
|
||||
/*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -26,23 +29,13 @@
|
||||
extern "C" {
|
||||
#include <openpilot.h>
|
||||
|
||||
#include <callbackinfo.h>
|
||||
|
||||
#include <math.h>
|
||||
#include <pid.h>
|
||||
#include <CoordinateConversions.h>
|
||||
#include <sin_lookup.h>
|
||||
#include <pathdesired.h>
|
||||
#include <paths.h>
|
||||
#include "plans.h"
|
||||
#include <sanitycheck.h>
|
||||
|
||||
#include <homelocation.h>
|
||||
#include <accelstate.h>
|
||||
#include <fixedwingpathfollowersettings.h>
|
||||
#include <fixedwingpathfollowerstatus.h>
|
||||
#include <flightstatus.h>
|
||||
#include <flightmodesettings.h>
|
||||
#include <pathstatus.h>
|
||||
#include <positionstate.h>
|
||||
#include <velocitystate.h>
|
||||
@ -50,14 +43,7 @@ extern "C" {
|
||||
#include <stabilizationdesired.h>
|
||||
#include <airspeedstate.h>
|
||||
#include <attitudestate.h>
|
||||
#include <takeofflocation.h>
|
||||
#include <poilocation.h>
|
||||
#include <manualcontrolcommand.h>
|
||||
#include <systemsettings.h>
|
||||
#include <stabilizationbank.h>
|
||||
#include <stabilizationdesired.h>
|
||||
#include <vtolselftuningstats.h>
|
||||
#include <pathsummary.h>
|
||||
}
|
||||
|
||||
// C++ includes
|
||||
@ -80,6 +66,7 @@ void FixedWingFlyController::Activate(void)
|
||||
SettingsUpdated();
|
||||
resetGlobals();
|
||||
mMode = pathDesired->Mode;
|
||||
lastAirspeedUpdate = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@ -244,9 +231,11 @@ void FixedWingFlyController::updatePathVelocity(float kFF, bool limited)
|
||||
*/
|
||||
uint8_t FixedWingFlyController::updateFixedDesiredAttitude()
|
||||
{
|
||||
uint8_t result = 1;
|
||||
uint8_t result = 1;
|
||||
bool cutThrust = false;
|
||||
bool hasAirspeed = true;
|
||||
|
||||
const float dT = fixedWingSettings->UpdatePeriod / 1000.0f;
|
||||
const float dT = fixedWingSettings->UpdatePeriod / 1000.0f;
|
||||
|
||||
VelocityDesiredData velocityDesired;
|
||||
VelocityStateData velocityState;
|
||||
@ -259,7 +248,7 @@ uint8_t FixedWingFlyController::updateFixedDesiredAttitude()
|
||||
float groundspeedProjection;
|
||||
float indicatedAirspeedState;
|
||||
float indicatedAirspeedDesired;
|
||||
float airspeedError;
|
||||
float airspeedError = 0.0f;
|
||||
|
||||
float pitchCommand;
|
||||
|
||||
@ -282,56 +271,99 @@ uint8_t FixedWingFlyController::updateFixedDesiredAttitude()
|
||||
AirspeedStateGet(&airspeedState);
|
||||
SystemSettingsGet(&systemSettings);
|
||||
|
||||
|
||||
/**
|
||||
* Compute speed error and course
|
||||
*/
|
||||
// missing sensors for airspeed-direction we have to assume within
|
||||
// reasonable error that measured airspeed is actually the airspeed
|
||||
// component in forward pointing direction
|
||||
// airspeedVector is normalized
|
||||
airspeedVector[0] = cos_lookup_deg(attitudeState.Yaw);
|
||||
airspeedVector[1] = sin_lookup_deg(attitudeState.Yaw);
|
||||
|
||||
// current ground speed projected in forward direction
|
||||
groundspeedProjection = velocityState.North * airspeedVector[0] + velocityState.East * airspeedVector[1];
|
||||
|
||||
// note that airspeedStateBias is ( calibratedAirspeed - groundspeedProjection ) at the time of measurement,
|
||||
// but thanks to accelerometers, groundspeedProjection reacts faster to changes in direction
|
||||
// than airspeed and gps sensors alone
|
||||
indicatedAirspeedState = groundspeedProjection + indicatedAirspeedStateBias;
|
||||
|
||||
// fluidMovement is a vector describing the aproximate movement vector of
|
||||
// the surrounding fluid in 2d space (aka wind vector)
|
||||
fluidMovement[0] = velocityState.North - (indicatedAirspeedState * airspeedVector[0]);
|
||||
fluidMovement[1] = velocityState.East - (indicatedAirspeedState * airspeedVector[1]);
|
||||
|
||||
// calculate the movement vector we need to fly to reach velocityDesired -
|
||||
// taking fluidMovement into account
|
||||
courseComponent[0] = velocityDesired.North - fluidMovement[0];
|
||||
courseComponent[1] = velocityDesired.East - fluidMovement[1];
|
||||
|
||||
indicatedAirspeedDesired = boundf(sqrtf(courseComponent[0] * courseComponent[0] + courseComponent[1] * courseComponent[1]),
|
||||
fixedWingSettings->HorizontalVelMin,
|
||||
fixedWingSettings->HorizontalVelMax);
|
||||
|
||||
// if we could fly at arbitrary speeds, we'd just have to move towards the
|
||||
// courseComponent vector as previously calculated and we'd be fine
|
||||
// unfortunately however we are bound by min and max air speed limits, so
|
||||
// we need to recalculate the correct course to meet at least the
|
||||
// velocityDesired vector direction at our current speed
|
||||
// this overwrites courseComponent
|
||||
bool valid = correctCourse(courseComponent, (float *)&velocityDesired.North, fluidMovement, indicatedAirspeedDesired);
|
||||
|
||||
// Error condition: wind speed too high, we can't go where we want anymore
|
||||
fixedWingPathFollowerStatus.Errors.Wind = 0;
|
||||
if ((!valid) &&
|
||||
fixedWingSettings->Safetymargins.Wind > 0.5f) { // alarm switched on
|
||||
fixedWingPathFollowerStatus.Errors.Wind = 1;
|
||||
// check for airspeed sensor
|
||||
fixedWingPathFollowerStatus.Errors.AirspeedSensor = 0;
|
||||
if (fixedWingSettings->UseAirspeedSensor == FIXEDWINGPATHFOLLOWERSETTINGS_USEAIRSPEEDSENSOR_FALSE) {
|
||||
// fallback algo triggered voluntarily
|
||||
hasAirspeed = false;
|
||||
fixedWingPathFollowerStatus.Errors.AirspeedSensor = 1;
|
||||
} else if (PIOS_DELAY_GetuSSince(lastAirspeedUpdate) > 1000000) {
|
||||
// no airspeed update in one second, assume airspeed sensor failure
|
||||
hasAirspeed = false;
|
||||
result = 0;
|
||||
fixedWingPathFollowerStatus.Errors.AirspeedSensor = 1;
|
||||
}
|
||||
|
||||
// Airspeed error
|
||||
airspeedError = indicatedAirspeedDesired - indicatedAirspeedState;
|
||||
|
||||
if (hasAirspeed) {
|
||||
// missing sensors for airspeed-direction we have to assume within
|
||||
// reasonable error that measured airspeed is actually the airspeed
|
||||
// component in forward pointing direction
|
||||
// airspeedVector is normalized
|
||||
airspeedVector[0] = cos_lookup_deg(attitudeState.Yaw);
|
||||
airspeedVector[1] = sin_lookup_deg(attitudeState.Yaw);
|
||||
|
||||
// current ground speed projected in forward direction
|
||||
groundspeedProjection = velocityState.North * airspeedVector[0] + velocityState.East * airspeedVector[1];
|
||||
|
||||
// note that airspeedStateBias is ( calibratedAirspeed - groundspeedProjection ) at the time of measurement,
|
||||
// but thanks to accelerometers, groundspeedProjection reacts faster to changes in direction
|
||||
// than airspeed and gps sensors alone
|
||||
indicatedAirspeedState = groundspeedProjection + indicatedAirspeedStateBias;
|
||||
|
||||
// fluidMovement is a vector describing the aproximate movement vector of
|
||||
// the surrounding fluid in 2d space (aka wind vector)
|
||||
fluidMovement[0] = velocityState.North - (indicatedAirspeedState * airspeedVector[0]);
|
||||
fluidMovement[1] = velocityState.East - (indicatedAirspeedState * airspeedVector[1]);
|
||||
|
||||
// calculate the movement vector we need to fly to reach velocityDesired -
|
||||
// taking fluidMovement into account
|
||||
courseComponent[0] = velocityDesired.North - fluidMovement[0];
|
||||
courseComponent[1] = velocityDesired.East - fluidMovement[1];
|
||||
|
||||
indicatedAirspeedDesired = boundf(sqrtf(courseComponent[0] * courseComponent[0] + courseComponent[1] * courseComponent[1]),
|
||||
fixedWingSettings->HorizontalVelMin,
|
||||
fixedWingSettings->HorizontalVelMax);
|
||||
|
||||
// if we could fly at arbitrary speeds, we'd just have to move towards the
|
||||
// courseComponent vector as previously calculated and we'd be fine
|
||||
// unfortunately however we are bound by min and max air speed limits, so
|
||||
// we need to recalculate the correct course to meet at least the
|
||||
// velocityDesired vector direction at our current speed
|
||||
// this overwrites courseComponent
|
||||
bool valid = correctCourse(courseComponent, (float *)&velocityDesired.North, fluidMovement, indicatedAirspeedDesired);
|
||||
|
||||
// Error condition: wind speed too high, we can't go where we want anymore
|
||||
fixedWingPathFollowerStatus.Errors.Wind = 0;
|
||||
if ((!valid) &&
|
||||
fixedWingSettings->Safetymargins.Wind > 0.5f) { // alarm switched on
|
||||
fixedWingPathFollowerStatus.Errors.Wind = 1;
|
||||
result = 0;
|
||||
}
|
||||
|
||||
// Airspeed error
|
||||
airspeedError = indicatedAirspeedDesired - indicatedAirspeedState;
|
||||
|
||||
// Error condition: plane too slow or too fast
|
||||
fixedWingPathFollowerStatus.Errors.Highspeed = 0;
|
||||
fixedWingPathFollowerStatus.Errors.Lowspeed = 0;
|
||||
if (indicatedAirspeedState > systemSettings.AirSpeedMax * fixedWingSettings->Safetymargins.Overspeed) {
|
||||
fixedWingPathFollowerStatus.Errors.Overspeed = 1;
|
||||
result = 0;
|
||||
}
|
||||
if (indicatedAirspeedState > fixedWingSettings->HorizontalVelMax * fixedWingSettings->Safetymargins.Highspeed) {
|
||||
fixedWingPathFollowerStatus.Errors.Highspeed = 1;
|
||||
result = 0;
|
||||
cutThrust = true;
|
||||
}
|
||||
if (indicatedAirspeedState < fixedWingSettings->HorizontalVelMin * fixedWingSettings->Safetymargins.Lowspeed) {
|
||||
fixedWingPathFollowerStatus.Errors.Lowspeed = 1;
|
||||
result = 0;
|
||||
}
|
||||
if (indicatedAirspeedState < systemSettings.AirSpeedMin * fixedWingSettings->Safetymargins.Stallspeed) {
|
||||
fixedWingPathFollowerStatus.Errors.Stallspeed = 1;
|
||||
result = 0;
|
||||
}
|
||||
if (indicatedAirspeedState < fixedWingSettings->HorizontalVelMin * fixedWingSettings->Safetymargins.Lowspeed - fixedWingSettings->SafetyCutoffLimits.MaxDecelerationDeltaMPS) {
|
||||
cutThrust = true;
|
||||
result = 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Vertical speed error
|
||||
descentspeedDesired = boundf(
|
||||
@ -340,36 +372,19 @@ uint8_t FixedWingFlyController::updateFixedDesiredAttitude()
|
||||
fixedWingSettings->VerticalVelMax);
|
||||
descentspeedError = descentspeedDesired - velocityState.Down;
|
||||
|
||||
// Error condition: plane too slow or too fast
|
||||
fixedWingPathFollowerStatus.Errors.Highspeed = 0;
|
||||
fixedWingPathFollowerStatus.Errors.Lowspeed = 0;
|
||||
if (indicatedAirspeedState > systemSettings.AirSpeedMax * fixedWingSettings->Safetymargins.Overspeed) {
|
||||
fixedWingPathFollowerStatus.Errors.Overspeed = 1;
|
||||
result = 0;
|
||||
}
|
||||
if (indicatedAirspeedState > fixedWingSettings->HorizontalVelMax * fixedWingSettings->Safetymargins.Highspeed) {
|
||||
fixedWingPathFollowerStatus.Errors.Highspeed = 1;
|
||||
result = 0;
|
||||
}
|
||||
if (indicatedAirspeedState < fixedWingSettings->HorizontalVelMin * fixedWingSettings->Safetymargins.Lowspeed) {
|
||||
fixedWingPathFollowerStatus.Errors.Lowspeed = 1;
|
||||
result = 0;
|
||||
}
|
||||
if (indicatedAirspeedState < systemSettings.AirSpeedMin * fixedWingSettings->Safetymargins.Stallspeed) {
|
||||
fixedWingPathFollowerStatus.Errors.Stallspeed = 1;
|
||||
result = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Compute desired thrust command
|
||||
*/
|
||||
|
||||
// Compute the cross feed from vertical speed to pitch, with saturation
|
||||
float speedErrorToPowerCommandComponent = boundf(
|
||||
(airspeedError / fixedWingSettings->HorizontalVelMin) * fixedWingSettings->AirspeedToPowerCrossFeed.Kp,
|
||||
-fixedWingSettings->AirspeedToPowerCrossFeed.Max,
|
||||
fixedWingSettings->AirspeedToPowerCrossFeed.Max
|
||||
);
|
||||
float speedErrorToPowerCommandComponent = 0.0f;
|
||||
if (hasAirspeed) {
|
||||
speedErrorToPowerCommandComponent = boundf(
|
||||
(airspeedError / fixedWingSettings->HorizontalVelMin) * fixedWingSettings->AirspeedToPowerCrossFeed.Kp,
|
||||
-fixedWingSettings->AirspeedToPowerCrossFeed.Max,
|
||||
fixedWingSettings->AirspeedToPowerCrossFeed.Max
|
||||
);
|
||||
}
|
||||
|
||||
// Compute final thrust response
|
||||
powerCommand = pid_apply(&PIDpower, -descentspeedError, dT) +
|
||||
@ -390,57 +405,84 @@ uint8_t FixedWingFlyController::updateFixedDesiredAttitude()
|
||||
if (fixedWingSettings->ThrustLimit.Neutral + powerCommand >= fixedWingSettings->ThrustLimit.Max && // thrust at maximum
|
||||
velocityState.Down > 0.0f && // we ARE going down
|
||||
descentspeedDesired < 0.0f && // we WANT to go up
|
||||
airspeedError > 0.0f && // we are too slow already
|
||||
fixedWingSettings->Safetymargins.Lowpower > 0.5f) { // alarm switched on
|
||||
airspeedError > 0.0f) { // we are too slow already
|
||||
fixedWingPathFollowerStatus.Errors.Lowpower = 1;
|
||||
result = 0;
|
||||
|
||||
if (fixedWingSettings->Safetymargins.Lowpower > 0.5f) { // alarm switched on
|
||||
result = 0;
|
||||
}
|
||||
}
|
||||
// Error condition: plane keeps climbing despite minimum thrust (opposite of above)
|
||||
fixedWingPathFollowerStatus.Errors.Highpower = 0;
|
||||
if (fixedWingSettings->ThrustLimit.Neutral + powerCommand <= fixedWingSettings->ThrustLimit.Min && // thrust at minimum
|
||||
velocityState.Down < 0.0f && // we ARE going up
|
||||
descentspeedDesired > 0.0f && // we WANT to go down
|
||||
airspeedError < 0.0f && // we are too fast already
|
||||
fixedWingSettings->Safetymargins.Highpower > 0.5f) { // alarm switched on
|
||||
airspeedError < 0.0f) { // we are too fast already
|
||||
// this alarm is often switched off because of false positives, however we still want to cut throttle if it happens
|
||||
cutThrust = true;
|
||||
fixedWingPathFollowerStatus.Errors.Highpower = 1;
|
||||
result = 0;
|
||||
|
||||
if (fixedWingSettings->Safetymargins.Highpower > 0.5f) { // alarm switched on
|
||||
result = 0;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Compute desired pitch command
|
||||
*/
|
||||
// Compute the cross feed from vertical speed to pitch, with saturation
|
||||
float verticalSpeedToPitchCommandComponent = boundf(-descentspeedError * fixedWingSettings->VerticalToPitchCrossFeed.Kp,
|
||||
-fixedWingSettings->VerticalToPitchCrossFeed.Max,
|
||||
fixedWingSettings->VerticalToPitchCrossFeed.Max
|
||||
);
|
||||
if (hasAirspeed) {
|
||||
// Compute the cross feed from vertical speed to pitch, with saturation
|
||||
float verticalSpeedToPitchCommandComponent = boundf(-descentspeedError * fixedWingSettings->VerticalToPitchCrossFeed.Kp,
|
||||
-fixedWingSettings->VerticalToPitchCrossFeed.Max,
|
||||
fixedWingSettings->VerticalToPitchCrossFeed.Max
|
||||
);
|
||||
|
||||
// Compute the pitch command as err*Kp + errInt*Ki + X_feed.
|
||||
pitchCommand = -pid_apply(&PIDspeed, airspeedError, dT) + verticalSpeedToPitchCommandComponent;
|
||||
// Compute the pitch command as err*Kp + errInt*Ki + X_feed.
|
||||
pitchCommand = -pid_apply(&PIDspeed, airspeedError, dT) + verticalSpeedToPitchCommandComponent;
|
||||
|
||||
fixedWingPathFollowerStatus.Error.Speed = airspeedError;
|
||||
fixedWingPathFollowerStatus.ErrorInt.Speed = PIDspeed.iAccumulator;
|
||||
fixedWingPathFollowerStatus.Command.Speed = pitchCommand;
|
||||
fixedWingPathFollowerStatus.Error.Speed = airspeedError;
|
||||
fixedWingPathFollowerStatus.ErrorInt.Speed = PIDspeed.iAccumulator;
|
||||
fixedWingPathFollowerStatus.Command.Speed = pitchCommand;
|
||||
|
||||
stabDesired.Pitch = boundf(fixedWingSettings->PitchLimit.Neutral + pitchCommand,
|
||||
fixedWingSettings->PitchLimit.Min,
|
||||
fixedWingSettings->PitchLimit.Max);
|
||||
stabDesired.Pitch = boundf(fixedWingSettings->PitchLimit.Neutral + pitchCommand,
|
||||
fixedWingSettings->PitchLimit.Min,
|
||||
fixedWingSettings->PitchLimit.Max);
|
||||
|
||||
// Error condition: high speed dive
|
||||
fixedWingPathFollowerStatus.Errors.Pitchcontrol = 0;
|
||||
if (fixedWingSettings->PitchLimit.Neutral + pitchCommand >= fixedWingSettings->PitchLimit.Max && // pitch demand is full up
|
||||
velocityState.Down > 0.0f && // we ARE going down
|
||||
descentspeedDesired < 0.0f && // we WANT to go up
|
||||
airspeedError < 0.0f && // we are too fast already
|
||||
fixedWingSettings->Safetymargins.Pitchcontrol > 0.5f) { // alarm switched on
|
||||
// Error condition: high speed dive
|
||||
fixedWingPathFollowerStatus.Errors.Pitchcontrol = 0;
|
||||
if (fixedWingSettings->PitchLimit.Neutral + pitchCommand >= fixedWingSettings->PitchLimit.Max && // pitch demand is full up
|
||||
velocityState.Down > 0.0f && // we ARE going down
|
||||
descentspeedDesired < 0.0f && // we WANT to go up
|
||||
airspeedError < 0.0f && // we are too fast already
|
||||
fixedWingSettings->Safetymargins.Pitchcontrol > 0.5f) { // alarm switched on
|
||||
fixedWingPathFollowerStatus.Errors.Pitchcontrol = 1;
|
||||
result = 0;
|
||||
cutThrust = true;
|
||||
}
|
||||
} else {
|
||||
// no airspeed sensor means we fly with constant pitch, like for landing pathfollower
|
||||
stabDesired.Pitch = fixedWingSettings->LandingPitch;
|
||||
}
|
||||
|
||||
// Error condition: pitch way out of wack
|
||||
if (fixedWingSettings->Safetymargins.Pitchcontrol > 0.5f &&
|
||||
(attitudeState.Pitch < fixedWingSettings->PitchLimit.Min - fixedWingSettings->SafetyCutoffLimits.PitchDeg ||
|
||||
attitudeState.Pitch > fixedWingSettings->PitchLimit.Max + fixedWingSettings->SafetyCutoffLimits.PitchDeg)) {
|
||||
fixedWingPathFollowerStatus.Errors.Pitchcontrol = 1;
|
||||
result = 0;
|
||||
cutThrust = true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Compute desired roll command
|
||||
*/
|
||||
courseError = RAD2DEG(atan2f(courseComponent[1], courseComponent[0])) - attitudeState.Yaw;
|
||||
if (hasAirspeed) {
|
||||
courseError = RAD2DEG(atan2f(courseComponent[1], courseComponent[0])) - attitudeState.Yaw;
|
||||
} else {
|
||||
// fallback based on effective movement direction when in fallback mode, hope that airspeed > wind velocity, or we will never get home
|
||||
courseError = RAD2DEG(atan2f(velocityDesired.East, velocityDesired.North)) - RAD2DEG(atan2f(velocityState.East, velocityState.North));
|
||||
}
|
||||
|
||||
if (courseError < -180.0f) {
|
||||
courseError += 360.0f;
|
||||
@ -473,7 +515,15 @@ uint8_t FixedWingFlyController::updateFixedDesiredAttitude()
|
||||
fixedWingSettings->RollLimit.Min,
|
||||
fixedWingSettings->RollLimit.Max);
|
||||
|
||||
// TODO: find a check to determine loss of directional control. Likely needs some check of derivative
|
||||
// Error condition: roll way out of wack
|
||||
fixedWingPathFollowerStatus.Errors.Rollcontrol = 0;
|
||||
if (fixedWingSettings->Safetymargins.Rollcontrol > 0.5f &&
|
||||
(attitudeState.Roll < fixedWingSettings->RollLimit.Min - fixedWingSettings->SafetyCutoffLimits.RollDeg ||
|
||||
attitudeState.Roll > fixedWingSettings->RollLimit.Max + fixedWingSettings->SafetyCutoffLimits.RollDeg)) {
|
||||
fixedWingPathFollowerStatus.Errors.Rollcontrol = 1;
|
||||
result = 0;
|
||||
cutThrust = true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
@ -482,6 +532,10 @@ uint8_t FixedWingFlyController::updateFixedDesiredAttitude()
|
||||
// TODO implement raw control mode for yaw and base on Accels.Y
|
||||
stabDesired.Yaw = 0.0f;
|
||||
|
||||
// safety cutoff condition
|
||||
if (cutThrust) {
|
||||
stabDesired.Thrust = 0.0f;
|
||||
}
|
||||
|
||||
stabDesired.StabilizationMode.Roll = STABILIZATIONDESIRED_STABILIZATIONMODE_ATTITUDE;
|
||||
stabDesired.StabilizationMode.Pitch = STABILIZATIONDESIRED_STABILIZATIONMODE_ATTITUDE;
|
||||
@ -615,4 +669,6 @@ void FixedWingFlyController::AirspeedStateUpdatedCb(__attribute__((unused)) UAVO
|
||||
// changes to groundspeed to offset the airspeed by the same measurement.
|
||||
// This has a side effect that in the absence of any airspeed updates, the
|
||||
// pathfollower will fly using groundspeed.
|
||||
|
||||
lastAirspeedUpdate = PIOS_DELAY_GetuS();
|
||||
}
|
||||
|
154
flight/modules/PathFollower/fixedwinglandcontroller.cpp
Normal file
154
flight/modules/PathFollower/fixedwinglandcontroller.cpp
Normal file
@ -0,0 +1,154 @@
|
||||
/*
|
||||
******************************************************************************
|
||||
*
|
||||
* @file FixedWingLandController.cpp
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @brief Fixed wing fly controller implementation
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
*
|
||||
* @addtogroup LibrePilot LibrePilotModules Modules PathFollower Navigation
|
||||
*
|
||||
*****************************************************************************/
|
||||
/*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
extern "C" {
|
||||
#include <openpilot.h>
|
||||
|
||||
#include <pathdesired.h>
|
||||
#include <fixedwingpathfollowersettings.h>
|
||||
#include <flightstatus.h>
|
||||
#include <pathstatus.h>
|
||||
#include <stabilizationdesired.h>
|
||||
}
|
||||
|
||||
// C++ includes
|
||||
#include "fixedwinglandcontroller.h"
|
||||
|
||||
// Private constants
|
||||
|
||||
// pointer to a singleton instance
|
||||
FixedWingLandController *FixedWingLandController::p_inst = 0;
|
||||
|
||||
FixedWingLandController::FixedWingLandController()
|
||||
: fixedWingSettings(NULL), mActive(false), mMode(0)
|
||||
{}
|
||||
|
||||
// Called when mode first engaged
|
||||
void FixedWingLandController::Activate(void)
|
||||
{
|
||||
if (!mActive) {
|
||||
mActive = true;
|
||||
SettingsUpdated();
|
||||
resetGlobals();
|
||||
mMode = pathDesired->Mode;
|
||||
}
|
||||
}
|
||||
|
||||
uint8_t FixedWingLandController::IsActive(void)
|
||||
{
|
||||
return mActive;
|
||||
}
|
||||
|
||||
uint8_t FixedWingLandController::Mode(void)
|
||||
{
|
||||
return mMode;
|
||||
}
|
||||
|
||||
// Objective updated in pathdesired
|
||||
void FixedWingLandController::ObjectiveUpdated(void)
|
||||
{}
|
||||
|
||||
void FixedWingLandController::Deactivate(void)
|
||||
{
|
||||
if (mActive) {
|
||||
mActive = false;
|
||||
resetGlobals();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void FixedWingLandController::SettingsUpdated(void)
|
||||
{}
|
||||
|
||||
/**
|
||||
* Initialise the module, called on startup
|
||||
* \returns 0 on success or -1 if initialisation failed
|
||||
*/
|
||||
int32_t FixedWingLandController::Initialize(FixedWingPathFollowerSettingsData *ptr_fixedWingSettings)
|
||||
{
|
||||
PIOS_Assert(ptr_fixedWingSettings);
|
||||
|
||||
fixedWingSettings = ptr_fixedWingSettings;
|
||||
|
||||
resetGlobals();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* reset globals, (integrals, accumulated errors and timers)
|
||||
*/
|
||||
void FixedWingLandController::resetGlobals()
|
||||
{
|
||||
pathStatus->path_time = 0.0f;
|
||||
pathStatus->path_direction_north = 0.0f;
|
||||
pathStatus->path_direction_east = 0.0f;
|
||||
pathStatus->path_direction_down = 0.0f;
|
||||
pathStatus->correction_direction_north = 0.0f;
|
||||
pathStatus->correction_direction_east = 0.0f;
|
||||
pathStatus->correction_direction_down = 0.0f;
|
||||
pathStatus->error = 0.0f;
|
||||
pathStatus->fractional_progress = 0.0f;
|
||||
}
|
||||
|
||||
/**
|
||||
* fixed wing autopilot
|
||||
* use fixed attitude heading towards destination waypoint
|
||||
*/
|
||||
void FixedWingLandController::UpdateAutoPilot()
|
||||
{
|
||||
StabilizationDesiredData stabDesired;
|
||||
|
||||
stabDesired.Roll = 0.0f;
|
||||
stabDesired.Pitch = fixedWingSettings->LandingPitch;
|
||||
stabDesired.Thrust = 0.0f;
|
||||
stabDesired.StabilizationMode.Roll = STABILIZATIONDESIRED_STABILIZATIONMODE_ATTITUDE;
|
||||
stabDesired.StabilizationMode.Pitch = STABILIZATIONDESIRED_STABILIZATIONMODE_ATTITUDE;
|
||||
stabDesired.StabilizationMode.Thrust = STABILIZATIONDESIRED_STABILIZATIONMODE_MANUAL;
|
||||
|
||||
// find out vector direction of *runway* (if any)
|
||||
// and align, otherwise just stay straight ahead
|
||||
if (fabsf(pathDesired->Start.North - pathDesired->End.North) < 1e-3f &&
|
||||
fabsf(pathDesired->Start.East - pathDesired->End.East) < 1e-3f) {
|
||||
stabDesired.Yaw = 0.0f;
|
||||
stabDesired.StabilizationMode.Yaw = STABILIZATIONDESIRED_STABILIZATIONMODE_RATE;
|
||||
} else {
|
||||
stabDesired.Yaw = RAD2DEG(atan2f(pathDesired->End.East - pathDesired->Start.East, pathDesired->End.North - pathDesired->Start.North));
|
||||
if (stabDesired.Yaw < -180.0f) {
|
||||
stabDesired.Yaw += 360.0f;
|
||||
}
|
||||
if (stabDesired.Yaw > 180.0f) {
|
||||
stabDesired.Yaw -= 360.0f;
|
||||
}
|
||||
stabDesired.StabilizationMode.Yaw = STABILIZATIONDESIRED_STABILIZATIONMODE_ATTITUDE;
|
||||
}
|
||||
StabilizationDesiredSet(&stabDesired);
|
||||
AlarmsSet(SYSTEMALARMS_ALARM_GUIDANCE, SYSTEMALARMS_ALARM_OK);
|
||||
|
||||
PathStatusSet(pathStatus);
|
||||
}
|
@ -0,0 +1,98 @@
|
||||
/**
|
||||
******************************************************************************
|
||||
* @addtogroup LibrePilotModules LibrePilot Modules
|
||||
* @{
|
||||
* @addtogroup FixedWing CONTROL interface class
|
||||
* @brief CONTROL interface class for pathfollower fixed wing fly controller
|
||||
* @{
|
||||
*
|
||||
* @file fixedwingautotakeoffcontroller.h
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @brief Executes CONTROL for fixed wing fly objectives
|
||||
*
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
*
|
||||
*****************************************************************************/
|
||||
/*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#ifndef FIXEDWINGAUTOTAKEOFFCONTROLLER_H
|
||||
#define FIXEDWINGAUTOTAKEOFFCONTROLLER_H
|
||||
#include "fixedwingflycontroller.h"
|
||||
|
||||
// AutoTakeoff state machine
|
||||
typedef enum {
|
||||
FW_AUTOTAKEOFF_STATE_INACTIVE = 0,
|
||||
FW_AUTOTAKEOFF_STATE_LAUNCH,
|
||||
FW_AUTOTAKEOFF_STATE_CLIMB,
|
||||
FW_AUTOTAKEOFF_STATE_HOLD,
|
||||
FW_AUTOTAKEOFF_STATE_ABORT,
|
||||
FW_AUTOTAKEOFF_STATE_SIZE
|
||||
} FixedWingAutoTakeoffControllerState_T;
|
||||
|
||||
class FixedWingAutoTakeoffController : public FixedWingFlyController {
|
||||
protected:
|
||||
static FixedWingAutoTakeoffController *p_inst;
|
||||
|
||||
public:
|
||||
static FixedWingFlyController *instance()
|
||||
{
|
||||
if (!p_inst) {
|
||||
p_inst = new FixedWingAutoTakeoffController();
|
||||
}
|
||||
return p_inst;
|
||||
}
|
||||
void Activate(void);
|
||||
void UpdateAutoPilot(void);
|
||||
|
||||
private:
|
||||
// variables
|
||||
FixedWingAutoTakeoffControllerState_T state;
|
||||
float initYaw;
|
||||
float maxVelocity;
|
||||
|
||||
// functions
|
||||
void setState(FixedWingAutoTakeoffControllerState_T setstate);
|
||||
void setAttitude(bool unsafe);
|
||||
float getAirspeed(void);
|
||||
bool isUnsafe(void);
|
||||
void run_inactive(void);
|
||||
void run_launch(void);
|
||||
void run_climb(void);
|
||||
void run_hold(void);
|
||||
void run_abort(void);
|
||||
void init_inactive(void);
|
||||
void init_launch(void);
|
||||
void init_climb(void);
|
||||
void init_hold(void);
|
||||
void init_abort(void);
|
||||
void(FixedWingAutoTakeoffController::*const runFunctionTable[FW_AUTOTAKEOFF_STATE_SIZE]) (void) = {
|
||||
&FixedWingAutoTakeoffController::run_inactive,
|
||||
&FixedWingAutoTakeoffController::run_launch,
|
||||
&FixedWingAutoTakeoffController::run_climb,
|
||||
&FixedWingAutoTakeoffController::run_hold,
|
||||
&FixedWingAutoTakeoffController::run_abort
|
||||
};
|
||||
void(FixedWingAutoTakeoffController::*const initFunctionTable[FW_AUTOTAKEOFF_STATE_SIZE]) (void) = {
|
||||
&FixedWingAutoTakeoffController::init_inactive,
|
||||
&FixedWingAutoTakeoffController::init_launch,
|
||||
&FixedWingAutoTakeoffController::init_climb,
|
||||
&FixedWingAutoTakeoffController::init_hold,
|
||||
&FixedWingAutoTakeoffController::init_abort
|
||||
};
|
||||
};
|
||||
|
||||
#endif // FIXEDWINGAUTOTAKEOFFCONTROLLER_H
|
@ -1,13 +1,14 @@
|
||||
/**
|
||||
******************************************************************************
|
||||
* @addtogroup OpenPilotModules OpenPilot Modules
|
||||
* @addtogroup LibrePilotModules LibrePilot Modules
|
||||
* @{
|
||||
* @addtogroup FixedWing CONTROL interface class
|
||||
* @brief CONTROL interface class for pathfollower fixed wing fly controller
|
||||
* @{
|
||||
*
|
||||
* @file FixedWingCONTROL.h
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @file fixedwingflycontroller.h
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @brief Executes CONTROL for fixed wing fly objectives
|
||||
*
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
@ -33,7 +34,7 @@
|
||||
#include "pathfollowercontrol.h"
|
||||
|
||||
class FixedWingFlyController : public PathFollowerControl {
|
||||
private:
|
||||
protected:
|
||||
static FixedWingFlyController *p_inst;
|
||||
FixedWingFlyController();
|
||||
|
||||
@ -57,24 +58,26 @@ public:
|
||||
uint8_t Mode(void);
|
||||
void AirspeedStateUpdatedCb(__attribute__((unused)) UAVObjEvent * ev);
|
||||
|
||||
protected:
|
||||
FixedWingPathFollowerSettingsData *fixedWingSettings;
|
||||
|
||||
uint8_t mActive;
|
||||
uint8_t mMode;
|
||||
// correct speed by measured airspeed
|
||||
float indicatedAirspeedStateBias;
|
||||
private:
|
||||
void resetGlobals();
|
||||
uint8_t updateAutoPilotFixedWing();
|
||||
void updatePathVelocity(float kFF, bool limited);
|
||||
uint8_t updateFixedDesiredAttitude();
|
||||
bool correctCourse(float *C, float *V, float *F, float s);
|
||||
|
||||
FixedWingPathFollowerSettingsData *fixedWingSettings;
|
||||
uint8_t mActive;
|
||||
uint8_t mMode;
|
||||
int32_t lastAirspeedUpdate;
|
||||
|
||||
struct pid PIDposH[2];
|
||||
struct pid PIDposV;
|
||||
struct pid PIDcourse;
|
||||
struct pid PIDspeed;
|
||||
struct pid PIDpower;
|
||||
// correct speed by measured airspeed
|
||||
float indicatedAirspeedStateBias;
|
||||
};
|
||||
|
||||
#endif // FIXEDWINGFLYCONTROLLER_H
|
||||
|
67
flight/modules/PathFollower/inc/fixedwinglandcontroller.h
Normal file
67
flight/modules/PathFollower/inc/fixedwinglandcontroller.h
Normal file
@ -0,0 +1,67 @@
|
||||
/**
|
||||
******************************************************************************
|
||||
* @addtogroup LibrePilotModules LibrePilot Modules
|
||||
* @{
|
||||
* @addtogroup FixedWing CONTROL interface class
|
||||
* @brief CONTROL interface class for pathfollower fixed wing fly controller
|
||||
* @{
|
||||
*
|
||||
* @file fixedwinglandcontroller.h
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @brief Executes CONTROL for fixed wing fly objectives
|
||||
*
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
*
|
||||
*****************************************************************************/
|
||||
/*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#ifndef FIXEDWINGLANDCONTROLLER_H
|
||||
#define FIXEDWINGLANDCONTROLLER_H
|
||||
#include "pathfollowercontrol.h"
|
||||
|
||||
class FixedWingLandController : public PathFollowerControl {
|
||||
private:
|
||||
static FixedWingLandController *p_inst;
|
||||
FixedWingLandController();
|
||||
|
||||
|
||||
public:
|
||||
static FixedWingLandController *instance()
|
||||
{
|
||||
if (!p_inst) {
|
||||
p_inst = new FixedWingLandController();
|
||||
}
|
||||
return p_inst;
|
||||
}
|
||||
|
||||
int32_t Initialize(FixedWingPathFollowerSettingsData *fixedWingSettings);
|
||||
void Activate(void);
|
||||
void Deactivate(void);
|
||||
void SettingsUpdated(void);
|
||||
void UpdateAutoPilot(void);
|
||||
void ObjectiveUpdated(void);
|
||||
uint8_t IsActive(void);
|
||||
uint8_t Mode(void);
|
||||
|
||||
private:
|
||||
void resetGlobals();
|
||||
FixedWingPathFollowerSettingsData *fixedWingSettings;
|
||||
uint8_t mActive;
|
||||
uint8_t mMode;
|
||||
};
|
||||
|
||||
#endif // FIXEDWINGLANDCONTROLLER_H
|
@ -1,13 +1,14 @@
|
||||
/**
|
||||
******************************************************************************
|
||||
* @addtogroup OpenPilotModules OpenPilot Modules
|
||||
* @addtogroup LibrePilotModules LibrePilot Modules
|
||||
* @{
|
||||
* @addtogroup PathFollower CONTROL interface class
|
||||
* @brief vtol land controller class
|
||||
* @{
|
||||
*
|
||||
* @file vtollandcontroller.h
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @brief Executes CONTROL for landing sequence
|
||||
*
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
@ -70,6 +71,8 @@ private:
|
||||
PIDControlDown controlDown;
|
||||
PIDControlNE controlNE;
|
||||
uint8_t mActive;
|
||||
uint8_t mOverride;
|
||||
StatusVtolAutoTakeoffControlStateOptions autotakeoffState;
|
||||
};
|
||||
|
||||
#endif // VTOLAUTOTAKEOFFCONTROLLER_H
|
||||
|
@ -1,13 +1,14 @@
|
||||
/**
|
||||
******************************************************************************
|
||||
* @addtogroup OpenPilotModules OpenPilot Modules
|
||||
* @addtogroup LibrePilotModules LibrePilot Modules
|
||||
* @{
|
||||
* @addtogroup PathFollower FSM
|
||||
* @brief Executes landing sequence via an FSM
|
||||
* @{
|
||||
*
|
||||
* @file vtollandfsm.h
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @brief Executes FSM for landing sequence
|
||||
*
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
@ -47,7 +48,7 @@ typedef enum {
|
||||
AUTOTAKEOFF_STATE_THRUSTDOWN, // Thrust down sequence
|
||||
AUTOTAKEOFF_STATE_THRUSTOFF, // Thrust is now off
|
||||
AUTOTAKEOFF_STATE_DISARMED, // Disarmed
|
||||
AUTOTAKEOFF_STATE_ABORT, // Abort on error triggerig fallback to hold
|
||||
AUTOTAKEOFF_STATE_ABORT, // Abort on error triggers fallback to land
|
||||
AUTOTAKEOFF_STATE_SIZE
|
||||
} PathFollowerFSM_AutoTakeoffState_T;
|
||||
|
||||
|
@ -1,13 +1,14 @@
|
||||
/**
|
||||
******************************************************************************
|
||||
* @addtogroup OpenPilotModules OpenPilot Modules
|
||||
* @addtogroup LibrePilotModules LibrePilot Modules
|
||||
* @{
|
||||
* @addtogroup PathFollower CONTROL interface class
|
||||
* @brief vtol land controller class
|
||||
* @{
|
||||
*
|
||||
* @file vtollandcontroller.h
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @brief Executes CONTROL for landing sequence
|
||||
*
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
@ -71,6 +72,7 @@ private:
|
||||
PIDControlDown controlDown;
|
||||
PIDControlNE controlNE;
|
||||
uint8_t mActive;
|
||||
uint8_t mOverride;
|
||||
};
|
||||
|
||||
#endif // VTOLLANDCONTROLLER_H
|
||||
|
@ -2,12 +2,14 @@
|
||||
******************************************************************************
|
||||
*
|
||||
* @file pathfollower.c
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @brief This module compared @ref PositionActuatl to @ref ActiveWaypoint
|
||||
* and sets @ref AttitudeDesired. It only does this when the FlightMode field
|
||||
* of @ref ManualControlCommand is Auto.
|
||||
*
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
* @addtogroup LibrePilot LibrePilotModules Modules PathFollower Navigation
|
||||
*
|
||||
*****************************************************************************/
|
||||
/*
|
||||
@ -93,6 +95,8 @@ extern "C" {
|
||||
#include "vtolbrakecontroller.h"
|
||||
#include "vtolflycontroller.h"
|
||||
#include "fixedwingflycontroller.h"
|
||||
#include "fixedwingautotakeoffcontroller.h"
|
||||
#include "fixedwinglandcontroller.h"
|
||||
#include "grounddrivecontroller.h"
|
||||
|
||||
// Private constants
|
||||
@ -220,6 +224,8 @@ void pathFollowerInitializeControllersForFrameType()
|
||||
case FRAME_TYPE_FIXED_WING:
|
||||
if (!fixedwing_initialised) {
|
||||
FixedWingFlyController::instance()->Initialize(&fixedWingPathFollowerSettings);
|
||||
FixedWingAutoTakeoffController::instance()->Initialize(&fixedWingPathFollowerSettings);
|
||||
FixedWingLandController::instance()->Initialize(&fixedWingPathFollowerSettings);
|
||||
fixedwing_initialised = 1;
|
||||
}
|
||||
break;
|
||||
@ -289,6 +295,14 @@ static void pathFollowerSetActiveController(void)
|
||||
activeController = FixedWingFlyController::instance();
|
||||
activeController->Activate();
|
||||
break;
|
||||
case PATHDESIRED_MODE_LAND: // land with optional velocity roam option
|
||||
activeController = FixedWingLandController::instance();
|
||||
activeController->Activate();
|
||||
break;
|
||||
case PATHDESIRED_MODE_AUTOTAKEOFF:
|
||||
activeController = FixedWingAutoTakeoffController::instance();
|
||||
activeController->Activate();
|
||||
break;
|
||||
default:
|
||||
activeController = 0;
|
||||
AlarmsSet(SYSTEMALARMS_ALARM_GUIDANCE, SYSTEMALARMS_ALARM_UNINITIALISED);
|
||||
@ -451,6 +465,7 @@ static void SettingsUpdatedCb(__attribute__((unused)) UAVObjEvent *ev)
|
||||
static void airspeedStateUpdatedCb(__attribute__((unused)) UAVObjEvent *ev)
|
||||
{
|
||||
FixedWingFlyController::instance()->AirspeedStateUpdatedCb(ev);
|
||||
FixedWingAutoTakeoffController::instance()->AirspeedStateUpdatedCb(ev);
|
||||
}
|
||||
|
||||
|
||||
|
@ -2,9 +2,11 @@
|
||||
******************************************************************************
|
||||
*
|
||||
* @file vtollandcontroller.cpp
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @brief Vtol landing controller loop
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
* @addtogroup LibrePilot LibrePilotModules Modules PathFollower Navigation
|
||||
*
|
||||
*****************************************************************************/
|
||||
/*
|
||||
@ -57,6 +59,7 @@ extern "C" {
|
||||
#include <stabilizationbank.h>
|
||||
#include <stabilizationdesired.h>
|
||||
#include <vtolselftuningstats.h>
|
||||
#include <statusvtolautotakeoff.h>
|
||||
#include <pathsummary.h>
|
||||
}
|
||||
|
||||
@ -67,6 +70,11 @@ extern "C" {
|
||||
#include "pidcontroldown.h"
|
||||
|
||||
// Private constants
|
||||
#define AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MIN 2.0f
|
||||
#define AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MAX 50.0f
|
||||
#define AUTOTAKEOFF_INFLIGHT_THROTTLE_CHECK_LIMIT 0.2f
|
||||
#define AUTOTAKEOFF_THROTTLE_LIMIT_TO_ALLOW_TAKEOFF_START 0.3f
|
||||
#define AUTOTAKEOFF_THROTTLE_ABORT_LIMIT 0.1f
|
||||
|
||||
// pointer to a singleton instance
|
||||
VtolAutoTakeoffController *VtolAutoTakeoffController::p_inst = 0;
|
||||
@ -79,11 +87,34 @@ VtolAutoTakeoffController::VtolAutoTakeoffController()
|
||||
void VtolAutoTakeoffController::Activate(void)
|
||||
{
|
||||
if (!mActive) {
|
||||
mActive = true;
|
||||
mActive = true;
|
||||
mOverride = true;
|
||||
SettingsUpdated();
|
||||
fsm->Activate();
|
||||
controlDown.Activate();
|
||||
controlNE.Activate();
|
||||
autotakeoffState = STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_WAITFORARMED;
|
||||
// We only allow takeoff if the state transition of disarmed to armed occurs
|
||||
// whilst in the autotake flight mode
|
||||
FlightStatusData flightStatus;
|
||||
FlightStatusGet(&flightStatus);
|
||||
StabilizationDesiredData stabiDesired;
|
||||
StabilizationDesiredGet(&stabiDesired);
|
||||
|
||||
if (flightStatus.Armed) {
|
||||
// Are we inflight?
|
||||
if (stabiDesired.Thrust > AUTOTAKEOFF_INFLIGHT_THROTTLE_CHECK_LIMIT || flightStatus.ControlChain.PathPlanner == FLIGHTSTATUS_CONTROLCHAIN_TRUE) {
|
||||
// ok assume already in flight and just enter position hold
|
||||
// if we are not actually inflight this will just be a violent autotakeoff
|
||||
autotakeoffState = STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_POSITIONHOLD;
|
||||
} else {
|
||||
autotakeoffState = STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_REQUIREUNARMEDFIRST;
|
||||
// Note that if this mode was invoked unintentionally whilst in flight, effectively
|
||||
// all inputs get ignored and the vtol continues to fly to its previous
|
||||
// stabi command.
|
||||
}
|
||||
}
|
||||
fsm->setControlState(autotakeoffState);
|
||||
}
|
||||
}
|
||||
|
||||
@ -100,15 +131,40 @@ uint8_t VtolAutoTakeoffController::Mode(void)
|
||||
// Objective updated in pathdesired, e.g. same flight mode but new target velocity
|
||||
void VtolAutoTakeoffController::ObjectiveUpdated(void)
|
||||
{
|
||||
// Set the objective's target velocity
|
||||
if (mOverride) {
|
||||
// override pathDesired from PathPlanner with current position,
|
||||
// as we deliberately don't care about the location of the waypoints on the map
|
||||
float velocity_down;
|
||||
float autotakeoff_height;
|
||||
PositionStateData positionState;
|
||||
PositionStateGet(&positionState);
|
||||
FlightModeSettingsAutoTakeOffVelocityGet(&velocity_down);
|
||||
FlightModeSettingsAutoTakeOffHeightGet(&autotakeoff_height);
|
||||
autotakeoff_height = fabsf(autotakeoff_height);
|
||||
if (autotakeoff_height < AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MIN) {
|
||||
autotakeoff_height = AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MIN;
|
||||
} else if (autotakeoff_height > AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MAX) {
|
||||
autotakeoff_height = AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MAX;
|
||||
}
|
||||
controlDown.UpdateVelocitySetpoint(velocity_down);
|
||||
controlNE.UpdateVelocitySetpoint(0.0f, 0.0f);
|
||||
controlNE.UpdatePositionSetpoint(positionState.North, positionState.East);
|
||||
|
||||
controlDown.UpdateVelocitySetpoint(pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_DOWN]);
|
||||
controlNE.UpdateVelocitySetpoint(pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_NORTH],
|
||||
pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_EAST]);
|
||||
controlNE.UpdatePositionSetpoint(pathDesired->End.North, pathDesired->End.East);
|
||||
controlDown.UpdatePositionSetpoint(pathDesired->End.Down);
|
||||
fsm->setControlState((StatusVtolAutoTakeoffControlStateOptions)pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_CONTROLSTATE]);
|
||||
|
||||
controlDown.UpdatePositionSetpoint(positionState.Down - autotakeoff_height);
|
||||
mOverride = false; // further updates always come from ManualControl and will control horizontal position
|
||||
} else {
|
||||
// Set the objective's target velocity
|
||||
|
||||
controlDown.UpdateVelocitySetpoint(pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_DOWN]);
|
||||
controlNE.UpdateVelocitySetpoint(pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_NORTH],
|
||||
pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_EAST]);
|
||||
controlNE.UpdatePositionSetpoint(pathDesired->End.North, pathDesired->End.East);
|
||||
controlDown.UpdatePositionSetpoint(pathDesired->End.Down);
|
||||
}
|
||||
}
|
||||
|
||||
// Controller deactivated
|
||||
void VtolAutoTakeoffController::Deactivate(void)
|
||||
{
|
||||
if (mActive) {
|
||||
@ -224,6 +280,16 @@ int8_t VtolAutoTakeoffController::UpdateStabilizationDesired()
|
||||
|
||||
controlNE.GetNECommand(&northCommand, &eastCommand);
|
||||
stabDesired.Thrust = controlDown.GetDownCommand();
|
||||
switch (autotakeoffState) {
|
||||
case STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_WAITFORARMED:
|
||||
case STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_WAITFORMIDTHROTTLE:
|
||||
case STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_REQUIREUNARMEDFIRST:
|
||||
case STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_ABORT:
|
||||
stabDesired.Thrust = 0.0f;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
float angle_radians = DEG2RAD(attitudeState.Yaw);
|
||||
float cos_angle = cosf(angle_radians);
|
||||
@ -251,6 +317,78 @@ int8_t VtolAutoTakeoffController::UpdateStabilizationDesired()
|
||||
|
||||
void VtolAutoTakeoffController::UpdateAutoPilot()
|
||||
{
|
||||
// state machine updates:
|
||||
// Vtol AutoTakeoff invocation from flight mode requires the following sequence:
|
||||
// 1. Arming must be done whilst in the AutoTakeOff flight mode
|
||||
// 2. If the AutoTakeoff flight mode is selected and already armed, requires disarming first
|
||||
// 3. Wait for armed state
|
||||
// 4. Once the user increases the throttle position to above 50%, then and only then initiate auto-takeoff.
|
||||
// 5. Whilst the throttle is < 50% before takeoff, all stick inputs are being ignored.
|
||||
// 6. If during the autotakeoff sequence, at any stage, if the throttle stick position reduces to less than 10%, landing is initiated.
|
||||
|
||||
switch (autotakeoffState) {
|
||||
case STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_REQUIREUNARMEDFIRST:
|
||||
{
|
||||
FlightStatusData flightStatus;
|
||||
FlightStatusGet(&flightStatus);
|
||||
if (!flightStatus.Armed) {
|
||||
autotakeoffState = STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_WAITFORARMED;
|
||||
fsm->setControlState(autotakeoffState);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_WAITFORARMED:
|
||||
{
|
||||
FlightStatusData flightStatus;
|
||||
FlightStatusGet(&flightStatus);
|
||||
if (flightStatus.Armed) {
|
||||
autotakeoffState = STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_WAITFORMIDTHROTTLE;
|
||||
fsm->setControlState(autotakeoffState);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_WAITFORMIDTHROTTLE:
|
||||
{
|
||||
ManualControlCommandData cmd;
|
||||
ManualControlCommandGet(&cmd);
|
||||
|
||||
if (cmd.Throttle > AUTOTAKEOFF_THROTTLE_LIMIT_TO_ALLOW_TAKEOFF_START) {
|
||||
autotakeoffState = STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_INITIATE;
|
||||
fsm->setControlState(autotakeoffState);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_INITIATE:
|
||||
{
|
||||
ManualControlCommandData cmd;
|
||||
ManualControlCommandGet(&cmd);
|
||||
FlightStatusData flightStatus;
|
||||
FlightStatusGet(&flightStatus);
|
||||
|
||||
// we do not do a takeoff abort in pathplanner mode
|
||||
if (flightStatus.ControlChain.PathPlanner != FLIGHTSTATUS_CONTROLCHAIN_TRUE &&
|
||||
cmd.Throttle < AUTOTAKEOFF_THROTTLE_ABORT_LIMIT) {
|
||||
autotakeoffState = STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_ABORT;
|
||||
fsm->setControlState(autotakeoffState);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_ABORT:
|
||||
{
|
||||
FlightStatusData flightStatus;
|
||||
FlightStatusGet(&flightStatus);
|
||||
if (!flightStatus.Armed) {
|
||||
autotakeoffState = STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_WAITFORARMED;
|
||||
fsm->setControlState(autotakeoffState);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_POSITIONHOLD:
|
||||
// nothing to do. land has been requested. stay here for forever until mode change.
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
fsm->Update();
|
||||
|
||||
UpdateVelocityDesired();
|
||||
|
@ -2,9 +2,11 @@
|
||||
******************************************************************************
|
||||
*
|
||||
* @file vtollandcontroller.cpp
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @brief Vtol landing controller loop
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
* @addtogroup LibrePilot LibrePilotModules Modules PathFollower Navigation
|
||||
*
|
||||
*****************************************************************************/
|
||||
/*
|
||||
@ -76,7 +78,8 @@ VtolLandController::VtolLandController()
|
||||
void VtolLandController::Activate(void)
|
||||
{
|
||||
if (!mActive) {
|
||||
mActive = true;
|
||||
mActive = true;
|
||||
mOverride = true;
|
||||
SettingsUpdated();
|
||||
fsm->Activate();
|
||||
controlDown.Activate();
|
||||
@ -97,11 +100,24 @@ uint8_t VtolLandController::Mode(void)
|
||||
// Objective updated in pathdesired, e.g. same flight mode but new target velocity
|
||||
void VtolLandController::ObjectiveUpdated(void)
|
||||
{
|
||||
// Set the objective's target velocity
|
||||
controlDown.UpdateVelocitySetpoint(pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_VELOCITY_VELOCITYVECTOR_DOWN]);
|
||||
controlNE.UpdateVelocitySetpoint(pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_VELOCITY_VELOCITYVECTOR_NORTH],
|
||||
pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_VELOCITY_VELOCITYVECTOR_EAST]);
|
||||
controlNE.UpdatePositionSetpoint(pathDesired->End.North, pathDesired->End.East);
|
||||
if (mOverride) {
|
||||
// override pathDesired from PathPLanner with current position,
|
||||
// as we deliberately don' not care about the location of the waypoints on the map
|
||||
float velocity_down;
|
||||
PositionStateData positionState;
|
||||
PositionStateGet(&positionState);
|
||||
FlightModeSettingsLandingVelocityGet(&velocity_down);
|
||||
controlDown.UpdateVelocitySetpoint(velocity_down);
|
||||
controlNE.UpdateVelocitySetpoint(0.0f, 0.0f);
|
||||
controlNE.UpdatePositionSetpoint(positionState.North, positionState.East);
|
||||
mOverride = false; // further updates always come from ManualControl and will control horizontal position
|
||||
} else {
|
||||
// Set the objective's target velocity
|
||||
controlDown.UpdateVelocitySetpoint(pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_VELOCITY_VELOCITYVECTOR_DOWN]);
|
||||
controlNE.UpdateVelocitySetpoint(pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_VELOCITY_VELOCITYVECTOR_NORTH],
|
||||
pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_VELOCITY_VELOCITYVECTOR_EAST]);
|
||||
controlNE.UpdatePositionSetpoint(pathDesired->End.North, pathDesired->End.East);
|
||||
}
|
||||
}
|
||||
void VtolLandController::Deactivate(void)
|
||||
{
|
||||
|
@ -1,13 +1,14 @@
|
||||
/**
|
||||
******************************************************************************
|
||||
* @addtogroup OpenPilotModules OpenPilot Modules
|
||||
* @addtogroup LibrePilotModules LibrePilot Modules
|
||||
* @{
|
||||
* @addtogroup PathPlanner Path Planner Module
|
||||
* @brief Executes a series of waypoints
|
||||
* @{
|
||||
*
|
||||
* @file pathplanner.c
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @brief Executes a series of waypoints
|
||||
*
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
@ -48,8 +49,6 @@
|
||||
#include "plans.h"
|
||||
#include <sanitycheck.h>
|
||||
#include <vtolpathfollowersettings.h>
|
||||
#include <statusvtolautotakeoff.h>
|
||||
#include <statusvtolland.h>
|
||||
#include <manualcontrolcommand.h>
|
||||
|
||||
// Private constants
|
||||
@ -80,9 +79,6 @@ static uint8_t conditionPointingTowardsNext();
|
||||
static uint8_t conditionPythonScript();
|
||||
static uint8_t conditionImmediate();
|
||||
static void SettingsUpdatedCb(__attribute__((unused)) UAVObjEvent *ev);
|
||||
static void planner_setup_pathdesired_land(PathDesiredData *pathDesired);
|
||||
static void planner_setup_pathdesired_takeoff(PathDesiredData *pathDesired);
|
||||
static void planner_setup_pathdesired(PathDesiredData *pathDesired, bool overwrite_start_position);
|
||||
|
||||
|
||||
// Private variables
|
||||
@ -132,8 +128,6 @@ int32_t PathPlannerInitialize()
|
||||
VelocityStateInitialize();
|
||||
WaypointInitialize();
|
||||
WaypointActiveInitialize();
|
||||
StatusVtolAutoTakeoffInitialize();
|
||||
StatusVtolLandInitialize();
|
||||
|
||||
pathPlannerHandle = PIOS_CALLBACKSCHEDULER_Create(&pathPlannerTask, CALLBACK_PRIORITY_REGULAR, TASK_PRIORITY, CALLBACKINFO_RUNNING_PATHPLANNER0, STACK_SIZE_BYTES);
|
||||
pathDesiredUpdaterHandle = PIOS_CALLBACKSCHEDULER_Create(&updatePathDesired, CALLBACK_PRIORITY_CRITICAL, TASK_PRIORITY, CALLBACKINFO_RUNNING_PATHPLANNER1, STACK_SIZE_BYTES);
|
||||
@ -236,17 +230,17 @@ static void pathPlannerTask()
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// the transition from pathplanner to another flightmode back to pathplanner
|
||||
// triggers a reset back to 0 index in the waypoint list
|
||||
if (pathplanner_active == false) {
|
||||
pathplanner_active = true;
|
||||
pathplanner_active = true;
|
||||
|
||||
// This triggers callback to update variable
|
||||
waypointActive.Index = 0;
|
||||
WaypointActiveSet(&waypointActive);
|
||||
|
||||
return;
|
||||
FlightModeSettingsFlightModeChangeRestartsPathPlanOptions restart;
|
||||
FlightModeSettingsFlightModeChangeRestartsPathPlanGet(&restart);
|
||||
if (restart == FLIGHTMODESETTINGS_FLIGHTMODECHANGERESTARTSPATHPLAN_TRUE) {
|
||||
setWaypoint(0);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
WaypointInstGet(waypointActive.Index, &waypoint);
|
||||
@ -265,21 +259,6 @@ static void pathPlannerTask()
|
||||
return;
|
||||
}
|
||||
|
||||
// check start conditions
|
||||
// autotakeoff requires midpoint thrust if we are in a pending takeoff situation
|
||||
if (pathAction.Mode == PATHACTION_MODE_AUTOTAKEOFF) {
|
||||
pathAction.EndCondition = PATHACTION_ENDCONDITION_LEGREMAINING;
|
||||
if ((uint8_t)pathDesired.ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_CONTROLSTATE] == STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_WAITFORMIDTHROTTLE) {
|
||||
ManualControlCommandData cmd;
|
||||
ManualControlCommandGet(&cmd);
|
||||
if (cmd.Throttle > AUTOTAKEOFF_THROTTLE_LIMIT_TO_ALLOW_TAKEOFF_START) {
|
||||
pathDesired.ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_CONTROLSTATE] = (float)STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_INITIATE;
|
||||
PathDesiredSet(&pathDesired);
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// check if condition has been met
|
||||
endCondition = pathConditionCheck();
|
||||
@ -331,22 +310,45 @@ void updatePathDesired()
|
||||
WaypointActiveGet(&waypointActive);
|
||||
WaypointInstGet(waypointActive.Index, &waypoint);
|
||||
|
||||
// Capture if current mode is takeoff
|
||||
bool autotakeoff = (pathAction.Mode == PATHACTION_MODE_AUTOTAKEOFF);
|
||||
|
||||
PathActionInstGet(waypoint.Action, &pathAction);
|
||||
|
||||
PathDesiredData pathDesired;
|
||||
switch (pathAction.Mode) {
|
||||
case PATHACTION_MODE_AUTOTAKEOFF:
|
||||
planner_setup_pathdesired_takeoff(&pathDesired);
|
||||
break;
|
||||
case PATHACTION_MODE_LAND:
|
||||
planner_setup_pathdesired_land(&pathDesired);
|
||||
break;
|
||||
default:
|
||||
planner_setup_pathdesired(&pathDesired, autotakeoff);
|
||||
break;
|
||||
|
||||
pathDesired.End.North = waypoint.Position.North;
|
||||
pathDesired.End.East = waypoint.Position.East;
|
||||
pathDesired.End.Down = waypoint.Position.Down;
|
||||
pathDesired.EndingVelocity = waypoint.Velocity;
|
||||
pathDesired.Mode = pathAction.Mode;
|
||||
pathDesired.ModeParameters[0] = pathAction.ModeParameters[0];
|
||||
pathDesired.ModeParameters[1] = pathAction.ModeParameters[1];
|
||||
pathDesired.ModeParameters[2] = pathAction.ModeParameters[2];
|
||||
pathDesired.ModeParameters[3] = pathAction.ModeParameters[3];
|
||||
pathDesired.UID = waypointActive.Index;
|
||||
|
||||
|
||||
if (waypointActive.Index == 0) {
|
||||
PositionStateData positionState;
|
||||
PositionStateGet(&positionState);
|
||||
// First waypoint has itself as start point (used to be home position but that proved dangerous when looping)
|
||||
|
||||
/*pathDesired.Start[PATHDESIRED_START_NORTH] = waypoint.Position[WAYPOINT_POSITION_NORTH];
|
||||
pathDesired.Start[PATHDESIRED_START_EAST] = waypoint.Position[WAYPOINT_POSITION_EAST];
|
||||
pathDesired.Start[PATHDESIRED_START_DOWN] = waypoint.Position[WAYPOINT_POSITION_DOWN];*/
|
||||
// note: if certain flightmodes need to override Start, End or mode parameters, that should happen within
|
||||
// the pathfollower as needed. This also holds if Start is replaced by current position for takeoff and landing
|
||||
pathDesired.Start.North = positionState.North;
|
||||
pathDesired.Start.East = positionState.East;
|
||||
pathDesired.Start.Down = positionState.Down;
|
||||
pathDesired.StartingVelocity = pathDesired.EndingVelocity;
|
||||
} else {
|
||||
// Get previous waypoint as start point
|
||||
WaypointData waypointPrev;
|
||||
WaypointInstGet(waypointActive.Index - 1, &waypointPrev);
|
||||
|
||||
pathDesired.Start.North = waypointPrev.Position.North;
|
||||
pathDesired.Start.East = waypointPrev.Position.East;
|
||||
pathDesired.Start.Down = waypointPrev.Position.Down;
|
||||
pathDesired.StartingVelocity = waypointPrev.Velocity;
|
||||
}
|
||||
|
||||
PathDesiredSet(&pathDesired);
|
||||
@ -437,112 +439,6 @@ void statusUpdated(__attribute__((unused)) UAVObjEvent *ev)
|
||||
PIOS_CALLBACKSCHEDULER_Dispatch(pathPlannerHandle);
|
||||
}
|
||||
|
||||
// Standard setup of a pathDesired command from the waypoint path plan
|
||||
static void planner_setup_pathdesired(PathDesiredData *pathDesired, bool overwrite_start_position)
|
||||
{
|
||||
pathDesired->End.North = waypoint.Position.North;
|
||||
pathDesired->End.East = waypoint.Position.East;
|
||||
pathDesired->End.Down = waypoint.Position.Down;
|
||||
pathDesired->EndingVelocity = waypoint.Velocity;
|
||||
pathDesired->Mode = pathAction.Mode;
|
||||
pathDesired->ModeParameters[0] = pathAction.ModeParameters[0];
|
||||
pathDesired->ModeParameters[1] = pathAction.ModeParameters[1];
|
||||
pathDesired->ModeParameters[2] = pathAction.ModeParameters[2];
|
||||
pathDesired->ModeParameters[3] = pathAction.ModeParameters[3];
|
||||
pathDesired->UID = waypointActive.Index;
|
||||
|
||||
|
||||
if (waypointActive.Index == 0 || overwrite_start_position) {
|
||||
PositionStateData positionState;
|
||||
PositionStateGet(&positionState);
|
||||
// First waypoint has itself as start point (used to be home position but that proved dangerous when looping)
|
||||
|
||||
/*pathDesired.Start[PATHDESIRED_START_NORTH] = waypoint.Position[WAYPOINT_POSITION_NORTH];
|
||||
pathDesired.Start[PATHDESIRED_START_EAST] = waypoint.Position[WAYPOINT_POSITION_EAST];
|
||||
pathDesired.Start[PATHDESIRED_START_DOWN] = waypoint.Position[WAYPOINT_POSITION_DOWN];*/
|
||||
// note takeoff relies on the start being the current location as it merely ascends and using
|
||||
// the start as assumption current NE location
|
||||
pathDesired->Start.North = positionState.North;
|
||||
pathDesired->Start.East = positionState.East;
|
||||
pathDesired->Start.Down = positionState.Down;
|
||||
pathDesired->StartingVelocity = pathDesired->EndingVelocity;
|
||||
} else {
|
||||
// Get previous waypoint as start point
|
||||
WaypointData waypointPrev;
|
||||
WaypointInstGet(waypointActive.Index - 1, &waypointPrev);
|
||||
|
||||
pathDesired->Start.North = waypointPrev.Position.North;
|
||||
pathDesired->Start.East = waypointPrev.Position.East;
|
||||
pathDesired->Start.Down = waypointPrev.Position.Down;
|
||||
pathDesired->StartingVelocity = waypointPrev.Velocity;
|
||||
}
|
||||
}
|
||||
|
||||
#define AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MIN 2.0f
|
||||
#define AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MAX 50.0f
|
||||
static void planner_setup_pathdesired_takeoff(PathDesiredData *pathDesired)
|
||||
{
|
||||
PositionStateData positionState;
|
||||
|
||||
PositionStateGet(&positionState);
|
||||
float velocity_down;
|
||||
float autotakeoff_height;
|
||||
FlightModeSettingsAutoTakeOffVelocityGet(&velocity_down);
|
||||
FlightModeSettingsAutoTakeOffHeightGet(&autotakeoff_height);
|
||||
autotakeoff_height = fabsf(autotakeoff_height);
|
||||
if (autotakeoff_height < AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MIN) {
|
||||
autotakeoff_height = AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MIN;
|
||||
} else if (autotakeoff_height > AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MAX) {
|
||||
autotakeoff_height = AUTOTAKEOFF_TO_INCREMENTAL_HEIGHT_MAX;
|
||||
}
|
||||
|
||||
|
||||
pathDesired->Start.North = positionState.North;
|
||||
pathDesired->Start.East = positionState.East;
|
||||
pathDesired->Start.Down = positionState.Down;
|
||||
pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_NORTH] = 0.0f;
|
||||
pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_EAST] = 0.0f;
|
||||
pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_DOWN] = -velocity_down;
|
||||
// initially halt takeoff.
|
||||
pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_AUTOTAKEOFF_CONTROLSTATE] = (float)STATUSVTOLAUTOTAKEOFF_CONTROLSTATE_WAITFORMIDTHROTTLE;
|
||||
|
||||
pathDesired->End.North = positionState.North;
|
||||
pathDesired->End.East = positionState.East;
|
||||
pathDesired->End.Down = positionState.Down - autotakeoff_height;
|
||||
|
||||
pathDesired->StartingVelocity = 0.0f;
|
||||
pathDesired->EndingVelocity = 0.0f;
|
||||
pathDesired->Mode = PATHDESIRED_MODE_AUTOTAKEOFF;
|
||||
|
||||
pathDesired->UID = waypointActive.Index;
|
||||
}
|
||||
|
||||
static void planner_setup_pathdesired_land(PathDesiredData *pathDesired)
|
||||
{
|
||||
PositionStateData positionState;
|
||||
|
||||
PositionStateGet(&positionState);
|
||||
float velocity_down;
|
||||
|
||||
FlightModeSettingsLandingVelocityGet(&velocity_down);
|
||||
|
||||
pathDesired->Start.North = positionState.North;
|
||||
pathDesired->Start.East = positionState.East;
|
||||
pathDesired->Start.Down = positionState.Down;
|
||||
pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_LAND_VELOCITYVECTOR_NORTH] = 0.0f;
|
||||
pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_LAND_VELOCITYVECTOR_EAST] = 0.0f;
|
||||
pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_LAND_VELOCITYVECTOR_DOWN] = velocity_down;
|
||||
|
||||
pathDesired->End.North = positionState.North;
|
||||
pathDesired->End.East = positionState.East;
|
||||
pathDesired->End.Down = positionState.Down;
|
||||
|
||||
pathDesired->StartingVelocity = 0.0f;
|
||||
pathDesired->EndingVelocity = 0.0f;
|
||||
pathDesired->Mode = PATHDESIRED_MODE_LAND;
|
||||
pathDesired->ModeParameters[PATHDESIRED_MODEPARAMETER_LAND_OPTIONS] = (float)PATHDESIRED_MODEPARAMETER_LAND_OPTION_HORIZONTAL_PH;
|
||||
}
|
||||
|
||||
|
||||
// helper function to go to a specific waypoint
|
||||
static void setWaypoint(uint16_t num)
|
||||
|
@ -80,9 +80,12 @@ extern StabilizationData stabSettings;
|
||||
// must be same as eventdispatcher to avoid needing additional mutexes
|
||||
#define CBTASK_PRIORITY CALLBACK_TASK_FLIGHTCONTROL
|
||||
|
||||
#ifndef STABILIZATION_ATTITUDE_DOWNSAMPLED
|
||||
// outer loop only executes every 4th uavobject update to save CPU
|
||||
#define OUTERLOOP_SKIPCOUNT 4
|
||||
|
||||
#else
|
||||
#define OUTERLOOP_SKIPCOUNT ATTITUDE_SENSORS_DOWNSAMPLE
|
||||
#endif // STABILIZATION_ATTITUDE_DOWNSAMPLED
|
||||
#endif // STABILIZATION_H
|
||||
|
||||
/**
|
||||
|
@ -365,14 +365,19 @@ static void stabilizationOuterloopTask()
|
||||
|
||||
static void AttitudeStateUpdatedCb(__attribute__((unused)) UAVObjEvent *ev)
|
||||
{
|
||||
#ifndef STABILIZATION_ATTITUDE_DOWNSAMPLED
|
||||
// to reduce CPU utilization, outer loop is not executed on every state update
|
||||
static uint8_t cpusaver = 0;
|
||||
|
||||
if ((cpusaver++ % OUTERLOOP_SKIPCOUNT) == 0) {
|
||||
// this does not need mutex protection as both eventdispatcher and stabi run in same callback task!
|
||||
AttitudeStateGet(&attitude);
|
||||
PIOS_CALLBACKSCHEDULER_Dispatch(callbackHandle);
|
||||
}
|
||||
#endif
|
||||
// this does not need mutex protection as both eventdispatcher and stabi run in same callback task!
|
||||
AttitudeStateGet(&attitude);
|
||||
PIOS_CALLBACKSCHEDULER_Dispatch(callbackHandle);
|
||||
|
||||
#ifndef STABILIZATION_ATTITUDE_DOWNSAMPLED
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -465,9 +465,11 @@ static void callbackSchedulerForEachCallback(int16_t callback_id, const struct p
|
||||
return;
|
||||
}
|
||||
// delayed callback scheduler reports callback stack overflows as remaininng: -1
|
||||
#if !defined(ARCH_POSIX) && !defined(ARCH_WIN32)
|
||||
if (callback_info->stack_remaining < 0 && stackOverflow == STACKOVERFLOW_NONE) {
|
||||
stackOverflow = STACKOVERFLOW_WARNING;
|
||||
}
|
||||
#endif
|
||||
// By convention, there is a direct mapping between (not negative) callback scheduler callback_id's and members
|
||||
// of the CallbackInfoXXXXElem enums
|
||||
PIOS_DEBUG_Assert(callback_id < CALLBACKINFO_RUNNING_NUMELEM);
|
||||
@ -681,6 +683,7 @@ void vApplicationIdleHook(void)
|
||||
void vApplicationStackOverflowHook(__attribute__((unused)) xTaskHandle *pxTask,
|
||||
__attribute__((unused)) signed portCHAR *pcTaskName)
|
||||
{
|
||||
#if !defined(ARCH_POSIX) && !defined(ARCH_WIN32)
|
||||
stackOverflow = STACKOVERFLOW_CRITICAL;
|
||||
#if DEBUG_STACK_OVERFLOW
|
||||
static volatile bool wait_here = true;
|
||||
@ -689,6 +692,7 @@ void vApplicationStackOverflowHook(__attribute__((unused)) xTaskHandle *pxTask,
|
||||
}
|
||||
wait_here = true;
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -7,7 +7,8 @@
|
||||
* @{
|
||||
*
|
||||
* @file pios_rfm22b.c
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
|
||||
* @brief Implements a driver the the RFM22B driver
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
*
|
||||
@ -187,6 +188,7 @@ static enum pios_radio_event rfm22_fatal_error(struct pios_rfm22b_dev *rfm22b_de
|
||||
static void rfm22b_add_rx_status(struct pios_rfm22b_dev *rfm22b_dev, enum pios_rfm22b_rx_packet_status status);
|
||||
static void rfm22_setNominalCarrierFrequency(struct pios_rfm22b_dev *rfm22b_dev, uint8_t init_chan);
|
||||
static bool rfm22_setFreqHopChannel(struct pios_rfm22b_dev *rfm22b_dev, uint8_t channel);
|
||||
static void rfm22_generateDeviceID(struct pios_rfm22b_dev *rfm22b_dev);
|
||||
static void rfm22_updatePairStatus(struct pios_rfm22b_dev *radio_dev);
|
||||
static void rfm22_updateStats(struct pios_rfm22b_dev *rfm22b_dev);
|
||||
static bool rfm22_checkTimeOut(struct pios_rfm22b_dev *rfm22b_dev);
|
||||
@ -446,18 +448,8 @@ int32_t PIOS_RFM22B_Init(uint32_t *rfm22b_id, uint32_t spi_id, uint32_t slave_nu
|
||||
// Create a semaphore to know if an ISR needs responding to
|
||||
vSemaphoreCreateBinary(rfm22b_dev->isrPending);
|
||||
|
||||
// Create our (hopefully) unique 32 bit id from the processor serial number.
|
||||
uint8_t crcs[] = { 0, 0, 0, 0 };
|
||||
{
|
||||
char serial_no_str[33];
|
||||
PIOS_SYS_SerialNumberGet(serial_no_str);
|
||||
// Create a 32 bit value using 4 8 bit CRC values.
|
||||
for (uint8_t i = 0; serial_no_str[i] != 0; ++i) {
|
||||
crcs[i % 4] = PIOS_CRC_updateByte(crcs[i % 4], serial_no_str[i]);
|
||||
}
|
||||
}
|
||||
rfm22b_dev->deviceID = crcs[0] | crcs[1] << 8 | crcs[2] << 16 | crcs[3] << 24;
|
||||
DEBUG_PRINTF(2, "RF device ID: %x\n\r", rfm22b_dev->deviceID);
|
||||
// Create default (hopefully) unique 32 bit id from the processor serial number.
|
||||
rfm22_generateDeviceID(rfm22b_dev);
|
||||
|
||||
// Initialize the external interrupt.
|
||||
PIOS_EXTI_Init(cfg->exti_cfg);
|
||||
@ -510,6 +502,26 @@ bool PIOS_RFM22_EXT_Int(void)
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Set the device ID for the RFM22B device.
|
||||
*
|
||||
* @param[in] rfm22b_id The RFM22B device index.
|
||||
*
|
||||
*/
|
||||
void PIOS_RFM22B_SetDeviceID(uint32_t rfm22b_id, uint32_t custom_device_id)
|
||||
{
|
||||
struct pios_rfm22b_dev *rfm22b_dev = (struct pios_rfm22b_dev *)rfm22b_id;
|
||||
|
||||
if (custom_device_id > 0) {
|
||||
rfm22b_dev->deviceID = custom_device_id;
|
||||
} else {
|
||||
rfm22_generateDeviceID(rfm22b_dev);
|
||||
}
|
||||
|
||||
DEBUG_PRINTF(2, "RF device ID: %x\n\r", rfm22b_dev->deviceID);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the unique device ID for the RFM22B device.
|
||||
*
|
||||
@ -1711,6 +1723,29 @@ static bool rfm22_setFreqHopChannel(struct pios_rfm22b_dev *rfm22b_dev, uint8_t
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate the unique device ID for the RFM22B device.
|
||||
*
|
||||
* @param[in] rfm22b_id The RFM22B device index.
|
||||
*
|
||||
*/
|
||||
void rfm22_generateDeviceID(struct pios_rfm22b_dev *rfm22b_dev)
|
||||
{
|
||||
// Create our (hopefully) unique 32 bit id from the processor serial number.
|
||||
uint8_t crcs[] = { 0, 0, 0, 0 };
|
||||
{
|
||||
char serial_no_str[33];
|
||||
PIOS_SYS_SerialNumberGet(serial_no_str);
|
||||
// Create a 32 bit value using 4 8 bit CRC values.
|
||||
for (uint8_t i = 0; serial_no_str[i] != 0; ++i) {
|
||||
crcs[i % 4] = PIOS_CRC_updateByte(crcs[i % 4], serial_no_str[i]);
|
||||
}
|
||||
}
|
||||
|
||||
rfm22b_dev->deviceID = crcs[0] | crcs[1] << 8 | crcs[2] << 16 | crcs[3] << 24;
|
||||
DEBUG_PRINTF(2, "Generated RF device ID: %x\n\r", rfm22b_dev->deviceID);
|
||||
}
|
||||
|
||||
/**
|
||||
* Read the RFM22B interrupt and device status registers
|
||||
*
|
||||
|
@ -2,7 +2,8 @@
|
||||
******************************************************************************
|
||||
*
|
||||
* @file pios_instrumentation_helper.h
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2014.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org, Copyright (c) 2016
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2014.
|
||||
* @brief Macros to easily add optional performance monitoring to a module
|
||||
*
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
@ -51,10 +52,16 @@
|
||||
* The following code needs to be added to a function called at module initialization.
|
||||
* the second parameter is a unique counter Id.
|
||||
* A good pracice is to use the upper half word as module id and lower as counter id
|
||||
* <pre>PERF_INIT_COUNTER(counterUpd, 0xA7710001);
|
||||
* PERF_INIT_COUNTER(counterAtt, 0xA7710002);
|
||||
* PERF_INIT_COUNTER(counterPeriod, 0xA7710003);
|
||||
* PERF_INIT_COUNTER(counterAccelSamples, 0xA7710004);</pre>
|
||||
* Optionally three strings containing Module Name, Counter description and unit of measure can be passed.
|
||||
* Those strings will be used in future to automatically extract the list of counters from code to managed
|
||||
* by GCS or some other custom tool.
|
||||
*
|
||||
* PERF_INIT_COUNTER(counterVariable, id, "MODULE NAME","COUNTER DESCRIPTION","UNIT OF MEASURE");
|
||||
*
|
||||
* <pre>PERF_INIT_COUNTER(counterUpd, 0xA7710001, "ATTITUDE", "Sensor update execution time", "us");
|
||||
* PERF_INIT_COUNTER(counterAtt, 0xA7710002, "ATTITUDE", "Attitude estimation execution time", "us");
|
||||
* PERF_INIT_COUNTER(counterPeriod, 0xA7710003, "ATTITUDE", "Sensor update period", "us");
|
||||
* PERF_INIT_COUNTER(counterAccelSamples, 0xA7710004, "ATTITUDE", "Samples for each sensor cycle", "count");</pre>
|
||||
*
|
||||
* At this point you can start using the counters as in the following samples
|
||||
*
|
||||
@ -84,31 +91,31 @@
|
||||
/**
|
||||
* include the following macro together with modules variable declaration
|
||||
*/
|
||||
#define PERF_DEFINE_COUNTER(x) pios_counter_t x
|
||||
#define PERF_DEFINE_COUNTER(x) static pios_counter_t x
|
||||
|
||||
/**
|
||||
* this mast be called at some module init code
|
||||
*/
|
||||
#define PERF_INIT_COUNTER(x, id) x = PIOS_Instrumentation_CreateCounter(id)
|
||||
#define PERF_INIT_COUNTER(x, id, ...) x = PIOS_Instrumentation_CreateCounter(id)
|
||||
|
||||
/**
|
||||
* those are the monitoring macros
|
||||
*/
|
||||
#define PERF_TIMED_SECTION_START(x) PIOS_Instrumentation_TimeStart(x)
|
||||
#define PERF_TIMED_SECTION_END(x) PIOS_Instrumentation_TimeEnd(x)
|
||||
#define PERF_MEASURE_PERIOD(x) PIOS_Instrumentation_TrackPeriod(x)
|
||||
#define PERF_TRACK_VALUE(x, y) PIOS_Instrumentation_updateCounter(x, y)
|
||||
#define PERF_INCREMENT_VALUE(x) PIOS_Instrumentation_incrementCounter(x, 1)
|
||||
#define PERF_DECREMENT_VALUE(x) PIOS_Instrumentation_incrementCounter(x, -1)
|
||||
#define PERF_TIMED_SECTION_START(x) PIOS_Instrumentation_TimeStart(x)
|
||||
#define PERF_TIMED_SECTION_END(x) PIOS_Instrumentation_TimeEnd(x)
|
||||
#define PERF_MEASURE_PERIOD(x) PIOS_Instrumentation_TrackPeriod(x)
|
||||
#define PERF_TRACK_VALUE(x, y) PIOS_Instrumentation_updateCounter(x, y)
|
||||
#define PERF_INCREMENT_VALUE(x) PIOS_Instrumentation_incrementCounter(x, 1)
|
||||
#define PERF_DECREMENT_VALUE(x) PIOS_Instrumentation_incrementCounter(x, -1)
|
||||
|
||||
#else
|
||||
|
||||
#define PERF_DEFINE_COUNTER(x)
|
||||
#define PERF_INIT_COUNTER(x, id)
|
||||
#define PERF_INIT_COUNTER(x, id, ...)
|
||||
#define PERF_TIMED_SECTION_START(x)
|
||||
#define PERF_TIMED_SECTION_END(x)
|
||||
#define PERF_MEASURE_PERIOD(x)
|
||||
#define PERF_TRACK_VALUE(x, y)
|
||||
#define PERF_TRACK_VALUE(x, y) (void)y
|
||||
#define PERF_INCREMENT_VALUE(x)
|
||||
#define PERF_DECREMENT_VALUE(x)
|
||||
#endif /* PIOS_INCLUDE_INSTRUMENTATION */
|
||||
|
@ -7,7 +7,8 @@
|
||||
* @{
|
||||
*
|
||||
* @file pios_rfm22b.h
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
|
||||
* @brief RFM22B functions header.
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
*
|
||||
@ -105,6 +106,7 @@ extern void PIOS_RFM22B_Reinit(uint32_t rfb22b_id);
|
||||
extern void PIOS_RFM22B_SetTxPower(uint32_t rfm22b_id, enum rfm22b_tx_power tx_pwr);
|
||||
extern void PIOS_RFM22B_SetChannelConfig(uint32_t rfm22b_id, enum rfm22b_datarate datarate, uint8_t min_chan, uint8_t max_chan, bool coordinator, bool oneway, bool ppm_mode, bool ppm_only);
|
||||
extern void PIOS_RFM22B_SetCoordinatorID(uint32_t rfm22b_id, uint32_t coord_id);
|
||||
extern void PIOS_RFM22B_SetDeviceID(uint32_t rfm22b_id, uint32_t device_id);
|
||||
extern uint32_t PIOS_RFM22B_DeviceID(uint32_t rfb22b_id);
|
||||
extern void PIOS_RFM22B_GetStats(uint32_t rfm22b_id, struct rfm22b_stats *stats);
|
||||
extern uint8_t PIOS_RFM22B_GetPairStats(uint32_t rfm22b_id, uint32_t *device_ids, int8_t *RSSIs, uint8_t max_pairs);
|
||||
|
@ -674,7 +674,7 @@ struct pios_rfm22b_dev {
|
||||
// The device ID
|
||||
uint32_t deviceID;
|
||||
|
||||
// The coodinator ID (0 if this modem is a coordinator).
|
||||
// The coordinator ID (0 if this modem is a coordinator).
|
||||
uint32_t coordinatorID;
|
||||
|
||||
// The task handle
|
||||
|
@ -93,7 +93,9 @@
|
||||
/* #define PIOS_INCLUDE_ETASV3 */
|
||||
/* #define PIOS_INCLUDE_HCSR04 */
|
||||
|
||||
#define PIOS_SENSOR_RATE 500.0f
|
||||
#define PIOS_SENSOR_RATE 500.0f
|
||||
#define STABILIZATION_ATTITUDE_DOWNSAMPLED
|
||||
#define ATTITUDE_SENSORS_DOWNSAMPLE 4
|
||||
|
||||
/* PIOS receiver drivers */
|
||||
#define PIOS_INCLUDE_PWM
|
||||
|
@ -992,7 +992,9 @@ SystemAlarmsExtendedAlarmStatusOptions CopterControlConfigHook()
|
||||
if ((recmode == HWSETTINGS_CC_RCVRPORT_PPM_PIN8ONESHOT ||
|
||||
flexiMode == HWSETTINGS_CC_FLEXIPORT_PPM) &&
|
||||
(modes[3] == ACTUATORSETTINGS_BANKMODE_PWMSYNC ||
|
||||
modes[3] == ACTUATORSETTINGS_BANKMODE_ONESHOT125)) {
|
||||
modes[3] == ACTUATORSETTINGS_BANKMODE_ONESHOT125 ||
|
||||
modes[3] == ACTUATORSETTINGS_BANKMODE_ONESHOT42 ||
|
||||
modes[3] == ACTUATORSETTINGS_BANKMODE_MULTISHOT)) {
|
||||
return SYSTEMALARMS_EXTENDEDALARMSTATUS_UNSUPPORTEDCONFIG_ONESHOT;
|
||||
} else {
|
||||
return SYSTEMALARMS_EXTENDEDALARMSTATUS_NONE;
|
||||
@ -1005,7 +1007,9 @@ SystemAlarmsExtendedAlarmStatusOptions CopterControlConfigHook()
|
||||
case HWSETTINGS_CC_RCVRPORT_PWMNOONESHOT:
|
||||
for (uint8_t i = 0; i < ACTUATORSETTINGS_BANKMODE_NUMELEM; i++) {
|
||||
if (modes[i] == ACTUATORSETTINGS_BANKMODE_PWMSYNC ||
|
||||
modes[i] == ACTUATORSETTINGS_BANKMODE_ONESHOT125) {
|
||||
modes[i] == ACTUATORSETTINGS_BANKMODE_ONESHOT125 ||
|
||||
modes[i] == ACTUATORSETTINGS_BANKMODE_ONESHOT42 ||
|
||||
modes[i] == ACTUATORSETTINGS_BANKMODE_MULTISHOT) {
|
||||
return SYSTEMALARMS_EXTENDEDALARMSTATUS_UNSUPPORTEDCONFIG_ONESHOT;;
|
||||
}
|
||||
|
||||
|
@ -1,8 +1,9 @@
|
||||
/**
|
||||
******************************************************************************
|
||||
* @file pios_board.c
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2011.
|
||||
* @author PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2011.
|
||||
* PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012
|
||||
* @addtogroup OpenPilotSystem OpenPilot System
|
||||
* @{
|
||||
* @addtogroup OpenPilotCore OpenPilot Core
|
||||
@ -813,6 +814,7 @@ void PIOS_Board_Init(void)
|
||||
}
|
||||
|
||||
/* Set the radio configuration parameters. */
|
||||
PIOS_RFM22B_SetDeviceID(pios_rfm22b_id, oplinkSettings.CustomDeviceID);
|
||||
PIOS_RFM22B_SetChannelConfig(pios_rfm22b_id, datarate, oplinkSettings.MinChannel, oplinkSettings.MaxChannel, is_coordinator, is_oneway, ppm_mode, ppm_only);
|
||||
PIOS_RFM22B_SetCoordinatorID(pios_rfm22b_id, oplinkSettings.CoordID);
|
||||
|
||||
@ -821,7 +823,7 @@ void PIOS_Board_Init(void)
|
||||
PIOS_RFM22B_SetPPMCallback(pios_rfm22b_id, PIOS_Board_PPM_callback);
|
||||
}
|
||||
|
||||
/* Set the modem Tx poer level */
|
||||
/* Set the modem Tx power level */
|
||||
switch (oplinkSettings.MaxRFPower) {
|
||||
case OPLINKSETTINGS_MAXRFPOWER_125:
|
||||
PIOS_RFM22B_SetTxPower(pios_rfm22b_id, RFM22_tx_pwr_txpow_0);
|
||||
|
@ -6,7 +6,8 @@
|
||||
* @{
|
||||
*
|
||||
* @file pios_board.c
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||
* @brief Defines board specific static initializers for hardware for the OpenPilot board.
|
||||
* @see The GNU Public License (GPL) Version 3
|
||||
*
|
||||
@ -406,7 +407,7 @@ void PIOS_Board_Init(void)
|
||||
break;
|
||||
}
|
||||
|
||||
/* Set the modem Tx poer level */
|
||||
/* Set the modem Tx power level */
|
||||
switch (oplinkSettings.MaxRFPower) {
|
||||
case OPLINKSETTINGS_MAXRFPOWER_125:
|
||||
PIOS_RFM22B_SetTxPower(pios_rfm22b_id, RFM22_tx_pwr_txpow_0);
|
||||
@ -438,6 +439,7 @@ void PIOS_Board_Init(void)
|
||||
}
|
||||
|
||||
// Set the radio configuration parameters.
|
||||
PIOS_RFM22B_SetDeviceID(pios_rfm22b_id, oplinkSettings.CustomDeviceID);
|
||||
PIOS_RFM22B_SetCoordinatorID(pios_rfm22b_id, oplinkSettings.CoordID);
|
||||
PIOS_RFM22B_SetChannelConfig(pios_rfm22b_id, datarate, oplinkSettings.MinChannel, oplinkSettings.MaxChannel, is_coordinator, is_oneway, ppm_mode, ppm_only);
|
||||
|
||||
@ -446,7 +448,7 @@ void PIOS_Board_Init(void)
|
||||
PIOS_RFM22B_SetPPMCallback(pios_rfm22b_id, PIOS_Board_PPM_callback);
|
||||
}
|
||||
|
||||
// Reinitilize the modem to affect te changes.
|
||||
// Reinitialize the modem to affect the changes.
|
||||
PIOS_RFM22B_Reinit(pios_rfm22b_id);
|
||||
} else {
|
||||
oplinkStatus.LinkState = OPLINKSTATUS_LINKSTATE_DISABLED;
|
||||
|
@ -1,7 +1,7 @@
|
||||
/**
|
||||
******************************************************************************
|
||||
* @file pios_board.c
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015-2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2011.
|
||||
* PhoenixPilot, http://github.com/PhoenixPilot, Copyright (C) 2012
|
||||
* @addtogroup OpenPilotSystem OpenPilot System
|
||||
@ -895,6 +895,7 @@ void PIOS_Board_Init(void)
|
||||
}
|
||||
|
||||
/* Set the radio configuration parameters. */
|
||||
PIOS_RFM22B_SetDeviceID(pios_rfm22b_id, oplinkSettings.CustomDeviceID);
|
||||
PIOS_RFM22B_SetCoordinatorID(pios_rfm22b_id, oplinkSettings.CoordID);
|
||||
PIOS_RFM22B_SetChannelConfig(pios_rfm22b_id, datarate, oplinkSettings.MinChannel, oplinkSettings.MaxChannel, is_coordinator, is_oneway, ppm_mode, ppm_only);
|
||||
|
||||
@ -903,7 +904,7 @@ void PIOS_Board_Init(void)
|
||||
PIOS_RFM22B_SetPPMCallback(pios_rfm22b_id, PIOS_Board_PPM_callback);
|
||||
}
|
||||
|
||||
/* Set the modem Tx poer level */
|
||||
/* Set the modem Tx power level */
|
||||
switch (oplinkSettings.MaxRFPower) {
|
||||
case OPLINKSETTINGS_MAXRFPOWER_125:
|
||||
PIOS_RFM22B_SetTxPower(pios_rfm22b_id, RFM22_tx_pwr_txpow_0);
|
||||
|
@ -902,7 +902,9 @@ SystemAlarmsExtendedAlarmStatusOptions RevoNanoConfigHook()
|
||||
case HWSETTINGS_RM_RCVRPORT_PWM:
|
||||
for (uint8_t i = 0; i < ACTUATORSETTINGS_BANKMODE_NUMELEM; i++) {
|
||||
if (modes[i] == ACTUATORSETTINGS_BANKMODE_PWMSYNC ||
|
||||
modes[i] == ACTUATORSETTINGS_BANKMODE_ONESHOT125) {
|
||||
modes[i] == ACTUATORSETTINGS_BANKMODE_ONESHOT125 ||
|
||||
modes[i] == ACTUATORSETTINGS_BANKMODE_ONESHOT42 ||
|
||||
modes[i] == ACTUATORSETTINGS_BANKMODE_MULTISHOT) {
|
||||
return SYSTEMALARMS_EXTENDEDALARMSTATUS_UNSUPPORTEDCONFIG_ONESHOT;;
|
||||
}
|
||||
}
|
||||
|
@ -607,11 +607,27 @@ QtKeyboardMap OSGViewport::Hidden::keyMap = QtKeyboardMap();
|
||||
OSGViewport::OSGViewport(QQuickItem *parent) : Inherited(parent), h(new Hidden(this))
|
||||
{
|
||||
// setClearBeforeRendering(false);
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
|
||||
setMirrorVertically(true);
|
||||
#endif
|
||||
setAcceptHoverEvents(true);
|
||||
setAcceptedMouseButtons(Qt::AllButtons);
|
||||
}
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
|
||||
QSGNode *OSGViewport::updatePaintNode(QSGNode *node, QQuickItem::UpdatePaintNodeData *nodeData)
|
||||
{
|
||||
if (!node) {
|
||||
node = QQuickFramebufferObject::updatePaintNode(node, nodeData);
|
||||
QSGSimpleTextureNode *n = static_cast<QSGSimpleTextureNode *>(node);
|
||||
if (n)
|
||||
n->setTextureCoordinatesTransform(QSGSimpleTextureNode::MirrorVertically);
|
||||
return node;
|
||||
}
|
||||
return QQuickFramebufferObject::updatePaintNode(node, nodeData);
|
||||
}
|
||||
#endif
|
||||
|
||||
OSGViewport::~OSGViewport()
|
||||
{
|
||||
delete h;
|
||||
|
@ -93,6 +93,9 @@ signals:
|
||||
void busyChanged(bool busy);
|
||||
|
||||
protected:
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
|
||||
QSGNode *updatePaintNode(QSGNode *node, QQuickItem::UpdatePaintNodeData *nodeData) override;
|
||||
#endif
|
||||
// QQuickItem
|
||||
void mousePressEvent(QMouseEvent *event);
|
||||
void mouseMoveEvent(QMouseEvent *event);
|
||||
|
@ -861,7 +861,16 @@ margin:1px;</string>
|
||||
<number>6</number>
|
||||
</property>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_18">
|
||||
<widget class="QLabel" name="motorPositionLabel5">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>80</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
|
||||
color: rgb(255, 255, 255);
|
||||
@ -870,7 +879,7 @@ font: bold 12px;
|
||||
margin:1px;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>5</string>
|
||||
<string>Pos5</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -891,7 +900,16 @@ margin:1px;</string>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_19">
|
||||
<widget class="QLabel" name="motorPositionLabel6">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>80</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
|
||||
color: rgb(255, 255, 255);
|
||||
@ -900,7 +918,7 @@ font: bold 12px;
|
||||
margin:1px;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>6</string>
|
||||
<string>Pos6</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -921,7 +939,16 @@ margin:1px;</string>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_20">
|
||||
<widget class="QLabel" name="motorPositionLabel7">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>80</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
|
||||
color: rgb(255, 255, 255);
|
||||
@ -930,7 +957,7 @@ font: bold 12px;
|
||||
margin:1px;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>7</string>
|
||||
<string>Pos7</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -951,7 +978,16 @@ margin:1px;</string>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="label_21">
|
||||
<widget class="QLabel" name="motorPositionLabel8">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>80</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
|
||||
color: rgb(255, 255, 255);
|
||||
@ -960,7 +996,7 @@ font: bold 12px;
|
||||
margin:1px;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>8</string>
|
||||
<string>Pos8</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -1029,7 +1065,16 @@ margin:1px;</string>
|
||||
<number>6</number>
|
||||
</property>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="MotorOutputLabel1_2">
|
||||
<widget class="QLabel" name="motorPositionLabel1">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>80</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
|
||||
color: rgb(255, 255, 255);
|
||||
@ -1038,7 +1083,7 @@ font: bold 12px;
|
||||
margin:1px;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>1</string>
|
||||
<string>Pos1</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -1056,7 +1101,16 @@ margin:1px;</string>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_13">
|
||||
<widget class="QLabel" name="motorPositionLabel2">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>80</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
|
||||
color: rgb(255, 255, 255);
|
||||
@ -1065,7 +1119,7 @@ font: bold 12px;
|
||||
margin:1px;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>2</string>
|
||||
<string>Pos2</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -1083,7 +1137,16 @@ margin:1px;</string>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_14">
|
||||
<widget class="QLabel" name="motorPositionLabel3">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>80</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
|
||||
color: rgb(255, 255, 255);
|
||||
@ -1092,7 +1155,7 @@ font: bold 12px;
|
||||
margin:1px;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>3</string>
|
||||
<string>Pos3</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -1110,7 +1173,16 @@ margin:1px;</string>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="label_15">
|
||||
<widget class="QLabel" name="motorPositionLabel4">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>80</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-color: qlineargradient(spread:reflect, x1:0.507, y1:0, x2:0.507, y2:0.772, stop:0.208955 rgba(74, 74, 74, 255), stop:0.78607 rgba(36, 36, 36, 255));
|
||||
color: rgb(255, 255, 255);
|
||||
@ -1119,7 +1191,7 @@ font: bold 12px;
|
||||
margin:1px;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>4</string>
|
||||
<string>Pos4</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
@ -190,15 +190,21 @@ void ConfigMultiRotorWidget::setupUI(QString frameType)
|
||||
Q_ASSERT(m_aircraft);
|
||||
Q_ASSERT(quad);
|
||||
|
||||
QStringList motorLabels;
|
||||
|
||||
if (frameType == "Tri" || frameType == "Tricopter Y") {
|
||||
setComboCurrentIndex(m_aircraft->multirotorFrameType, m_aircraft->multirotorFrameType->findText("Tricopter Y"));
|
||||
|
||||
motorLabels << "NW" << "NE" << "S";
|
||||
|
||||
m_aircraft->mrRollMixLevel->setValue(100);
|
||||
m_aircraft->mrPitchMixLevel->setValue(100);
|
||||
setYawMixLevel(100);
|
||||
} else if (frameType == "QuadX" || frameType == "Quad X") {
|
||||
setComboCurrentIndex(m_aircraft->multirotorFrameType, m_aircraft->multirotorFrameType->findText("Quad X"));
|
||||
|
||||
motorLabels << "NW" << "NE" << "SE" << "SW";
|
||||
|
||||
// init mixer levels
|
||||
m_aircraft->mrRollMixLevel->setValue(50);
|
||||
m_aircraft->mrPitchMixLevel->setValue(50);
|
||||
@ -206,12 +212,16 @@ void ConfigMultiRotorWidget::setupUI(QString frameType)
|
||||
} else if (frameType == "QuadP" || frameType == "Quad +") {
|
||||
setComboCurrentIndex(m_aircraft->multirotorFrameType, m_aircraft->multirotorFrameType->findText("Quad +"));
|
||||
|
||||
motorLabels << "N" << "E" << "S" << "W";
|
||||
|
||||
m_aircraft->mrRollMixLevel->setValue(100);
|
||||
m_aircraft->mrPitchMixLevel->setValue(100);
|
||||
setYawMixLevel(50);
|
||||
} else if (frameType == "Hexa" || frameType == "Hexacopter") {
|
||||
setComboCurrentIndex(m_aircraft->multirotorFrameType, m_aircraft->multirotorFrameType->findText("Hexacopter"));
|
||||
|
||||
motorLabels << "N" << "NE" << "SE" << "S" << "SW" << "NW";
|
||||
|
||||
m_aircraft->mrRollMixLevel->setValue(100); // Old Roll 50 - Pitch 33 - Yaw 33
|
||||
m_aircraft->mrPitchMixLevel->setValue(100); // Do not alter mixer matrix
|
||||
setYawMixLevel(100);
|
||||
@ -219,6 +229,8 @@ void ConfigMultiRotorWidget::setupUI(QString frameType)
|
||||
setComboCurrentIndex(m_aircraft->multirotorFrameType,
|
||||
m_aircraft->multirotorFrameType->findText("Hexacopter X"));
|
||||
|
||||
motorLabels << "NE" << "E" << "SE" << "SW" << "W" << "NW";
|
||||
|
||||
m_aircraft->mrRollMixLevel->setValue(100); // Old: Roll 33 - Pitch 50 - Yaw 33
|
||||
m_aircraft->mrPitchMixLevel->setValue(100); // Do not alter mixer matrix
|
||||
setYawMixLevel(100);
|
||||
@ -226,6 +238,8 @@ void ConfigMultiRotorWidget::setupUI(QString frameType)
|
||||
setComboCurrentIndex(m_aircraft->multirotorFrameType,
|
||||
m_aircraft->multirotorFrameType->findText("Hexacopter H"));
|
||||
|
||||
motorLabels << "NE" << "E" << "SE" << "SW" << "W" << "NW";
|
||||
|
||||
m_aircraft->mrRollMixLevel->setValue(100); // Do not alter mixer matrix
|
||||
m_aircraft->mrPitchMixLevel->setValue(100); // All mixers RPY levels = 100%
|
||||
setYawMixLevel(100);
|
||||
@ -233,18 +247,24 @@ void ConfigMultiRotorWidget::setupUI(QString frameType)
|
||||
setComboCurrentIndex(m_aircraft->multirotorFrameType,
|
||||
m_aircraft->multirotorFrameType->findText("Hexacopter Y6"));
|
||||
|
||||
motorLabels << "NW Top" << "NW Bottom" << "NE Top" << "NE Bottom" << "S Top" << "S Bottom";
|
||||
|
||||
m_aircraft->mrRollMixLevel->setValue(86);
|
||||
m_aircraft->mrPitchMixLevel->setValue(100);
|
||||
setYawMixLevel(100);
|
||||
} else if (frameType == "Octo" || frameType == "Octocopter") {
|
||||
setComboCurrentIndex(m_aircraft->multirotorFrameType, m_aircraft->multirotorFrameType->findText("Octocopter"));
|
||||
|
||||
motorLabels << "N" << "NE" << "E" << "SE" << "S" << "SW" << "W" << "NW";
|
||||
|
||||
m_aircraft->mrRollMixLevel->setValue(100); // Do not alter mixer matrix
|
||||
m_aircraft->mrPitchMixLevel->setValue(100); // All mixers RPY levels = 100%
|
||||
setYawMixLevel(100);
|
||||
} else if (frameType == "OctoX" || frameType == "Octocopter X") {
|
||||
setComboCurrentIndex(m_aircraft->multirotorFrameType, m_aircraft->multirotorFrameType->findText("Octocopter X"));
|
||||
|
||||
motorLabels << "NNE" << "ENE" << "ESE" << "SSE" << "SSW" << "WSW" << "WNW" << "NNW";
|
||||
|
||||
m_aircraft->mrRollMixLevel->setValue(100); // Do not alter mixer matrix
|
||||
m_aircraft->mrPitchMixLevel->setValue(100); // All mixers RPY levels = 100%
|
||||
setYawMixLevel(100);
|
||||
@ -252,18 +272,25 @@ void ConfigMultiRotorWidget::setupUI(QString frameType)
|
||||
setComboCurrentIndex(m_aircraft->multirotorFrameType,
|
||||
m_aircraft->multirotorFrameType->findText("Octocopter V"));
|
||||
|
||||
motorLabels << "N" << "NE" << "E" << "SE" << "S" << "SW" << "W" << "NW";
|
||||
|
||||
m_aircraft->mrRollMixLevel->setValue(25);
|
||||
m_aircraft->mrPitchMixLevel->setValue(25);
|
||||
setYawMixLevel(25);
|
||||
} else if (frameType == "OctoCoaxP" || frameType == "Octo Coax +") {
|
||||
setComboCurrentIndex(m_aircraft->multirotorFrameType, m_aircraft->multirotorFrameType->findText("Octo Coax +"));
|
||||
|
||||
motorLabels << "N Top" << "N Bottom" << "E Top" << "E Bottom" << "S Top" << "S Bottom" << "W Top" << "W Bottom";
|
||||
|
||||
m_aircraft->mrRollMixLevel->setValue(100);
|
||||
m_aircraft->mrPitchMixLevel->setValue(100);
|
||||
setYawMixLevel(50);
|
||||
} else if (frameType == "OctoCoaxX" || frameType == "Octo Coax X") {
|
||||
setComboCurrentIndex(m_aircraft->multirotorFrameType, m_aircraft->multirotorFrameType->findText("Octo Coax X"));
|
||||
|
||||
motorLabels << "NW Top" << "NW Bottom" << "NE Top" << "NE Bottom" << "SE Top" << "SE Bottom" << "SW Top" << "SW Bottom";
|
||||
|
||||
|
||||
m_aircraft->mrRollMixLevel->setValue(50);
|
||||
m_aircraft->mrPitchMixLevel->setValue(50);
|
||||
setYawMixLevel(50);
|
||||
@ -272,6 +299,9 @@ void ConfigMultiRotorWidget::setupUI(QString frameType)
|
||||
// Enable/Disable controls
|
||||
setupEnabledControls(frameType);
|
||||
|
||||
// Update motor position labels
|
||||
updateMotorsPositionLabels(motorLabels);
|
||||
|
||||
// Draw the appropriate airframe
|
||||
updateAirframe(frameType);
|
||||
}
|
||||
@ -527,6 +557,32 @@ void ConfigMultiRotorWidget::refreshWidgetsValues(QString frameType)
|
||||
updateAirframe(frameType);
|
||||
}
|
||||
|
||||
/**
|
||||
Helper function to update the UI MotorPositionLabels text
|
||||
*/
|
||||
void ConfigMultiRotorWidget::updateMotorsPositionLabels(QStringList motorLabels)
|
||||
{
|
||||
QList<QLabel *> mpList;
|
||||
mpList << m_aircraft->motorPositionLabel1 << m_aircraft->motorPositionLabel2
|
||||
<< m_aircraft->motorPositionLabel3 << m_aircraft->motorPositionLabel4
|
||||
<< m_aircraft->motorPositionLabel5 << m_aircraft->motorPositionLabel6
|
||||
<< m_aircraft->motorPositionLabel7 << m_aircraft->motorPositionLabel8;
|
||||
|
||||
int motorCount = motorLabels.count();
|
||||
int uiLabelsCount = mpList.count();
|
||||
|
||||
if (motorCount < uiLabelsCount) {
|
||||
// Fill labels for unused motors
|
||||
for (int index = motorCount; index < uiLabelsCount; index++) {
|
||||
motorLabels.insert(index, "Not used");
|
||||
}
|
||||
}
|
||||
|
||||
foreach(QString posLabel, motorLabels) {
|
||||
mpList.takeFirst()->setText(posLabel);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
Helper function to update the UI widget objects
|
||||
*/
|
||||
|
@ -79,6 +79,7 @@ private:
|
||||
void setYawMixLevel(int);
|
||||
void updateRcCurvesUsed();
|
||||
void updateAirframe(QString multiRotorType);
|
||||
void updateMotorsPositionLabels(QStringList motorLabels);
|
||||
void setupEnabledControls(QString multiRotorType);
|
||||
|
||||
private slots:
|
||||
|
@ -1,14 +1,14 @@
|
||||
/**
|
||||
******************************************************************************
|
||||
*
|
||||
* @file configtxpidswidget.cpp
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015.
|
||||
* @file configoplinkwidget.cpp
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015-2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
|
||||
* @addtogroup GCSPlugins GCS Plugins
|
||||
* @{
|
||||
* @addtogroup ConfigPlugin Config Plugin
|
||||
* @{
|
||||
* @brief The Configuration Gadget used to configure the PipXtreme
|
||||
* @brief The Configuration Gadget used to configure the OPLink and Revo modem
|
||||
*****************************************************************************/
|
||||
/*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -80,6 +80,7 @@ ConfigOPLinkWidget::ConfigOPLinkWidget(QWidget *parent) : ConfigTaskWidget(paren
|
||||
addWidgetBinding("OPLinkSettings", "PPMOnly", m_oplink->PPMOnly);
|
||||
addWidgetBinding("OPLinkSettings", "PPM", m_oplink->PPM);
|
||||
addWidgetBinding("OPLinkSettings", "ComSpeed", m_oplink->ComSpeed);
|
||||
addWidgetBinding("OPLinkSettings", "CustomDeviceID", m_oplink->CustomDeviceID);
|
||||
|
||||
addWidgetBinding("OPLinkStatus", "DeviceID", m_oplink->DeviceID);
|
||||
addWidgetBinding("OPLinkStatus", "RxGood", m_oplink->Good);
|
||||
@ -102,16 +103,15 @@ ConfigOPLinkWidget::ConfigOPLinkWidget(QWidget *parent) : ConfigTaskWidget(paren
|
||||
addWidgetBinding("OPLinkStatus", "RXPacketRate", m_oplink->RXPacketRate);
|
||||
addWidgetBinding("OPLinkStatus", "TXPacketRate", m_oplink->TXPacketRate);
|
||||
|
||||
// Connect the bind buttons
|
||||
connect(m_oplink->Bind1, SIGNAL(clicked()), this, SLOT(bind()));
|
||||
connect(m_oplink->Bind2, SIGNAL(clicked()), this, SLOT(bind()));
|
||||
connect(m_oplink->Bind3, SIGNAL(clicked()), this, SLOT(bind()));
|
||||
connect(m_oplink->Bind4, SIGNAL(clicked()), this, SLOT(bind()));
|
||||
|
||||
// Connect the selection changed signals.
|
||||
connect(m_oplink->PPMOnly, SIGNAL(toggled(bool)), this, SLOT(ppmOnlyChanged()));
|
||||
connect(m_oplink->Coordinator, SIGNAL(toggled(bool)), this, SLOT(updateCoordID()));
|
||||
connect(m_oplink->MinimumChannel, SIGNAL(valueChanged(int)), this, SLOT(minChannelChanged()));
|
||||
connect(m_oplink->MaximumChannel, SIGNAL(valueChanged(int)), this, SLOT(maxChannelChanged()));
|
||||
connect(m_oplink->CustomDeviceID, SIGNAL(editingFinished()), this, SLOT(updateCustomDeviceID()));
|
||||
|
||||
m_oplink->CustomDeviceID->setInputMask("HHHHHHHH");
|
||||
m_oplink->CoordID->setInputMask("HHHHHHHH");
|
||||
|
||||
m_oplink->MinimumChannel->setKeyboardTracking(false);
|
||||
m_oplink->MaximumChannel->setKeyboardTracking(false);
|
||||
@ -144,53 +144,10 @@ void ConfigOPLinkWidget::updateStatus(UAVObject *object)
|
||||
UAVObjectField *linkField = object->getField("LinkState");
|
||||
m_oplink->LinkState->setText(linkField->getValue().toString());
|
||||
bool linkConnected = (linkField->getValue() == linkField->getOptions().at(OPLinkStatus::LINKSTATE_CONNECTED));
|
||||
bool modemEnabled = linkConnected || (linkField->getValue() == linkField->getOptions().at(OPLinkStatus::LINKSTATE_DISCONNECTED)) ||
|
||||
(linkField->getValue() == linkField->getOptions().at(OPLinkStatus::LINKSTATE_ENABLED));
|
||||
|
||||
UAVObjectField *pairRssiField = object->getField("PairSignalStrengths");
|
||||
|
||||
bool bound;
|
||||
bool ok;
|
||||
quint32 boundPairId = m_oplink->CoordID->text().toUInt(&ok, 16);
|
||||
|
||||
// Update the detected devices.
|
||||
UAVObjectField *pairIdField = object->getField("PairIDs");
|
||||
quint32 pairid = pairIdField->getValue(0).toUInt();
|
||||
bound = (pairid == boundPairId);
|
||||
m_oplink->PairID1->setText(QString::number(pairid, 16).toUpper());
|
||||
m_oplink->PairID1->setEnabled(false);
|
||||
m_oplink->Bind1->setText(bound ? tr("Unbind") : tr("Bind"));
|
||||
m_oplink->Bind1->setEnabled(pairid && modemEnabled);
|
||||
m_oplink->PairSignalStrengthBar1->setValue(((bound && !linkConnected) || !modemEnabled) ? -127 : pairRssiField->getValue(0).toInt());
|
||||
m_oplink->PairSignalStrengthBar1->setValue(linkConnected ? m_oplink->RSSI->text().toInt() : -127);
|
||||
m_oplink->PairSignalStrengthLabel1->setText(QString("%1dB").arg(m_oplink->PairSignalStrengthBar1->value()));
|
||||
|
||||
pairid = pairIdField->getValue(1).toUInt();
|
||||
bound = (pairid == boundPairId);
|
||||
m_oplink->PairID2->setText(QString::number(pairid, 16).toUpper());
|
||||
m_oplink->PairID2->setEnabled(false);
|
||||
m_oplink->Bind2->setText(bound ? tr("Unbind") : tr("Bind"));
|
||||
m_oplink->Bind2->setEnabled(pairid && modemEnabled);
|
||||
m_oplink->PairSignalStrengthBar2->setValue(((bound && !linkConnected) || !modemEnabled) ? -127 : pairRssiField->getValue(1).toInt());
|
||||
m_oplink->PairSignalStrengthLabel2->setText(QString("%1dB").arg(m_oplink->PairSignalStrengthBar2->value()));
|
||||
|
||||
pairid = pairIdField->getValue(2).toUInt();
|
||||
bound = (pairid == boundPairId);
|
||||
m_oplink->PairID3->setText(QString::number(pairid, 16).toUpper());
|
||||
m_oplink->PairID3->setEnabled(false);
|
||||
m_oplink->Bind3->setText(bound ? tr("Unbind") : tr("Bind"));
|
||||
m_oplink->Bind3->setEnabled(pairid && modemEnabled);
|
||||
m_oplink->PairSignalStrengthBar3->setValue(((bound && !linkConnected) || !modemEnabled) ? -127 : pairRssiField->getValue(2).toInt());
|
||||
m_oplink->PairSignalStrengthLabel3->setText(QString("%1dB").arg(m_oplink->PairSignalStrengthBar3->value()));
|
||||
|
||||
pairid = pairIdField->getValue(3).toUInt();
|
||||
bound = (pairid == boundPairId);
|
||||
m_oplink->PairID4->setText(QString::number(pairid, 16).toUpper());
|
||||
m_oplink->PairID4->setEnabled(false);
|
||||
m_oplink->Bind4->setText(bound ? tr("Unbind") : tr("Bind"));
|
||||
m_oplink->Bind4->setEnabled(pairid && modemEnabled);
|
||||
m_oplink->PairSignalStrengthBar4->setValue(((bound && !linkConnected) || !modemEnabled) ? -127 : pairRssiField->getValue(3).toInt());
|
||||
m_oplink->PairSignalStrengthLabel4->setText(QString("%1dB").arg(m_oplink->PairSignalStrengthBar4->value()));
|
||||
|
||||
// Update the Description field
|
||||
// TODO use UAVObjectUtilManager::descriptionToStructure()
|
||||
UAVObjectField *descField = object->getField("Description");
|
||||
@ -247,7 +204,6 @@ void ConfigOPLinkWidget::updateSettings(UAVObject *object)
|
||||
|
||||
if (!settingsUpdated) {
|
||||
settingsUpdated = true;
|
||||
|
||||
// Enable components based on the board type connected.
|
||||
UAVObjectField *board_type_field = oplinkStatusObj->getField("BoardType");
|
||||
switch (board_type_field->getValue().toInt()) {
|
||||
@ -260,7 +216,7 @@ void ConfigOPLinkWidget::updateSettings(UAVObject *object)
|
||||
m_oplink->VCPPortLabel->setVisible(false);
|
||||
m_oplink->FlexiIOPort->setVisible(false);
|
||||
m_oplink->FlexiIOPortLabel->setVisible(false);
|
||||
m_oplink->PPM->setVisible(true);
|
||||
m_oplink->PPM->setEnabled(true);
|
||||
break;
|
||||
case 0x03: // OPLinkMini
|
||||
m_oplink->MainPort->setVisible(true);
|
||||
@ -271,7 +227,9 @@ void ConfigOPLinkWidget::updateSettings(UAVObject *object)
|
||||
m_oplink->VCPPortLabel->setVisible(true);
|
||||
m_oplink->FlexiIOPort->setVisible(false);
|
||||
m_oplink->FlexiIOPortLabel->setVisible(false);
|
||||
m_oplink->PPM->setVisible(false);
|
||||
m_oplink->PPM->setEnabled(false);
|
||||
connect(m_oplink->MainPort, SIGNAL(currentIndexChanged(int)), this, SLOT(updatePPMOptions()));
|
||||
connect(m_oplink->FlexiPort, SIGNAL(currentIndexChanged(int)), this, SLOT(updatePPMOptions()));
|
||||
break;
|
||||
case 0x0A: // OPLink?
|
||||
m_oplink->MainPort->setVisible(true);
|
||||
@ -282,7 +240,9 @@ void ConfigOPLinkWidget::updateSettings(UAVObject *object)
|
||||
m_oplink->VCPPortLabel->setVisible(true);
|
||||
m_oplink->FlexiIOPort->setVisible(true);
|
||||
m_oplink->FlexiIOPortLabel->setVisible(true);
|
||||
m_oplink->PPM->setVisible(false);
|
||||
m_oplink->PPM->setEnabled(false);
|
||||
connect(m_oplink->MainPort, SIGNAL(currentIndexChanged(int)), this, SLOT(updatePPMOptions()));
|
||||
connect(m_oplink->FlexiPort, SIGNAL(currentIndexChanged(int)), this, SLOT(updatePPMOptions()));
|
||||
break;
|
||||
default:
|
||||
// This shouldn't happen.
|
||||
@ -295,6 +255,9 @@ void ConfigOPLinkWidget::updateSettings(UAVObject *object)
|
||||
void ConfigOPLinkWidget::updateEnableControls()
|
||||
{
|
||||
enableControls(true);
|
||||
updatePPMOptions();
|
||||
updateCustomDeviceID();
|
||||
updateCoordID();
|
||||
ppmOnlyChanged();
|
||||
}
|
||||
|
||||
@ -305,37 +268,45 @@ void ConfigOPLinkWidget::disconnected()
|
||||
}
|
||||
}
|
||||
|
||||
void ConfigOPLinkWidget::bind()
|
||||
void ConfigOPLinkWidget::updatePPMOptions()
|
||||
{
|
||||
QPushButton *bindButton = qobject_cast<QPushButton *>(sender());
|
||||
bool is_oplm = m_oplink->MainPort->isVisible();
|
||||
|
||||
if (bindButton) {
|
||||
QLineEdit *editField = NULL;
|
||||
if (bindButton == m_oplink->Bind1) {
|
||||
editField = m_oplink->PairID1;
|
||||
} else if (bindButton == m_oplink->Bind2) {
|
||||
editField = m_oplink->PairID2;
|
||||
} else if (bindButton == m_oplink->Bind3) {
|
||||
editField = m_oplink->PairID3;
|
||||
} else if (bindButton == m_oplink->Bind4) {
|
||||
editField = m_oplink->PairID4;
|
||||
if (!is_oplm) {
|
||||
return;
|
||||
}
|
||||
|
||||
bool is_coordinator = m_oplink->Coordinator->isChecked();
|
||||
bool is_ppm_active = ((isComboboxOptionSelected(m_oplink->MainPort, OPLinkSettings::MAINPORT_PPM)) ||
|
||||
(isComboboxOptionSelected(m_oplink->FlexiPort, OPLinkSettings::FLEXIPORT_PPM)));
|
||||
|
||||
m_oplink->PPM->setEnabled(false);
|
||||
m_oplink->PPM->setChecked(is_ppm_active);
|
||||
m_oplink->PPMOnly->setEnabled(is_ppm_active);
|
||||
|
||||
if (!is_ppm_active) {
|
||||
m_oplink->PPMOnly->setChecked(false);
|
||||
QString selectPort = tr("Please select a port for PPM function.");
|
||||
m_oplink->PPMOnly->setToolTip(selectPort);
|
||||
m_oplink->PPM->setToolTip(selectPort);
|
||||
} else {
|
||||
if (is_coordinator) {
|
||||
m_oplink->PPMOnly->setToolTip(tr("Only PPM packets will be transmitted and baudrate set to 9600 bauds by default."));
|
||||
m_oplink->PPM->setToolTip(tr("PPM packets will be transmitted by this modem."));
|
||||
} else {
|
||||
m_oplink->PPMOnly->setToolTip(tr("Only PPM packets will be received and baudrate set to 9600 bauds by default."));
|
||||
m_oplink->PPM->setToolTip(tr("PPM packets will be received by this modem."));
|
||||
}
|
||||
Q_ASSERT(editField);
|
||||
bool ok;
|
||||
quint32 pairid = editField->text().toUInt(&ok, 16);
|
||||
if (ok) {
|
||||
quint32 boundPairId = m_oplink->CoordID->text().toUInt(&ok, 16);
|
||||
(pairid != boundPairId) ? m_oplink->CoordID->setText(QString::number(pairid, 16).toUpper()) : m_oplink->CoordID->setText("0");
|
||||
}
|
||||
QMessageBox::information(this, tr("Information"), tr("To apply the changes when binding/unbinding the board must be rebooted or power cycled."), QMessageBox::Ok);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void ConfigOPLinkWidget::ppmOnlyChanged()
|
||||
{
|
||||
bool is_ppm_only = m_oplink->PPMOnly->isChecked();
|
||||
bool is_oplm = m_oplink->MainPort->isVisible();
|
||||
|
||||
m_oplink->PPM->setEnabled(!is_ppm_only);
|
||||
m_oplink->PPM->setEnabled(!is_ppm_only && !is_oplm);
|
||||
m_oplink->OneWayLink->setEnabled(!is_ppm_only);
|
||||
m_oplink->ComSpeed->setEnabled(!is_ppm_only);
|
||||
}
|
||||
@ -384,6 +355,26 @@ void ConfigOPLinkWidget::channelChanged(bool isMax)
|
||||
m_oplink->MaxFreq->setText("(" + QString::number(maxFrequency, 'f', 3) + " MHz)");
|
||||
}
|
||||
|
||||
void ConfigOPLinkWidget::updateCoordID()
|
||||
{
|
||||
bool is_coordinator = m_oplink->Coordinator->isChecked();
|
||||
bool coordinatorNotSet = (m_oplink->CoordID->text() == "0");
|
||||
|
||||
if (settingsUpdated && coordinatorNotSet) {
|
||||
m_oplink->CoordID->clear();
|
||||
}
|
||||
m_oplink->CoordID->setEnabled(!is_coordinator);
|
||||
}
|
||||
|
||||
void ConfigOPLinkWidget::updateCustomDeviceID()
|
||||
{
|
||||
bool customDeviceIDNotSet = (m_oplink->CustomDeviceID->text() == "0");
|
||||
|
||||
if (settingsUpdated && customDeviceIDNotSet) {
|
||||
m_oplink->CustomDeviceID->clear();
|
||||
m_oplink->CustomDeviceID->setPlaceholderText("AutoGen");
|
||||
}
|
||||
}
|
||||
/**
|
||||
@}
|
||||
@}
|
||||
|
@ -1,13 +1,14 @@
|
||||
/**
|
||||
******************************************************************************
|
||||
*
|
||||
* @file configpipxtremewidget.h
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
|
||||
* @file configoplinkwidget.h
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
|
||||
* @addtogroup GCSPlugins GCS Plugins
|
||||
* @{
|
||||
* @addtogroup ConfigPlugin Config Plugin
|
||||
* @{
|
||||
* @brief The Configuration Gadget used to configure PipXtreme
|
||||
* @brief The Configuration Gadget used to configure the OPLink and Revo modem
|
||||
*****************************************************************************/
|
||||
/*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
@ -24,8 +25,8 @@
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#ifndef CONFIGPIPXTREMEWIDGET_H
|
||||
#define CONFIGPIPXTREMEWIDGET_H
|
||||
#ifndef CONFIGOPLINKWIDGET_H
|
||||
#define CONFIGOPLINKWIDGET_H
|
||||
|
||||
#include "configtaskwidget.h"
|
||||
|
||||
@ -61,11 +62,13 @@ protected:
|
||||
|
||||
private slots:
|
||||
void disconnected();
|
||||
void bind();
|
||||
void updatePPMOptions();
|
||||
void ppmOnlyChanged();
|
||||
void minChannelChanged();
|
||||
void maxChannelChanged();
|
||||
void updateCoordID();
|
||||
void updateCustomDeviceID();
|
||||
void channelChanged(bool isMax);
|
||||
};
|
||||
|
||||
#endif // CONFIGTXPIDWIDGET_H
|
||||
#endif // CONFIGOPLINKWIDGET_H
|
||||
|
@ -25,17 +25,17 @@
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1280"
|
||||
inkscape:window-height="928"
|
||||
inkscape:window-width="1112"
|
||||
inkscape:window-height="746"
|
||||
id="namedview6635"
|
||||
showgrid="false"
|
||||
inkscape:zoom="0.16679771"
|
||||
inkscape:cx="2344.2732"
|
||||
inkscape:cy="2636.8234"
|
||||
inkscape:window-x="0"
|
||||
inkscape:zoom="0.66883113"
|
||||
inkscape:cx="592.0899"
|
||||
inkscape:cy="1972.8034"
|
||||
inkscape:window-x="751"
|
||||
inkscape:window-y="27"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="hexa-coax_reverse"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="svg4183"
|
||||
inkscape:object-paths="true"
|
||||
inkscape:snap-midpoints="true"
|
||||
inkscape:snap-global="true"
|
||||
@ -10049,34 +10049,18 @@
|
||||
id="path5389"
|
||||
d="m 934.1211,1284.0758 c 9.404,9.413 9.404,24.67 -0.008,34.077 -9.406,9.41 -24.664,9.41 -34.076,0 -9.404,-9.407 -9.404,-24.662 0.008,-34.069 9.406,-9.412 24.664,-9.413 34.076,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path5393"
|
||||
d="m 916.0205,1309.1182 0,-10.918 -2.771,2.142 -1.828,-2.499 4.892,-3.59 3.234,0 0,14.865 -3.527,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path5397"
|
||||
d="m 1127.1367,1284.0758 c 9.404,9.413 9.404,24.67 -0.01,34.077 -9.406,9.41 -24.664,9.41 -34.078,0 -9.404,-9.407 -9.404,-24.662 0.01,-34.069 9.406,-9.412 24.664,-9.413 34.078,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path5401"
|
||||
d="m 1103.6787,1308.1178 0,-2.939 5.795,-5.249 c 0.734,-0.693 1.218,-1.386 1.218,-2.289 0,-1.05 -0.736,-1.785 -1.848,-1.785 -1.176,0 -1.952,0.924 -2.1,2.247 l -3.379,-0.462 c 0.335,-3.002 2.771,-4.787 5.668,-4.787 2.73,0 5.375,1.449 5.375,4.556 0,2.121 -1.239,3.359 -2.604,4.577 l -3.443,3.066 6.068,0 0,3.065 -10.75,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path5405"
|
||||
d="m 934.1211,1476.0963 c 9.404,9.412 9.404,24.668 -0.008,34.074 -9.406,9.412 -24.664,9.412 -34.074,0 -9.406,-9.406 -9.406,-24.662 0.006,-34.068 9.406,-9.412 24.664,-9.412 34.076,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path5409"
|
||||
d="m 917.6162,1489.2037 -0.063,0 -3.528,5.502 3.591,0 0,-5.502 z m 3.275,8.357 0,2.897 -3.296,0 0,-2.897 -6.993,0 0,-2.961 6.047,-9.007 4.221,0 0,9.113 2.058,0 0,2.855 -2.037,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path5413"
|
||||
d="m 1126.1367,1476.0943 c 9.404,9.412 9.404,24.67 -0.01,34.076 -9.406,9.412 -24.664,9.412 -34.078,0 -9.404,-9.406 -9.404,-24.662 0.01,-34.068 9.406,-9.412 24.664,-9.412 34.078,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path5417"
|
||||
d="m 1108.8857,1500.857 c -2.709,0 -5.165,-1.176 -5.963,-3.947 l 3.275,-0.861 c 0.274,0.987 1.176,1.848 2.52,1.848 1.008,0 2.162,-0.504 2.162,-1.891 0,-1.511 -1.553,-1.952 -3.023,-1.952 l -0.945,0 0,-2.583 1.029,0 c 1.323,0 2.603,-0.336 2.603,-1.763 0,-1.071 -0.902,-1.637 -1.868,-1.637 -1.008,0 -1.806,0.65 -2.036,1.658 l -3.275,-0.756 c 0.712,-2.498 3.064,-3.779 5.542,-3.779 2.625,0 5.228,1.344 5.228,4.199 0,1.638 -1.05,2.856 -2.499,3.234 l 0,0.063 c 1.68,0.398 2.855,1.784 2.855,3.443 0,3.254 -2.876,4.724 -5.605,4.724" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#2f2d2e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7075"
|
||||
d="m 981.9609,1362.252 62.131,0 c 1.629,0 2.953,1.32 2.953,2.949 l 0,62.128 c 0,1.631 -1.324,2.955 -2.953,2.955 l -62.131,0 c -1.631,0 -2.947,-1.324 -2.947,-2.955 l 0,-62.128 c 0,-1.629 1.316,-2.949 2.947,-2.949" /><g
|
||||
@ -10204,7 +10188,43 @@
|
||||
id="path4400-5-9"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15472-7"><path
|
||||
d="M 898.14579,1293.4143 L 902.59079,1293.4143 L 908.39135,1301.9365 L 908.39135,1293.4143 L 912.87838,1293.4143 L 912.87838,1308.8195 L 908.39135,1308.8195 L 902.62231,1300.3603 L 902.62231,1308.8195 L 898.14579,1308.8195 L 898.14579,1293.4143 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15689" /><path
|
||||
d="M 914.47563,1293.4143 L 918.99419,1293.4143 L 920.62297,1302.0206 L 922.99784,1293.4143 L 927.50588,1293.4143 L 929.89126,1302.0206 L 931.52004,1293.4143 L 936.01757,1293.4143 L 932.62341,1308.8195 L 927.95774,1308.8195 L 925.25711,1299.1203 L 922.567,1308.8195 L 917.90133,1308.8195 L 914.47563,1293.4143 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15691" /></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15476-4"><path
|
||||
d="M 1094.6491,1293.4143 L 1099.0941,1293.4143 L 1104.8947,1301.9365 L 1104.8947,1293.4143 L 1109.3817,1293.4143 L 1109.3817,1308.8195 L 1104.8947,1308.8195 L 1099.1257,1300.3603 L 1099.1257,1308.8195 L 1094.6491,1308.8195 L 1094.6491,1293.4143 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15684" /><path
|
||||
d="M 1112.5552,1293.4143 L 1125.3123,1293.4143 L 1125.3123,1296.7034 L 1117.326,1296.7034 L 1117.326,1299.1519 L 1124.7343,1299.1519 L 1124.7343,1302.2938 L 1117.326,1302.2938 L 1117.326,1305.3307 L 1125.5434,1305.3307 L 1125.5434,1308.8195 L 1112.5552,1308.8195 L 1112.5552,1293.4143 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15686" /></g><g
|
||||
inkscape:transform-center-x="38.194477"
|
||||
inkscape:transform-center-y="15.277791"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15480-3"><path
|
||||
d="M 1094.4127,1495.7417 L 1098.9418,1495.458 Q 1099.0889,1496.5614 1099.5407,1497.1393 Q 1100.2763,1498.0746 1101.6424,1498.0746 Q 1102.6617,1498.0746 1103.2081,1497.6017 Q 1103.7651,1497.1183 1103.7651,1496.4878 Q 1103.7651,1495.8889 1103.2397,1495.416 Q 1102.7142,1494.9431 1100.8017,1494.5228 Q 1097.6703,1493.8187 1096.3357,1492.6523 Q 1094.9907,1491.4859 1094.9907,1489.6785 Q 1094.9907,1488.491 1095.6737,1487.4402 Q 1096.3672,1486.3789 1097.7438,1485.7799 Q 1099.1309,1485.1704 1101.5373,1485.1704 Q 1104.4901,1485.1704 1106.0349,1486.2738 Q 1107.5901,1487.3667 1107.8843,1489.7625 L 1103.3973,1490.0253 Q 1103.2186,1488.9849 1102.6407,1488.5121 Q 1102.0732,1488.0392 1101.0644,1488.0392 Q 1100.2343,1488.0392 1099.814,1488.3965 Q 1099.3936,1488.7432 1099.3936,1489.2476 Q 1099.3936,1489.6154 1099.7404,1489.9097 Q 1100.0767,1490.2144 1101.3377,1490.4771 Q 1104.4586,1491.1496 1105.8037,1491.8432 Q 1107.1592,1492.5262 1107.7687,1493.5455 Q 1108.3887,1494.5648 1108.3887,1495.8258 Q 1108.3887,1497.3075 1107.5691,1498.558 Q 1106.7494,1499.8084 1105.2783,1500.46 Q 1103.8071,1501.101 1101.5688,1501.101 Q 1097.6387,1501.101 1096.1256,1499.5878 Q 1094.6124,1498.0746 1094.4127,1495.7417 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15679" /><path
|
||||
d="M 1110.7846,1485.4331 L 1123.5416,1485.4331 L 1123.5416,1488.7222 L 1115.5553,1488.7222 L 1115.5553,1491.1707 L 1122.9637,1491.1707 L 1122.9637,1494.3126 L 1115.5553,1494.3126 L 1115.5553,1497.3495 L 1123.7728,1497.3495 L 1123.7728,1500.8383 L 1110.7846,1500.8383 L 1110.7846,1485.4331 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15681" /></g><g
|
||||
inkscape:transform-center-x="38.194477"
|
||||
inkscape:transform-center-y="15.277791"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15653"><path
|
||||
d="M 898.91045,1495.7417 L 903.43952,1495.458 Q 903.58663,1496.5614 904.03849,1497.1393 Q 904.77407,1498.0746 906.14014,1498.0746 Q 907.15944,1498.0746 907.70587,1497.6017 Q 908.26281,1497.1183 908.26281,1496.4878 Q 908.26281,1495.8889 907.7374,1495.416 Q 907.21198,1494.9431 905.29948,1494.5228 Q 902.16802,1493.8187 900.83347,1492.6523 Q 899.48841,1491.4859 899.48841,1489.6785 Q 899.48841,1488.491 900.17145,1487.4402 Q 900.86499,1486.3789 902.24157,1485.7799 Q 903.62867,1485.1704 906.03506,1485.1704 Q 908.98788,1485.1704 910.53259,1486.2738 Q 912.08782,1487.3667 912.38205,1489.7625 L 907.89502,1490.0253 Q 907.71638,1488.9849 907.13843,1488.5121 Q 906.57098,1488.0392 905.56219,1488.0392 Q 904.73203,1488.0392 904.3117,1488.3965 Q 903.89137,1488.7432 903.89137,1489.2476 Q 903.89137,1489.6154 904.23814,1489.9097 Q 904.57441,1490.2144 905.8354,1490.4771 Q 908.95636,1491.1496 910.30141,1491.8432 Q 911.65698,1492.5262 912.26646,1493.5455 Q 912.88645,1494.5648 912.88645,1495.8258 Q 912.88645,1497.3075 912.0668,1498.558 Q 911.24716,1499.8084 909.776,1500.46 Q 908.30484,1501.101 906.06658,1501.101 Q 902.13649,1501.101 900.6233,1499.5878 Q 899.11011,1498.0746 898.91045,1495.7417 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15674" /><path
|
||||
d="M 913.70609,1485.4331 L 918.22464,1485.4331 L 919.85343,1494.0394 L 922.22829,1485.4331 L 926.73634,1485.4331 L 929.12172,1494.0394 L 930.7505,1485.4331 L 935.24803,1485.4331 L 931.85386,1500.8383 L 927.18819,1500.8383 L 924.48757,1491.1391 L 921.79745,1500.8383 L 917.13179,1500.8383 L 913.70609,1485.4331 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15676" /></g></g><g
|
||||
id="quad-plus"
|
||||
transform="matrix(1.25,0,0,-1.25,-146.76331,3148.707)"><g
|
||||
id="g5429"><path
|
||||
@ -10369,34 +10389,18 @@
|
||||
id="path5807"
|
||||
d="m 1644.1719,1536.7109 c 9.404,-9.414 9.404,-24.67 -0.01,-34.076 -9.406,-9.411 -24.664,-9.411 -34.076,-10e-4 -9.402,9.407 -9.404,24.663 0.01,34.069 9.406,9.413 24.664,9.413 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path5811"
|
||||
d="m 1626.0713,1511.6689 0,10.918 -2.771,-2.142 -1.828,2.499 4.892,3.59 3.234,0 0,-14.865 -3.527,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path5815"
|
||||
d="m 1780.6543,1400.2285 c 9.406,-9.413 9.406,-24.671 -0.01,-34.077 -9.408,-9.41 -24.666,-9.41 -34.078,0 -9.406,9.406 -9.406,24.662 0.01,34.069 9.406,9.412 24.664,9.414 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path5819"
|
||||
d="m 1757.1973,1376.1875 0,2.939 5.795,5.249 c 0.735,0.694 1.218,1.386 1.218,2.29 0,1.048 -0.735,1.784 -1.848,1.784 -1.176,0 -1.953,-0.924 -2.1,-2.247 l -3.38,0.463 c 0.336,3.001 2.771,4.786 5.669,4.786 2.729,0 5.375,-1.449 5.375,-4.556 0,-2.121 -1.239,-3.359 -2.603,-4.577 l -3.443,-3.066 6.067,0 0,-3.065 -10.75,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path5823"
|
||||
d="m 1509.8086,1400.3457 c 9.404,-9.411 9.404,-24.667 -0.01,-34.075 -9.406,-9.41 -24.664,-9.412 -34.074,0 -9.406,9.406 -9.406,24.664 0.01,34.068 9.406,9.413 24.664,9.413 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path5827"
|
||||
d="m 1493.3018,1387.2363 -0.063,0 -3.528,-5.501 3.591,0 0,5.501 z m 3.275,-8.356 0,-2.898 -3.296,0 0,2.898 -6.993,0 0,2.96 6.047,9.007 4.221,0 0,-9.112 2.058,0 0,-2.855 -2.037,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path5831"
|
||||
d="m 1645.291,1263.8662 c 9.406,-9.414 9.406,-24.67 -0.01,-34.078 -9.408,-9.41 -24.666,-9.41 -34.078,0 -9.406,9.408 -9.406,24.664 0.01,34.07 9.406,9.412 24.664,9.412 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path5835"
|
||||
d="m 1628.04,1239.1035 c -2.708,0 -5.164,1.176 -5.963,3.947 l 3.275,0.861 c 0.274,-0.987 1.176,-1.848 2.52,-1.848 1.008,0 2.163,0.504 2.163,1.891 0,1.511 -1.554,1.952 -3.023,1.952 l -0.945,0 0,2.583 1.029,0 c 1.323,0 2.603,0.336 2.603,1.763 0,1.071 -0.903,1.637 -1.868,1.637 -1.008,0 -1.807,-0.65 -2.037,-1.658 l -3.275,0.756 c 0.713,2.498 3.065,3.779 5.542,3.779 2.625,0 5.229,-1.344 5.229,-4.199 0,-1.638 -1.051,-2.856 -2.499,-3.234 l 0,-0.063 c 1.68,-0.398 2.855,-1.784 2.855,-3.443 0,-3.254 -2.876,-4.724 -5.606,-4.724" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#2f2d2e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7759"
|
||||
d="m 1596.0625,1418.1309 62.131,0 c 1.629,0 2.953,-1.32 2.953,-2.95 l 0,-62.127 c 0,-1.631 -1.324,-2.955 -2.953,-2.955 l -62.131,0 c -1.631,0 -2.947,1.324 -2.947,2.955 l 0,62.127 c 0,1.63 1.316,2.95 2.947,2.95" /><g
|
||||
@ -10524,7 +10528,31 @@
|
||||
id="path4400-5-7"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15472-8"><path
|
||||
d="M 1481.9949,-1391.0086 L 1486.5134,-1391.0086 L 1488.1422,-1382.4024 L 1490.5171,-1391.0086 L 1495.0251,-1391.0086 L 1497.4105,-1382.4024 L 1499.0393,-1391.0086 L 1503.5368,-1391.0086 L 1500.1426,-1375.6035 L 1495.477,-1375.6035 L 1492.7763,-1385.3026 L 1490.0862,-1375.6035 L 1485.4206,-1375.6035 L 1481.9949,-1391.0086 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15589" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15476-5"><path
|
||||
d="M 1619.763,-1527.3728 L 1624.208,-1527.3728 L 1630.0086,-1518.8506 L 1630.0086,-1527.3728 L 1634.4956,-1527.3728 L 1634.4956,-1511.9677 L 1630.0086,-1511.9677 L 1624.2396,-1520.4268 L 1624.2396,-1511.9677 L 1619.763,-1511.9677 L 1619.763,-1527.3728 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15586" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15480-7"><path
|
||||
d="M 1621.259,-1244.2186 L 1625.7881,-1244.5023 Q 1625.9352,-1243.3989 1626.3871,-1242.821 Q 1627.1226,-1241.8857 1628.4887,-1241.8857 Q 1629.508,-1241.8857 1630.0544,-1242.3586 Q 1630.6114,-1242.842 1630.6114,-1243.4725 Q 1630.6114,-1244.0715 1630.086,-1244.5443 Q 1629.5606,-1245.0172 1627.6481,-1245.4375 Q 1624.5166,-1246.1416 1623.182,-1247.308 Q 1621.837,-1248.4744 1621.837,-1250.2818 Q 1621.837,-1251.4693 1622.52,-1252.5201 Q 1623.2136,-1253.5814 1624.5901,-1254.1804 Q 1625.9772,-1254.7899 1628.3836,-1254.7899 Q 1631.3365,-1254.7899 1632.8812,-1253.6865 Q 1634.4364,-1252.5937 1634.7306,-1250.1978 L 1630.2436,-1249.9351 Q 1630.065,-1250.9754 1629.487,-1251.4483 Q 1628.9196,-1251.9211 1627.9108,-1251.9211 Q 1627.0806,-1251.9211 1626.6603,-1251.5639 Q 1626.2399,-1251.2171 1626.2399,-1250.7127 Q 1626.2399,-1250.3449 1626.5867,-1250.0507 Q 1626.923,-1249.7459 1628.184,-1249.4832 Q 1631.3049,-1248.8107 1632.65,-1248.1171 Q 1634.0056,-1247.4341 1634.615,-1246.4148 Q 1635.235,-1245.3955 1635.235,-1244.1345 Q 1635.235,-1242.6528 1634.4154,-1241.4024 Q 1633.5957,-1240.1519 1632.1246,-1239.5004 Q 1630.6534,-1238.8594 1628.4152,-1238.8594 Q 1624.4851,-1238.8594 1622.9719,-1240.3726 Q 1621.4587,-1241.8857 1621.259,-1244.2186 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15580" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15559"><path
|
||||
d="M 1757.121,-1390.8906 L 1769.8781,-1390.8906 L 1769.8781,-1387.6015 L 1761.8918,-1387.6015 L 1761.8918,-1385.1531 L 1769.3001,-1385.1531 L 1769.3001,-1382.0111 L 1761.8918,-1382.0111 L 1761.8918,-1378.9742 L 1770.1092,-1378.9742 L 1770.1092,-1375.4855 L 1757.121,-1375.4855 L 1757.121,-1390.8906 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15583" /></g></g><g
|
||||
id="quad-h"><g
|
||||
id="g5011-8"
|
||||
transform="matrix(1.25,0,0,-1.25,-165.90968,1816.6329)"><path
|
||||
@ -11026,11 +11054,7 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6159"
|
||||
d="m 2312.3633,1564.1504 c 9.404,-9.414 9.404,-24.671 -0.01,-34.076 -9.407,-9.411 -24.664,-9.412 -34.076,0 -9.403,9.408 -9.404,24.663 0.01,34.07 9.405,9.412 24.663,9.412 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6163"
|
||||
d="m 2294.2627,1539.1064 0,10.918 -2.771,-2.142 -1.827,2.499 4.893,3.59 3.232,0 0,-14.865 -3.527,0 z" /><g
|
||||
d="m 2312.3633,1564.1504 c 9.404,-9.414 9.404,-24.671 -0.01,-34.076 -9.407,-9.411 -24.664,-9.412 -34.076,0 -9.403,9.408 -9.404,24.663 0.01,34.07 9.405,9.412 24.663,9.412 34.076,0.01" /><g
|
||||
id="g6173"><g
|
||||
style="opacity:0.5"
|
||||
id="g6175"
|
||||
@ -11070,25 +11094,13 @@
|
||||
id="path6247"
|
||||
d="m 2148.1543,1284.0088 c 9.402,-9.414 9.402,-24.67 -0.01,-34.076 -9.407,-9.41 -24.664,-9.412 -34.077,0 -9.402,9.408 -9.403,24.664 0.01,34.07 9.406,9.412 24.663,9.412 34.078,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6251"
|
||||
d="m 2130.5967,1258.5703 c -2.708,0 -4.955,1.428 -5.647,3.779 l 3.211,0.988 c 0.316,-1.03 1.24,-1.786 2.395,-1.786 1.196,0 2.225,0.735 2.225,2.163 0,1.763 -1.596,2.267 -3.044,2.267 -1.05,0 -2.583,-0.272 -3.632,-0.65 l 0.356,8.504 9.113,0 0,-3.024 -5.985,0 -0.125,-2.351 c 0.441,0.104 1.049,0.146 1.49,0.146 2.982,0 5.375,-1.596 5.375,-4.724 0,-3.612 -2.813,-5.312 -5.732,-5.312" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6255"
|
||||
d="m 2472.8633,1468.7354 c 9.405,-9.412 9.405,-24.669 -0.01,-34.076 -9.407,-9.41 -24.665,-9.41 -34.078,0 -9.405,9.407 -9.405,24.662 0.01,34.068 9.405,9.412 24.663,9.414 34.077,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6259"
|
||||
d="m 2449.4043,1444.6938 0,2.939 5.795,5.249 c 0.735,0.693 1.218,1.386 1.218,2.289 0,1.05 -0.735,1.785 -1.848,1.785 -1.176,0 -1.953,-0.924 -2.1,-2.247 l -3.38,0.462 c 0.336,3.002 2.771,4.787 5.669,4.787 2.729,0 5.375,-1.449 5.375,-4.556 0,-2.121 -1.239,-3.359 -2.603,-4.577 l -3.443,-3.066 6.067,0 0,-3.065 -10.75,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6263"
|
||||
d="m 2311.8711,1190.5596 c 9.405,-9.41 9.405,-24.666 -0.01,-34.074 -9.406,-9.41 -24.664,-9.412 -34.076,0 -9.405,9.406 -9.406,24.664 0.01,34.068 9.406,9.414 24.664,9.412 34.075,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6267"
|
||||
d="m 2295.3643,1177.4561 -0.063,0 -3.527,-5.501 3.59,0 0,5.501 z m 3.275,-8.356 0,-2.898 -3.296,0 0,2.898 -6.991,0 0,2.96 6.047,9.007 4.22,0 0,-9.112 2.058,0 0,-2.855 -2.038,0 z" /><g
|
||||
d="m 2311.8711,1190.5596 c 9.405,-9.41 9.405,-24.666 -0.01,-34.074 -9.406,-9.41 -24.664,-9.412 -34.076,0 -9.405,9.406 -9.406,24.664 0.01,34.068 9.406,9.414 24.664,9.412 34.075,0.01" /><g
|
||||
id="g6277"><g
|
||||
style="opacity:0.5"
|
||||
id="g6279"
|
||||
@ -11128,18 +11140,10 @@
|
||||
id="path6351"
|
||||
d="m 2150.7617,1469.1543 c 9.404,-9.41 9.406,-24.667 -0.01,-34.073 -9.406,-9.412 -24.663,-9.412 -34.075,0 -9.405,9.406 -9.404,24.663 0.01,34.067 9.407,9.414 24.666,9.414 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6355"
|
||||
d="m 2133.499,1452.042 c -1.385,0 -2.352,-0.966 -2.352,-2.352 0,-1.28 0.924,-2.351 2.331,-2.351 1.386,0 2.332,0.966 2.332,2.372 0,1.344 -0.924,2.331 -2.311,2.331 m -0.021,-7.643 c -3.233,0 -5.858,2.058 -5.858,5.312 0,1.764 0.672,3.129 1.659,4.599 l 3.591,5.354 4.262,0 -3.654,-5.081 -0.063,-0.105 c 0.273,0.105 0.715,0.168 1.051,0.168 2.603,0 4.871,-1.953 4.871,-4.851 0,-3.38 -2.647,-5.396 -5.859,-5.396" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6359"
|
||||
d="m 2471.9102,1285.8057 c 9.406,-9.412 9.407,-24.668 -0.01,-34.076 -9.408,-9.41 -24.667,-9.412 -34.08,0 -9.405,9.408 -9.406,24.662 0.01,34.07 9.407,9.412 24.666,9.412 34.078,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6363"
|
||||
d="m 2454.6582,1261.0439 c -2.708,0 -5.165,1.176 -5.963,3.947 l 3.275,0.862 c 0.273,-0.988 1.176,-1.848 2.52,-1.848 1.008,0 2.163,0.504 2.163,1.889 0,1.511 -1.555,1.953 -3.023,1.953 l -0.946,0 0,2.582 1.03,0 c 1.322,0 2.603,0.336 2.603,1.763 0,1.072 -0.903,1.639 -1.869,1.639 -1.008,0 -1.806,-0.651 -2.037,-1.659 l -3.275,0.756 c 0.714,2.499 3.066,3.779 5.543,3.779 2.625,0 5.228,-1.344 5.228,-4.199 0,-1.638 -1.05,-2.856 -2.498,-3.234 l 0,-0.062 c 1.68,-0.399 2.855,-1.785 2.855,-3.443 0,-3.255 -2.877,-4.725 -5.606,-4.725" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#2f2d2e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7857"
|
||||
d="m 2264.7764,1394.3682 62.131,0 c 1.628,0 2.952,-1.32 2.952,-2.949 l 0,-62.127 c 0,-1.631 -1.324,-2.955 -2.952,-2.955 l -62.131,0 c -1.631,0 -2.948,1.324 -2.948,2.955 l 0,62.127 c 0,1.629 1.317,2.949 2.948,2.949" /><g
|
||||
@ -11267,7 +11271,89 @@
|
||||
id="path4400-5-1"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text15476-44"
|
||||
y="-1539.4077"
|
||||
x="2286.3464"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"
|
||||
transform="scale(1,-1)"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="-1539.4077"
|
||||
x="2286.3464"
|
||||
id="tspan15478-4"
|
||||
sodipodi:role="line">N</tspan></text>
|
||||
<text
|
||||
transform="scale(1,-1)"
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="2438.7644"
|
||||
y="-1443.9926"
|
||||
id="text15992"
|
||||
sodipodi:linespacing="125%"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan15994"
|
||||
x="2438.7644"
|
||||
y="-1443.9926"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">NE</tspan></text>
|
||||
<text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text15996"
|
||||
y="-1261.0631"
|
||||
x="2439.4395"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"
|
||||
transform="scale(1,-1)"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="-1261.0631"
|
||||
x="2439.4395"
|
||||
id="tspan15998"
|
||||
sodipodi:role="line">SE</tspan></text>
|
||||
<text
|
||||
transform="scale(1,-1)"
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="2287.0938"
|
||||
y="-1165.8184"
|
||||
id="text16000"
|
||||
sodipodi:linespacing="125%"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan16002"
|
||||
x="2287.0938"
|
||||
y="-1165.8184"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">S</tspan></text>
|
||||
<text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text16004"
|
||||
y="-1259.2662"
|
||||
x="2112.1958"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"
|
||||
transform="scale(1,-1)"
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
inkscape:transform-center-y="-19.642874"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="-1259.2662"
|
||||
x="2112.1958"
|
||||
id="tspan16006"
|
||||
sodipodi:role="line">SW</tspan></text>
|
||||
<text
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
transform="scale(1,-1)"
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="2113.1758"
|
||||
y="-1444.4136"
|
||||
id="text16008"
|
||||
sodipodi:linespacing="125%"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan16010"
|
||||
x="2113.1758"
|
||||
y="-1444.4136"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">NW</tspan></text>
|
||||
</g><g
|
||||
id="quad-octo"
|
||||
transform="matrix(1.25,0,0,1.25,-146.76331,-267.9055)"><path
|
||||
inkscape:connector-curvature="0"
|
||||
@ -11381,17 +11467,9 @@
|
||||
id="path6531"
|
||||
d="m 3231.1162,1452.9903 c 9.404,9.41 9.405,24.666 -0.01,34.074 -9.406,9.408 -24.66,9.412 -34.072,0 -9.406,-9.406 -9.408,-24.664 0,-34.068 9.407,-9.412 24.664,-9.414 34.076,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6535"
|
||||
d="m 3214.6104,1466.0918 -0.063,0 -3.527,5.5 3.59,0 0,-5.5 z m 3.275,8.355 0,2.899 -3.296,0 0,-2.899 -6.992,0 0,-2.959 6.047,-9.007 4.22,0 0,9.111 2.059,0 0,2.855 -2.038,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6539"
|
||||
d="m 3302.04,1280.0137 c 9.406,9.416 9.406,24.672 -0.01,34.08 -9.408,9.41 -24.664,9.412 -34.078,0 -9.407,-9.408 -9.407,-24.662 0.01,-34.068 9.407,-9.414 24.666,-9.412 34.08,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6543"
|
||||
d="m 3284.7871,1304.7774 c -2.708,0 -5.165,-1.176 -5.963,-3.947 l 3.275,-0.862 c 0.273,0.987 1.176,1.848 2.52,1.848 1.008,0 2.163,-0.504 2.163,-1.89 0,-1.511 -1.555,-1.952 -3.023,-1.952 l -0.946,0 0,-2.583 1.03,0 c 1.322,0 2.603,-0.336 2.603,-1.763 0,-1.072 -0.903,-1.638 -1.869,-1.638 -1.008,0 -1.806,0.65 -2.037,1.658 l -3.275,-0.756 c 0.714,-2.498 3.066,-3.779 5.543,-3.779 2.625,0 5.228,1.344 5.228,4.199 0,1.639 -1.05,2.856 -2.498,3.235 l 0,0.062 c 1.68,0.398 2.855,1.785 2.855,3.443 0,3.254 -2.877,4.725 -5.606,4.725" /><g
|
||||
d="m 3302.04,1280.0137 c 9.406,9.416 9.406,24.672 -0.01,34.08 -9.408,9.41 -24.664,9.412 -34.078,0 -9.407,-9.408 -9.407,-24.662 0.01,-34.068 9.407,-9.414 24.666,-9.412 34.08,-0.01" /><g
|
||||
id="g6553"
|
||||
transform="matrix(1,0,0,-1,0,2590.6553)"><g
|
||||
style="opacity:0.5"
|
||||
@ -11471,17 +11549,9 @@
|
||||
id="path6707"
|
||||
d="m 3232.1885,1106.4502 c 9.404,9.414 9.403,24.669 -0.01,34.074 -9.406,9.412 -24.664,9.412 -34.074,0 -9.406,-9.41 -9.407,-24.665 0.01,-34.07 9.405,-9.413 24.664,-9.413 34.076,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6711"
|
||||
d="m 3210.2393,1130.8067 0,-2.939 5.795,-5.249 c 0.734,-0.693 1.218,-1.386 1.218,-2.289 0,-1.05 -0.736,-1.785 -1.848,-1.785 -1.176,0 -1.952,0.924 -2.1,2.247 l -3.379,-0.462 c 0.335,-3.002 2.771,-4.787 5.668,-4.787 2.73,0 5.375,1.449 5.375,4.556 0,2.121 -1.239,3.359 -2.604,4.577 l -3.443,3.066 6.068,0 0,3.065 -10.75,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6715"
|
||||
d="m 3060.6943,1036.1319 c 9.408,9.414 9.408,24.67 -0.01,34.078 -9.407,9.41 -24.667,9.411 -34.078,0 -9.406,-9.406 -9.406,-24.662 0.01,-34.07 9.406,-9.414 24.664,-9.41 34.076,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6719"
|
||||
d="m 3042.751,1060.4961 0,-10.918 -2.771,2.142 -1.828,-2.499 4.892,-3.59 3.234,0 0,14.865 -3.527,0 z" /><g
|
||||
d="m 3060.6943,1036.1319 c 9.408,9.414 9.408,24.67 -0.01,34.078 -9.407,9.41 -24.667,9.411 -34.078,0 -9.406,-9.406 -9.406,-24.662 0.01,-34.07 9.406,-9.414 24.664,-9.41 34.076,-0.01" /><g
|
||||
id="g6729"
|
||||
transform="matrix(1,0,0,-1,0,2590.6553)"><g
|
||||
style="opacity:0.5"
|
||||
@ -11561,17 +11631,9 @@
|
||||
id="path6883"
|
||||
d="m 2887.8545,1106.7998 c 9.406,9.412 9.406,24.666 -0.01,34.073 -9.406,9.411 -24.663,9.412 -34.075,0 -9.405,-9.405 -9.405,-24.663 0.01,-34.068 9.406,-9.413 24.662,-9.411 34.074,0" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6887"
|
||||
d="m 2870.5928,1118.6216 c -1.051,0 -1.764,0.735 -1.764,1.701 0,0.945 0.672,1.763 1.764,1.763 1.028,0 1.784,-0.818 1.784,-1.763 0,-0.966 -0.798,-1.701 -1.784,-1.701 m 0,6.152 c -1.219,0 -2.079,0.861 -2.079,2.015 0,1.197 0.86,1.974 2.079,1.974 1.217,0 2.057,-0.777 2.057,-1.974 0,-1.133 -0.861,-2.015 -2.057,-2.015 m 0,6.782 c -2.939,0 -5.586,-1.491 -5.586,-4.62 0,-1.805 1.219,-3.086 2.667,-3.548 l 0,-0.042 c -1.28,-0.483 -2.268,-1.575 -2.268,-3.212 0,-2.751 2.436,-4.241 5.187,-4.241 2.729,0 5.186,1.427 5.186,4.178 0,1.637 -0.946,2.813 -2.268,3.254 l 0,0.063 c 1.49,0.42 2.666,1.785 2.666,3.527 0,3.129 -2.645,4.641 -5.584,4.641" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6891"
|
||||
d="m 2816.1475,1276.7676 c 9.406,9.412 9.406,24.668 -0.01,34.074 -9.406,9.412 -24.666,9.41 -34.078,0 -9.408,-9.406 -9.406,-24.66 0.01,-34.07 9.407,-9.41 24.663,-9.41 34.077,0" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path6895"
|
||||
d="m 2798.6836,1301.1289 -4.095,0 6.027,-11.842 -7.035,0 0,-3.023 10.793,0 0,2.814 -5.69,12.051 z" /><g
|
||||
d="m 2816.1475,1276.7676 c 9.406,9.412 9.406,24.668 -0.01,34.074 -9.406,9.412 -24.666,9.41 -34.078,0 -9.408,-9.406 -9.406,-24.66 0.01,-34.07 9.407,-9.41 24.663,-9.41 34.077,0" /><g
|
||||
id="g6905"
|
||||
transform="matrix(1,0,0,-1,0,2590.6553)"><g
|
||||
style="opacity:0.5"
|
||||
@ -11651,17 +11713,9 @@
|
||||
id="path7059"
|
||||
d="m 2883.2217,1451.0664 c 9.404,9.41 9.404,24.666 -0.01,34.074 -9.406,9.41 -24.665,9.41 -34.075,0 -9.405,-9.408 -9.405,-24.662 0.01,-34.068 9.404,-9.412 24.661,-9.414 34.074,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7063"
|
||||
d="m 2865.9639,1468.1641 c -1.387,0 -2.352,0.967 -2.352,2.352 0,1.281 0.924,2.351 2.331,2.351 1.385,0 2.33,-0.965 2.33,-2.372 0,-1.344 -0.924,-2.331 -2.309,-2.331 m -0.021,7.643 c -3.234,0 -5.858,-2.057 -5.858,-5.312 0,-1.764 0.672,-3.128 1.658,-4.599 l 3.59,-5.353 4.263,0 -3.653,5.081 -0.063,0.104 c 0.272,-0.104 0.713,-0.168 1.049,-0.168 2.603,0 4.871,1.954 4.871,4.851 0,3.38 -2.645,5.396 -5.857,5.396" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7067"
|
||||
d="m 3056.3213,1521.1836 c 9.408,9.414 9.406,24.668 -0.01,34.076 -9.406,9.41 -24.667,9.41 -34.079,0 -9.406,-9.41 -9.404,-24.664 0.01,-34.068 9.406,-9.412 24.666,-9.414 34.078,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7071"
|
||||
d="m 3038.9287,1545.9278 c -2.709,0 -4.955,-1.428 -5.648,-3.779 l 3.212,-0.988 c 0.315,1.029 1.239,1.785 2.393,1.785 1.197,0 2.227,-0.735 2.227,-2.163 0,-1.763 -1.596,-2.267 -3.045,-2.267 -1.05,0 -2.582,0.273 -3.633,0.65 l 0.357,-8.503 9.113,0 0,3.024 -5.984,0 -0.127,2.351 c 0.442,-0.104 1.051,-0.147 1.491,-0.147 2.982,0 5.375,1.596 5.375,4.724 0,3.612 -2.813,5.313 -5.731,5.313" /><g
|
||||
d="m 3056.3213,1521.1836 c 9.408,9.414 9.406,24.668 -0.01,34.076 -9.406,9.41 -24.667,9.41 -34.079,0 -9.406,-9.41 -9.404,-24.664 0.01,-34.068 9.406,-9.412 24.666,-9.414 34.078,-0.01" /><g
|
||||
id="g8501"
|
||||
transform="matrix(1,0,0,-1,0,2590.6553)"><path
|
||||
inkscape:connector-curvature="0"
|
||||
@ -11798,7 +11852,107 @@
|
||||
id="path4400-5-34"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g></g><text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text15476-44-6-9-2-1"
|
||||
y="1301.5095"
|
||||
x="2788.3428"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="1301.5095"
|
||||
x="2788.3428"
|
||||
id="tspan15478-4-7-0"
|
||||
sodipodi:role="line">W</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="3197.8123"
|
||||
y="1132.063"
|
||||
id="text15992-1-2-6-2"
|
||||
sodipodi:linespacing="125%"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan15994-8-9"
|
||||
x="3197.8123"
|
||||
y="1132.063"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">NE</tspan></text>
|
||||
<text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text15996-0-3-1-7"
|
||||
y="1477.7311"
|
||||
x="3198.6475"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="1477.7311"
|
||||
x="3198.6475"
|
||||
id="tspan15998-4-4"
|
||||
sodipodi:role="line">SE</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="3276.9358"
|
||||
y="1304.7609"
|
||||
id="text16000-48-6-0-5"
|
||||
sodipodi:linespacing="125%"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan16002-1-9"
|
||||
x="3276.9358"
|
||||
y="1304.7609"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">E</tspan></text>
|
||||
<text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text16004-6-9-4-8"
|
||||
y="1475.8073"
|
||||
x="2847.2639"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
inkscape:transform-center-y="-19.642874"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="1475.8073"
|
||||
x="2847.2639"
|
||||
id="tspan16006-6-0"
|
||||
sodipodi:role="line">SW</tspan></text>
|
||||
<text
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="2850.2688"
|
||||
y="1131.5411"
|
||||
id="text16008-9-6-0-5"
|
||||
sodipodi:linespacing="125%"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan16010-8-2-8"
|
||||
x="2850.2688"
|
||||
y="1131.5411"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">NW</tspan></text>
|
||||
<text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text16339-4"
|
||||
y="1060.8762"
|
||||
x="3034.677"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="1060.8762"
|
||||
x="3034.677"
|
||||
id="tspan16341"
|
||||
sodipodi:role="line">N</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="3031.5435"
|
||||
y="1545.9264"
|
||||
id="text16343-0"
|
||||
sodipodi:linespacing="125%"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan16345"
|
||||
x="3031.5435"
|
||||
y="1545.9264"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">S</tspan></text>
|
||||
</g><g
|
||||
id="octo-coax-X"
|
||||
transform="matrix(1.25,0,0,-1.25,-146.76331,1768.3686)"><g
|
||||
id="g4609"><g
|
||||
@ -11996,10 +12150,6 @@
|
||||
id="path8157"
|
||||
d="m 1036.009,966.499 c 1.295,31.434 27.179,56.541 58.933,56.529 23.84,0 44.364,-14.144 53.666,-34.502 l -17.443,-17.443 c -3.242,9.352 -12.109,16.068 -22.572,16.066 -12.094,0.01 -22.069,-8.99 -23.664,-20.65 l 11.103,0.002 -10.301,-10.303 -17.845,-17.845 -7.457,-7.457 -35.602,35.601 11.182,0.002 z" /></g></g></g></g></g></g><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8161"
|
||||
d="m 1131.1748,939.6729 -0.063,0 -3.528,-5.5 3.591,0 0,5.5 z m 3.275,-8.355 0,-2.899 -3.296,0 0,2.899 -6.993,0 0,2.959 6.047,9.007 4.221,0 0,-9.111 2.058,0 0,-2.855 -2.037,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#100f0d;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8165"
|
||||
d="m 914.9248,953.9619 c 9.406,-9.412 9.406,-24.668 -0.006,-34.074 -9.406,-9.412 -24.664,-9.412 -34.076,0 -9.404,9.406 -9.404,24.662 0.008,34.066 9.406,9.414 24.664,9.414 34.074,0.008" /><path
|
||||
@ -12037,10 +12187,6 @@
|
||||
id="path8237"
|
||||
d="m 947.401,966.712 c -1.297,31.434 -27.179,56.541 -58.933,56.529 -23.84,0 -44.364,-14.144 -53.666,-34.502 l 17.443,-17.443 c 3.242,9.351 12.109,16.068 22.572,16.066 12.094,0.01 22.067,-8.99 23.664,-20.65 l -11.105,0.002 10.303,-10.303 17.845,-17.846 7.457,-7.457 35.6,35.602 -11.18,0.002 z" /></g></g></g></g></g></g><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8241"
|
||||
d="m 892.3096,929.6025 0,2.939 5.795,5.25 c 0.734,0.693 1.218,1.385 1.218,2.289 0,1.049 -0.736,1.784 -1.848,1.784 -1.176,0 -1.952,-0.924 -2.1,-2.246 l -3.379,0.462 c 0.335,3.002 2.771,4.787 5.668,4.787 2.73,0 5.375,-1.449 5.375,-4.556 0,-2.121 -1.239,-3.359 -2.604,-4.578 l -3.443,-3.065 6.068,0 0,-3.066 -10.75,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#2e2d2d;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8245"
|
||||
d="m 1121.4482,945.208 c 2.596,2.594 3.242,6.152 1.445,7.947 -1.795,1.797 -5.353,1.151 -7.949,-1.445 L 881.9072,718.671 c -2.596,-2.596 -3.242,-6.154 -1.445,-7.949 1.795,-1.795 5.353,-1.149 7.945,1.443 l 233.041,233.043 z" /><path
|
||||
@ -12092,10 +12238,6 @@
|
||||
id="path8337"
|
||||
d="m 1125.8779,980.2139 c 9.404,-9.412 9.404,-24.67 -0.01,-34.076 -9.406,-9.41 -24.664,-9.41 -34.078,0 -9.404,9.406 -9.404,24.662 0.01,34.068 9.406,9.412 24.664,9.414 34.078,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8341"
|
||||
d="m 1107.6279,955.7725 c -2.709,0 -5.166,1.176 -5.963,3.947 l 3.275,0.862 c 0.273,-0.987 1.176,-1.848 2.52,-1.848 1.008,0 2.162,0.504 2.162,1.89 0,1.511 -1.554,1.952 -3.023,1.952 l -0.946,0 0,2.583 1.03,0 c 1.322,0 2.603,0.336 2.603,1.763 0,1.072 -0.902,1.638 -1.869,1.638 -1.008,0 -1.805,-0.65 -2.036,-1.658 l -3.275,0.756 c 0.713,2.498 3.065,3.779 5.543,3.779 2.624,0 5.227,-1.344 5.227,-4.199 0,-1.639 -1.049,-2.856 -2.498,-3.235 l 0,-0.062 c 1.68,-0.398 2.855,-1.785 2.855,-3.443 0,-3.254 -2.876,-4.725 -5.605,-4.725" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#100f0d;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8345"
|
||||
d="m 911.292,717.3389 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.408,-9.41 -24.664,-9.41 -34.076,0 -9.404,9.406 -9.404,24.662 0.008,34.068 9.404,9.414 24.662,9.414 34.076,0.008" /><g
|
||||
@ -12140,37 +12282,17 @@
|
||||
id="path8429"
|
||||
d="m 892.292,980.9619 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.408,-9.41 -24.664,-9.41 -34.076,0 -9.404,9.406 -9.404,24.662 0.008,34.068 9.404,9.414 24.662,9.414 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8433"
|
||||
d="m 874.1904,955.9189 0,10.918 -2.771,-2.142 -1.828,2.499 4.892,3.59 3.234,0 0,-14.865 -3.527,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8461"
|
||||
d="m 887.9248,740.3389 c 9.406,-9.412 9.406,-24.668 -0.006,-34.074 -9.406,-9.412 -24.664,-9.412 -34.076,0 -9.404,9.406 -9.404,24.662 0.008,34.066 9.406,9.414 24.664,9.414 34.074,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8465"
|
||||
d="m 870.3066,715.9795 -4.095,0 6.027,11.842 -7.035,0 0,3.023 10.793,0 0,-2.812 -5.69,-12.053 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8469"
|
||||
d="m 1123.9111,742.2803 c 9.404,-9.41 9.404,-24.666 -0.01,-34.074 -9.406,-9.41 -24.664,-9.412 -34.074,0 -9.406,9.406 -9.406,24.664 0.01,34.068 9.406,9.412 24.664,9.412 34.076,0.006" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8473"
|
||||
d="m 1106.3545,717.5225 c -2.708,0 -4.955,1.428 -5.647,3.779 l 3.211,0.988 c 0.316,-1.029 1.24,-1.785 2.395,-1.785 1.196,0 2.225,0.735 2.225,2.163 0,1.763 -1.596,2.267 -3.044,2.267 -1.05,0 -2.583,-0.273 -3.632,-0.65 l 0.356,8.503 9.113,0 0,-3.024 -5.985,0 -0.125,-2.351 c 0.441,0.104 1.049,0.147 1.49,0.147 2.982,0 5.375,-1.596 5.375,-4.724 0,-3.612 -2.813,-5.313 -5.732,-5.313" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#2f2d2e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8477"
|
||||
d="m 970.624,866.5869 62.129,0 c 1.629,0 2.953,-1.32 2.953,-2.951 l 0,-62.127 c 0,-1.629 -1.324,-2.953 -2.953,-2.953 l -62.129,0 c -1.633,0 -2.949,1.324 -2.949,2.953 l 0,62.127 c 0,1.631 1.316,2.951 2.949,2.951" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8537"
|
||||
d="m 894.0303,704.8311 c -1.051,0 -1.764,-0.735 -1.764,-1.701 0,-0.945 0.672,-1.764 1.764,-1.764 1.028,0 1.784,0.819 1.784,1.764 0,0.966 -0.798,1.701 -1.784,1.701 m 0,-6.152 c -1.219,0 -2.079,-0.862 -2.079,-2.016 0,-1.197 0.86,-1.974 2.079,-1.974 1.217,0 2.057,0.777 2.057,1.974 0,1.134 -0.861,2.016 -2.057,2.016 m 0,-6.782 c -2.939,0 -5.586,1.491 -5.586,4.62 0,1.804 1.219,3.085 2.667,3.547 l 0,0.042 c -1.28,0.483 -2.268,1.575 -2.268,3.213 0,2.75 2.436,4.241 5.187,4.241 2.729,0 5.186,-1.428 5.186,-4.178 0,-1.638 -0.946,-2.814 -2.268,-3.254 l 0,-0.064 c 1.49,-0.42 2.666,-1.784 2.666,-3.527 0,-3.128 -2.645,-4.64 -5.584,-4.64" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8541"
|
||||
d="m 1129.2939,702.1631 c -1.385,0 -2.352,-0.966 -2.352,-2.352 0,-1.281 0.924,-2.351 2.331,-2.351 1.386,0 2.332,0.966 2.332,2.373 0,1.344 -0.924,2.33 -2.311,2.33 m -0.021,-7.643 c -3.233,0 -5.858,2.058 -5.858,5.313 0,1.764 0.672,3.128 1.659,4.598 l 3.591,5.353 4.262,0 -3.654,-5.08 -0.063,-0.105 c 0.273,0.105 0.715,0.168 1.051,0.168 2.603,0 4.871,-1.954 4.871,-4.85 0,-3.381 -2.647,-5.397 -5.859,-5.397" /><g
|
||||
d="m 970.624,866.5869 62.129,0 c 1.629,0 2.953,-1.32 2.953,-2.951 l 0,-62.127 c 0,-1.629 -1.324,-2.953 -2.953,-2.953 l -62.129,0 c -1.633,0 -2.949,1.324 -2.949,2.953 l 0,62.127 c 0,1.631 1.316,2.951 2.949,2.951" /><g
|
||||
style="display:inline"
|
||||
transform="matrix(0.13034138,0,0,-0.13034138,939.66545,1129.9927)"
|
||||
id="g6140-8-6"><g
|
||||
@ -12295,7 +12417,47 @@
|
||||
id="path4400-5-6"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15472-7-9"><path
|
||||
d="M 856.31412,-971.62448 L 860.75912,-971.62448 L 866.55968,-963.10227 L 866.55968,-971.62448 L 871.04671,-971.62448 L 871.04671,-956.21936 L 866.55968,-956.21936 L 860.79064,-964.67851 L 860.79064,-956.21936 L 856.31412,-956.21936 L 856.31412,-971.62448 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15809" /><path
|
||||
d="M 872.64397,-971.62448 L 877.16252,-971.62448 L 878.7913,-963.01821 L 881.16617,-971.62448 L 885.67422,-971.62448 L 888.05959,-963.01821 L 889.68837,-971.62448 L 894.18591,-971.62448 L 890.79174,-956.21936 L 886.12607,-956.21936 L 883.42545,-965.91849 L 880.73533,-956.21936 L 876.06966,-956.21936 L 872.64397,-971.62448 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15811" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15476-4-6"><path
|
||||
d="M 1093.3904,-970.87533 L 1097.8354,-970.87533 L 1103.6359,-962.35313 L 1103.6359,-970.87533 L 1108.1229,-970.87533 L 1108.1229,-955.47021 L 1103.6359,-955.47021 L 1097.8669,-963.92937 L 1097.8669,-955.47021 L 1093.3904,-955.47021 L 1093.3904,-970.87533 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15804" /><path
|
||||
d="M 1111.2964,-970.87533 L 1124.0535,-970.87533 L 1124.0535,-967.58624 L 1116.0672,-967.58624 L 1116.0672,-965.13782 L 1123.4755,-965.13782 L 1123.4755,-961.99585 L 1116.0672,-961.99585 L 1116.0672,-958.95896 L 1124.2847,-958.95896 L 1124.2847,-955.47021 L 1111.2964,-955.47021 L 1111.2964,-970.87533 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15806" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
inkscape:transform-center-x="38.194477"
|
||||
inkscape:transform-center-y="15.277791"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15480-3-0"><path
|
||||
d="M 1092.1883,-722.63502 L 1096.7174,-722.91874 Q 1096.8645,-721.81538 1097.3164,-721.23742 Q 1098.052,-720.30219 1099.418,-720.30219 Q 1100.4373,-720.30219 1100.9838,-720.77506 Q 1101.5407,-721.25844 1101.5407,-721.88893 Q 1101.5407,-722.48791 1101.0153,-722.96078 Q 1100.4899,-723.43365 1098.5774,-723.85398 Q 1095.4459,-724.55803 1094.1114,-725.72445 Q 1092.7663,-726.89087 1092.7663,-728.69829 Q 1092.7663,-729.88572 1093.4493,-730.93655 Q 1094.1429,-731.99789 1095.5195,-732.59686 Q 1096.9066,-733.20634 1099.313,-733.20634 Q 1102.2658,-733.20634 1103.8105,-732.10297 Q 1105.3657,-731.01011 1105.6599,-728.61422 L 1101.1729,-728.35152 Q 1100.9943,-729.39184 1100.4163,-729.86471 Q 1099.8489,-730.33758 1098.8401,-730.33758 Q 1098.0099,-730.33758 1097.5896,-729.9803 Q 1097.1693,-729.63353 1097.1693,-729.12913 Q 1097.1693,-728.76134 1097.516,-728.46711 Q 1097.8523,-728.16237 1099.1133,-727.89966 Q 1102.2342,-727.22713 1103.5793,-726.53359 Q 1104.9349,-725.85055 1105.5444,-724.83125 Q 1106.1643,-723.81195 1106.1643,-722.55096 Q 1106.1643,-721.06929 1105.3447,-719.81881 Q 1104.525,-718.56832 1103.0539,-717.91681 Q 1101.5827,-717.27581 1099.3445,-717.27581 Q 1095.4144,-717.27581 1093.9012,-718.789 Q 1092.388,-720.30219 1092.1883,-722.63502 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15799" /><path
|
||||
d="M 1108.5602,-732.94363 L 1121.3173,-732.94363 L 1121.3173,-729.65454 L 1113.331,-729.65454 L 1113.331,-727.20612 L 1120.7393,-727.20612 L 1120.7393,-724.06415 L 1113.331,-724.06415 L 1113.331,-721.02726 L 1121.5484,-721.02726 L 1121.5484,-717.53851 L 1108.5602,-717.53851 L 1108.5602,-732.94363 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15801" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
inkscape:transform-center-x="38.194477"
|
||||
inkscape:transform-center-y="15.277791"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15653-1"><path
|
||||
d="M 852.71587,-720.69313 L 857.24494,-720.97685 Q 857.39205,-719.87348 857.84391,-719.29553 Q 858.57949,-718.36029 859.94556,-718.36029 Q 860.96486,-718.36029 861.51129,-718.83316 Q 862.06823,-719.31654 862.06823,-719.94704 Q 862.06823,-720.54601 861.54282,-721.01888 Q 861.0174,-721.49175 859.1049,-721.91209 Q 855.97344,-722.61614 854.63889,-723.78256 Q 853.29383,-724.94897 853.29383,-726.7564 Q 853.29383,-727.94383 853.97687,-728.99466 Q 854.67041,-730.05599 856.04699,-730.65496 Q 857.43409,-731.26444 859.84048,-731.26444 Q 862.7933,-731.26444 864.33801,-730.16107 Q 865.89324,-729.06821 866.18747,-726.67233 L 861.70044,-726.40962 Q 861.5218,-727.44994 860.94385,-727.92281 Q 860.3764,-728.39568 859.36761,-728.39568 Q 858.53745,-728.39568 858.11712,-728.0384 Q 857.69679,-727.69163 857.69679,-727.18723 Q 857.69679,-726.81945 858.04356,-726.52521 Q 858.37983,-726.22047 859.64082,-725.95777 Q 862.76178,-725.28524 864.10683,-724.59169 Q 865.4624,-723.90866 866.07188,-722.88935 Q 866.69187,-721.87005 866.69187,-720.60906 Q 866.69187,-719.1274 865.87222,-717.87691 Q 865.05258,-716.62643 863.58142,-715.97492 Q 862.11026,-715.33391 859.872,-715.33391 Q 855.94191,-715.33391 854.42872,-716.8471 Q 852.91553,-718.36029 852.71587,-720.69313 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15794" /><path
|
||||
d="M 867.51151,-731.00173 L 872.03006,-731.00173 L 873.65885,-722.39547 L 876.03371,-731.00173 L 880.54176,-731.00173 L 882.92714,-722.39547 L 884.55592,-731.00173 L 889.05345,-731.00173 L 885.65928,-715.59662 L 880.99361,-715.59662 L 878.29299,-725.29575 L 875.60287,-715.59662 L 870.93721,-715.59662 L 867.51151,-731.00173 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15796" /></g></g><g
|
||||
id="octo-coax-P"
|
||||
transform="matrix(1.25,0,0,-1.25,-146.76331,1749.3214)"><g
|
||||
id="g7783"><path
|
||||
@ -12381,15 +12543,7 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8709"
|
||||
d="m 1604.5449,691.7588 c 9.404,-9.411 9.404,-24.667 -0.01,-34.074 -9.406,-9.411 -24.664,-9.412 -34.074,0 -9.406,9.406 -9.406,24.663 0.01,34.067 9.406,9.413 24.664,9.413 34.076,0.007" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8713"
|
||||
d="m 1586.9873,667.002 c -2.708,0 -4.955,1.428 -5.647,3.779 l 3.211,0.988 c 0.316,-1.03 1.24,-1.786 2.395,-1.786 1.196,0 2.225,0.735 2.225,2.163 0,1.763 -1.596,2.267 -3.044,2.267 -1.05,0 -2.583,-0.272 -3.632,-0.65 l 0.356,8.504 9.113,0 0,-3.024 -5.985,0 -0.125,-2.351 c 0.441,0.104 1.049,0.146 1.49,0.146 2.982,0 5.375,-1.596 5.375,-4.724 0,-3.612 -2.813,-5.312 -5.732,-5.312" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8717"
|
||||
d="m 1609.9268,651.6416 c -1.385,0 -2.352,-0.965 -2.352,-2.352 0,-1.28 0.924,-2.351 2.331,-2.351 1.386,0 2.332,0.967 2.332,2.373 0,1.344 -0.924,2.33 -2.311,2.33 m -0.021,-7.643 c -3.233,0 -5.858,2.059 -5.858,5.313 0,1.764 0.672,3.129 1.659,4.598 l 3.591,5.354 4.262,0 -3.654,-5.081 -0.063,-0.105 c 0.273,0.105 0.715,0.168 1.051,0.168 2.603,0 4.871,-1.953 4.871,-4.85 0,-3.381 -2.647,-5.397 -5.859,-5.397" /><g
|
||||
d="m 1604.5449,691.7588 c 9.404,-9.411 9.404,-24.667 -0.01,-34.074 -9.406,-9.411 -24.664,-9.412 -34.074,0 -9.406,9.406 -9.406,24.663 0.01,34.067 9.406,9.413 24.664,9.413 34.076,0.007" /><g
|
||||
style="opacity:0.5"
|
||||
id="g8731"
|
||||
transform="translate(1528.2617,880.1563)"><path
|
||||
@ -12450,15 +12604,7 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8885"
|
||||
d="m 1461.6484,858.0703 c 9.404,-9.411 9.404,-24.667 -0.01,-34.074 -9.406,-9.411 -24.664,-9.412 -34.074,0 -9.406,9.406 -9.406,24.663 0.01,34.067 9.406,9.413 24.664,9.413 34.076,0.007" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8889"
|
||||
d="m 1444.0293,833.7119 -4.095,0 6.027,11.842 -7.035,0 0,3.023 10.793,0 0,-2.813 -5.69,-12.052 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8893"
|
||||
d="m 1467.0322,823.2441 c -1.051,0 -1.764,-0.735 -1.764,-1.7 0,-0.946 0.672,-1.764 1.764,-1.764 1.028,0 1.784,0.818 1.784,1.764 0,0.965 -0.798,1.7 -1.784,1.7 m 0,-6.151 c -1.219,0 -2.079,-0.862 -2.079,-2.016 0,-1.197 0.86,-1.975 2.079,-1.975 1.217,0 2.057,0.778 2.057,1.975 0,1.133 -0.861,2.016 -2.057,2.016 m 0,-6.783 c -2.939,0 -5.586,1.492 -5.586,4.62 0,1.805 1.219,3.086 2.667,3.547 l 0,0.043 c -1.28,0.483 -2.268,1.575 -2.268,3.212 0,2.751 2.436,4.241 5.187,4.241 2.729,0 5.186,-1.427 5.186,-4.177 0,-1.639 -0.946,-2.815 -2.268,-3.255 l 0,-0.064 c 1.49,-0.42 2.666,-1.784 2.666,-3.527 0,-3.128 -2.645,-4.64 -5.584,-4.64" /><g
|
||||
d="m 1461.6484,858.0703 c 9.404,-9.411 9.404,-24.667 -0.01,-34.074 -9.406,-9.411 -24.664,-9.412 -34.074,0 -9.406,9.406 -9.406,24.663 0.01,34.067 9.406,9.413 24.664,9.413 34.076,0.007" /><g
|
||||
style="opacity:0.5"
|
||||
id="g8907"
|
||||
transform="translate(1846.8262,888.373)"><path
|
||||
@ -12519,15 +12665,7 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9061"
|
||||
d="m 1780.2109,866.2871 c 9.406,-9.411 9.406,-24.667 -0.01,-34.074 -9.406,-9.411 -24.664,-9.412 -34.076,0 -9.404,9.406 -9.404,24.663 0.01,34.067 9.406,9.413 24.664,9.413 34.074,0.007" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9065"
|
||||
d="m 1762.8037,841.5303 c -2.709,0 -5.166,1.176 -5.963,3.947 l 3.275,0.861 c 0.273,-0.988 1.176,-1.848 2.52,-1.848 1.008,0 2.162,0.504 2.162,1.89 0,1.511 -1.554,1.953 -3.023,1.953 l -0.946,0 0,2.582 1.03,0 c 1.322,0 2.603,0.336 2.603,1.763 0,1.071 -0.902,1.638 -1.869,1.638 -1.008,0 -1.805,-0.651 -2.036,-1.659 l -3.275,0.756 c 0.713,2.499 3.065,3.779 5.543,3.779 2.624,0 5.227,-1.344 5.227,-4.199 0,-1.637 -1.049,-2.856 -2.498,-3.233 l 0,-0.063 c 1.68,-0.399 2.855,-1.784 2.855,-3.443 0,-3.255 -2.876,-4.724 -5.605,-4.724" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9069"
|
||||
d="m 1786.3516,830.1807 -0.063,0 -3.528,-5.502 3.591,0 0,5.502 z m 3.275,-8.357 0,-2.897 -3.296,0 0,2.897 -6.992,0 0,2.961 6.047,9.007 4.221,0 0,-9.113 2.057,0 0,-2.855 -2.037,0 z" /><g
|
||||
d="m 1780.2109,866.2871 c 9.406,-9.411 9.406,-24.667 -0.01,-34.074 -9.406,-9.411 -24.664,-9.412 -34.076,0 -9.404,9.406 -9.404,24.663 0.01,34.067 9.406,9.413 24.664,9.413 34.074,0.007" /><g
|
||||
style="opacity:0.5"
|
||||
id="g9083"
|
||||
transform="translate(1550.8242,1032.3867)"><path
|
||||
@ -12586,15 +12724,7 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9237"
|
||||
d="m 1604.5449,1010.3008 c 9.404,-9.411 9.404,-24.667 -0.01,-34.074 -9.406,-9.411 -24.664,-9.412 -34.074,0 -9.406,9.406 -9.406,24.663 0.01,34.067 9.406,9.413 24.664,9.413 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9241"
|
||||
d="m 1586.4424,985.9424 0,10.918 -2.771,-2.143 -1.828,2.499 4.892,3.591 3.234,0 0,-14.865 -3.527,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9245"
|
||||
d="m 1604.5732,962.9395 0,2.939 5.795,5.249 c 0.734,0.694 1.218,1.386 1.218,2.29 0,1.048 -0.736,1.784 -1.848,1.784 -1.176,0 -1.952,-0.924 -2.1,-2.247 l -3.379,0.463 c 0.335,3.001 2.771,4.787 5.668,4.787 2.73,0 5.375,-1.45 5.375,-4.557 0,-2.121 -1.239,-3.359 -2.604,-4.577 l -3.443,-3.066 6.068,0 0,-3.065 -10.75,0 z" /><g
|
||||
d="m 1604.5449,1010.3008 c 9.404,-9.411 9.404,-24.667 -0.01,-34.074 -9.406,-9.411 -24.664,-9.412 -34.074,0 -9.406,9.406 -9.406,24.663 0.01,34.067 9.406,9.413 24.664,9.413 34.076,0.01" /><g
|
||||
style="display:inline"
|
||||
transform="matrix(0.13034138,0,0,-0.13034138,1541.7183,1134.1826)"
|
||||
id="g6140-8-63"><g
|
||||
@ -12719,7 +12849,35 @@
|
||||
id="path4400-5-91"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><g
|
||||
transform="matrix(1,0,0,-1,-48.1602,-542.27525)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15472-8-5"><path
|
||||
inkscape:connector-curvature="0"
|
||||
d="M 1481.9949,-1391.0086 L 1486.5134,-1391.0086 L 1488.1422,-1382.4024 L 1490.5171,-1391.0086 L 1495.0251,-1391.0086 L 1497.4105,-1382.4024 L 1499.0393,-1391.0086 L 1503.5368,-1391.0086 L 1500.1426,-1375.6035 L 1495.477,-1375.6035 L 1492.7763,-1385.3026 L 1490.0862,-1375.6035 L 1485.4206,-1375.6035 L 1481.9949,-1391.0086 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15589-9" /></g><g
|
||||
transform="matrix(1,0,0,-1,-39.62715,-526.40876)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15476-5-3"><path
|
||||
inkscape:connector-curvature="0"
|
||||
d="M 1619.763,-1527.3728 L 1624.208,-1527.3728 L 1630.0086,-1518.8506 L 1630.0086,-1527.3728 L 1634.4956,-1527.3728 L 1634.4956,-1511.9677 L 1630.0086,-1511.9677 L 1624.2396,-1520.4268 L 1624.2396,-1511.9677 L 1619.763,-1511.9677 L 1619.763,-1527.3728 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15586-3" /></g><g
|
||||
transform="matrix(1,0,0,-1,-40.74485,-572.10535)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15480-7-3"><path
|
||||
inkscape:connector-curvature="0"
|
||||
d="M 1621.259,-1244.2186 L 1625.7881,-1244.5023 Q 1625.9352,-1243.3989 1626.3871,-1242.821 Q 1627.1226,-1241.8857 1628.4887,-1241.8857 Q 1629.508,-1241.8857 1630.0544,-1242.3586 Q 1630.6114,-1242.842 1630.6114,-1243.4725 Q 1630.6114,-1244.0715 1630.086,-1244.5443 Q 1629.5606,-1245.0172 1627.6481,-1245.4375 Q 1624.5166,-1246.1416 1623.182,-1247.308 Q 1621.837,-1248.4744 1621.837,-1250.2818 Q 1621.837,-1251.4693 1622.52,-1252.5201 Q 1623.2136,-1253.5814 1624.5901,-1254.1804 Q 1625.9772,-1254.7899 1628.3836,-1254.7899 Q 1631.3365,-1254.7899 1632.8812,-1253.6865 Q 1634.4364,-1252.5937 1634.7306,-1250.1978 L 1630.2436,-1249.9351 Q 1630.065,-1250.9754 1629.487,-1251.4483 Q 1628.9196,-1251.9211 1627.9108,-1251.9211 Q 1627.0806,-1251.9211 1626.6603,-1251.5639 Q 1626.2399,-1251.2171 1626.2399,-1250.7127 Q 1626.2399,-1250.3449 1626.5867,-1250.0507 Q 1626.923,-1249.7459 1628.184,-1249.4832 Q 1631.3049,-1248.8107 1632.65,-1248.1171 Q 1634.0056,-1247.4341 1634.615,-1246.4148 Q 1635.235,-1245.3955 1635.235,-1244.1345 Q 1635.235,-1242.6528 1634.4154,-1241.4024 Q 1633.5957,-1240.1519 1632.1246,-1239.5004 Q 1630.6534,-1238.8594 1628.4152,-1238.8594 Q 1624.4851,-1238.8594 1622.9719,-1240.3726 Q 1621.4587,-1241.8857 1621.259,-1244.2186 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15580-1" /></g><g
|
||||
transform="matrix(1,0,0,-1,-0.44645,-533.94045)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15559-5"><path
|
||||
inkscape:connector-curvature="0"
|
||||
d="M 1757.121,-1390.8906 L 1769.8781,-1390.8906 L 1769.8781,-1387.6015 L 1761.8918,-1387.6015 L 1761.8918,-1385.1531 L 1769.3001,-1385.1531 L 1769.3001,-1382.0111 L 1761.8918,-1382.0111 L 1761.8918,-1378.9742 L 1770.1092,-1378.9742 L 1770.1092,-1375.4855 L 1757.121,-1375.4855 L 1757.121,-1390.8906 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15583-0" /></g></g><g
|
||||
id="quad-hexa-H"
|
||||
transform="matrix(1.25,0,0,1.25,-146.76331,-311.9055)"><path
|
||||
inkscape:connector-curvature="0"
|
||||
@ -12868,25 +13026,13 @@
|
||||
id="path7397"
|
||||
d="m 2495.2002,580.4255 c 9.406,9.413 9.406,24.67 -0.01,34.076 -9.408,9.411 -24.664,9.411 -34.076,0 -9.404,-9.406 -9.404,-24.662 0.01,-34.068 9.404,-9.412 24.662,-9.413 34.074,-0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7401"
|
||||
d="m 2477.1006,605.4675 0,-10.918 -2.771,2.143 -1.828,-2.499 4.892,-3.591 3.234,0 0,14.865 -3.527,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7405"
|
||||
d="m 2495.2061,760.3367 c 9.404,9.413 9.404,24.67 -0.01,34.076 -9.406,9.411 -24.664,9.411 -34.078,0 -9.404,-9.406 -9.404,-24.662 0.01,-34.068 9.406,-9.412 24.664,-9.413 34.078,-0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7409"
|
||||
d="m 2471.748,784.3787 0,-2.939 5.795,-5.249 c 0.735,-0.694 1.218,-1.386 1.218,-2.29 0,-1.048 -0.735,-1.784 -1.848,-1.784 -1.176,0 -1.953,0.924 -2.1,2.247 l -3.38,-0.463 c 0.336,-3.001 2.771,-4.787 5.669,-4.787 2.729,0 5.375,1.45 5.375,4.557 0,2.121 -1.239,3.359 -2.603,4.577 l -3.443,3.066 6.067,0 0,3.065 -10.75,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7413"
|
||||
d="m 2494.2061,942.3543 c 9.404,9.412 9.404,24.669 -0.01,34.076 -9.406,9.411 -24.664,9.411 -34.078,0 -9.404,-9.407 -9.404,-24.663 0.01,-34.068 9.406,-9.412 24.664,-9.413 34.078,-0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7417"
|
||||
d="m 2476.9551,967.117 c -2.708,0 -5.165,-1.176 -5.963,-3.947 l 3.275,-0.861 c 0.273,0.987 1.176,1.848 2.52,1.848 1.008,0 2.163,-0.504 2.163,-1.891 0,-1.511 -1.555,-1.952 -3.023,-1.952 l -0.946,0 0,-2.583 1.03,0 c 1.322,0 2.603,-0.336 2.603,-1.763 0,-1.071 -0.903,-1.637 -1.869,-1.637 -1.008,0 -1.806,0.65 -2.037,1.658 l -3.275,-0.756 c 0.714,-2.498 3.066,-3.779 5.543,-3.779 2.625,0 5.228,1.344 5.228,4.199 0,1.638 -1.05,2.856 -2.498,3.234 l 0,0.063 c 1.68,0.398 2.855,1.784 2.855,3.443 0,3.254 -2.877,4.724 -5.606,4.724" /><g
|
||||
d="m 2494.2061,942.3543 c 9.404,9.412 9.404,24.669 -0.01,34.076 -9.406,9.411 -24.664,9.411 -34.078,0 -9.404,-9.407 -9.404,-24.663 0.01,-34.068 9.406,-9.412 24.664,-9.413 34.078,-0.008" /><g
|
||||
id="g7427"
|
||||
transform="matrix(1,0,0,-1,0,1554.865)"><g
|
||||
style="opacity:0.5"
|
||||
@ -13003,26 +13149,14 @@
|
||||
id="path7661"
|
||||
d="m 2133.9463,580.4255 c 9.406,9.413 9.406,24.67 -0.01,34.076 -9.408,9.411 -24.664,9.411 -34.076,0 -9.404,-9.406 -9.404,-24.662 0.01,-34.068 9.404,-9.412 24.662,-9.413 34.074,-0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7665"
|
||||
d="m 2116.6846,598.2244 c -1.385,0 -2.352,0.966 -2.352,2.352 0,1.28 0.924,2.351 2.331,2.351 1.386,0 2.332,-0.966 2.332,-2.372 0,-1.344 -0.924,-2.331 -2.311,-2.331 m -0.021,7.643 c -3.233,0 -5.858,-2.058 -5.858,-5.312 0,-1.764 0.672,-3.129 1.659,-4.599 l 3.591,-5.354 4.262,0 -3.654,5.082 -0.063,0.104 c 0.273,-0.104 0.715,-0.168 1.051,-0.168 2.603,0 4.871,1.953 4.871,4.851 0,3.38 -2.647,5.396 -5.859,5.396" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7669"
|
||||
d="m 2133.9502,760.3367 c 9.406,9.413 9.406,24.67 -0.01,34.076 -9.408,9.411 -24.666,9.411 -34.078,0 -9.406,-9.406 -9.406,-24.662 0.01,-34.068 9.406,-9.412 24.664,-9.413 34.076,-0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7673"
|
||||
d="m 2115.5537,784.7781 c -2.709,0 -4.955,-1.428 -5.648,-3.779 l 3.212,-0.988 c 0.315,1.029 1.239,1.785 2.393,1.785 1.197,0 2.227,-0.735 2.227,-2.163 0,-1.763 -1.596,-2.267 -3.045,-2.267 -1.05,0 -2.582,0.273 -3.633,0.65 l 0.357,-8.503 9.113,0 0,3.024 -5.984,0 -0.127,2.351 c 0.442,-0.104 1.051,-0.147 1.491,-0.147 2.982,0 5.375,1.596 5.375,4.724 0,3.612 -2.813,5.313 -5.731,5.313" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7677"
|
||||
d="m 2132.9502,942.3543 c 9.406,9.412 9.406,24.669 -0.01,34.076 -9.408,9.411 -24.666,9.411 -34.078,0 -9.406,-9.407 -9.406,-24.663 0.01,-34.068 9.406,-9.412 24.664,-9.413 34.076,-0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7681"
|
||||
d="m 2116.6025,955.4636 -0.063,0 -3.527,5.502 3.59,0 0,-5.502 z m 3.275,8.357 0,2.897 -3.296,0 0,-2.897 -6.991,0 0,-2.961 6.047,-9.007 4.22,0 0,9.113 2.058,0 0,2.855 -2.038,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#2f2d2e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7685"
|
||||
d="m 2267.0889,745.405 62.129,0 c 1.629,0 2.953,1.32 2.953,2.95 l 0,62.127 c 0,1.63 -1.324,2.954 -2.953,2.954 l -62.129,0 c -1.633,0 -2.949,-1.324 -2.949,-2.954 l 0,-62.127 c 0,-1.63 1.316,-2.95 2.949,-2.95" /><g
|
||||
@ -13150,7 +13284,57 @@
|
||||
id="path4400-5-4"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15476-44-6-9-8"><path
|
||||
d="M 2106.1389,769.67515 L 2110.6575,769.67515 L 2112.2862,778.28141 L 2114.6611,769.67515 L 2119.1692,769.67515 L 2121.5545,778.28141 L 2123.1833,769.67515 L 2127.6808,769.67515 L 2124.2867,785.08026 L 2119.621,785.08026 L 2116.9204,775.38113 L 2114.2303,785.08026 L 2109.5646,785.08026 L 2106.1389,769.67515 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16301" /></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15992-1-2-5"><path
|
||||
d="M 2462.7108,589.76389 L 2467.1558,589.76389 L 2472.9563,598.28609 L 2472.9563,589.76389 L 2477.4434,589.76389 L 2477.4434,605.16901 L 2472.9563,605.16901 L 2467.1873,596.70985 L 2467.1873,605.16901 L 2462.7108,605.16901 L 2462.7108,589.76389 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16307" /><path
|
||||
d="M 2480.6169,589.76389 L 2493.3739,589.76389 L 2493.3739,593.05298 L 2485.3876,593.05298 L 2485.3876,595.5014 L 2492.796,595.5014 L 2492.796,598.64337 L 2485.3876,598.64337 L 2485.3876,601.68026 L 2493.6051,601.68026 L 2493.6051,605.16901 L 2480.6169,605.16901 L 2480.6169,589.76389 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16309" /></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15996-0-3-3"><path
|
||||
d="M 2462.4822,962.00133 L 2467.0112,961.71761 Q 2467.1583,962.82098 2467.6102,963.39893 Q 2468.3458,964.33417 2469.7119,964.33417 Q 2470.7312,964.33417 2471.2776,963.86129 Q 2471.8345,963.37791 2471.8345,962.74742 Q 2471.8345,962.14845 2471.3091,961.67557 Q 2470.7837,961.2027 2468.8712,960.78237 Q 2465.7397,960.07832 2464.4052,958.9119 Q 2463.0601,957.74548 2463.0601,955.93806 Q 2463.0601,954.75063 2463.7432,953.6998 Q 2464.4367,952.63847 2465.8133,952.0395 Q 2467.2004,951.43002 2469.6068,951.43002 Q 2472.5596,951.43002 2474.1043,952.53338 Q 2475.6595,953.62624 2475.9538,956.02213 L 2471.4667,956.28484 Q 2471.2881,955.24452 2470.7101,954.77165 Q 2470.1427,954.29877 2469.1339,954.29877 Q 2468.3037,954.29877 2467.8834,954.65605 Q 2467.4631,955.00283 2467.4631,955.50722 Q 2467.4631,955.87501 2467.8099,956.16924 Q 2468.1461,956.47398 2469.4071,956.73669 Q 2472.5281,957.40922 2473.8731,958.10277 Q 2475.2287,958.7858 2475.8382,959.8051 Q 2476.4582,960.82441 2476.4582,962.0854 Q 2476.4582,963.56706 2475.6385,964.81755 Q 2474.8189,966.06803 2473.3477,966.71954 Q 2471.8766,967.36055 2469.6383,967.36055 Q 2465.7082,967.36055 2464.195,965.84736 Q 2462.6818,964.33417 2462.4822,962.00133 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16291" /><path
|
||||
d="M 2478.854,951.69272 L 2491.6111,951.69272 L 2491.6111,954.98181 L 2483.6248,954.98181 L 2483.6248,957.43024 L 2491.0331,957.43024 L 2491.0331,960.57221 L 2483.6248,960.57221 L 2483.6248,963.6091 L 2491.8423,963.6091 L 2491.8423,967.09784 L 2478.854,967.09784 L 2478.854,951.69272 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16293" /></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16000-48-6-8"><path
|
||||
d="M 2471.668,769.67515 L 2484.4251,769.67515 L 2484.4251,772.96423 L 2476.4388,772.96423 L 2476.4388,775.41266 L 2483.8471,775.41266 L 2483.8471,778.55463 L 2476.4388,778.55463 L 2476.4388,781.59152 L 2484.6562,781.59152 L 2484.6562,785.08026 L 2471.668,785.08026 L 2471.668,769.67515 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16304" /></g><g
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16004-6-9-8"><path
|
||||
d="M 2097.7373,962.00133 L 2102.2664,961.71761 Q 2102.4135,962.82098 2102.8653,963.39893 Q 2103.6009,964.33417 2104.967,964.33417 Q 2105.9863,964.33417 2106.5327,963.86129 Q 2107.0897,963.37791 2107.0897,962.74742 Q 2107.0897,962.14845 2106.5642,961.67557 Q 2106.0388,961.2027 2104.1263,960.78237 Q 2100.9949,960.07832 2099.6603,958.9119 Q 2098.3153,957.74548 2098.3153,955.93806 Q 2098.3153,954.75063 2098.9983,953.6998 Q 2099.6918,952.63847 2101.0684,952.0395 Q 2102.4555,951.43002 2104.8619,951.43002 Q 2107.8147,951.43002 2109.3594,952.53338 Q 2110.9147,953.62624 2111.2089,956.02213 L 2106.7219,956.28484 Q 2106.5432,955.24452 2105.9653,954.77165 Q 2105.3978,954.29877 2104.389,954.29877 Q 2103.5589,954.29877 2103.1385,954.65605 Q 2102.7182,955.00283 2102.7182,955.50722 Q 2102.7182,955.87501 2103.065,956.16924 Q 2103.4013,956.47398 2104.6622,956.73669 Q 2107.7832,957.40922 2109.1283,958.10277 Q 2110.4838,958.7858 2111.0933,959.8051 Q 2111.7133,960.82441 2111.7133,962.0854 Q 2111.7133,963.56706 2110.8936,964.81755 Q 2110.074,966.06803 2108.6028,966.71954 Q 2107.1317,967.36055 2104.8934,967.36055 Q 2100.9633,967.36055 2099.4501,965.84736 Q 2097.937,964.33417 2097.7373,962.00133 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16296" /><path
|
||||
d="M 2112.5329,951.69272 L 2117.0515,951.69272 L 2118.6803,960.29899 L 2121.0551,951.69272 L 2125.5632,951.69272 L 2127.9486,960.29899 L 2129.5773,951.69272 L 2134.0749,951.69272 L 2130.6807,967.09784 L 2126.015,967.09784 L 2123.3144,957.39871 L 2120.6243,967.09784 L 2115.9586,967.09784 L 2112.5329,951.69272 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16298" /></g><text
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="2096.3604"
|
||||
y="605.16901"
|
||||
id="text16008-9-6-7"
|
||||
sodipodi:linespacing="125%"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan16010-8-2"
|
||||
x="2096.3604"
|
||||
y="605.16901"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">NW</tspan></text>
|
||||
</g><g
|
||||
id="quad-hexa-H_reverse"
|
||||
transform="matrix(1.25,0,0,1.25,-146.76331,-311.9055)"><path
|
||||
inkscape:connector-curvature="0"
|
||||
@ -13299,25 +13483,13 @@
|
||||
id="path11454"
|
||||
d="m 2495.2002,2020.4255 c 9.406,9.413 9.406,24.67 -0.01,34.076 -9.408,9.411 -24.664,9.411 -34.076,0 -9.404,-9.406 -9.404,-24.662 0.01,-34.068 9.404,-9.412 24.662,-9.413 34.074,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11456"
|
||||
d="m 2477.1006,2045.4675 0,-10.918 -2.771,2.143 -1.828,-2.499 4.892,-3.591 3.234,0 0,14.865 -3.527,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11458"
|
||||
d="m 2495.2061,2200.3367 c 9.404,9.413 9.404,24.67 -0.01,34.076 -9.406,9.411 -24.664,9.411 -34.078,0 -9.404,-9.406 -9.404,-24.662 0.01,-34.068 9.406,-9.412 24.664,-9.413 34.078,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11460"
|
||||
d="m 2471.748,2224.3787 0,-2.939 5.795,-5.249 c 0.735,-0.694 1.218,-1.386 1.218,-2.29 0,-1.048 -0.735,-1.784 -1.848,-1.784 -1.176,0 -1.953,0.924 -2.1,2.247 l -3.38,-0.463 c 0.336,-3.001 2.771,-4.787 5.669,-4.787 2.729,0 5.375,1.45 5.375,4.557 0,2.121 -1.239,3.359 -2.603,4.577 l -3.443,3.066 6.067,0 0,3.065 -10.75,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11462"
|
||||
d="m 2494.2061,2382.3543 c 9.404,9.412 9.404,24.669 -0.01,34.076 -9.406,9.411 -24.664,9.411 -34.078,0 -9.404,-9.407 -9.404,-24.663 0.01,-34.068 9.406,-9.412 24.664,-9.413 34.078,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11464"
|
||||
d="m 2476.9551,2407.117 c -2.708,0 -5.165,-1.176 -5.963,-3.947 l 3.275,-0.861 c 0.273,0.987 1.176,1.848 2.52,1.848 1.008,0 2.163,-0.504 2.163,-1.891 0,-1.511 -1.555,-1.952 -3.023,-1.952 l -0.946,0 0,-2.583 1.03,0 c 1.322,0 2.603,-0.336 2.603,-1.763 0,-1.071 -0.903,-1.637 -1.869,-1.637 -1.008,0 -1.806,0.65 -2.037,1.658 l -3.275,-0.756 c 0.714,-2.498 3.066,-3.779 5.543,-3.779 2.625,0 5.228,1.344 5.228,4.199 0,1.638 -1.05,2.856 -2.498,3.234 l 0,0.063 c 1.68,0.398 2.855,1.784 2.855,3.443 0,3.254 -2.877,4.724 -5.606,4.724" /><g
|
||||
d="m 2494.2061,2382.3543 c 9.404,9.412 9.404,24.669 -0.01,34.076 -9.406,9.411 -24.664,9.411 -34.078,0 -9.404,-9.407 -9.404,-24.663 0.01,-34.068 9.406,-9.412 24.664,-9.413 34.078,-0.01" /><g
|
||||
id="g11466"
|
||||
transform="matrix(1,0,0,-1,0,2994.865)"><g
|
||||
style="opacity:0.5"
|
||||
@ -13434,26 +13606,14 @@
|
||||
id="path11574"
|
||||
d="m 2133.9463,2020.4255 c 9.406,9.413 9.406,24.67 -0.01,34.076 -9.408,9.411 -24.664,9.411 -34.076,0 -9.404,-9.406 -9.404,-24.662 0.01,-34.068 9.404,-9.412 24.662,-9.413 34.074,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11576"
|
||||
d="m 2116.6846,2038.2244 c -1.385,0 -2.352,0.966 -2.352,2.352 0,1.28 0.924,2.351 2.331,2.351 1.386,0 2.332,-0.966 2.332,-2.372 0,-1.344 -0.924,-2.331 -2.311,-2.331 m -0.021,7.643 c -3.233,0 -5.858,-2.058 -5.858,-5.312 0,-1.764 0.672,-3.129 1.659,-4.599 l 3.591,-5.354 4.262,0 -3.654,5.082 -0.063,0.104 c 0.273,-0.104 0.715,-0.168 1.051,-0.168 2.603,0 4.871,1.953 4.871,4.851 0,3.38 -2.647,5.396 -5.859,5.396" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11578"
|
||||
d="m 2133.9502,2200.3367 c 9.406,9.413 9.406,24.67 -0.01,34.076 -9.408,9.411 -24.666,9.411 -34.078,0 -9.406,-9.406 -9.406,-24.662 0.01,-34.068 9.406,-9.412 24.664,-9.413 34.076,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11580"
|
||||
d="m 2115.5537,2224.7781 c -2.709,0 -4.955,-1.428 -5.648,-3.779 l 3.212,-0.988 c 0.315,1.029 1.239,1.785 2.393,1.785 1.197,0 2.227,-0.735 2.227,-2.163 0,-1.763 -1.596,-2.267 -3.045,-2.267 -1.05,0 -2.582,0.273 -3.633,0.65 l 0.357,-8.503 9.113,0 0,3.024 -5.984,0 -0.127,2.351 c 0.442,-0.104 1.051,-0.147 1.491,-0.147 2.982,0 5.375,1.596 5.375,4.724 0,3.612 -2.813,5.313 -5.731,5.313" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11582"
|
||||
d="m 2132.9502,2382.3543 c 9.406,9.412 9.406,24.669 -0.01,34.076 -9.408,9.411 -24.666,9.411 -34.078,0 -9.406,-9.407 -9.406,-24.663 0.01,-34.068 9.406,-9.412 24.664,-9.413 34.076,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11584"
|
||||
d="m 2116.6025,2395.4636 -0.063,0 -3.527,5.502 3.59,0 0,-5.502 z m 3.275,8.357 0,2.897 -3.296,0 0,-2.897 -6.991,0 0,-2.961 6.047,-9.007 4.22,0 0,9.113 2.058,0 0,2.855 -2.038,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#2f2d2e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11586"
|
||||
d="m 2267.0889,2185.405 62.129,0 c 1.629,0 2.953,1.32 2.953,2.95 l 0,62.127 c 0,1.63 -1.324,2.954 -2.953,2.954 l -62.129,0 c -1.633,0 -2.949,-1.324 -2.949,-2.954 l 0,-62.127 c 0,-1.63 1.316,-2.95 2.949,-2.95" /><g
|
||||
@ -13581,7 +13741,53 @@
|
||||
id="path4400-5-8"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15476-44-6-9"><path
|
||||
d="M 2106.1389,2209.675 L 2110.6575,2209.675 L 2112.2862,2218.2812 L 2114.6611,2209.675 L 2119.1692,2209.675 L 2121.5545,2218.2812 L 2123.1833,2209.675 L 2127.6808,2209.675 L 2124.2867,2225.0801 L 2119.621,2225.0801 L 2116.9204,2215.381 L 2114.2303,2225.0801 L 2109.5646,2225.0801 L 2106.1389,2209.675 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16255" /></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15992-1-2"><path
|
||||
d="M 2462.7108,2029.7637 L 2467.1558,2029.7637 L 2472.9563,2038.2859 L 2472.9563,2029.7637 L 2477.4434,2029.7637 L 2477.4434,2045.1688 L 2472.9563,2045.1688 L 2467.1873,2036.7097 L 2467.1873,2045.1688 L 2462.7108,2045.1688 L 2462.7108,2029.7637 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16245" /><path
|
||||
d="M 2480.6169,2029.7637 L 2493.3739,2029.7637 L 2493.3739,2033.0528 L 2485.3876,2033.0528 L 2485.3876,2035.5012 L 2492.796,2035.5012 L 2492.796,2038.6432 L 2485.3876,2038.6432 L 2485.3876,2041.6801 L 2493.6051,2041.6801 L 2493.6051,2045.1688 L 2480.6169,2045.1688 L 2480.6169,2029.7637 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16247" /></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15996-0-3"><path
|
||||
d="M 2462.4822,2402.0011 L 2467.0112,2401.7174 Q 2467.1583,2402.8208 2467.6102,2403.3987 Q 2468.3458,2404.334 2469.7119,2404.334 Q 2470.7312,2404.334 2471.2776,2403.8611 Q 2471.8345,2403.3777 2471.8345,2402.7472 Q 2471.8345,2402.1483 2471.3091,2401.6754 Q 2470.7837,2401.2025 2468.8712,2400.7822 Q 2465.7397,2400.0781 2464.4052,2398.9117 Q 2463.0601,2397.7453 2463.0601,2395.9379 Q 2463.0601,2394.7504 2463.7432,2393.6996 Q 2464.4367,2392.6383 2465.8133,2392.0393 Q 2467.2004,2391.4298 2469.6068,2391.4298 Q 2472.5596,2391.4298 2474.1043,2392.5332 Q 2475.6595,2393.6261 2475.9538,2396.0219 L 2471.4667,2396.2847 Q 2471.2881,2395.2443 2470.7101,2394.7715 Q 2470.1427,2394.2986 2469.1339,2394.2986 Q 2468.3037,2394.2986 2467.8834,2394.6559 Q 2467.4631,2395.0026 2467.4631,2395.507 Q 2467.4631,2395.8748 2467.8099,2396.1691 Q 2468.1461,2396.4738 2469.4071,2396.7365 Q 2472.5281,2397.409 2473.8731,2398.1026 Q 2475.2287,2398.7856 2475.8382,2399.8049 Q 2476.4582,2400.8242 2476.4582,2402.0852 Q 2476.4582,2403.5669 2475.6385,2404.8174 Q 2474.8189,2406.0678 2473.3477,2406.7194 Q 2471.8766,2407.3604 2469.6383,2407.3604 Q 2465.7082,2407.3604 2464.195,2405.8472 Q 2462.6818,2404.334 2462.4822,2402.0011 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16237" /><path
|
||||
d="M 2478.854,2391.6925 L 2491.6111,2391.6925 L 2491.6111,2394.9816 L 2483.6248,2394.9816 L 2483.6248,2397.4301 L 2491.0331,2397.4301 L 2491.0331,2400.572 L 2483.6248,2400.572 L 2483.6248,2403.6089 L 2491.8423,2403.6089 L 2491.8423,2407.0977 L 2478.854,2407.0977 L 2478.854,2391.6925 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16239" /></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16000-48-6"><path
|
||||
d="M 2471.668,2209.675 L 2484.4251,2209.675 L 2484.4251,2212.964 L 2476.4388,2212.964 L 2476.4388,2215.4125 L 2483.8471,2215.4125 L 2483.8471,2218.5544 L 2476.4388,2218.5544 L 2476.4388,2221.5913 L 2484.6562,2221.5913 L 2484.6562,2225.0801 L 2471.668,2225.0801 L 2471.668,2209.675 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16242" /></g><g
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16004-6-9"><path
|
||||
d="M 2097.7373,2402.0011 L 2102.2664,2401.7174 Q 2102.4135,2402.8208 2102.8653,2403.3987 Q 2103.6009,2404.334 2104.967,2404.334 Q 2105.9863,2404.334 2106.5327,2403.8611 Q 2107.0897,2403.3777 2107.0897,2402.7472 Q 2107.0897,2402.1483 2106.5642,2401.6754 Q 2106.0388,2401.2025 2104.1263,2400.7822 Q 2100.9949,2400.0781 2099.6603,2398.9117 Q 2098.3153,2397.7453 2098.3153,2395.9379 Q 2098.3153,2394.7504 2098.9983,2393.6996 Q 2099.6918,2392.6383 2101.0684,2392.0393 Q 2102.4555,2391.4298 2104.8619,2391.4298 Q 2107.8147,2391.4298 2109.3594,2392.5332 Q 2110.9147,2393.6261 2111.2089,2396.0219 L 2106.7219,2396.2847 Q 2106.5432,2395.2443 2105.9653,2394.7715 Q 2105.3978,2394.2986 2104.389,2394.2986 Q 2103.5589,2394.2986 2103.1385,2394.6559 Q 2102.7182,2395.0026 2102.7182,2395.507 Q 2102.7182,2395.8748 2103.065,2396.1691 Q 2103.4013,2396.4738 2104.6622,2396.7365 Q 2107.7832,2397.409 2109.1283,2398.1026 Q 2110.4838,2398.7856 2111.0933,2399.8049 Q 2111.7133,2400.8242 2111.7133,2402.0852 Q 2111.7133,2403.5669 2110.8936,2404.8174 Q 2110.074,2406.0678 2108.6028,2406.7194 Q 2107.1317,2407.3604 2104.8934,2407.3604 Q 2100.9633,2407.3604 2099.4501,2405.8472 Q 2097.937,2404.334 2097.7373,2402.0011 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16258" /><path
|
||||
d="M 2112.5329,2391.6925 L 2117.0515,2391.6925 L 2118.6803,2400.2988 L 2121.0551,2391.6925 L 2125.5632,2391.6925 L 2127.9486,2400.2988 L 2129.5773,2391.6925 L 2134.0749,2391.6925 L 2130.6807,2407.0977 L 2126.015,2407.0977 L 2123.3144,2397.3985 L 2120.6243,2407.0977 L 2115.9586,2407.0977 L 2112.5329,2391.6925 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16260" /></g><g
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16008-9-6"><path
|
||||
d="M 2097.9681,2029.7637 L 2102.4131,2029.7637 L 2108.2137,2038.2859 L 2108.2137,2029.7637 L 2112.7007,2029.7637 L 2112.7007,2045.1688 L 2108.2137,2045.1688 L 2102.4446,2036.7097 L 2102.4446,2045.1688 L 2097.9681,2045.1688 L 2097.9681,2029.7637 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16250" /><path
|
||||
d="M 2114.298,2029.7637 L 2118.8165,2029.7637 L 2120.4453,2038.37 L 2122.8202,2029.7637 L 2127.3282,2029.7637 L 2129.7136,2038.37 L 2131.3424,2029.7637 L 2135.8399,2029.7637 L 2132.4457,2045.1688 L 2127.7801,2045.1688 L 2125.0794,2035.4697 L 2122.3893,2045.1688 L 2117.7237,2045.1688 L 2114.298,2029.7637 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16252" /></g></g><g
|
||||
id="quad-octo-v"
|
||||
transform="matrix(1.25,0,0,-1.25,-146.76331,1081.4925)"><path
|
||||
inkscape:connector-curvature="0"
|
||||
@ -13728,25 +13934,13 @@
|
||||
id="path9535"
|
||||
d="m 3276.7451,797.2002 c 9.406,-9.413 9.406,-24.67 -0.01,-34.076 -9.408,-9.411 -24.664,-9.411 -34.076,0 -9.404,9.406 -9.404,24.662 0.01,34.068 9.404,9.412 24.662,9.413 34.074,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9539"
|
||||
d="m 3258.6475,772.1533 0,10.918 -2.771,-2.141 -1.828,2.498 4.892,3.59 3.234,0 0,-14.865 -3.527,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9543"
|
||||
d="m 3236.7451,617.2891 c 9.406,-9.413 9.406,-24.67 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.406 -9.406,24.662 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9547"
|
||||
d="m 3213.292,593.2432 0,2.939 5.795,5.249 c 0.735,0.693 1.219,1.386 1.219,2.289 0,1.05 -0.736,1.785 -1.848,1.785 -1.176,0 -1.953,-0.924 -2.1,-2.246 l -3.38,0.461 c 0.335,3.002 2.771,4.787 5.668,4.787 2.73,0 5.375,-1.449 5.375,-4.556 0,-2.12 -1.239,-3.359 -2.603,-4.577 l -3.443,-3.066 6.067,0 0,-3.065 -10.75,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9551"
|
||||
d="m 3195.7412,435.2715 c 9.406,-9.412 9.406,-24.669 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.407 -9.406,24.663 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9555"
|
||||
d="m 3178.4971,410.5049 c -2.709,0 -5.165,1.176 -5.963,3.947 l 3.275,0.862 c 0.274,-0.988 1.176,-1.848 2.52,-1.848 1.008,0 2.162,0.504 2.162,1.889 0,1.511 -1.553,1.953 -3.023,1.953 l -0.945,0 0,2.582 1.029,0 c 1.323,0 2.603,0.336 2.603,1.763 0,1.072 -0.902,1.639 -1.868,1.639 -1.008,0 -1.806,-0.651 -2.036,-1.659 l -3.275,0.756 c 0.712,2.499 3.064,3.779 5.542,3.779 2.625,0 5.228,-1.344 5.228,-4.199 0,-1.638 -1.05,-2.856 -2.499,-3.234 l 0,-0.062 c 1.68,-0.399 2.855,-1.785 2.855,-3.443 0,-3.255 -2.876,-4.725 -5.605,-4.725" /><g
|
||||
d="m 3195.7412,435.2715 c 9.406,-9.412 9.406,-24.669 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.407 -9.406,24.663 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><g
|
||||
id="g9565"><g
|
||||
style="opacity:0.5"
|
||||
id="g9567"
|
||||
@ -13786,11 +13980,7 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9639"
|
||||
d="m 3154.7354,255.2002 c 9.406,-9.412 9.406,-24.669 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.407 -9.406,24.663 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9643"
|
||||
d="m 3138.3955,242.0869 -0.063,0 -3.527,-5.502 3.59,0 0,5.502 z m 3.275,-8.357 0,-2.897 -3.296,0 0,2.897 -6.992,0 0,2.961 6.047,9.007 4.22,0 0,-9.113 2.059,0 0,-2.855 -2.038,0 z" /><g
|
||||
d="m 3154.7354,255.2002 c 9.406,-9.412 9.406,-24.669 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.407 -9.406,24.663 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><g
|
||||
id="g9653"><g
|
||||
style="opacity:0.5"
|
||||
id="g9655"
|
||||
@ -13900,25 +14090,13 @@
|
||||
id="path9887"
|
||||
d="m 2824.7236,797.2002 c 9.406,-9.413 9.406,-24.67 -0.01,-34.076 -9.408,-9.411 -24.664,-9.411 -34.076,0 -9.404,9.406 -9.404,24.662 0.01,34.068 9.404,9.412 24.662,9.413 34.074,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9891"
|
||||
d="m 2807.4658,784.6885 c -1.049,0 -1.764,-0.734 -1.764,-1.701 0,-0.945 0.672,-1.764 1.764,-1.764 1.029,0 1.785,0.819 1.785,1.764 0,0.967 -0.798,1.701 -1.785,1.701 m 0,-6.152 c -1.217,0 -2.078,-0.861 -2.078,-2.016 0,-1.196 0.861,-1.973 2.078,-1.973 1.219,0 2.059,0.777 2.059,1.973 0,1.135 -0.862,2.016 -2.059,2.016 m 0,-6.782 c -2.939,0 -5.584,1.491 -5.584,4.62 0,1.805 1.217,3.085 2.666,3.548 l 0,0.041 c -1.281,0.484 -2.268,1.576 -2.268,3.213 0,2.75 2.436,4.241 5.186,4.241 2.73,0 5.187,-1.427 5.187,-4.178 0,-1.637 -0.945,-2.813 -2.268,-3.254 l 0,-0.063 c 1.491,-0.42 2.667,-1.785 2.667,-3.527 0,-3.129 -2.647,-4.641 -5.586,-4.641" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9895"
|
||||
d="m 2864.7314,617.2891 c 9.406,-9.413 9.406,-24.67 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.406 -9.406,24.662 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9899"
|
||||
d="m 2846.2744,593.2432 -4.095,0 6.027,11.842 -7.035,0 0,3.023 10.792,0 0,-2.813 -5.689,-12.052 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9903"
|
||||
d="m 2903.7354,435.2715 c 9.406,-9.412 9.406,-24.669 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.407 -9.406,24.663 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9907"
|
||||
d="m 2886.6338,418.1475 c -1.387,0 -2.352,-0.966 -2.352,-2.352 0,-1.281 0.924,-2.351 2.331,-2.351 1.385,0 2.33,0.966 2.33,2.373 0,1.344 -0.924,2.33 -2.309,2.33 m -0.021,-7.643 c -3.234,0 -5.858,2.058 -5.858,5.313 0,1.764 0.672,3.128 1.658,4.598 l 3.59,5.353 4.263,0 -3.653,-5.08 -0.063,-0.105 c 0.272,0.105 0.713,0.168 1.049,0.168 2.603,0 4.871,-1.954 4.871,-4.85 0,-3.381 -2.645,-5.397 -5.857,-5.397" /><g
|
||||
d="m 2903.7354,435.2715 c 9.406,-9.412 9.406,-24.669 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.407 -9.406,24.663 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><g
|
||||
id="g9917"><g
|
||||
style="opacity:0.5"
|
||||
id="g9919"
|
||||
@ -13958,10 +14136,6 @@
|
||||
id="path9991"
|
||||
d="m 2942.7373,255.2002 c 9.406,-9.412 9.406,-24.669 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.407 -9.406,24.663 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9995"
|
||||
d="m 2925.3398,230.4336 c -2.708,0 -4.955,1.428 -5.647,3.779 l 3.211,0.988 c 0.316,-1.03 1.24,-1.786 2.394,-1.786 1.197,0 2.226,0.735 2.226,2.163 0,1.763 -1.596,2.267 -3.044,2.267 -1.051,0 -2.583,-0.272 -3.633,-0.65 l 0.357,8.504 9.112,0 0,-3.024 -5.984,0 -0.126,-2.351 c 0.442,0.104 1.05,0.146 1.49,0.146 2.983,0 5.375,-1.596 5.375,-4.724 0,-3.612 -2.812,-5.312 -5.731,-5.312" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#2f2d2e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9999"
|
||||
d="m 3000.6279,632.2207 62.129,0 c 1.629,0 2.953,-1.32 2.953,-2.95 l 0,-62.127 c 0,-1.63 -1.324,-2.954 -2.953,-2.954 l -62.129,0 c -1.633,0 -2.949,1.324 -2.949,2.954 l 0,62.127 c 0,1.63 1.316,2.95 2.949,2.95" /><g
|
||||
@ -14089,7 +14263,71 @@
|
||||
id="path4400-5-90"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15476-44-6-9-2-7"><path
|
||||
d="M 2836.9165,-607.95071 L 2841.435,-607.95071 L 2843.0638,-599.34444 L 2845.4387,-607.95071 L 2849.9467,-607.95071 L 2852.3321,-599.34444 L 2853.9609,-607.95071 L 2858.4584,-607.95071 L 2855.0643,-592.54559 L 2850.3986,-592.54559 L 2847.698,-602.24472 L 2845.0079,-592.54559 L 2840.3422,-592.54559 L 2836.9165,-607.95071 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16508" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15992-1-2-6-3"><path
|
||||
d="M 3204.254,-607.95071 L 3208.699,-607.95071 L 3214.4996,-599.42851 L 3214.4996,-607.95071 L 3218.9866,-607.95071 L 3218.9866,-592.54559 L 3214.4996,-592.54559 L 3208.7305,-601.00475 L 3208.7305,-592.54559 L 3204.254,-592.54559 L 3204.254,-607.95071 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16519" /><path
|
||||
d="M 3222.1601,-607.95071 L 3234.9171,-607.95071 L 3234.9171,-604.66162 L 3226.9308,-604.66162 L 3226.9308,-602.2132 L 3234.3392,-602.2132 L 3234.3392,-599.07123 L 3226.9308,-599.07123 L 3226.9308,-596.03434 L 3235.1483,-596.03434 L 3235.1483,-592.54559 L 3222.1601,-592.54559 L 3222.1601,-607.95071 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16521" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15996-0-3-1-1"><path
|
||||
d="M 3123.0115,-235.55322 L 3127.5405,-235.83694 Q 3127.6876,-234.73357 3128.1395,-234.15562 Q 3128.8751,-233.22038 3130.2412,-233.22038 Q 3131.2605,-233.22038 3131.8069,-233.69326 Q 3132.3638,-234.17664 3132.3638,-234.80713 Q 3132.3638,-235.4061 3131.8384,-235.87898 Q 3131.313,-236.35185 3129.4005,-236.77218 Q 3126.269,-237.47623 3124.9345,-238.64265 Q 3123.5894,-239.80907 3123.5894,-241.61649 Q 3123.5894,-242.80392 3124.2725,-243.85475 Q 3124.966,-244.91608 3126.3426,-245.51505 Q 3127.7297,-246.12453 3130.1361,-246.12453 Q 3133.0889,-246.12453 3134.6336,-245.02117 Q 3136.1888,-243.92831 3136.4831,-241.53242 L 3131.996,-241.26971 Q 3131.8174,-242.31003 3131.2394,-242.7829 Q 3130.672,-243.25578 3129.6632,-243.25578 Q 3128.833,-243.25578 3128.4127,-242.8985 Q 3127.9924,-242.55172 3127.9924,-242.04733 Q 3127.9924,-241.67954 3128.3392,-241.38531 Q 3128.6754,-241.08057 3129.9364,-240.81786 Q 3133.0574,-240.14533 3134.4024,-239.45179 Q 3135.758,-238.76875 3136.3675,-237.74945 Q 3136.9875,-236.73014 3136.9875,-235.46915 Q 3136.9875,-233.98749 3136.1678,-232.737 Q 3135.3482,-231.48652 3133.877,-230.83501 Q 3132.4059,-230.194 3130.1676,-230.194 Q 3126.2375,-230.194 3124.7243,-231.70719 Q 3123.2111,-233.22038 3123.0115,-235.55322 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16527" /><path
|
||||
d="M 3139.3833,-245.86183 L 3152.1404,-245.86183 L 3152.1404,-242.57274 L 3144.1541,-242.57274 L 3144.1541,-240.12431 L 3151.5624,-240.12431 L 3151.5624,-236.98234 L 3144.1541,-236.98234 L 3144.1541,-233.94545 L 3152.3716,-233.94545 L 3152.3716,-230.45671 L 3139.3833,-230.45671 L 3139.3833,-245.86183 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16529" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16000-48-6-0-3"><path
|
||||
d="M 3172.2032,-425.93313 L 3184.9602,-425.93313 L 3184.9602,-422.64404 L 3176.9739,-422.64404 L 3176.9739,-420.19562 L 3184.3823,-420.19562 L 3184.3823,-417.05365 L 3176.9739,-417.05365 L 3176.9739,-414.01676 L 3185.1914,-414.01676 L 3185.1914,-410.52802 L 3172.2032,-410.52802 L 3172.2032,-425.93313 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16524" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16004-6-9-4-1"><path
|
||||
d="M 2868.5227,-415.62452 L 2873.0518,-415.90825 Q 2873.1989,-414.80488 2873.6507,-414.22692 Q 2874.3863,-413.29169 2875.7524,-413.29169 Q 2876.7717,-413.29169 2877.3181,-413.76456 Q 2877.8751,-414.24794 2877.8751,-414.87844 Q 2877.8751,-415.47741 2877.3496,-415.95028 Q 2876.8242,-416.42315 2874.9117,-416.84348 Q 2871.7803,-417.54754 2870.4457,-418.71395 Q 2869.1007,-419.88037 2869.1007,-421.68779 Q 2869.1007,-422.87523 2869.7837,-423.92605 Q 2870.4772,-424.98739 2871.8538,-425.58636 Q 2873.2409,-426.19584 2875.6473,-426.19584 Q 2878.6001,-426.19584 2880.1448,-425.09247 Q 2881.7001,-423.99961 2881.9943,-421.60373 L 2877.5073,-421.34102 Q 2877.3286,-422.38134 2876.7507,-422.85421 Q 2876.1832,-423.32708 2875.1744,-423.32708 Q 2874.3443,-423.32708 2873.9239,-422.9698 Q 2873.5036,-422.62303 2873.5036,-422.11863 Q 2873.5036,-421.75084 2873.8504,-421.45661 Q 2874.1867,-421.15187 2875.4476,-420.88916 Q 2878.5686,-420.21663 2879.9137,-419.52309 Q 2881.2692,-418.84005 2881.8787,-417.82075 Q 2882.4987,-416.80145 2882.4987,-415.54046 Q 2882.4987,-414.05879 2881.679,-412.80831 Q 2880.8594,-411.55783 2879.3882,-410.90631 Q 2877.9171,-410.26531 2875.6788,-410.26531 Q 2871.7487,-410.26531 2870.2355,-411.7785 Q 2868.7224,-413.29169 2868.5227,-415.62452 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16503" /><path
|
||||
d="M 2883.3183,-425.93313 L 2887.8369,-425.93313 L 2889.4657,-417.32686 L 2891.8405,-425.93313 L 2896.3486,-425.93313 L 2898.734,-417.32686 L 2900.3627,-425.93313 L 2904.8603,-425.93313 L 2901.4661,-410.52802 L 2896.8004,-410.52802 L 2894.0998,-420.22714 L 2891.4097,-410.52802 L 2886.744,-410.52802 L 2883.3183,-425.93313 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16505" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16008-9-6-0-4"><path
|
||||
d="M 2788.7508,-787.86184 L 2793.1958,-787.86184 L 2798.9964,-779.33964 L 2798.9964,-787.86184 L 2803.4834,-787.86184 L 2803.4834,-772.45673 L 2798.9964,-772.45673 L 2793.2274,-780.91588 L 2793.2274,-772.45673 L 2788.7508,-772.45673 L 2788.7508,-787.86184 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16511" /><path
|
||||
d="M 2805.0807,-787.86184 L 2809.5992,-787.86184 L 2811.228,-779.25557 L 2813.6029,-787.86184 L 2818.1109,-787.86184 L 2820.4963,-779.25557 L 2822.1251,-787.86184 L 2826.6226,-787.86184 L 2823.2284,-772.45673 L 2818.5628,-772.45673 L 2815.8622,-782.15585 L 2813.172,-772.45673 L 2808.5064,-772.45673 L 2805.0807,-787.86184 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16513" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16339-0"><path
|
||||
d="M 3252.3414,-787.86184 L 3256.7864,-787.86184 L 3262.587,-779.33964 L 3262.587,-787.86184 L 3267.074,-787.86184 L 3267.074,-772.45673 L 3262.587,-772.45673 L 3256.8179,-780.91588 L 3256.8179,-772.45673 L 3252.3414,-772.45673 L 3252.3414,-787.86184 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16516" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16343-6"><path
|
||||
d="M 2918.7053,-235.55322 L 2923.2344,-235.83694 Q 2923.3815,-234.73357 2923.8333,-234.15562 Q 2924.5689,-233.22038 2925.935,-233.22038 Q 2926.9543,-233.22038 2927.5007,-233.69326 Q 2928.0577,-234.17664 2928.0577,-234.80713 Q 2928.0577,-235.4061 2927.5323,-235.87898 Q 2927.0068,-236.35185 2925.0943,-236.77218 Q 2921.9629,-237.47623 2920.6283,-238.64265 Q 2919.2833,-239.80907 2919.2833,-241.61649 Q 2919.2833,-242.80392 2919.9663,-243.85475 Q 2920.6599,-244.91608 2922.0364,-245.51505 Q 2923.4235,-246.12453 2925.8299,-246.12453 Q 2928.7827,-246.12453 2930.3275,-245.02117 Q 2931.8827,-243.92831 2932.1769,-241.53242 L 2927.6899,-241.26971 Q 2927.5112,-242.31003 2926.9333,-242.7829 Q 2926.3658,-243.25578 2925.357,-243.25578 Q 2924.5269,-243.25578 2924.1066,-242.8985 Q 2923.6862,-242.55172 2923.6862,-242.04733 Q 2923.6862,-241.67954 2924.033,-241.38531 Q 2924.3693,-241.08057 2925.6303,-240.81786 Q 2928.7512,-240.14533 2930.0963,-239.45179 Q 2931.4518,-238.76875 2932.0613,-237.74945 Q 2932.6813,-236.73014 2932.6813,-235.46915 Q 2932.6813,-233.98749 2931.8617,-232.737 Q 2931.042,-231.48652 2929.5709,-230.83501 Q 2928.0997,-230.194 2925.8614,-230.194 Q 2921.9314,-230.194 2920.4182,-231.70719 Q 2918.905,-233.22038 2918.7053,-235.55322 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16500" /></g></g><g
|
||||
id="hexa-coax"
|
||||
transform="matrix(1.25,0,0,-1.25,-146.76331,1791.2695)"><g
|
||||
id="g4333"><g
|
||||
@ -14274,29 +14512,13 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8445"
|
||||
d="m 361.7002,739.2861 c 9.406,-9.414 9.406,-24.67 -0.007,-34.078 -9.407,-9.41 -24.666,-9.41 -34.079,0 -9.406,9.408 -9.406,24.664 0.008,34.07 9.406,9.412 24.665,9.412 34.078,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8449"
|
||||
d="m 344.3018,714.5225 c -2.709,0 -4.955,1.428 -5.648,3.779 l 3.212,0.987 c 0.315,-1.03 1.239,-1.786 2.393,-1.786 1.197,0 2.227,0.736 2.227,2.164 0,1.763 -1.596,2.267 -3.045,2.267 -1.05,0 -2.582,-0.272 -3.633,-0.651 l 0.357,8.504 9.113,0 0,-3.024 -5.984,0 -0.127,-2.351 c 0.442,0.105 1.051,0.146 1.491,0.146 2.982,0 5.375,-1.596 5.375,-4.723 0,-3.612 -2.813,-5.312 -5.731,-5.312" /></g><g
|
||||
d="m 361.7002,739.2861 c 9.406,-9.414 9.406,-24.67 -0.007,-34.078 -9.407,-9.41 -24.666,-9.41 -34.079,0 -9.406,9.408 -9.406,24.664 0.008,34.07 9.406,9.412 24.665,9.412 34.078,0.008" /></g><g
|
||||
id="g5136"
|
||||
transform="translate(1.6,3.2)"><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8453"
|
||||
d="m 217.4854,994.3389 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.408,-9.41 -24.664,-9.41 -34.076,0 -9.404,9.406 -9.404,24.662 0.008,34.068 9.404,9.414 24.662,9.414 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8457"
|
||||
d="m 199.3838,969.2959 0,10.918 -2.771,-2.143 -1.828,2.499 4.892,3.591 3.234,0 0,-14.865 -3.527,0 z" /></g><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10019"
|
||||
d="m 218.5029,948.9795 0,2.939 5.795,5.249 c 0.734,0.693 1.218,1.386 1.218,2.289 0,1.05 -0.736,1.785 -1.848,1.785 -1.176,0 -1.952,-0.924 -2.1,-2.246 l -3.379,0.461 c 0.335,3.002 2.771,4.787 5.668,4.787 2.73,0 5.375,-1.449 5.375,-4.556 0,-2.12 -1.239,-3.359 -2.604,-4.577 l -3.443,-3.066 6.068,0 0,-3.065 -10.75,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10027"
|
||||
d="m 368.9502,700.167 c -1.387,0 -2.352,-0.965 -2.352,-2.352 0,-1.28 0.924,-2.351 2.331,-2.351 1.385,0 2.33,0.967 2.33,2.373 0,1.344 -0.924,2.33 -2.309,2.33 m -0.021,-7.643 c -3.234,0 -5.858,2.059 -5.858,5.313 0,1.764 0.672,3.129 1.658,4.598 l 3.59,5.354 4.263,0 -3.653,-5.081 -0.063,-0.105 c 0.272,0.105 0.713,0.168 1.049,0.168 2.603,0 4.871,-1.953 4.871,-4.85 0,-3.381 -2.645,-5.397 -5.857,-5.397" /><g
|
||||
d="m 217.4854,994.3389 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.408,-9.41 -24.664,-9.41 -34.076,0 -9.404,9.406 -9.404,24.662 0.008,34.068 9.404,9.414 24.662,9.414 34.076,0.008" /></g><g
|
||||
id="g5144"
|
||||
transform="translate(299.2,0)"><g
|
||||
style="opacity:0.5"
|
||||
@ -14381,15 +14603,7 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path5220"
|
||||
d="m 217.4854,994.3389 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.408,-9.41 -24.664,-9.41 -34.076,0 -9.404,9.406 -9.404,24.662 0.008,34.068 9.404,9.414 24.662,9.414 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8341-5"
|
||||
d="m 200.6224,969.4669 c -2.709,0 -5.166,1.176 -5.963,3.947 l 3.275,0.862 c 0.273,-0.987 1.176,-1.848 2.52,-1.848 1.008,0 2.162,0.504 2.162,1.89 0,1.511 -1.554,1.952 -3.023,1.952 l -0.946,0 0,2.583 1.03,0 c 1.322,0 2.603,0.336 2.603,1.763 0,1.072 -0.902,1.638 -1.869,1.638 -1.008,0 -1.805,-0.65 -2.036,-1.658 l -3.275,0.756 c 0.713,2.498 3.065,3.779 5.543,3.779 2.624,0 5.227,-1.344 5.227,-4.199 0,-1.639 -1.049,-2.856 -2.498,-3.235 l 0,-0.062 c 1.68,-0.398 2.855,-1.785 2.855,-3.443 0,-3.254 -2.876,-4.725 -5.605,-4.725" /></g></g><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path8161-0"
|
||||
d="m 526.26165,960.82187 -0.063,0 -3.528,-5.5 3.591,0 0,5.5 z m 3.275,-8.355 0,-2.899 -3.296,0 0,2.899 -6.993,0 0,2.959 6.047,9.007 4.221,0 0,-9.111 2.058,0 0,-2.855 -2.037,0 z" /><g
|
||||
d="m 217.4854,994.3389 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.408,-9.41 -24.664,-9.41 -34.076,0 -9.404,9.406 -9.404,24.662 0.008,34.068 9.404,9.414 24.662,9.414 34.076,0.008" /></g></g><g
|
||||
style="display:inline"
|
||||
transform="matrix(0.13034138,0,0,-0.13034138,295.35694,1183.4102)"
|
||||
id="g6140-8-33"><g
|
||||
@ -14514,7 +14728,35 @@
|
||||
id="path4400-5-39"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15472-95"><path
|
||||
d="M 183.10751,-988.20144 L 187.5525,-988.20144 L 193.35306,-979.67924 L 193.35306,-988.20144 L 197.84009,-988.20144 L 197.84009,-972.79633 L 193.35306,-972.79633 L 187.58403,-981.25548 L 187.58403,-972.79633 L 183.10751,-972.79633 L 183.10751,-988.20144 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15913" /><path
|
||||
d="M 199.43735,-988.20144 L 203.9559,-988.20144 L 205.58468,-979.59517 L 207.95955,-988.20144 L 212.4676,-988.20144 L 214.85297,-979.59517 L 216.48175,-988.20144 L 220.97929,-988.20144 L 217.58512,-972.79633 L 212.91945,-972.79633 L 210.21883,-982.49545 L 207.52871,-972.79633 L 202.86304,-972.79633 L 199.43735,-988.20144 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15915" /></g><text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text15476-9"
|
||||
y="-972.79633"
|
||||
x="484.18848"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"
|
||||
transform="scale(1,-1)"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="-972.79633"
|
||||
x="484.18848"
|
||||
id="tspan15478-8"
|
||||
sodipodi:role="line">NE</tspan></text>
|
||||
<g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15480-13"><path
|
||||
d="M 337.66927,-718.03828 L 342.19834,-718.322 Q 342.34545,-717.21864 342.79731,-716.64068 Q 343.53289,-715.70545 344.89896,-715.70545 Q 345.91826,-715.70545 346.46469,-716.17832 Q 347.02163,-716.6617 347.02163,-717.29219 Q 347.02163,-717.89117 346.49622,-718.36404 Q 345.9708,-718.83691 344.0583,-719.25724 Q 340.92684,-719.96129 339.59229,-721.12771 Q 338.24723,-722.29413 338.24723,-724.10155 Q 338.24723,-725.28898 338.93027,-726.33981 Q 339.62381,-727.40114 341.00039,-728.00012 Q 342.38748,-728.60959 344.79388,-728.60959 Q 347.7467,-728.60959 349.29141,-727.50623 Q 350.84664,-726.41337 351.14087,-724.01748 L 346.65384,-723.75478 Q 346.4752,-724.79509 345.89725,-725.26797 Q 345.3298,-725.74084 344.32101,-725.74084 Q 343.49085,-725.74084 343.07052,-725.38356 Q 342.65019,-725.03678 342.65019,-724.53239 Q 342.65019,-724.1646 342.99696,-723.87037 Q 343.33323,-723.56563 344.59422,-723.30292 Q 347.71517,-722.63039 349.06023,-721.93685 Q 350.4158,-721.25381 351.02528,-720.23451 Q 351.64527,-719.21521 351.64527,-717.95421 Q 351.64527,-716.47255 350.82562,-715.22207 Q 350.00598,-713.97158 348.53482,-713.32007 Q 347.06366,-712.67907 344.8254,-712.67907 Q 340.89531,-712.67907 339.38212,-714.19226 Q 337.86893,-715.70545 337.66927,-718.03828 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15918" /></g></g><g
|
||||
id="tri"
|
||||
transform="matrix(1.25,0,0,-1.25,-146.76331,3138.7695)"><path
|
||||
inkscape:connector-curvature="0"
|
||||
@ -14621,11 +14863,7 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10259"
|
||||
d="m 544.333,1524.3389 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.406,-9.411 -24.664,-9.411 -34.076,-10e-4 -9.402,9.407 -9.404,24.663 0.008,34.069 9.406,9.413 24.664,9.413 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10263"
|
||||
d="m 521.7197,1499.2964 0,2.939 5.795,5.249 c 0.734,0.693 1.218,1.386 1.218,2.289 0,1.05 -0.736,1.785 -1.848,1.785 -1.176,0 -1.952,-0.924 -2.1,-2.247 l -3.379,0.462 c 0.335,3.002 2.771,4.787 5.668,4.787 2.73,0 5.375,-1.449 5.375,-4.556 0,-2.121 -1.239,-3.359 -2.604,-4.577 l -3.443,-3.066 6.068,0 0,-3.065 -10.75,0 z" /><g
|
||||
d="m 544.333,1524.3389 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.406,-9.411 -24.664,-9.411 -34.076,-10e-4 -9.402,9.407 -9.404,24.663 0.008,34.069 9.406,9.413 24.664,9.413 34.076,0.01" /><g
|
||||
id="g10273"><g
|
||||
style="opacity:0.5"
|
||||
id="g10275"
|
||||
@ -14665,17 +14903,9 @@
|
||||
id="path10347"
|
||||
d="m 396.9326,1268.2861 c 9.406,-9.414 9.406,-24.67 -0.008,-34.078 -9.406,-9.41 -24.666,-9.41 -34.078,0 -9.406,9.408 -9.406,24.664 0.008,34.07 9.406,9.412 24.664,9.412 34.078,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10351"
|
||||
d="m 379.6807,1243.5225 c -2.709,0 -5.165,1.176 -5.963,3.947 l 3.275,0.861 c 0.274,-0.988 1.176,-1.848 2.52,-1.848 1.008,0 2.162,0.504 2.162,1.89 0,1.511 -1.553,1.953 -3.023,1.953 l -0.945,0 0,2.582 1.029,0 c 1.323,0 2.603,0.336 2.603,1.763 0,1.071 -0.902,1.638 -1.868,1.638 -1.008,0 -1.806,-0.651 -2.036,-1.659 l -3.275,0.756 c 0.712,2.499 3.064,3.779 5.542,3.779 2.625,0 5.228,-1.344 5.228,-4.199 0,-1.637 -1.05,-2.856 -2.499,-3.233 l 0,-0.063 c 1.68,-0.399 2.855,-1.784 2.855,-3.443 0,-3.255 -2.876,-4.724 -5.605,-4.724" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10355"
|
||||
d="m 252.7178,1521.3379 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.408,-9.411 -24.664,-9.411 -34.076,-10e-4 -9.404,9.407 -9.404,24.663 0.008,34.069 9.404,9.413 24.662,9.413 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10359"
|
||||
d="m 234.6162,1496.2944 0,10.918 -2.771,-2.142 -1.828,2.499 4.892,3.59 3.234,0 0,-14.865 -3.527,0 z" /><g
|
||||
d="m 252.7178,1521.3379 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.408,-9.411 -24.664,-9.411 -34.076,-10e-4 -9.404,9.407 -9.404,24.663 0.008,34.069 9.404,9.413 24.662,9.413 34.076,0.01" /><g
|
||||
style="display:inline"
|
||||
transform="matrix(0.13034138,0,0,-0.13034138,317.58844,1723.4097)"
|
||||
id="g6140-8-3"><g
|
||||
@ -14800,7 +15030,31 @@
|
||||
id="path4400-5-3"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15472"><path
|
||||
d="M 216.73991,-1511.9997 L 221.1849,-1511.9997 L 226.98546,-1503.4775 L 226.98546,-1511.9997 L 231.47249,-1511.9997 L 231.47249,-1496.5946 L 226.98546,-1496.5946 L 221.21643,-1505.0538 L 221.21643,-1496.5946 L 216.73991,-1496.5946 L 216.73991,-1511.9997 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16778" /><path
|
||||
d="M 233.06975,-1511.9997 L 237.5883,-1511.9997 L 239.21708,-1503.3935 L 241.59195,-1511.9997 L 246.1,-1511.9997 L 248.48537,-1503.3935 L 250.11415,-1511.9997 L 254.61169,-1511.9997 L 251.21752,-1496.5946 L 246.55185,-1496.5946 L 243.85123,-1506.2937 L 241.16111,-1496.5946 L 236.49544,-1496.5946 L 233.06975,-1511.9997 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16780" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15476"><path
|
||||
d="M 511.84638,-1515.0006 L 516.29138,-1515.0006 L 522.09194,-1506.4784 L 522.09194,-1515.0006 L 526.57897,-1515.0006 L 526.57897,-1499.5955 L 522.09194,-1499.5955 L 516.3229,-1508.0546 L 516.3229,-1499.5955 L 511.84638,-1499.5955 L 511.84638,-1515.0006 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16773" /><path
|
||||
d="M 529.75246,-1515.0006 L 542.5095,-1515.0006 L 542.5095,-1511.7115 L 534.52322,-1511.7115 L 534.52322,-1509.2631 L 541.93154,-1509.2631 L 541.93154,-1506.1211 L 534.52322,-1506.1211 L 534.52322,-1503.0842 L 542.74068,-1503.0842 L 542.74068,-1499.5955 L 529.75246,-1499.5955 L 529.75246,-1515.0006 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16775" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15480"><path
|
||||
d="M 372.9016,-1248.6384 L 377.43067,-1248.9221 Q 377.57778,-1247.8187 378.02964,-1247.2408 Q 378.76522,-1246.3055 380.13129,-1246.3055 Q 381.15059,-1246.3055 381.69702,-1246.7784 Q 382.25396,-1247.2618 382.25396,-1247.8923 Q 382.25396,-1248.4913 381.72855,-1248.9641 Q 381.20313,-1249.437 379.29063,-1249.8573 Q 376.15917,-1250.5614 374.82462,-1251.7278 Q 373.47956,-1252.8942 373.47956,-1254.7016 Q 373.47956,-1255.8891 374.1626,-1256.9399 Q 374.85614,-1258.0012 376.23272,-1258.6002 Q 377.61982,-1259.2097 380.02621,-1259.2097 Q 382.97903,-1259.2097 384.52374,-1258.1063 Q 386.07897,-1257.0135 386.3732,-1254.6176 L 381.88617,-1254.3549 Q 381.70753,-1255.3952 381.12958,-1255.8681 Q 380.56213,-1256.3409 379.55334,-1256.3409 Q 378.72318,-1256.3409 378.30285,-1255.9837 Q 377.88252,-1255.6369 377.88252,-1255.1325 Q 377.88252,-1254.7647 378.22929,-1254.4705 Q 378.56556,-1254.1657 379.82655,-1253.903 Q 382.94751,-1253.2305 384.29256,-1252.5369 Q 385.64813,-1251.8539 386.25761,-1250.8346 Q 386.8776,-1249.8153 386.8776,-1248.5543 Q 386.8776,-1247.0726 386.05795,-1245.8222 Q 385.23831,-1244.5717 383.76715,-1243.9202 Q 382.29599,-1243.2792 380.05773,-1243.2792 Q 376.12764,-1243.2792 374.61445,-1244.7924 Q 373.10126,-1246.3055 372.9016,-1248.6384 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16770" /></g></g><g
|
||||
id="quad-x_reverse"
|
||||
transform="matrix(1.25,0,0,1.25,-146.76331,1488.0945)"><g
|
||||
id="g9762"
|
||||
@ -14983,34 +15237,18 @@
|
||||
id="path9918"
|
||||
d="m 934.1211,1284.0758 c 9.404,9.413 9.404,24.67 -0.008,34.077 -9.406,9.41 -24.664,9.41 -34.076,0 -9.404,-9.407 -9.404,-24.662 0.008,-34.069 9.406,-9.412 24.664,-9.413 34.076,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9920"
|
||||
d="m 916.0205,1309.1182 0,-10.918 -2.771,2.142 -1.828,-2.499 4.892,-3.59 3.234,0 0,14.865 -3.527,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9922"
|
||||
d="m 1127.1367,1284.0758 c 9.404,9.413 9.404,24.67 -0.01,34.077 -9.406,9.41 -24.664,9.41 -34.078,0 -9.404,-9.407 -9.404,-24.662 0.01,-34.069 9.406,-9.412 24.664,-9.413 34.078,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9924"
|
||||
d="m 1103.6787,1308.1178 0,-2.939 5.795,-5.249 c 0.734,-0.693 1.218,-1.386 1.218,-2.289 0,-1.05 -0.736,-1.785 -1.848,-1.785 -1.176,0 -1.952,0.924 -2.1,2.247 l -3.379,-0.462 c 0.335,-3.002 2.771,-4.787 5.668,-4.787 2.73,0 5.375,1.449 5.375,4.556 0,2.121 -1.239,3.359 -2.604,4.577 l -3.443,3.066 6.068,0 0,3.065 -10.75,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9926"
|
||||
d="m 934.1211,1476.0963 c 9.404,9.412 9.404,24.668 -0.008,34.074 -9.406,9.412 -24.664,9.412 -34.074,0 -9.406,-9.406 -9.406,-24.662 0.006,-34.068 9.406,-9.412 24.664,-9.412 34.076,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9928"
|
||||
d="m 917.6162,1489.2037 -0.063,0 -3.528,5.502 3.591,0 0,-5.502 z m 3.275,8.357 0,2.897 -3.296,0 0,-2.897 -6.993,0 0,-2.961 6.047,-9.007 4.221,0 0,9.113 2.058,0 0,2.855 -2.037,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9930"
|
||||
d="m 1126.1367,1476.0943 c 9.404,9.412 9.404,24.67 -0.01,34.076 -9.406,9.412 -24.664,9.412 -34.078,0 -9.404,-9.406 -9.404,-24.662 0.01,-34.068 9.406,-9.412 24.664,-9.412 34.078,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9932"
|
||||
d="m 1108.8857,1500.857 c -2.709,0 -5.165,-1.176 -5.963,-3.947 l 3.275,-0.861 c 0.274,0.987 1.176,1.848 2.52,1.848 1.008,0 2.162,-0.504 2.162,-1.891 0,-1.511 -1.553,-1.952 -3.023,-1.952 l -0.945,0 0,-2.583 1.029,0 c 1.323,0 2.603,-0.336 2.603,-1.763 0,-1.071 -0.902,-1.637 -1.868,-1.637 -1.008,0 -1.806,0.65 -2.036,1.658 l -3.275,-0.756 c 0.712,-2.498 3.064,-3.779 5.542,-3.779 2.625,0 5.228,1.344 5.228,4.199 0,1.638 -1.05,2.856 -2.499,3.234 l 0,0.063 c 1.68,0.398 2.855,1.784 2.855,3.443 0,3.254 -2.876,4.724 -5.605,4.724" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#2f2d2e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9934"
|
||||
d="m 981.9609,1362.252 62.131,0 c 1.629,0 2.953,1.32 2.953,2.949 l 0,62.128 c 0,1.631 -1.324,2.955 -2.953,2.955 l -62.131,0 c -1.631,0 -2.947,-1.324 -2.947,-2.955 l 0,-62.128 c 0,-1.629 1.316,-2.949 2.947,-2.949" /><g
|
||||
@ -15138,7 +15376,43 @@
|
||||
id="path4400-5-11"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15472-7-1"><path
|
||||
d="M 898.14567,1293.4143 L 902.59066,1293.4143 L 908.39123,1301.9365 L 908.39123,1293.4143 L 912.87825,1293.4143 L 912.87825,1308.8195 L 908.39123,1308.8195 L 902.62219,1300.3603 L 902.62219,1308.8195 L 898.14567,1308.8195 L 898.14567,1293.4143 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15724" /><path
|
||||
d="M 914.47551,1293.4143 L 918.99406,1293.4143 L 920.62285,1302.0206 L 922.99771,1293.4143 L 927.50576,1293.4143 L 929.89113,1302.0206 L 931.51992,1293.4143 L 936.01745,1293.4143 L 932.62328,1308.8195 L 927.95761,1308.8195 L 925.25699,1299.1203 L 922.56687,1308.8195 L 917.90121,1308.8195 L 914.47551,1293.4143 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15726" /></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15476-4-9"><path
|
||||
d="M 1094.6491,1293.4143 L 1099.0941,1293.4143 L 1104.8947,1301.9365 L 1104.8947,1293.4143 L 1109.3817,1293.4143 L 1109.3817,1308.8195 L 1104.8947,1308.8195 L 1099.1257,1300.3603 L 1099.1257,1308.8195 L 1094.6491,1308.8195 L 1094.6491,1293.4143 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15729" /><path
|
||||
d="M 1112.5552,1293.4143 L 1125.3123,1293.4143 L 1125.3123,1296.7034 L 1117.326,1296.7034 L 1117.326,1299.1519 L 1124.7343,1299.1519 L 1124.7343,1302.2938 L 1117.326,1302.2938 L 1117.326,1305.3307 L 1125.5434,1305.3307 L 1125.5434,1308.8195 L 1112.5552,1308.8195 L 1112.5552,1293.4143 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15731" /></g><g
|
||||
inkscape:transform-center-x="38.194477"
|
||||
inkscape:transform-center-y="15.277791"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15480-3-2"><path
|
||||
d="M 1094.4126,1495.7417 L 1098.9417,1495.458 Q 1099.0888,1496.5614 1099.5406,1497.1393 Q 1100.2762,1498.0746 1101.6423,1498.0746 Q 1102.6616,1498.0746 1103.208,1497.6017 Q 1103.7649,1497.1183 1103.7649,1496.4878 Q 1103.7649,1495.8889 1103.2395,1495.416 Q 1102.7141,1494.9431 1100.8016,1494.5228 Q 1097.6702,1493.8187 1096.3356,1492.6523 Q 1094.9905,1491.4859 1094.9905,1489.6785 Q 1094.9905,1488.491 1095.6736,1487.4402 Q 1096.3671,1486.3789 1097.7437,1485.7799 Q 1099.1308,1485.1704 1101.5372,1485.1704 Q 1104.49,1485.1704 1106.0347,1486.2738 Q 1107.59,1487.3667 1107.8842,1489.7625 L 1103.3972,1490.0253 Q 1103.2185,1488.9849 1102.6406,1488.5121 Q 1102.0731,1488.0392 1101.0643,1488.0392 Q 1100.2342,1488.0392 1099.8138,1488.3965 Q 1099.3935,1488.7432 1099.3935,1489.2476 Q 1099.3935,1489.6154 1099.7403,1489.9097 Q 1100.0765,1490.2144 1101.3375,1490.4771 Q 1104.4585,1491.1496 1105.8035,1491.8432 Q 1107.1591,1492.5262 1107.7686,1493.5455 Q 1108.3886,1494.5648 1108.3886,1495.8258 Q 1108.3886,1497.3075 1107.5689,1498.558 Q 1106.7493,1499.8084 1105.2781,1500.46 Q 1103.807,1501.101 1101.5687,1501.101 Q 1097.6386,1501.101 1096.1254,1499.5878 Q 1094.6122,1498.0746 1094.4126,1495.7417 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15714" /><path
|
||||
d="M 1110.7845,1485.4331 L 1123.5415,1485.4331 L 1123.5415,1488.7222 L 1115.5552,1488.7222 L 1115.5552,1491.1707 L 1122.9635,1491.1707 L 1122.9635,1494.3126 L 1115.5552,1494.3126 L 1115.5552,1497.3495 L 1123.7727,1497.3495 L 1123.7727,1500.8383 L 1110.7845,1500.8383 L 1110.7845,1485.4331 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15716" /></g><g
|
||||
inkscape:transform-center-x="38.194477"
|
||||
inkscape:transform-center-y="15.277791"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15653-3"><path
|
||||
d="M 898.91033,1495.7417 L 903.43939,1495.458 Q 903.58651,1496.5614 904.03837,1497.1393 Q 904.77394,1498.0746 906.14002,1498.0746 Q 907.15932,1498.0746 907.70575,1497.6017 Q 908.26269,1497.1183 908.26269,1496.4878 Q 908.26269,1495.8889 907.73727,1495.416 Q 907.21186,1494.9431 905.29936,1494.5228 Q 902.16789,1493.8187 900.83334,1492.6523 Q 899.48829,1491.4859 899.48829,1489.6785 Q 899.48829,1488.491 900.17132,1487.4402 Q 900.86487,1486.3789 902.24145,1485.7799 Q 903.62854,1485.1704 906.03494,1485.1704 Q 908.98776,1485.1704 910.53247,1486.2738 Q 912.0877,1487.3667 912.38193,1489.7625 L 907.8949,1490.0253 Q 907.71626,1488.9849 907.1383,1488.5121 Q 906.57086,1488.0392 905.56206,1488.0392 Q 904.73191,1488.0392 904.31158,1488.3965 Q 903.89125,1488.7432 903.89125,1489.2476 Q 903.89125,1489.6154 904.23802,1489.9097 Q 904.57429,1490.2144 905.83528,1490.4771 Q 908.95623,1491.1496 910.30129,1491.8432 Q 911.65686,1492.5262 912.26634,1493.5455 Q 912.88632,1494.5648 912.88632,1495.8258 Q 912.88632,1497.3075 912.06668,1498.558 Q 911.24703,1499.8084 909.77588,1500.46 Q 908.30472,1501.101 906.06646,1501.101 Q 902.13637,1501.101 900.62318,1499.5878 Q 899.10999,1498.0746 898.91033,1495.7417 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15719" /><path
|
||||
d="M 913.70597,1485.4331 L 918.22452,1485.4331 L 919.8533,1494.0394 L 922.22817,1485.4331 L 926.73622,1485.4331 L 929.12159,1494.0394 L 930.75037,1485.4331 L 935.24791,1485.4331 L 931.85374,1500.8383 L 927.18807,1500.8383 L 924.48745,1491.1391 L 921.79733,1500.8383 L 917.13166,1500.8383 L 913.70597,1485.4331 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15721" /></g></g><g
|
||||
id="quad-plus_reverse"
|
||||
transform="matrix(1.25,0,0,-1.25,-146.76331,4948.707)"><g
|
||||
id="g9944"><path
|
||||
@ -15311,34 +15585,18 @@
|
||||
id="path10100"
|
||||
d="m 1644.1719,1536.7109 c 9.404,-9.414 9.404,-24.67 -0.01,-34.076 -9.406,-9.411 -24.664,-9.411 -34.076,-10e-4 -9.402,9.407 -9.404,24.663 0.01,34.069 9.406,9.413 24.664,9.413 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10102"
|
||||
d="m 1626.0713,1511.6689 0,10.918 -2.771,-2.142 -1.828,2.499 4.892,3.59 3.234,0 0,-14.865 -3.527,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10104"
|
||||
d="m 1780.6543,1400.2285 c 9.406,-9.413 9.406,-24.671 -0.01,-34.077 -9.408,-9.41 -24.666,-9.41 -34.078,0 -9.406,9.406 -9.406,24.662 0.01,34.069 9.406,9.412 24.664,9.414 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10106"
|
||||
d="m 1757.1973,1376.1875 0,2.939 5.795,5.249 c 0.735,0.694 1.218,1.386 1.218,2.29 0,1.048 -0.735,1.784 -1.848,1.784 -1.176,0 -1.953,-0.924 -2.1,-2.247 l -3.38,0.463 c 0.336,3.001 2.771,4.786 5.669,4.786 2.729,0 5.375,-1.449 5.375,-4.556 0,-2.121 -1.239,-3.359 -2.603,-4.577 l -3.443,-3.066 6.067,0 0,-3.065 -10.75,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10108"
|
||||
d="m 1509.8086,1400.3457 c 9.404,-9.411 9.404,-24.667 -0.01,-34.075 -9.406,-9.41 -24.664,-9.412 -34.074,0 -9.406,9.406 -9.406,24.664 0.01,34.068 9.406,9.413 24.664,9.413 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10110"
|
||||
d="m 1493.3018,1387.2363 -0.063,0 -3.528,-5.501 3.591,0 0,5.501 z m 3.275,-8.356 0,-2.898 -3.296,0 0,2.898 -6.993,0 0,2.96 6.047,9.007 4.221,0 0,-9.112 2.058,0 0,-2.855 -2.037,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10112"
|
||||
d="m 1645.291,1263.8662 c 9.406,-9.414 9.406,-24.67 -0.01,-34.078 -9.408,-9.41 -24.666,-9.41 -34.078,0 -9.406,9.408 -9.406,24.664 0.01,34.07 9.406,9.412 24.664,9.412 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10114"
|
||||
d="m 1628.04,1239.1035 c -2.708,0 -5.164,1.176 -5.963,3.947 l 3.275,0.861 c 0.274,-0.987 1.176,-1.848 2.52,-1.848 1.008,0 2.163,0.504 2.163,1.891 0,1.511 -1.554,1.952 -3.023,1.952 l -0.945,0 0,2.583 1.029,0 c 1.323,0 2.603,0.336 2.603,1.763 0,1.071 -0.903,1.637 -1.868,1.637 -1.008,0 -1.807,-0.65 -2.037,-1.658 l -3.275,0.756 c 0.713,2.498 3.065,3.779 5.542,3.779 2.625,0 5.229,-1.344 5.229,-4.199 0,-1.638 -1.051,-2.856 -2.499,-3.234 l 0,-0.063 c 1.68,-0.398 2.855,-1.784 2.855,-3.443 0,-3.254 -2.876,-4.724 -5.606,-4.724" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#2f2d2e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10116"
|
||||
d="m 1596.0625,1418.1309 62.131,0 c 1.629,0 2.953,-1.32 2.953,-2.95 l 0,-62.127 c 0,-1.631 -1.324,-2.955 -2.953,-2.955 l -62.131,0 c -1.631,0 -2.947,1.324 -2.947,2.955 l 0,62.127 c 0,1.63 1.316,2.95 2.947,2.95" /><g
|
||||
@ -15466,7 +15724,31 @@
|
||||
id="path4400-5-17"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15472-8-2"><path
|
||||
d="M 1481.9949,-1391.0085 L 1486.5134,-1391.0085 L 1488.1422,-1382.4022 L 1490.5171,-1391.0085 L 1495.0251,-1391.0085 L 1497.4105,-1382.4022 L 1499.0393,-1391.0085 L 1503.5368,-1391.0085 L 1500.1426,-1375.6034 L 1495.477,-1375.6034 L 1492.7763,-1385.3025 L 1490.0862,-1375.6034 L 1485.4206,-1375.6034 L 1481.9949,-1391.0085 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15618" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15476-5-2"><path
|
||||
d="M 1619.763,-1527.3728 L 1624.208,-1527.3728 L 1630.0086,-1518.8506 L 1630.0086,-1527.3728 L 1634.4956,-1527.3728 L 1634.4956,-1511.9677 L 1630.0086,-1511.9677 L 1624.2396,-1520.4268 L 1624.2396,-1511.9677 L 1619.763,-1511.9677 L 1619.763,-1527.3728 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15615" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15480-7-1"><path
|
||||
d="M 1621.259,-1244.2185 L 1625.7881,-1244.5022 Q 1625.9352,-1243.3988 1626.3871,-1242.8209 Q 1627.1226,-1241.8856 1628.4887,-1241.8856 Q 1629.508,-1241.8856 1630.0544,-1242.3585 Q 1630.6114,-1242.8419 1630.6114,-1243.4724 Q 1630.6114,-1244.0713 1630.086,-1244.5442 Q 1629.5606,-1245.0171 1627.6481,-1245.4374 Q 1624.5166,-1246.1415 1623.182,-1247.3079 Q 1621.837,-1248.4743 1621.837,-1250.2817 Q 1621.837,-1251.4692 1622.52,-1252.52 Q 1623.2136,-1253.5813 1624.5901,-1254.1803 Q 1625.9772,-1254.7898 1628.3836,-1254.7898 Q 1631.3365,-1254.7898 1632.8812,-1253.6864 Q 1634.4364,-1252.5935 1634.7306,-1250.1977 L 1630.2436,-1249.935 Q 1630.065,-1250.9753 1629.487,-1251.4481 Q 1628.9196,-1251.921 1627.9108,-1251.921 Q 1627.0806,-1251.921 1626.6603,-1251.5637 Q 1626.2399,-1251.217 1626.2399,-1250.7126 Q 1626.2399,-1250.3448 1626.5867,-1250.0505 Q 1626.923,-1249.7458 1628.184,-1249.4831 Q 1631.3049,-1248.8106 1632.65,-1248.117 Q 1634.0056,-1247.434 1634.615,-1246.4147 Q 1635.235,-1245.3954 1635.235,-1244.1344 Q 1635.235,-1242.6527 1634.4154,-1241.4022 Q 1633.5957,-1240.1518 1632.1246,-1239.5002 Q 1630.6534,-1238.8592 1628.4152,-1238.8592 Q 1624.4851,-1238.8592 1622.9719,-1240.3724 Q 1621.4587,-1241.8856 1621.259,-1244.2185 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15621" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15559-3"><path
|
||||
d="M 1757.121,-1390.8906 L 1769.8781,-1390.8906 L 1769.8781,-1387.6015 L 1761.8918,-1387.6015 L 1761.8918,-1385.1531 L 1769.3001,-1385.1531 L 1769.3001,-1382.0111 L 1761.8918,-1382.0111 L 1761.8918,-1378.9742 L 1770.1092,-1378.9742 L 1770.1092,-1375.4855 L 1757.121,-1375.4855 L 1757.121,-1390.8906 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15612" /></g></g><g
|
||||
id="quad-hexa_reverse"
|
||||
transform="matrix(1.25,0,0,-1.25,-146.76331,4891.382)"><path
|
||||
inkscape:connector-curvature="0"
|
||||
@ -15645,11 +15927,7 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10286"
|
||||
d="m 2312.3633,1564.1504 c 9.404,-9.414 9.404,-24.671 -0.01,-34.076 -9.407,-9.411 -24.664,-9.412 -34.076,0 -9.403,9.408 -9.404,24.663 0.01,34.07 9.405,9.412 24.663,9.412 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10288"
|
||||
d="m 2294.2627,1539.1064 0,10.918 -2.771,-2.142 -1.827,2.499 4.893,3.59 3.232,0 0,-14.865 -3.527,0 z" /><g
|
||||
d="m 2312.3633,1564.1504 c 9.404,-9.414 9.404,-24.671 -0.01,-34.076 -9.407,-9.411 -24.664,-9.412 -34.076,0 -9.403,9.408 -9.404,24.663 0.01,34.07 9.405,9.412 24.663,9.412 34.076,0.01" /><g
|
||||
id="g10290"><g
|
||||
style="opacity:0.5"
|
||||
id="g10292"
|
||||
@ -15691,25 +15969,13 @@
|
||||
id="path10326"
|
||||
d="m 2148.1543,1284.0088 c 9.402,-9.414 9.402,-24.67 -0.01,-34.076 -9.407,-9.41 -24.664,-9.412 -34.077,0 -9.402,9.408 -9.403,24.664 0.01,34.07 9.406,9.412 24.663,9.412 34.078,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10328"
|
||||
d="m 2130.5967,1258.5703 c -2.708,0 -4.955,1.428 -5.647,3.779 l 3.211,0.988 c 0.316,-1.03 1.24,-1.786 2.395,-1.786 1.196,0 2.225,0.735 2.225,2.163 0,1.763 -1.596,2.267 -3.044,2.267 -1.05,0 -2.583,-0.272 -3.632,-0.65 l 0.356,8.504 9.113,0 0,-3.024 -5.985,0 -0.125,-2.351 c 0.441,0.104 1.049,0.146 1.49,0.146 2.982,0 5.375,-1.596 5.375,-4.724 0,-3.612 -2.813,-5.312 -5.732,-5.312" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10330"
|
||||
d="m 2472.8633,1468.7354 c 9.405,-9.412 9.405,-24.669 -0.01,-34.076 -9.407,-9.41 -24.665,-9.41 -34.078,0 -9.405,9.407 -9.405,24.662 0.01,34.068 9.405,9.412 24.663,9.414 34.077,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10332"
|
||||
d="m 2449.4043,1444.6938 0,2.939 5.795,5.249 c 0.735,0.693 1.218,1.386 1.218,2.289 0,1.05 -0.735,1.785 -1.848,1.785 -1.176,0 -1.953,-0.924 -2.1,-2.247 l -3.38,0.462 c 0.336,3.002 2.771,4.787 5.669,4.787 2.729,0 5.375,-1.449 5.375,-4.556 0,-2.121 -1.239,-3.359 -2.603,-4.577 l -3.443,-3.066 6.067,0 0,-3.065 -10.75,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10334"
|
||||
d="m 2311.8711,1190.5596 c 9.405,-9.41 9.405,-24.666 -0.01,-34.074 -9.406,-9.41 -24.664,-9.412 -34.076,0 -9.405,9.406 -9.406,24.664 0.01,34.068 9.406,9.414 24.664,9.412 34.075,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10336"
|
||||
d="m 2295.3643,1177.4561 -0.063,0 -3.527,-5.501 3.59,0 0,5.501 z m 3.275,-8.356 0,-2.898 -3.296,0 0,2.898 -6.991,0 0,2.96 6.047,9.007 4.22,0 0,-9.112 2.058,0 0,-2.855 -2.038,0 z" /><g
|
||||
d="m 2311.8711,1190.5596 c 9.405,-9.41 9.405,-24.666 -0.01,-34.074 -9.406,-9.41 -24.664,-9.412 -34.076,0 -9.405,9.406 -9.406,24.664 0.01,34.068 9.406,9.414 24.664,9.412 34.075,0.01" /><g
|
||||
id="g10338"><g
|
||||
style="opacity:0.5"
|
||||
id="g10340"
|
||||
@ -15751,18 +16017,10 @@
|
||||
id="path10374"
|
||||
d="m 2150.7617,1469.1543 c 9.404,-9.41 9.406,-24.667 -0.01,-34.073 -9.406,-9.412 -24.663,-9.412 -34.075,0 -9.405,9.406 -9.404,24.663 0.01,34.067 9.407,9.414 24.666,9.414 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10376"
|
||||
d="m 2133.499,1452.042 c -1.385,0 -2.352,-0.966 -2.352,-2.352 0,-1.28 0.924,-2.351 2.331,-2.351 1.386,0 2.332,0.966 2.332,2.372 0,1.344 -0.924,2.331 -2.311,2.331 m -0.021,-7.643 c -3.233,0 -5.858,2.058 -5.858,5.312 0,1.764 0.672,3.129 1.659,4.599 l 3.591,5.354 4.262,0 -3.654,-5.081 -0.063,-0.105 c 0.273,0.105 0.715,0.168 1.051,0.168 2.603,0 4.871,-1.953 4.871,-4.851 0,-3.38 -2.647,-5.396 -5.859,-5.396" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10378"
|
||||
d="m 2471.9102,1285.8057 c 9.406,-9.412 9.407,-24.668 -0.01,-34.076 -9.408,-9.41 -24.667,-9.412 -34.08,0 -9.405,9.408 -9.406,24.662 0.01,34.07 9.407,9.412 24.666,9.412 34.078,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10380"
|
||||
d="m 2454.6582,1261.0439 c -2.708,0 -5.165,1.176 -5.963,3.947 l 3.275,0.862 c 0.273,-0.988 1.176,-1.848 2.52,-1.848 1.008,0 2.163,0.504 2.163,1.889 0,1.511 -1.555,1.953 -3.023,1.953 l -0.946,0 0,2.582 1.03,0 c 1.322,0 2.603,0.336 2.603,1.763 0,1.072 -0.903,1.639 -1.869,1.639 -1.008,0 -1.806,-0.651 -2.037,-1.659 l -3.275,0.756 c 0.714,2.499 3.066,3.779 5.543,3.779 2.625,0 5.228,-1.344 5.228,-4.199 0,-1.638 -1.05,-2.856 -2.498,-3.234 l 0,-0.062 c 1.68,-0.399 2.855,-1.785 2.855,-3.443 0,-3.255 -2.877,-4.725 -5.606,-4.725" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#2f2d2e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10382"
|
||||
d="m 2264.7764,1394.3682 62.131,0 c 1.628,0 2.952,-1.32 2.952,-2.949 l 0,-62.127 c 0,-1.631 -1.324,-2.955 -2.952,-2.955 l -62.131,0 c -1.631,0 -2.948,1.324 -2.948,2.955 l 0,62.127 c 0,1.629 1.317,2.949 2.948,2.949" /><g
|
||||
@ -15890,7 +16148,59 @@
|
||||
id="path4400-5-02"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15476-44-7"><path
|
||||
d="M 2287.9542,-1554.8127 L 2292.3992,-1554.8127 L 2298.1998,-1546.2905 L 2298.1998,-1554.8127 L 2302.6868,-1554.8127 L 2302.6868,-1539.4076 L 2298.1998,-1539.4076 L 2292.4307,-1547.8667 L 2292.4307,-1539.4076 L 2287.9542,-1539.4076 L 2287.9542,-1554.8127 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16079" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15992-7"><path
|
||||
d="M 2440.3722,-1459.3977 L 2444.8172,-1459.3977 L 2450.6177,-1450.8755 L 2450.6177,-1459.3977 L 2455.1048,-1459.3977 L 2455.1048,-1443.9926 L 2450.6177,-1443.9926 L 2444.8487,-1452.4517 L 2444.8487,-1443.9926 L 2440.3722,-1443.9926 L 2440.3722,-1459.3977 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16074" /><path
|
||||
d="M 2458.2783,-1459.3977 L 2471.0353,-1459.3977 L 2471.0353,-1456.1086 L 2463.049,-1456.1086 L 2463.049,-1453.6602 L 2470.4573,-1453.6602 L 2470.4573,-1450.5182 L 2463.049,-1450.5182 L 2463.049,-1447.4813 L 2471.2665,-1447.4813 L 2471.2665,-1443.9926 L 2458.2783,-1443.9926 L 2458.2783,-1459.3977 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16076" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15996-1"><path
|
||||
d="M 2440.1855,-1266.1596 L 2444.7146,-1266.4433 Q 2444.8617,-1265.34 2445.3136,-1264.762 Q 2446.0492,-1263.8268 2447.4152,-1263.8268 Q 2448.4345,-1263.8268 2448.981,-1264.2997 Q 2449.5379,-1264.783 2449.5379,-1265.4135 Q 2449.5379,-1266.0125 2449.0125,-1266.4854 Q 2448.4871,-1266.9582 2446.5746,-1267.3786 Q 2443.4431,-1268.0826 2442.1086,-1269.249 Q 2440.7635,-1270.4155 2440.7635,-1272.2229 Q 2440.7635,-1273.4103 2441.4465,-1274.4611 Q 2442.1401,-1275.5225 2443.5167,-1276.1215 Q 2444.9038,-1276.7309 2447.3101,-1276.7309 Q 2450.263,-1276.7309 2451.8077,-1275.6276 Q 2453.3629,-1274.5347 2453.6571,-1272.1388 L 2449.1701,-1271.8761 Q 2448.9915,-1272.9164 2448.4135,-1273.3893 Q 2447.8461,-1273.8622 2446.8373,-1273.8622 Q 2446.0071,-1273.8622 2445.5868,-1273.5049 Q 2445.1665,-1273.1581 2445.1665,-1272.6537 Q 2445.1665,-1272.2859 2445.5132,-1271.9917 Q 2445.8495,-1271.687 2447.1105,-1271.4243 Q 2450.2314,-1270.7517 2451.5765,-1270.0582 Q 2452.9321,-1269.3751 2453.5415,-1268.3558 Q 2454.1615,-1267.3365 2454.1615,-1266.0756 Q 2454.1615,-1264.5939 2453.3419,-1263.3434 Q 2452.5222,-1262.0929 2451.0511,-1261.4414 Q 2449.5799,-1260.8004 2447.3417,-1260.8004 Q 2443.4116,-1260.8004 2441.8984,-1262.3136 Q 2440.3852,-1263.8268 2440.1855,-1266.1596 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16069" /><path
|
||||
d="M 2456.5574,-1276.4682 L 2469.3144,-1276.4682 L 2469.3144,-1273.1791 L 2461.3282,-1273.1791 L 2461.3282,-1270.7307 L 2468.7365,-1270.7307 L 2468.7365,-1267.5887 L 2461.3282,-1267.5887 L 2461.3282,-1264.5519 L 2469.5456,-1264.5519 L 2469.5456,-1261.0631 L 2456.5574,-1261.0631 L 2456.5574,-1276.4682 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16071" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16000-4"><path
|
||||
d="M 2287.8398,-1170.9147 L 2292.3689,-1171.1985 Q 2292.516,-1170.0951 2292.9679,-1169.5171 Q 2293.7034,-1168.5819 2295.0695,-1168.5819 Q 2296.0888,-1168.5819 2296.6353,-1169.0548 Q 2297.1922,-1169.5382 2297.1922,-1170.1687 Q 2297.1922,-1170.7676 2296.6668,-1171.2405 Q 2296.1414,-1171.7134 2294.2289,-1172.1337 Q 2291.0974,-1172.8378 2289.7628,-1174.0042 Q 2288.4178,-1175.1706 2288.4178,-1176.978 Q 2288.4178,-1178.1654 2289.1008,-1179.2163 Q 2289.7944,-1180.2776 2291.171,-1180.8766 Q 2292.558,-1181.4861 2294.9644,-1181.4861 Q 2297.9173,-1181.4861 2299.462,-1180.3827 Q 2301.0172,-1179.2898 2301.3114,-1176.8939 L 2296.8244,-1176.6312 Q 2296.6458,-1177.6716 2296.0678,-1178.1444 Q 2295.5004,-1178.6173 2294.4916,-1178.6173 Q 2293.6614,-1178.6173 2293.2411,-1178.26 Q 2292.8208,-1177.9132 2292.8208,-1177.4089 Q 2292.8208,-1177.0411 2293.1675,-1176.7468 Q 2293.5038,-1176.4421 2294.7648,-1176.1794 Q 2297.8857,-1175.5069 2299.2308,-1174.8133 Q 2300.5864,-1174.1303 2301.1958,-1173.111 Q 2301.8158,-1172.0917 2301.8158,-1170.8307 Q 2301.8158,-1169.349 2300.9962,-1168.0985 Q 2300.1765,-1166.848 2298.7054,-1166.1965 Q 2297.2342,-1165.5555 2294.996,-1165.5555 Q 2291.0659,-1165.5555 2289.5527,-1167.0687 Q 2288.0395,-1168.5819 2287.8398,-1170.9147 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16061" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16004-5"><path
|
||||
d="M 2112.9419,-1264.3627 L 2117.4709,-1264.6465 Q 2117.6181,-1263.5431 2118.0699,-1262.9651 Q 2118.8055,-1262.0299 2120.1716,-1262.0299 Q 2121.1909,-1262.0299 2121.7373,-1262.5028 Q 2122.2942,-1262.9862 2122.2942,-1263.6167 Q 2122.2942,-1264.2156 2121.7688,-1264.6885 Q 2121.2434,-1265.1614 2119.3309,-1265.5817 Q 2116.1994,-1266.2858 2114.8649,-1267.4522 Q 2113.5198,-1268.6186 2113.5198,-1270.426 Q 2113.5198,-1271.6134 2114.2029,-1272.6643 Q 2114.8964,-1273.7256 2116.273,-1274.3246 Q 2117.6601,-1274.9341 2120.0665,-1274.9341 Q 2123.0193,-1274.9341 2124.564,-1273.8307 Q 2126.1193,-1272.7378 2126.4135,-1270.3419 L 2121.9265,-1270.0792 Q 2121.7478,-1271.1196 2121.1699,-1271.5924 Q 2120.6024,-1272.0653 2119.5936,-1272.0653 Q 2118.7635,-1272.0653 2118.3431,-1271.708 Q 2117.9228,-1271.3612 2117.9228,-1270.8569 Q 2117.9228,-1270.4891 2118.2696,-1270.1948 Q 2118.6058,-1269.8901 2119.8668,-1269.6274 Q 2122.9878,-1268.9549 2124.3328,-1268.2613 Q 2125.6884,-1267.5783 2126.2979,-1266.559 Q 2126.9179,-1265.5397 2126.9179,-1264.2787 Q 2126.9179,-1262.797 2126.0982,-1261.5465 Q 2125.2786,-1260.296 2123.8074,-1259.6445 Q 2122.3363,-1259.0035 2120.098,-1259.0035 Q 2116.1679,-1259.0035 2114.6547,-1260.5167 Q 2113.1415,-1262.0299 2112.9419,-1264.3627 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16064" /><path
|
||||
d="M 2127.7375,-1274.6714 L 2132.2561,-1274.6714 L 2133.8849,-1266.0651 L 2136.2597,-1274.6714 L 2140.7678,-1274.6714 L 2143.1531,-1266.0651 L 2144.7819,-1274.6714 L 2149.2795,-1274.6714 L 2145.8853,-1259.2662 L 2141.2196,-1259.2662 L 2138.519,-1268.9654 L 2135.8289,-1259.2662 L 2131.1632,-1259.2662 L 2127.7375,-1274.6714 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16066" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16008-5"><path
|
||||
d="M 2114.7835,-1459.8186 L 2119.2285,-1459.8186 L 2125.0291,-1451.2964 L 2125.0291,-1459.8186 L 2129.5161,-1459.8186 L 2129.5161,-1444.4135 L 2125.0291,-1444.4135 L 2119.2601,-1452.8726 L 2119.2601,-1444.4135 L 2114.7835,-1444.4135 L 2114.7835,-1459.8186 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16082" /><path
|
||||
d="M 2131.1134,-1459.8186 L 2135.6319,-1459.8186 L 2137.2607,-1451.2123 L 2139.6356,-1459.8186 L 2144.1436,-1459.8186 L 2146.529,-1451.2123 L 2148.1578,-1459.8186 L 2152.6553,-1459.8186 L 2149.2612,-1444.4135 L 2144.5955,-1444.4135 L 2141.8949,-1454.1126 L 2139.2048,-1444.4135 L 2134.5391,-1444.4135 L 2131.1134,-1459.8186 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16084" /></g></g><g
|
||||
id="quad-octo_reverse"
|
||||
transform="matrix(1.25,0,0,1.25,-146.76331,1532.0945)"><path
|
||||
inkscape:connector-curvature="0"
|
||||
@ -16004,17 +16314,9 @@
|
||||
id="path10480"
|
||||
d="m 3231.1162,1452.9903 c 9.404,9.41 9.405,24.666 -0.01,34.074 -9.406,9.408 -24.66,9.412 -34.072,0 -9.406,-9.406 -9.408,-24.664 0,-34.068 9.407,-9.412 24.664,-9.414 34.076,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10482"
|
||||
d="m 3214.6104,1466.0918 -0.063,0 -3.527,5.5 3.59,0 0,-5.5 z m 3.275,8.355 0,2.899 -3.296,0 0,-2.899 -6.992,0 0,-2.959 6.047,-9.007 4.22,0 0,9.111 2.059,0 0,2.855 -2.038,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10484"
|
||||
d="m 3302.04,1280.0137 c 9.406,9.416 9.406,24.672 -0.01,34.08 -9.408,9.41 -24.664,9.412 -34.078,0 -9.407,-9.408 -9.407,-24.662 0.01,-34.068 9.407,-9.414 24.666,-9.412 34.08,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10486"
|
||||
d="m 3284.7871,1304.7774 c -2.708,0 -5.165,-1.176 -5.963,-3.947 l 3.275,-0.862 c 0.273,0.987 1.176,1.848 2.52,1.848 1.008,0 2.163,-0.504 2.163,-1.89 0,-1.511 -1.555,-1.952 -3.023,-1.952 l -0.946,0 0,-2.583 1.03,0 c 1.322,0 2.603,-0.336 2.603,-1.763 0,-1.072 -0.903,-1.638 -1.869,-1.638 -1.008,0 -1.806,0.65 -2.037,1.658 l -3.275,-0.756 c 0.714,-2.498 3.066,-3.779 5.543,-3.779 2.625,0 5.228,1.344 5.228,4.199 0,1.639 -1.05,2.856 -2.498,3.235 l 0,0.062 c 1.68,0.398 2.855,1.785 2.855,3.443 0,3.254 -2.877,4.725 -5.606,4.725" /><g
|
||||
d="m 3302.04,1280.0137 c 9.406,9.416 9.406,24.672 -0.01,34.08 -9.408,9.41 -24.664,9.412 -34.078,0 -9.407,-9.408 -9.407,-24.662 0.01,-34.068 9.407,-9.414 24.666,-9.412 34.08,-0.01" /><g
|
||||
id="g10488"
|
||||
transform="matrix(1,0,0,-1,0,2590.6553)"><g
|
||||
style="opacity:0.5"
|
||||
@ -16094,17 +16396,9 @@
|
||||
id="path10560"
|
||||
d="m 3232.1885,1106.4502 c 9.404,9.414 9.403,24.669 -0.01,34.074 -9.406,9.412 -24.664,9.412 -34.074,0 -9.406,-9.41 -9.407,-24.665 0.01,-34.07 9.405,-9.413 24.664,-9.413 34.076,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10562"
|
||||
d="m 3210.2393,1130.8067 0,-2.939 5.795,-5.249 c 0.734,-0.693 1.218,-1.386 1.218,-2.289 0,-1.05 -0.736,-1.785 -1.848,-1.785 -1.176,0 -1.952,0.924 -2.1,2.247 l -3.379,-0.462 c 0.335,-3.002 2.771,-4.787 5.668,-4.787 2.73,0 5.375,1.449 5.375,4.556 0,2.121 -1.239,3.359 -2.604,4.577 l -3.443,3.066 6.068,0 0,3.065 -10.75,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10564"
|
||||
d="m 3060.6943,1036.1319 c 9.408,9.414 9.408,24.67 -0.01,34.078 -9.407,9.41 -24.667,9.411 -34.078,0 -9.406,-9.406 -9.406,-24.662 0.01,-34.07 9.406,-9.414 24.664,-9.41 34.076,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10566"
|
||||
d="m 3042.751,1060.4961 0,-10.918 -2.771,2.142 -1.828,-2.499 4.892,-3.59 3.234,0 0,14.865 -3.527,0 z" /><g
|
||||
d="m 3060.6943,1036.1319 c 9.408,9.414 9.408,24.67 -0.01,34.078 -9.407,9.41 -24.667,9.411 -34.078,0 -9.406,-9.406 -9.406,-24.662 0.01,-34.07 9.406,-9.414 24.664,-9.41 34.076,-0.01" /><g
|
||||
id="g10568"
|
||||
transform="matrix(1,0,0,-1,0,2590.6553)"><g
|
||||
style="opacity:0.5"
|
||||
@ -16184,17 +16478,9 @@
|
||||
id="path10640"
|
||||
d="m 2887.8545,1106.7998 c 9.406,9.412 9.406,24.666 -0.01,34.073 -9.406,9.411 -24.663,9.412 -34.075,0 -9.405,-9.405 -9.405,-24.663 0.01,-34.068 9.406,-9.413 24.662,-9.411 34.074,0" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10642"
|
||||
d="m 2870.5928,1118.6216 c -1.051,0 -1.764,0.735 -1.764,1.701 0,0.945 0.672,1.763 1.764,1.763 1.028,0 1.784,-0.818 1.784,-1.763 0,-0.966 -0.798,-1.701 -1.784,-1.701 m 0,6.152 c -1.219,0 -2.079,0.861 -2.079,2.015 0,1.197 0.86,1.974 2.079,1.974 1.217,0 2.057,-0.777 2.057,-1.974 0,-1.133 -0.861,-2.015 -2.057,-2.015 m 0,6.782 c -2.939,0 -5.586,-1.491 -5.586,-4.62 0,-1.805 1.219,-3.086 2.667,-3.548 l 0,-0.042 c -1.28,-0.483 -2.268,-1.575 -2.268,-3.212 0,-2.751 2.436,-4.241 5.187,-4.241 2.729,0 5.186,1.427 5.186,4.178 0,1.637 -0.946,2.813 -2.268,3.254 l 0,0.063 c 1.49,0.42 2.666,1.785 2.666,3.527 0,3.129 -2.645,4.641 -5.584,4.641" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10644"
|
||||
d="m 2816.1475,1276.7676 c 9.406,9.412 9.406,24.668 -0.01,34.074 -9.406,9.412 -24.666,9.41 -34.078,0 -9.408,-9.406 -9.406,-24.66 0.01,-34.07 9.407,-9.41 24.663,-9.41 34.077,0" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10646"
|
||||
d="m 2798.6836,1301.1289 -4.095,0 6.027,-11.842 -7.035,0 0,-3.023 10.793,0 0,2.814 -5.69,12.051 z" /><g
|
||||
d="m 2816.1475,1276.7676 c 9.406,9.412 9.406,24.668 -0.01,34.074 -9.406,9.412 -24.666,9.41 -34.078,0 -9.408,-9.406 -9.406,-24.66 0.01,-34.07 9.407,-9.41 24.663,-9.41 34.077,0" /><g
|
||||
id="g10648"
|
||||
transform="matrix(1,0,0,-1,0,2590.6553)"><g
|
||||
style="opacity:0.5"
|
||||
@ -16274,17 +16560,9 @@
|
||||
id="path10720"
|
||||
d="m 2883.2217,1451.0664 c 9.404,9.41 9.404,24.666 -0.01,34.074 -9.406,9.41 -24.665,9.41 -34.075,0 -9.405,-9.408 -9.405,-24.662 0.01,-34.068 9.404,-9.412 24.661,-9.414 34.074,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10722"
|
||||
d="m 2865.9639,1468.1641 c -1.387,0 -2.352,0.967 -2.352,2.352 0,1.281 0.924,2.351 2.331,2.351 1.385,0 2.33,-0.965 2.33,-2.372 0,-1.344 -0.924,-2.331 -2.309,-2.331 m -0.021,7.643 c -3.234,0 -5.858,-2.057 -5.858,-5.312 0,-1.764 0.672,-3.128 1.658,-4.599 l 3.59,-5.353 4.263,0 -3.653,5.081 -0.063,0.104 c 0.272,-0.104 0.713,-0.168 1.049,-0.168 2.603,0 4.871,1.954 4.871,4.851 0,3.38 -2.645,5.396 -5.857,5.396" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10724"
|
||||
d="m 3056.3213,1521.1836 c 9.408,9.414 9.406,24.668 -0.01,34.076 -9.406,9.41 -24.667,9.41 -34.079,0 -9.406,-9.41 -9.404,-24.664 0.01,-34.068 9.406,-9.412 24.666,-9.414 34.078,-0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10726"
|
||||
d="m 3038.9287,1545.9278 c -2.709,0 -4.955,-1.428 -5.648,-3.779 l 3.212,-0.988 c 0.315,1.029 1.239,1.785 2.393,1.785 1.197,0 2.227,-0.735 2.227,-2.163 0,-1.763 -1.596,-2.267 -3.045,-2.267 -1.05,0 -2.582,0.273 -3.633,0.65 l 0.357,-8.503 9.113,0 0,3.024 -5.984,0 -0.127,2.351 c 0.442,-0.104 1.051,-0.147 1.491,-0.147 2.982,0 5.375,1.596 5.375,4.724 0,3.612 -2.813,5.313 -5.731,5.313" /><g
|
||||
d="m 3056.3213,1521.1836 c 9.408,9.414 9.406,24.668 -0.01,34.076 -9.406,9.41 -24.667,9.41 -34.079,0 -9.406,-9.41 -9.404,-24.664 0.01,-34.068 9.406,-9.412 24.666,-9.414 34.078,-0.01" /><g
|
||||
id="g10728"
|
||||
transform="matrix(1,0,0,-1,0,2590.6553)"><path
|
||||
inkscape:connector-curvature="0"
|
||||
@ -16421,7 +16699,63 @@
|
||||
id="path4400-5-42"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15476-44-6-9-2"><path
|
||||
d="M 2788.3323,1286.1044 L 2792.8508,1286.1044 L 2794.4796,1294.7107 L 2796.8545,1286.1044 L 2801.3625,1286.1044 L 2803.7479,1294.7107 L 2805.3767,1286.1044 L 2809.8742,1286.1044 L 2806.48,1301.5095 L 2801.8144,1301.5095 L 2799.1137,1291.8104 L 2796.4236,1301.5095 L 2791.758,1301.5095 L 2788.3323,1286.1044 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16401" /></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15992-1-2-6"><path
|
||||
d="M 3199.42,1116.6579 L 3203.865,1116.6579 L 3209.6656,1125.1801 L 3209.6656,1116.6579 L 3214.1526,1116.6579 L 3214.1526,1132.063 L 3209.6656,1132.063 L 3203.8965,1123.6038 L 3203.8965,1132.063 L 3199.42,1132.063 L 3199.42,1116.6579 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16380" /><path
|
||||
d="M 3217.3261,1116.6579 L 3230.0831,1116.6579 L 3230.0831,1119.947 L 3222.0969,1119.947 L 3222.0969,1122.3954 L 3229.5052,1122.3954 L 3229.5052,1125.5374 L 3222.0969,1125.5374 L 3222.0969,1128.5742 L 3230.3143,1128.5742 L 3230.3143,1132.063 L 3217.3261,1132.063 L 3217.3261,1116.6579 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16382" /></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15996-0-3-1"><path
|
||||
d="M 3199.3935,1472.6346 L 3203.9226,1472.3508 Q 3204.0697,1473.4542 3204.5216,1474.0322 Q 3205.2572,1474.9674 3206.6232,1474.9674 Q 3207.6425,1474.9674 3208.189,1474.4945 Q 3208.7459,1474.0112 3208.7459,1473.3807 Q 3208.7459,1472.7817 3208.2205,1472.3088 Q 3207.6951,1471.8359 3205.7826,1471.4156 Q 3202.6511,1470.7116 3201.3166,1469.5451 Q 3199.9715,1468.3787 3199.9715,1466.5713 Q 3199.9715,1465.3839 3200.6545,1464.333 Q 3201.3481,1463.2717 3202.7247,1462.6727 Q 3204.1118,1462.0633 3206.5182,1462.0633 Q 3209.471,1462.0633 3211.0157,1463.1666 Q 3212.5709,1464.2595 3212.8651,1466.6554 L 3208.3781,1466.9181 Q 3208.1995,1465.8778 3207.6215,1465.4049 Q 3207.0541,1464.932 3206.0453,1464.932 Q 3205.2151,1464.932 3204.7948,1465.2893 Q 3204.3745,1465.6361 3204.3745,1466.1405 Q 3204.3745,1466.5083 3204.7212,1466.8025 Q 3205.0575,1467.1072 3206.3185,1467.3699 Q 3209.4394,1468.0425 3210.7845,1468.736 Q 3212.1401,1469.419 3212.7496,1470.4383 Q 3213.3695,1471.4576 3213.3695,1472.7186 Q 3213.3695,1474.2003 3212.5499,1475.4508 Q 3211.7303,1476.7013 3210.2591,1477.3528 Q 3208.7879,1477.9938 3206.5497,1477.9938 Q 3202.6196,1477.9938 3201.1064,1476.4806 Q 3199.5932,1474.9674 3199.3935,1472.6346 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16388" /><path
|
||||
d="M 3215.7654,1462.326 L 3228.5225,1462.326 L 3228.5225,1465.6151 L 3220.5362,1465.6151 L 3220.5362,1468.0635 L 3227.9445,1468.0635 L 3227.9445,1471.2054 L 3220.5362,1471.2054 L 3220.5362,1474.2423 L 3228.7536,1474.2423 L 3228.7536,1477.7311 L 3215.7654,1477.7311 L 3215.7654,1462.326 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16390" /></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16000-48-6-0"><path
|
||||
d="M 3278.5015,1289.3557 L 3291.2586,1289.3557 L 3291.2586,1292.6448 L 3283.2723,1292.6448 L 3283.2723,1295.0933 L 3290.6806,1295.0933 L 3290.6806,1298.2352 L 3283.2723,1298.2352 L 3283.2723,1301.2721 L 3291.4897,1301.2721 L 3291.4897,1304.7609 L 3278.5015,1304.7609 L 3278.5015,1289.3557 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16385" /></g><g
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16004-6-9-4"><path
|
||||
d="M 2848.01,1470.7107 L 2852.5391,1470.427 Q 2852.6862,1471.5304 2853.138,1472.1083 Q 2853.8736,1473.0436 2855.2397,1473.0436 Q 2856.259,1473.0436 2856.8054,1472.5707 Q 2857.3624,1472.0873 2857.3624,1471.4568 Q 2857.3624,1470.8579 2856.8369,1470.385 Q 2856.3115,1469.9121 2854.399,1469.4918 Q 2851.2676,1468.7877 2849.933,1467.6213 Q 2848.588,1466.4549 2848.588,1464.6475 Q 2848.588,1463.46 2849.271,1462.4092 Q 2849.9645,1461.3479 2851.3411,1460.7489 Q 2852.7282,1460.1394 2855.1346,1460.1394 Q 2858.0874,1460.1394 2859.6321,1461.2428 Q 2861.1874,1462.3357 2861.4816,1464.7315 L 2856.9946,1464.9942 Q 2856.8159,1463.9539 2856.238,1463.4811 Q 2855.6705,1463.0082 2854.6617,1463.0082 Q 2853.8316,1463.0082 2853.4113,1463.3655 Q 2852.9909,1463.7122 2852.9909,1464.2166 Q 2852.9909,1464.5844 2853.3377,1464.8787 Q 2853.674,1465.1834 2854.9349,1465.4461 Q 2858.0559,1466.1186 2859.401,1466.8122 Q 2860.7565,1467.4952 2861.366,1468.5145 Q 2861.986,1469.5338 2861.986,1470.7948 Q 2861.986,1472.2765 2861.1663,1473.527 Q 2860.3467,1474.7774 2858.8755,1475.429 Q 2857.4044,1476.07 2855.1661,1476.07 Q 2851.236,1476.07 2849.7228,1474.5568 Q 2848.2097,1473.0436 2848.01,1470.7107 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16396" /><path
|
||||
d="M 2862.8056,1460.4021 L 2867.3242,1460.4021 L 2868.953,1469.0084 L 2871.3278,1460.4021 L 2875.8359,1460.4021 L 2878.2213,1469.0084 L 2879.85,1460.4021 L 2884.3476,1460.4021 L 2880.9534,1475.8073 L 2876.2877,1475.8073 L 2873.5871,1466.1081 L 2870.897,1475.8073 L 2866.2313,1475.8073 L 2862.8056,1460.4021 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16398" /></g><g
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16008-9-6-0"><path
|
||||
d="M 2851.8766,1116.136 L 2856.3216,1116.136 L 2862.1221,1124.6582 L 2862.1221,1116.136 L 2866.6091,1116.136 L 2866.6091,1131.5411 L 2862.1221,1131.5411 L 2856.3531,1123.082 L 2856.3531,1131.5411 L 2851.8766,1131.5411 L 2851.8766,1116.136 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16372" /><path
|
||||
d="M 2868.2064,1116.136 L 2872.725,1116.136 L 2874.3537,1124.7423 L 2876.7286,1116.136 L 2881.2367,1116.136 L 2883.622,1124.7423 L 2885.2508,1116.136 L 2889.7483,1116.136 L 2886.3542,1131.5411 L 2881.6885,1131.5411 L 2878.9879,1121.842 L 2876.2978,1131.5411 L 2871.6321,1131.5411 L 2868.2064,1116.136 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16374" /></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16339"><path
|
||||
d="M 3036.2848,1045.4711 L 3040.7298,1045.4711 L 3046.5303,1053.9933 L 3046.5303,1045.4711 L 3051.0174,1045.4711 L 3051.0174,1060.8762 L 3046.5303,1060.8762 L 3040.7613,1052.4171 L 3040.7613,1060.8762 L 3036.2848,1060.8762 L 3036.2848,1045.4711 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16377" /></g><g
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16343"><path
|
||||
d="M 3032.2895,1540.8299 L 3036.8186,1540.5462 Q 3036.9657,1541.6495 3037.4176,1542.2275 Q 3038.1532,1543.1627 3039.5192,1543.1627 Q 3040.5385,1543.1627 3041.085,1542.6898 Q 3041.6419,1542.2065 3041.6419,1541.576 Q 3041.6419,1540.977 3041.1165,1540.5041 Q 3040.5911,1540.0313 3038.6786,1539.6109 Q 3035.5471,1538.9069 3034.2126,1537.7405 Q 3032.8675,1536.574 3032.8675,1534.7666 Q 3032.8675,1533.5792 3033.5505,1532.5284 Q 3034.2441,1531.467 3035.6207,1530.868 Q 3037.0078,1530.2586 3039.4141,1530.2586 Q 3042.367,1530.2586 3043.9117,1531.3619 Q 3045.4669,1532.4548 3045.7611,1534.8507 L 3041.2741,1535.1134 Q 3041.0955,1534.0731 3040.5175,1533.6002 Q 3039.9501,1533.1273 3038.9413,1533.1273 Q 3038.1111,1533.1273 3037.6908,1533.4846 Q 3037.2705,1533.8314 3037.2705,1534.3358 Q 3037.2705,1534.7036 3037.6172,1534.9978 Q 3037.9535,1535.3025 3039.2145,1535.5652 Q 3042.3354,1536.2378 3043.6805,1536.9313 Q 3045.0361,1537.6144 3045.6455,1538.6337 Q 3046.2655,1539.653 3046.2655,1540.9139 Q 3046.2655,1542.3956 3045.4459,1543.6461 Q 3044.6262,1544.8966 3043.1551,1545.5481 Q 3041.6839,1546.1891 3039.4457,1546.1891 Q 3035.5156,1546.1891 3034.0024,1544.6759 Q 3032.4892,1543.1627 3032.2895,1540.8299 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16393" /></g></g><g
|
||||
id="octo-coax-X_reverse"
|
||||
transform="matrix(1.25,0,0,-1.25,-146.76331,3568.3686)"><g
|
||||
id="g14046"
|
||||
@ -16579,10 +16913,6 @@
|
||||
id="path13833"
|
||||
d="m 826.062,940.249 c 1.294,31.436 27.177,56.539 58.929,56.525 23.84,0.006 44.363,-14.142 53.666,-34.5 l -17.443,-17.443 c -3.242,9.352 -12.11,16.07 -22.572,16.068 -12.092,0.008 -22.065,-8.99 -23.663,-20.65 l 11.106,0 -10.303,-10.301 -17.845,-17.845 -7.456,-7.456 -35.601,35.602 11.182,0 z" /></g></g></g></g></g></g><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10938"
|
||||
d="m 1131.1748,939.6729 -0.063,0 -3.528,-5.5 3.591,0 0,5.5 z m 3.275,-8.355 0,-2.899 -3.296,0 0,2.899 -6.993,0 0,2.959 6.047,9.007 4.221,0 0,-9.111 2.058,0 0,-2.855 -2.037,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#100f0d;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10940"
|
||||
d="m 914.9248,953.9619 c 9.406,-9.412 9.406,-24.668 -0.006,-34.074 -9.406,-9.412 -24.664,-9.412 -34.076,0 -9.404,9.406 -9.404,24.662 0.008,34.066 9.406,9.414 24.664,9.414 34.074,0.008" /><g
|
||||
@ -16667,10 +16997,6 @@
|
||||
id="path10972"
|
||||
d="m 947.401,966.712 c -1.297,31.434 -27.179,56.541 -58.933,56.529 -23.84,0 -44.364,-14.144 -53.666,-34.502 l 17.443,-17.443 c 3.242,9.351 12.109,16.068 22.572,16.066 12.094,0.01 22.067,-8.99 23.664,-20.65 l -11.105,0.002 10.303,-10.303 17.845,-17.846 7.457,-7.457 35.6,35.602 -11.18,0.002 z" /></g></g></g></g></g></g><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10974"
|
||||
d="m 892.3096,929.6025 0,2.939 5.795,5.25 c 0.734,0.693 1.218,1.385 1.218,2.289 0,1.049 -0.736,1.784 -1.848,1.784 -1.176,0 -1.952,-0.924 -2.1,-2.246 l -3.379,0.462 c 0.335,3.002 2.771,4.787 5.668,4.787 2.73,0 5.375,-1.449 5.375,-4.556 0,-2.121 -1.239,-3.359 -2.604,-4.578 l -3.443,-3.065 6.068,0 0,-3.066 -10.75,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#2e2d2d;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path10976"
|
||||
d="m 1121.4482,945.208 c 2.596,2.594 3.242,6.152 1.445,7.947 -1.795,1.797 -5.353,1.151 -7.949,-1.445 L 881.9072,718.671 c -2.596,-2.596 -3.242,-6.154 -1.445,-7.949 1.795,-1.795 5.353,-1.149 7.945,1.443 l 233.041,233.043 z" /><path
|
||||
@ -16687,10 +17013,6 @@
|
||||
id="path11018"
|
||||
d="m 1125.8779,980.2139 c 9.404,-9.412 9.404,-24.67 -0.01,-34.076 -9.406,-9.41 -24.664,-9.41 -34.078,0 -9.404,9.406 -9.404,24.662 0.01,34.068 9.406,9.412 24.664,9.414 34.078,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11020"
|
||||
d="m 1107.6279,955.7725 c -2.709,0 -5.166,1.176 -5.963,3.947 l 3.275,0.862 c 0.273,-0.987 1.176,-1.848 2.52,-1.848 1.008,0 2.162,0.504 2.162,1.89 0,1.511 -1.554,1.952 -3.023,1.952 l -0.946,0 0,2.583 1.03,0 c 1.322,0 2.603,0.336 2.603,1.763 0,1.072 -0.902,1.638 -1.869,1.638 -1.008,0 -1.805,-0.65 -2.036,-1.658 l -3.275,0.756 c 0.713,2.498 3.065,3.779 5.543,3.779 2.624,0 5.227,-1.344 5.227,-4.199 0,-1.639 -1.049,-2.856 -2.498,-3.235 l 0,-0.062 c 1.68,-0.398 2.855,-1.785 2.855,-3.443 0,-3.254 -2.876,-4.725 -5.605,-4.725" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#100f0d;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11022"
|
||||
d="m 911.292,717.3389 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.408,-9.41 -24.664,-9.41 -34.076,0 -9.404,9.406 -9.404,24.662 0.008,34.068 9.404,9.414 24.662,9.414 34.076,0.008" /><g
|
||||
@ -16769,37 +17091,17 @@
|
||||
id="path11060"
|
||||
d="m 892.292,980.9619 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.408,-9.41 -24.664,-9.41 -34.076,0 -9.404,9.406 -9.404,24.662 0.008,34.068 9.404,9.414 24.662,9.414 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11062"
|
||||
d="m 874.1904,955.9189 0,10.918 -2.771,-2.142 -1.828,2.499 4.892,3.59 3.234,0 0,-14.865 -3.527,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11064"
|
||||
d="m 887.9248,740.3389 c 9.406,-9.412 9.406,-24.668 -0.006,-34.074 -9.406,-9.412 -24.664,-9.412 -34.076,0 -9.404,9.406 -9.404,24.662 0.008,34.066 9.406,9.414 24.664,9.414 34.074,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11066"
|
||||
d="m 870.3066,715.9795 -4.095,0 6.027,11.842 -7.035,0 0,3.023 10.793,0 0,-2.812 -5.69,-12.053 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11068"
|
||||
d="m 1123.9111,742.2803 c 9.404,-9.41 9.404,-24.666 -0.01,-34.074 -9.406,-9.41 -24.664,-9.412 -34.074,0 -9.406,9.406 -9.406,24.664 0.01,34.068 9.406,9.412 24.664,9.412 34.076,0.006" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11070"
|
||||
d="m 1106.3545,717.5225 c -2.708,0 -4.955,1.428 -5.647,3.779 l 3.211,0.988 c 0.316,-1.029 1.24,-1.785 2.395,-1.785 1.196,0 2.225,0.735 2.225,2.163 0,1.763 -1.596,2.267 -3.044,2.267 -1.05,0 -2.583,-0.273 -3.632,-0.65 l 0.356,8.503 9.113,0 0,-3.024 -5.985,0 -0.125,-2.351 c 0.441,0.104 1.049,0.147 1.49,0.147 2.982,0 5.375,-1.596 5.375,-4.724 0,-3.612 -2.813,-5.313 -5.732,-5.313" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#2f2d2e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11072"
|
||||
d="m 970.624,866.5869 62.129,0 c 1.629,0 2.953,-1.32 2.953,-2.951 l 0,-62.127 c 0,-1.629 -1.324,-2.953 -2.953,-2.953 l -62.129,0 c -1.633,0 -2.949,1.324 -2.949,2.953 l 0,62.127 c 0,1.631 1.316,2.951 2.949,2.951" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11080"
|
||||
d="m 894.0303,704.8311 c -1.051,0 -1.764,-0.735 -1.764,-1.701 0,-0.945 0.672,-1.764 1.764,-1.764 1.028,0 1.784,0.819 1.784,1.764 0,0.966 -0.798,1.701 -1.784,1.701 m 0,-6.152 c -1.219,0 -2.079,-0.862 -2.079,-2.016 0,-1.197 0.86,-1.974 2.079,-1.974 1.217,0 2.057,0.777 2.057,1.974 0,1.134 -0.861,2.016 -2.057,2.016 m 0,-6.782 c -2.939,0 -5.586,1.491 -5.586,4.62 0,1.804 1.219,3.085 2.667,3.547 l 0,0.042 c -1.28,0.483 -2.268,1.575 -2.268,3.213 0,2.75 2.436,4.241 5.187,4.241 2.729,0 5.186,-1.428 5.186,-4.178 0,-1.638 -0.946,-2.814 -2.268,-3.254 l 0,-0.064 c 1.49,-0.42 2.666,-1.784 2.666,-3.527 0,-3.128 -2.645,-4.64 -5.584,-4.64" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11082"
|
||||
d="m 1129.2939,702.1631 c -1.385,0 -2.352,-0.966 -2.352,-2.352 0,-1.281 0.924,-2.351 2.331,-2.351 1.386,0 2.332,0.966 2.332,2.373 0,1.344 -0.924,2.33 -2.311,2.33 m -0.021,-7.643 c -3.233,0 -5.858,2.058 -5.858,5.313 0,1.764 0.672,3.128 1.659,4.598 l 3.591,5.353 4.262,0 -3.654,-5.08 -0.063,-0.105 c 0.273,0.105 0.715,0.168 1.051,0.168 2.603,0 4.871,-1.954 4.871,-4.85 0,-3.381 -2.647,-5.397 -5.859,-5.397" /><g
|
||||
d="m 970.624,866.5869 62.129,0 c 1.629,0 2.953,-1.32 2.953,-2.951 l 0,-62.127 c 0,-1.629 -1.324,-2.953 -2.953,-2.953 l -62.129,0 c -1.633,0 -2.949,1.324 -2.949,2.953 l 0,62.127 c 0,1.631 1.316,2.951 2.949,2.951" /><g
|
||||
style="display:inline"
|
||||
transform="matrix(0.13034138,0,0,-0.13034138,939.66545,1129.9927)"
|
||||
id="g6140-8-61"><g
|
||||
@ -16924,7 +17226,47 @@
|
||||
id="path4400-5-5"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15472-7-2"><path
|
||||
d="M 856.31412,-971.62448 L 860.75912,-971.62448 L 866.55968,-963.10227 L 866.55968,-971.62448 L 871.04671,-971.62448 L 871.04671,-956.21936 L 866.55968,-956.21936 L 860.79064,-964.67851 L 860.79064,-956.21936 L 856.31412,-956.21936 L 856.31412,-971.62448 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15769" /><path
|
||||
d="M 872.64397,-971.62448 L 877.16252,-971.62448 L 878.7913,-963.01821 L 881.16617,-971.62448 L 885.67422,-971.62448 L 888.05959,-963.01821 L 889.68837,-971.62448 L 894.18591,-971.62448 L 890.79174,-956.21936 L 886.12607,-956.21936 L 883.42545,-965.91849 L 880.73533,-956.21936 L 876.06966,-956.21936 L 872.64397,-971.62448 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15771" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15476-4-2"><path
|
||||
d="M 1093.3867,-970.87606 L 1097.8317,-970.87606 L 1103.6323,-962.35386 L 1103.6323,-970.87606 L 1108.1193,-970.87606 L 1108.1193,-955.47095 L 1103.6323,-955.47095 L 1097.8632,-963.9301 L 1097.8632,-955.47095 L 1093.3867,-955.47095 L 1093.3867,-970.87606 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15764" /><path
|
||||
d="M 1111.2928,-970.87606 L 1124.0498,-970.87606 L 1124.0498,-967.58698 L 1116.0635,-967.58698 L 1116.0635,-965.13855 L 1123.4719,-965.13855 L 1123.4719,-961.99658 L 1116.0635,-961.99658 L 1116.0635,-958.95969 L 1124.281,-958.95969 L 1124.281,-955.47095 L 1111.2928,-955.47095 L 1111.2928,-970.87606 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15766" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
inkscape:transform-center-x="38.194477"
|
||||
inkscape:transform-center-y="15.277791"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15480-3-3"><path
|
||||
d="M 1092.1883,-722.63502 L 1096.7174,-722.91874 Q 1096.8645,-721.81538 1097.3164,-721.23742 Q 1098.052,-720.30219 1099.418,-720.30219 Q 1100.4373,-720.30219 1100.9838,-720.77506 Q 1101.5407,-721.25844 1101.5407,-721.88893 Q 1101.5407,-722.48791 1101.0153,-722.96078 Q 1100.4899,-723.43365 1098.5774,-723.85398 Q 1095.4459,-724.55803 1094.1114,-725.72445 Q 1092.7663,-726.89087 1092.7663,-728.69829 Q 1092.7663,-729.88572 1093.4493,-730.93655 Q 1094.1429,-731.99789 1095.5195,-732.59686 Q 1096.9066,-733.20634 1099.313,-733.20634 Q 1102.2658,-733.20634 1103.8105,-732.10297 Q 1105.3657,-731.01011 1105.6599,-728.61422 L 1101.1729,-728.35152 Q 1100.9943,-729.39184 1100.4163,-729.86471 Q 1099.8489,-730.33758 1098.8401,-730.33758 Q 1098.0099,-730.33758 1097.5896,-729.9803 Q 1097.1693,-729.63353 1097.1693,-729.12913 Q 1097.1693,-728.76134 1097.516,-728.46711 Q 1097.8523,-728.16237 1099.1133,-727.89966 Q 1102.2342,-727.22713 1103.5793,-726.53359 Q 1104.9349,-725.85055 1105.5444,-724.83125 Q 1106.1643,-723.81195 1106.1643,-722.55096 Q 1106.1643,-721.06929 1105.3447,-719.81881 Q 1104.525,-718.56832 1103.0539,-717.91681 Q 1101.5827,-717.27581 1099.3445,-717.27581 Q 1095.4144,-717.27581 1093.9012,-718.789 Q 1092.388,-720.30219 1092.1883,-722.63502 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15759" /><path
|
||||
d="M 1108.5602,-732.94363 L 1121.3173,-732.94363 L 1121.3173,-729.65454 L 1113.331,-729.65454 L 1113.331,-727.20612 L 1120.7393,-727.20612 L 1120.7393,-724.06415 L 1113.331,-724.06415 L 1113.331,-721.02726 L 1121.5484,-721.02726 L 1121.5484,-717.53851 L 1108.5602,-717.53851 L 1108.5602,-732.94363 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15761" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
inkscape:transform-center-x="38.194477"
|
||||
inkscape:transform-center-y="15.277791"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15653-6"><path
|
||||
d="M 852.71587,-720.69313 L 857.24494,-720.97685 Q 857.39205,-719.87348 857.84391,-719.29553 Q 858.57949,-718.36029 859.94556,-718.36029 Q 860.96486,-718.36029 861.51129,-718.83316 Q 862.06823,-719.31654 862.06823,-719.94704 Q 862.06823,-720.54601 861.54282,-721.01888 Q 861.0174,-721.49175 859.1049,-721.91209 Q 855.97344,-722.61614 854.63889,-723.78256 Q 853.29383,-724.94897 853.29383,-726.7564 Q 853.29383,-727.94383 853.97687,-728.99466 Q 854.67041,-730.05599 856.04699,-730.65496 Q 857.43409,-731.26444 859.84048,-731.26444 Q 862.7933,-731.26444 864.33801,-730.16107 Q 865.89324,-729.06821 866.18747,-726.67233 L 861.70044,-726.40962 Q 861.5218,-727.44994 860.94385,-727.92281 Q 860.3764,-728.39568 859.36761,-728.39568 Q 858.53745,-728.39568 858.11712,-728.0384 Q 857.69679,-727.69163 857.69679,-727.18723 Q 857.69679,-726.81945 858.04356,-726.52521 Q 858.37983,-726.22047 859.64082,-725.95777 Q 862.76178,-725.28524 864.10683,-724.59169 Q 865.4624,-723.90866 866.07188,-722.88935 Q 866.69187,-721.87005 866.69187,-720.60906 Q 866.69187,-719.1274 865.87222,-717.87691 Q 865.05258,-716.62643 863.58142,-715.97492 Q 862.11026,-715.33391 859.872,-715.33391 Q 855.94191,-715.33391 854.42872,-716.8471 Q 852.91553,-718.36029 852.71587,-720.69313 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15754" /><path
|
||||
d="M 867.51151,-731.00173 L 872.03006,-731.00173 L 873.65885,-722.39547 L 876.03371,-731.00173 L 880.54176,-731.00173 L 882.92714,-722.39547 L 884.55592,-731.00173 L 889.05345,-731.00173 L 885.65928,-715.59662 L 880.99361,-715.59662 L 878.29299,-725.29575 L 875.60287,-715.59662 L 870.93721,-715.59662 L 867.51151,-731.00173 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15756" /></g></g><g
|
||||
id="octo-coax-P_reverse"
|
||||
transform="matrix(1.25,0,0,-1.25,-146.76331,3549.3214)"><g
|
||||
style="opacity:0.5"
|
||||
@ -17069,14 +17411,6 @@
|
||||
id="path11156"
|
||||
d="m 1604.5449,691.7588 c 9.404,-9.411 9.404,-24.667 -0.01,-34.074 -9.406,-9.411 -24.664,-9.412 -34.074,0 -9.406,9.406 -9.406,24.663 0.01,34.067 9.406,9.413 24.664,9.413 34.076,0.007" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11158"
|
||||
d="m 1586.9873,667.002 c -2.708,0 -4.955,1.428 -5.647,3.779 l 3.211,0.988 c 0.316,-1.03 1.24,-1.786 2.395,-1.786 1.196,0 2.225,0.735 2.225,2.163 0,1.763 -1.596,2.267 -3.044,2.267 -1.05,0 -2.583,-0.272 -3.632,-0.65 l 0.356,8.504 9.113,0 0,-3.024 -5.985,0 -0.125,-2.351 c 0.441,0.104 1.049,0.146 1.49,0.146 2.982,0 5.375,-1.596 5.375,-4.724 0,-3.612 -2.813,-5.312 -5.732,-5.312" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11160"
|
||||
d="m 1609.9268,651.6416 c -1.385,0 -2.352,-0.965 -2.352,-2.352 0,-1.28 0.924,-2.351 2.331,-2.351 1.386,0 2.332,0.967 2.332,2.373 0,1.344 -0.924,2.33 -2.311,2.33 m -0.021,-7.643 c -3.233,0 -5.858,2.059 -5.858,5.313 0,1.764 0.672,3.129 1.659,4.598 l 3.591,5.354 4.262,0 -3.654,-5.081 -0.063,-0.105 c 0.273,0.105 0.715,0.168 1.051,0.168 2.603,0 4.871,-1.953 4.871,-4.85 0,-3.381 -2.647,-5.397 -5.859,-5.397" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#100f0d;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11186"
|
||||
d="m 1484.1367,835.0732 c 9.406,-9.413 9.406,-24.67 -0.01,-34.077 -9.406,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.407 -9.406,24.663 0.01,34.069 9.406,9.412 24.664,9.412 34.078,0.008" /><g
|
||||
@ -17110,14 +17444,6 @@
|
||||
id="path11212"
|
||||
d="m 1461.6484,858.0703 c 9.404,-9.411 9.404,-24.667 -0.01,-34.074 -9.406,-9.411 -24.664,-9.412 -34.074,0 -9.406,9.406 -9.406,24.663 0.01,34.067 9.406,9.413 24.664,9.413 34.076,0.007" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11214"
|
||||
d="m 1444.0293,833.7119 -4.095,0 6.027,11.842 -7.035,0 0,3.023 10.793,0 0,-2.813 -5.69,-12.052 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11216"
|
||||
d="m 1467.0322,823.2441 c -1.051,0 -1.764,-0.735 -1.764,-1.7 0,-0.946 0.672,-1.764 1.764,-1.764 1.028,0 1.784,0.818 1.784,1.764 0,0.965 -0.798,1.7 -1.784,1.7 m 0,-6.151 c -1.219,0 -2.079,-0.862 -2.079,-2.016 0,-1.197 0.86,-1.975 2.079,-1.975 1.217,0 2.057,0.778 2.057,1.975 0,1.133 -0.861,2.016 -2.057,2.016 m 0,-6.783 c -2.939,0 -5.586,1.492 -5.586,4.62 0,1.805 1.219,3.086 2.667,3.547 l 0,0.043 c -1.28,0.483 -2.268,1.575 -2.268,3.212 0,2.751 2.436,4.241 5.187,4.241 2.729,0 5.186,-1.427 5.186,-4.177 0,-1.639 -0.946,-2.815 -2.268,-3.255 l 0,-0.064 c 1.49,-0.42 2.666,-1.784 2.666,-3.527 0,-3.128 -2.645,-4.64 -5.584,-4.64" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#100f0d;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11242"
|
||||
d="m 1802.6992,843.29 c 9.406,-9.413 9.406,-24.67 -0.01,-34.077 -9.408,-9.411 -24.666,-9.411 -34.08,0 -9.406,9.407 -9.406,24.663 0.01,34.069 9.406,9.412 24.666,9.412 34.078,0.008" /><g
|
||||
@ -17151,15 +17477,7 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11268"
|
||||
d="m 1780.2109,866.2871 c 9.406,-9.411 9.406,-24.667 -0.01,-34.074 -9.406,-9.411 -24.664,-9.412 -34.076,0 -9.404,9.406 -9.404,24.663 0.01,34.067 9.406,9.413 24.664,9.413 34.074,0.007" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11270"
|
||||
d="m 1762.8037,841.5303 c -2.709,0 -5.166,1.176 -5.963,3.947 l 3.275,0.861 c 0.273,-0.988 1.176,-1.848 2.52,-1.848 1.008,0 2.162,0.504 2.162,1.89 0,1.511 -1.554,1.953 -3.023,1.953 l -0.946,0 0,2.582 1.03,0 c 1.322,0 2.603,0.336 2.603,1.763 0,1.071 -0.902,1.638 -1.869,1.638 -1.008,0 -1.805,-0.651 -2.036,-1.659 l -3.275,0.756 c 0.713,2.499 3.065,3.779 5.543,3.779 2.624,0 5.227,-1.344 5.227,-4.199 0,-1.637 -1.049,-2.856 -2.498,-3.233 l 0,-0.063 c 1.68,-0.399 2.855,-1.784 2.855,-3.443 0,-3.255 -2.876,-4.724 -5.605,-4.724" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11272"
|
||||
d="m 1786.3516,830.1807 -0.063,0 -3.528,-5.502 3.591,0 0,5.502 z m 3.275,-8.357 0,-2.897 -3.296,0 0,2.897 -6.992,0 0,2.961 6.047,9.007 4.221,0 0,-9.113 2.057,0 0,-2.855 -2.037,0 z" /><g
|
||||
d="m 1780.2109,866.2871 c 9.406,-9.411 9.406,-24.667 -0.01,-34.074 -9.406,-9.411 -24.664,-9.412 -34.076,0 -9.404,9.406 -9.404,24.663 0.01,34.067 9.406,9.413 24.664,9.413 34.074,0.007" /><g
|
||||
style="opacity:0.5"
|
||||
id="g11274"
|
||||
transform="translate(1550.8242,1032.3867)"><path
|
||||
@ -17221,15 +17539,7 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11324"
|
||||
d="m 1604.5449,1010.3008 c 9.404,-9.411 9.404,-24.667 -0.01,-34.074 -9.406,-9.411 -24.664,-9.412 -34.074,0 -9.406,9.406 -9.406,24.663 0.01,34.067 9.406,9.413 24.664,9.413 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11326"
|
||||
d="m 1586.4424,985.9424 0,10.918 -2.771,-2.143 -1.828,2.499 4.892,3.591 3.234,0 0,-14.865 -3.527,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11328"
|
||||
d="m 1604.5732,962.9395 0,2.939 5.795,5.249 c 0.734,0.694 1.218,1.386 1.218,2.29 0,1.048 -0.736,1.784 -1.848,1.784 -1.176,0 -1.952,-0.924 -2.1,-2.247 l -3.379,0.463 c 0.335,3.001 2.771,4.787 5.668,4.787 2.73,0 5.375,-1.45 5.375,-4.557 0,-2.121 -1.239,-3.359 -2.604,-4.577 l -3.443,-3.066 6.068,0 0,-3.065 -10.75,0 z" /><g
|
||||
d="m 1604.5449,1010.3008 c 9.404,-9.411 9.404,-24.667 -0.01,-34.074 -9.406,-9.411 -24.664,-9.412 -34.074,0 -9.406,9.406 -9.406,24.663 0.01,34.067 9.406,9.413 24.664,9.413 34.076,0.01" /><g
|
||||
style="display:inline"
|
||||
transform="matrix(0.13034138,0,0,-0.13034138,1541.7183,1134.1826)"
|
||||
id="g6140-8-075"><g
|
||||
@ -17354,7 +17664,32 @@
|
||||
id="path4400-5-48"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><path
|
||||
inkscape:connector-curvature="0"
|
||||
d="M 1433.8347,848.73335 L 1438.3532,848.73335 L 1439.982,840.12715 L 1442.3569,848.73335 L 1446.8649,848.73335 L 1449.2503,840.12715 L 1450.8791,848.73335 L 1455.3766,848.73335 L 1451.9824,833.32825 L 1447.3168,833.32825 L 1444.6161,843.02735 L 1441.926,833.32825 L 1437.2604,833.32825 L 1433.8347,848.73335 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="path15589-9-3" /><g
|
||||
transform="matrix(1,0,0,-1,-39.62715,-526.40876)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15476-5-3-9"><path
|
||||
inkscape:connector-curvature="0"
|
||||
d="M 1619.763,-1527.3728 L 1624.208,-1527.3728 L 1630.0086,-1518.8506 L 1630.0086,-1527.3728 L 1634.4956,-1527.3728 L 1634.4956,-1511.9677 L 1630.0086,-1511.9677 L 1624.2396,-1520.4268 L 1624.2396,-1511.9677 L 1619.763,-1511.9677 L 1619.763,-1527.3728 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15586-3-4" /></g><g
|
||||
transform="matrix(1,0,0,-1,-40.74485,-572.10535)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15480-7-3-4"><path
|
||||
inkscape:connector-curvature="0"
|
||||
d="M 1621.259,-1244.2186 L 1625.7881,-1244.5023 Q 1625.9352,-1243.3989 1626.3871,-1242.821 Q 1627.1226,-1241.8857 1628.4887,-1241.8857 Q 1629.508,-1241.8857 1630.0544,-1242.3586 Q 1630.6114,-1242.842 1630.6114,-1243.4725 Q 1630.6114,-1244.0715 1630.086,-1244.5443 Q 1629.5606,-1245.0172 1627.6481,-1245.4375 Q 1624.5166,-1246.1416 1623.182,-1247.308 Q 1621.837,-1248.4744 1621.837,-1250.2818 Q 1621.837,-1251.4693 1622.52,-1252.5201 Q 1623.2136,-1253.5814 1624.5901,-1254.1804 Q 1625.9772,-1254.7899 1628.3836,-1254.7899 Q 1631.3365,-1254.7899 1632.8812,-1253.6865 Q 1634.4364,-1252.5937 1634.7306,-1250.1978 L 1630.2436,-1249.9351 Q 1630.065,-1250.9754 1629.487,-1251.4483 Q 1628.9196,-1251.9211 1627.9108,-1251.9211 Q 1627.0806,-1251.9211 1626.6603,-1251.5639 Q 1626.2399,-1251.2171 1626.2399,-1250.7127 Q 1626.2399,-1250.3449 1626.5867,-1250.0507 Q 1626.923,-1249.7459 1628.184,-1249.4832 Q 1631.3049,-1248.8107 1632.65,-1248.1171 Q 1634.0056,-1247.4341 1634.615,-1246.4148 Q 1635.235,-1245.3955 1635.235,-1244.1345 Q 1635.235,-1242.6528 1634.4154,-1241.4024 Q 1633.5957,-1240.1519 1632.1246,-1239.5004 Q 1630.6534,-1238.8594 1628.4152,-1238.8594 Q 1624.4851,-1238.8594 1622.9719,-1240.3726 Q 1621.4587,-1241.8857 1621.259,-1244.2186 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15580-1-3" /></g><g
|
||||
transform="matrix(1,0,0,-1,-0.44645,-533.94045)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15559-5-2"><path
|
||||
inkscape:connector-curvature="0"
|
||||
d="M 1757.121,-1390.8906 L 1769.8781,-1390.8906 L 1769.8781,-1387.6015 L 1761.8918,-1387.6015 L 1761.8918,-1385.1531 L 1769.3001,-1385.1531 L 1769.3001,-1382.0111 L 1761.8918,-1382.0111 L 1761.8918,-1378.9742 L 1770.1092,-1378.9742 L 1770.1092,-1375.4855 L 1757.121,-1375.4855 L 1757.121,-1390.8906 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15583-0-7" /></g></g><g
|
||||
id="quad-octo-v_reverse"
|
||||
transform="matrix(1.25,0,0,-1.25,-146.76331,2881.4925)"><path
|
||||
inkscape:connector-curvature="0"
|
||||
@ -17507,25 +17842,13 @@
|
||||
id="path11724"
|
||||
d="m 3276.7451,797.2002 c 9.406,-9.413 9.406,-24.67 -0.01,-34.076 -9.408,-9.411 -24.664,-9.411 -34.076,0 -9.404,9.406 -9.404,24.662 0.01,34.068 9.404,9.412 24.662,9.413 34.074,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11726"
|
||||
d="m 3258.6475,772.1533 0,10.918 -2.771,-2.141 -1.828,2.498 4.892,3.59 3.234,0 0,-14.865 -3.527,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11728"
|
||||
d="m 3236.7451,617.2891 c 9.406,-9.413 9.406,-24.67 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.406 -9.406,24.662 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11730"
|
||||
d="m 3213.292,593.2432 0,2.939 5.795,5.249 c 0.735,0.693 1.219,1.386 1.219,2.289 0,1.05 -0.736,1.785 -1.848,1.785 -1.176,0 -1.953,-0.924 -2.1,-2.246 l -3.38,0.461 c 0.335,3.002 2.771,4.787 5.668,4.787 2.73,0 5.375,-1.449 5.375,-4.556 0,-2.12 -1.239,-3.359 -2.603,-4.577 l -3.443,-3.066 6.067,0 0,-3.065 -10.75,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11732"
|
||||
d="m 3195.7412,435.2715 c 9.406,-9.412 9.406,-24.669 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.407 -9.406,24.663 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11734"
|
||||
d="m 3178.4971,410.5049 c -2.709,0 -5.165,1.176 -5.963,3.947 l 3.275,0.862 c 0.274,-0.988 1.176,-1.848 2.52,-1.848 1.008,0 2.162,0.504 2.162,1.889 0,1.511 -1.553,1.953 -3.023,1.953 l -0.945,0 0,2.582 1.029,0 c 1.323,0 2.603,0.336 2.603,1.763 0,1.072 -0.902,1.639 -1.868,1.639 -1.008,0 -1.806,-0.651 -2.036,-1.659 l -3.275,0.756 c 0.712,2.499 3.064,3.779 5.542,3.779 2.625,0 5.228,-1.344 5.228,-4.199 0,-1.638 -1.05,-2.856 -2.499,-3.234 l 0,-0.062 c 1.68,-0.399 2.855,-1.785 2.855,-3.443 0,-3.255 -2.876,-4.725 -5.605,-4.725" /><g
|
||||
d="m 3195.7412,435.2715 c 9.406,-9.412 9.406,-24.669 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.407 -9.406,24.663 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><g
|
||||
id="g11736"><g
|
||||
style="opacity:0.5"
|
||||
id="g11738"
|
||||
@ -17565,11 +17888,7 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11772"
|
||||
d="m 3154.7354,255.2002 c 9.406,-9.412 9.406,-24.669 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.407 -9.406,24.663 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11774"
|
||||
d="m 3138.3955,242.0869 -0.063,0 -3.527,-5.502 3.59,0 0,5.502 z m 3.275,-8.357 0,-2.897 -3.296,0 0,2.897 -6.992,0 0,2.961 6.047,9.007 4.22,0 0,-9.113 2.059,0 0,-2.855 -2.038,0 z" /><g
|
||||
d="m 3154.7354,255.2002 c 9.406,-9.412 9.406,-24.669 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.407 -9.406,24.663 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><g
|
||||
id="g11776"><g
|
||||
style="opacity:0.5"
|
||||
id="g11778"
|
||||
@ -17683,25 +18002,13 @@
|
||||
id="path11884"
|
||||
d="m 2824.7236,797.2002 c 9.406,-9.413 9.406,-24.67 -0.01,-34.076 -9.408,-9.411 -24.664,-9.411 -34.076,0 -9.404,9.406 -9.404,24.662 0.01,34.068 9.404,9.412 24.662,9.413 34.074,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11886"
|
||||
d="m 2807.4658,784.6885 c -1.049,0 -1.764,-0.734 -1.764,-1.701 0,-0.945 0.672,-1.764 1.764,-1.764 1.029,0 1.785,0.819 1.785,1.764 0,0.967 -0.798,1.701 -1.785,1.701 m 0,-6.152 c -1.217,0 -2.078,-0.861 -2.078,-2.016 0,-1.196 0.861,-1.973 2.078,-1.973 1.219,0 2.059,0.777 2.059,1.973 0,1.135 -0.862,2.016 -2.059,2.016 m 0,-6.782 c -2.939,0 -5.584,1.491 -5.584,4.62 0,1.805 1.217,3.085 2.666,3.548 l 0,0.041 c -1.281,0.484 -2.268,1.576 -2.268,3.213 0,2.75 2.436,4.241 5.186,4.241 2.73,0 5.187,-1.427 5.187,-4.178 0,-1.637 -0.945,-2.813 -2.268,-3.254 l 0,-0.063 c 1.491,-0.42 2.667,-1.785 2.667,-3.527 0,-3.129 -2.647,-4.641 -5.586,-4.641" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11888"
|
||||
d="m 2864.7314,617.2891 c 9.406,-9.413 9.406,-24.67 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.406 -9.406,24.662 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11890"
|
||||
d="m 2846.2744,593.2432 -4.095,0 6.027,11.842 -7.035,0 0,3.023 10.792,0 0,-2.813 -5.689,-12.052 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11892"
|
||||
d="m 2903.7354,435.2715 c 9.406,-9.412 9.406,-24.669 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.407 -9.406,24.663 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11894"
|
||||
d="m 2886.6338,418.1475 c -1.387,0 -2.352,-0.966 -2.352,-2.352 0,-1.281 0.924,-2.351 2.331,-2.351 1.385,0 2.33,0.966 2.33,2.373 0,1.344 -0.924,2.33 -2.309,2.33 m -0.021,-7.643 c -3.234,0 -5.858,2.058 -5.858,5.313 0,1.764 0.672,3.128 1.658,4.598 l 3.59,5.353 4.263,0 -3.653,-5.08 -0.063,-0.105 c 0.272,0.105 0.713,0.168 1.049,0.168 2.603,0 4.871,-1.954 4.871,-4.85 0,-3.381 -2.645,-5.397 -5.857,-5.397" /><g
|
||||
d="m 2903.7354,435.2715 c 9.406,-9.412 9.406,-24.669 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.407 -9.406,24.663 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><g
|
||||
id="g11896"><g
|
||||
style="opacity:0.5"
|
||||
id="g11898"
|
||||
@ -17743,10 +18050,6 @@
|
||||
id="path11932"
|
||||
d="m 2942.7373,255.2002 c 9.406,-9.412 9.406,-24.669 -0.01,-34.076 -9.408,-9.411 -24.666,-9.411 -34.078,0 -9.406,9.407 -9.406,24.663 0.01,34.068 9.406,9.412 24.664,9.413 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11934"
|
||||
d="m 2925.3398,230.4336 c -2.708,0 -4.955,1.428 -5.647,3.779 l 3.211,0.988 c 0.316,-1.03 1.24,-1.786 2.394,-1.786 1.197,0 2.226,0.735 2.226,2.163 0,1.763 -1.596,2.267 -3.044,2.267 -1.051,0 -2.583,-0.272 -3.633,-0.65 l 0.357,8.504 9.112,0 0,-3.024 -5.984,0 -0.126,-2.351 c 0.442,0.104 1.05,0.146 1.49,0.146 2.983,0 5.375,-1.596 5.375,-4.724 0,-3.612 -2.812,-5.312 -5.731,-5.312" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#2f2d2e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path11936"
|
||||
d="m 3000.6279,632.2207 62.129,0 c 1.629,0 2.953,-1.32 2.953,-2.95 l 0,-62.127 c 0,-1.63 -1.324,-2.954 -2.953,-2.954 l -62.129,0 c -1.633,0 -2.949,1.324 -2.949,2.954 l 0,62.127 c 0,1.63 1.316,2.95 2.949,2.95" /><g
|
||||
@ -17874,7 +18177,115 @@
|
||||
id="path4400-5-33"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text15476-44-6-9-2-7-7"
|
||||
y="-592.54559"
|
||||
x="2836.927"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"
|
||||
transform="scale(1,-1)"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="-592.54559"
|
||||
x="2836.927"
|
||||
id="tspan15478-4-7-0-5"
|
||||
sodipodi:role="line">W</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="3202.6462"
|
||||
y="-592.54559"
|
||||
id="text15992-1-2-6-3-5"
|
||||
sodipodi:linespacing="125%"
|
||||
transform="scale(1,-1)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan15994-8-9-1"
|
||||
x="3202.6462"
|
||||
y="-592.54559"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">NE</tspan></text>
|
||||
<text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text15996-0-3-1-1-2"
|
||||
y="-230.45671"
|
||||
x="3122.2654"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"
|
||||
transform="scale(1,-1)"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="-230.45671"
|
||||
x="3122.2654"
|
||||
id="tspan15998-4-4-2"
|
||||
sodipodi:role="line">SE</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="3170.6375"
|
||||
y="-410.52798"
|
||||
id="text16000-48-6-0-3-7"
|
||||
sodipodi:linespacing="125%"
|
||||
transform="scale(1,-1)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan16002-1-9-3"
|
||||
x="3170.6375"
|
||||
y="-410.52798"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">E</tspan></text>
|
||||
<text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text16004-6-9-4-1-9"
|
||||
y="-410.52798"
|
||||
x="2867.7766"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
transform="scale(1,-1)"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="-410.52798"
|
||||
x="2867.7766"
|
||||
id="tspan16006-6-0-5"
|
||||
sodipodi:role="line">SW</tspan></text>
|
||||
<text
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="2787.1431"
|
||||
y="-772.45673"
|
||||
id="text16008-9-6-0-4-2"
|
||||
sodipodi:linespacing="125%"
|
||||
transform="scale(1,-1)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan16010-8-2-8-8"
|
||||
x="2787.1431"
|
||||
y="-772.45673"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">NW</tspan></text>
|
||||
<text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text16339-0-8"
|
||||
y="-772.45673"
|
||||
x="3250.7336"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"
|
||||
transform="scale(1,-1)"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="-772.45673"
|
||||
x="3250.7336"
|
||||
id="tspan16341-2"
|
||||
sodipodi:role="line">N</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="2917.9592"
|
||||
y="-230.45671"
|
||||
id="text16343-6-3"
|
||||
sodipodi:linespacing="125%"
|
||||
transform="scale(1,-1)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan16345-9"
|
||||
x="2917.9592"
|
||||
y="-230.45671"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">S</tspan></text>
|
||||
</g><g
|
||||
id="hexa-coax_reverse"
|
||||
transform="matrix(1.25,0,0,-1.25,-146.76331,3591.2695)"><g
|
||||
id="g11996"><g
|
||||
@ -18080,29 +18491,13 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path12120"
|
||||
d="m 361.7002,739.2861 c 9.406,-9.414 9.406,-24.67 -0.007,-34.078 -9.407,-9.41 -24.666,-9.41 -34.079,0 -9.406,9.408 -9.406,24.664 0.008,34.07 9.406,9.412 24.665,9.412 34.078,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path12122"
|
||||
d="m 344.3018,714.5225 c -2.709,0 -4.955,1.428 -5.648,3.779 l 3.212,0.987 c 0.315,-1.03 1.239,-1.786 2.393,-1.786 1.197,0 2.227,0.736 2.227,2.164 0,1.763 -1.596,2.267 -3.045,2.267 -1.05,0 -2.582,-0.272 -3.633,-0.651 l 0.357,8.504 9.113,0 0,-3.024 -5.984,0 -0.127,-2.351 c 0.442,0.105 1.051,0.146 1.491,0.146 2.982,0 5.375,-1.596 5.375,-4.723 0,-3.612 -2.813,-5.312 -5.731,-5.312" /></g><g
|
||||
d="m 361.7002,739.2861 c 9.406,-9.414 9.406,-24.67 -0.007,-34.078 -9.407,-9.41 -24.666,-9.41 -34.079,0 -9.406,9.408 -9.406,24.664 0.008,34.07 9.406,9.412 24.665,9.412 34.078,0.008" /></g><g
|
||||
id="g12124"
|
||||
transform="translate(1.6,3.2)"><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path12126"
|
||||
d="m 217.4854,994.3389 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.408,-9.41 -24.664,-9.41 -34.076,0 -9.404,9.406 -9.404,24.662 0.008,34.068 9.404,9.414 24.662,9.414 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path12128"
|
||||
d="m 199.3838,969.2959 0,10.918 -2.771,-2.143 -1.828,2.499 4.892,3.591 3.234,0 0,-14.865 -3.527,0 z" /></g><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path12130"
|
||||
d="m 218.5029,948.9795 0,2.939 5.795,5.249 c 0.734,0.693 1.218,1.386 1.218,2.289 0,1.05 -0.736,1.785 -1.848,1.785 -1.176,0 -1.952,-0.924 -2.1,-2.246 l -3.379,0.461 c 0.335,3.002 2.771,4.787 5.668,4.787 2.73,0 5.375,-1.449 5.375,-4.556 0,-2.12 -1.239,-3.359 -2.604,-4.577 l -3.443,-3.066 6.068,0 0,-3.065 -10.75,0 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path12132"
|
||||
d="m 368.9502,700.167 c -1.387,0 -2.352,-0.965 -2.352,-2.352 0,-1.28 0.924,-2.351 2.331,-2.351 1.385,0 2.33,0.967 2.33,2.373 0,1.344 -0.924,2.33 -2.309,2.33 m -0.021,-7.643 c -3.234,0 -5.858,2.059 -5.858,5.313 0,1.764 0.672,3.129 1.658,4.598 l 3.59,5.354 4.263,0 -3.653,-5.081 -0.063,-0.105 c 0.272,0.105 0.713,0.168 1.049,0.168 2.603,0 4.871,-1.953 4.871,-4.85 0,-3.381 -2.645,-5.397 -5.857,-5.397" /><g
|
||||
d="m 217.4854,994.3389 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.408,-9.41 -24.664,-9.41 -34.076,0 -9.404,9.406 -9.404,24.662 0.008,34.068 9.404,9.414 24.662,9.414 34.076,0.008" /></g><g
|
||||
id="g12134"
|
||||
transform="translate(299.2,0)"><g
|
||||
style="opacity:0.5"
|
||||
@ -18174,15 +18569,7 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path12212"
|
||||
d="m 217.4854,994.3389 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.408,-9.41 -24.664,-9.41 -34.076,0 -9.404,9.406 -9.404,24.662 0.008,34.068 9.404,9.414 24.662,9.414 34.076,0.008" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path12214"
|
||||
d="m 200.6224,969.4669 c -2.709,0 -5.166,1.176 -5.963,3.947 l 3.275,0.862 c 0.273,-0.987 1.176,-1.848 2.52,-1.848 1.008,0 2.162,0.504 2.162,1.89 0,1.511 -1.554,1.952 -3.023,1.952 l -0.946,0 0,2.583 1.03,0 c 1.322,0 2.603,0.336 2.603,1.763 0,1.072 -0.902,1.638 -1.869,1.638 -1.008,0 -1.805,-0.65 -2.036,-1.658 l -3.275,0.756 c 0.713,2.498 3.065,3.779 5.543,3.779 2.624,0 5.227,-1.344 5.227,-4.199 0,-1.639 -1.049,-2.856 -2.498,-3.235 l 0,-0.062 c 1.68,-0.398 2.855,-1.785 2.855,-3.443 0,-3.254 -2.876,-4.725 -5.605,-4.725" /></g></g><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path12216"
|
||||
d="m 526.26165,960.82187 -0.063,0 -3.528,-5.5 3.591,0 0,5.5 z m 3.275,-8.355 0,-2.899 -3.296,0 0,2.899 -6.993,0 0,2.959 6.047,9.007 4.221,0 0,-9.111 2.058,0 0,-2.855 -2.037,0 z" /><g
|
||||
d="m 217.4854,994.3389 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.408,-9.41 -24.664,-9.41 -34.076,0 -9.404,9.406 -9.404,24.662 0.008,34.068 9.404,9.414 24.662,9.414 34.076,0.008" /></g></g><g
|
||||
style="display:inline"
|
||||
transform="matrix(0.13034138,0,0,-0.13034138,295.35694,1183.4102)"
|
||||
id="g6140-8-39"><g
|
||||
@ -18307,7 +18694,38 @@
|
||||
id="path4400-5-72"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><g
|
||||
transform="matrix(1,0,0,-1,0,1.5159405e-5)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15472-95-0"><path
|
||||
inkscape:connector-curvature="0"
|
||||
d="M 183.10751,-988.20144 L 187.5525,-988.20144 L 193.35306,-979.67924 L 193.35306,-988.20144 L 197.84009,-988.20144 L 197.84009,-972.79633 L 193.35306,-972.79633 L 187.58403,-981.25548 L 187.58403,-972.79633 L 183.10751,-972.79633 L 183.10751,-988.20144 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15913-7" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
d="M 199.43735,-988.20144 L 203.9559,-988.20144 L 205.58468,-979.59517 L 207.95955,-988.20144 L 212.4676,-988.20144 L 214.85297,-979.59517 L 216.48175,-988.20144 L 220.97929,-988.20144 L 217.58512,-972.79633 L 212.91945,-972.79633 L 210.21883,-982.49545 L 207.52871,-972.79633 L 202.86304,-972.79633 L 199.43735,-988.20144 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15915-5" /></g><g
|
||||
transform="matrix(1,0,0,-1,-7.537354e-6,2.0159439e-5)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15480-13-0"><path
|
||||
inkscape:connector-curvature="0"
|
||||
d="M 337.66927,-718.03828 L 342.19834,-718.322 Q 342.34545,-717.21864 342.79731,-716.64068 Q 343.53289,-715.70545 344.89896,-715.70545 Q 345.91826,-715.70545 346.46469,-716.17832 Q 347.02163,-716.6617 347.02163,-717.29219 Q 347.02163,-717.89117 346.49622,-718.36404 Q 345.9708,-718.83691 344.0583,-719.25724 Q 340.92684,-719.96129 339.59229,-721.12771 Q 338.24723,-722.29413 338.24723,-724.10155 Q 338.24723,-725.28898 338.93027,-726.33981 Q 339.62381,-727.40114 341.00039,-728.00012 Q 342.38748,-728.60959 344.79388,-728.60959 Q 347.7467,-728.60959 349.29141,-727.50623 Q 350.84664,-726.41337 351.14087,-724.01748 L 346.65384,-723.75478 Q 346.4752,-724.79509 345.89725,-725.26797 Q 345.3298,-725.74084 344.32101,-725.74084 Q 343.49085,-725.74084 343.07052,-725.38356 Q 342.65019,-725.03678 342.65019,-724.53239 Q 342.65019,-724.1646 342.99696,-723.87037 Q 343.33323,-723.56563 344.59422,-723.30292 Q 347.71517,-722.63039 349.06023,-721.93685 Q 350.4158,-721.25381 351.02528,-720.23451 Q 351.64527,-719.21521 351.64527,-717.95421 Q 351.64527,-716.47255 350.82562,-715.22207 Q 350.00598,-713.97158 348.53482,-713.32007 Q 347.06366,-712.67907 344.8254,-712.67907 Q 340.89531,-712.67907 339.38212,-714.19226 Q 337.86893,-715.70545 337.66927,-718.03828 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15918-9" /></g><text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text15476-9-1"
|
||||
y="-972.79633"
|
||||
x="484.18848"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"
|
||||
transform="scale(1,-1)"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="-972.79633"
|
||||
x="484.18848"
|
||||
id="tspan15478-8-1"
|
||||
sodipodi:role="line">NE</tspan></text>
|
||||
</g><g
|
||||
id="tri_reverse"
|
||||
transform="matrix(1.25,0,0,-1.25,-146.76331,4938.7695)"><path
|
||||
inkscape:connector-curvature="0"
|
||||
@ -18418,11 +18836,7 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path12316"
|
||||
d="m 544.333,1524.3389 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.406,-9.411 -24.664,-9.411 -34.076,-10e-4 -9.402,9.407 -9.404,24.663 0.008,34.069 9.406,9.413 24.664,9.413 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path12318"
|
||||
d="m 521.7197,1499.2964 0,2.939 5.795,5.249 c 0.734,0.693 1.218,1.386 1.218,2.289 0,1.05 -0.736,1.785 -1.848,1.785 -1.176,0 -1.952,-0.924 -2.1,-2.247 l -3.379,0.462 c 0.335,3.002 2.771,4.787 5.668,4.787 2.73,0 5.375,-1.449 5.375,-4.556 0,-2.121 -1.239,-3.359 -2.604,-4.577 l -3.443,-3.066 6.068,0 0,-3.065 -10.75,0 z" /><g
|
||||
d="m 544.333,1524.3389 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.406,-9.411 -24.664,-9.411 -34.076,-10e-4 -9.402,9.407 -9.404,24.663 0.008,34.069 9.406,9.413 24.664,9.413 34.076,0.01" /><g
|
||||
id="g12320"><g
|
||||
style="opacity:0.5"
|
||||
id="g12322"
|
||||
@ -18464,17 +18878,9 @@
|
||||
id="path12356"
|
||||
d="m 396.9326,1268.2861 c 9.406,-9.414 9.406,-24.67 -0.008,-34.078 -9.406,-9.41 -24.666,-9.41 -34.078,0 -9.406,9.408 -9.406,24.664 0.008,34.07 9.406,9.412 24.664,9.412 34.078,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path12358"
|
||||
d="m 379.6807,1243.5225 c -2.709,0 -5.165,1.176 -5.963,3.947 l 3.275,0.861 c 0.274,-0.988 1.176,-1.848 2.52,-1.848 1.008,0 2.162,0.504 2.162,1.89 0,1.511 -1.553,1.953 -3.023,1.953 l -0.945,0 0,2.582 1.029,0 c 1.323,0 2.603,0.336 2.603,1.763 0,1.071 -0.902,1.638 -1.868,1.638 -1.008,0 -1.806,-0.651 -2.036,-1.659 l -3.275,0.756 c 0.712,2.499 3.064,3.779 5.542,3.779 2.625,0 5.228,-1.344 5.228,-4.199 0,-1.637 -1.05,-2.856 -2.499,-3.233 l 0,-0.063 c 1.68,-0.399 2.855,-1.784 2.855,-3.443 0,-3.255 -2.876,-4.724 -5.605,-4.724" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path12360"
|
||||
d="m 252.7178,1521.3379 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.408,-9.411 -24.664,-9.411 -34.076,-10e-4 -9.404,9.407 -9.404,24.663 0.008,34.069 9.404,9.413 24.662,9.413 34.076,0.01" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path12362"
|
||||
d="m 234.6162,1496.2944 0,10.918 -2.771,-2.142 -1.828,2.499 4.892,3.59 3.234,0 0,-14.865 -3.527,0 z" /><g
|
||||
d="m 252.7178,1521.3379 c 9.404,-9.414 9.404,-24.67 -0.008,-34.076 -9.408,-9.411 -24.664,-9.411 -34.076,-10e-4 -9.404,9.407 -9.404,24.663 0.008,34.069 9.404,9.413 24.662,9.413 34.076,0.01" /><g
|
||||
style="display:inline"
|
||||
transform="matrix(0.13034138,0,0,-0.13034138,317.58844,1723.4097)"
|
||||
id="g6140-8-34"><g
|
||||
@ -18599,7 +19005,31 @@
|
||||
id="path4400-5-57"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15472-9"><path
|
||||
d="M 216.73989,-1511.9997 L 221.18489,-1511.9997 L 226.98545,-1503.4775 L 226.98545,-1511.9997 L 231.47248,-1511.9997 L 231.47248,-1496.5946 L 226.98545,-1496.5946 L 221.21641,-1505.0538 L 221.21641,-1496.5946 L 216.73989,-1496.5946 L 216.73989,-1511.9997 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15523" /><path
|
||||
d="M 233.06973,-1511.9997 L 237.58829,-1511.9997 L 239.21707,-1503.3935 L 241.59194,-1511.9997 L 246.09998,-1511.9997 L 248.48536,-1503.3935 L 250.11414,-1511.9997 L 254.61168,-1511.9997 L 251.21751,-1496.5946 L 246.55184,-1496.5946 L 243.85121,-1506.2937 L 241.1611,-1496.5946 L 236.49543,-1496.5946 L 233.06973,-1511.9997 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15525" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15476-8"><path
|
||||
d="M 511.84635,-1515.0007 L 516.29135,-1515.0007 L 522.09191,-1506.4785 L 522.09191,-1515.0007 L 526.57894,-1515.0007 L 526.57894,-1499.5956 L 522.09191,-1499.5956 L 516.32287,-1508.0547 L 516.32287,-1499.5956 L 511.84635,-1499.5956 L 511.84635,-1515.0007 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15518" /><path
|
||||
d="M 529.75243,-1515.0007 L 542.50947,-1515.0007 L 542.50947,-1511.7116 L 534.52319,-1511.7116 L 534.52319,-1509.2632 L 541.93151,-1509.2632 L 541.93151,-1506.1212 L 534.52319,-1506.1212 L 534.52319,-1503.0843 L 542.74065,-1503.0843 L 542.74065,-1499.5956 L 529.75243,-1499.5956 L 529.75243,-1515.0007 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15520" /></g><g
|
||||
transform="scale(1,-1)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15480-1"><path
|
||||
d="M 372.9016,-1248.6384 L 377.43067,-1248.9221 Q 377.57778,-1247.8187 378.02964,-1247.2408 Q 378.76522,-1246.3055 380.13129,-1246.3055 Q 381.15059,-1246.3055 381.69702,-1246.7784 Q 382.25396,-1247.2618 382.25396,-1247.8923 Q 382.25396,-1248.4913 381.72855,-1248.9641 Q 381.20313,-1249.437 379.29063,-1249.8573 Q 376.15917,-1250.5614 374.82462,-1251.7278 Q 373.47956,-1252.8942 373.47956,-1254.7016 Q 373.47956,-1255.8891 374.1626,-1256.9399 Q 374.85614,-1258.0012 376.23272,-1258.6002 Q 377.61982,-1259.2097 380.02621,-1259.2097 Q 382.97903,-1259.2097 384.52374,-1258.1063 Q 386.07897,-1257.0135 386.3732,-1254.6176 L 381.88617,-1254.3549 Q 381.70753,-1255.3952 381.12958,-1255.8681 Q 380.56213,-1256.3409 379.55334,-1256.3409 Q 378.72318,-1256.3409 378.30285,-1255.9837 Q 377.88252,-1255.6369 377.88252,-1255.1325 Q 377.88252,-1254.7647 378.22929,-1254.4705 Q 378.56556,-1254.1657 379.82655,-1253.903 Q 382.94751,-1253.2305 384.29256,-1252.5369 Q 385.64813,-1251.8539 386.25761,-1250.8346 Q 386.8776,-1249.8153 386.8776,-1248.5543 Q 386.8776,-1247.0726 386.05795,-1245.8222 Q 385.23831,-1244.5717 383.76715,-1243.9202 Q 382.29599,-1243.2792 380.05773,-1243.2792 Q 376.12764,-1243.2792 374.61445,-1244.7924 Q 373.10126,-1246.3055 372.9016,-1248.6384 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path15515" /></g></g><g
|
||||
transform="matrix(1.0825318,-0.625,-0.625,-1.0825318,1114.0558,2851.0675)"
|
||||
id="quad-hexa-X"><g
|
||||
id="g10687"><path
|
||||
@ -18833,11 +19263,7 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9612"
|
||||
d="m 2317.1069,1180.0291 c 3.44,-12.8518 -4.188,-26.0638 -17.0457,-29.5039 -12.8508,-3.4463 -26.0656,4.181 -29.5106,17.038 -3.442,12.8483 4.1861,26.0626 17.0426,29.4987 12.8529,3.4498 26.0657,-4.1809 29.5148,-17.0288" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9614"
|
||||
d="m 2133.6613,1269.979 -0.054,0.032 -5.805,-3.0005 3.109,-1.795 2.7505,4.764 z m -1.3417,-8.874 -1.449,-2.5098 -2.8544,1.648 1.449,2.5098 -6.0544,3.4955 1.48,2.5634 9.7403,4.7768 3.6547,-2.11 -4.556,-7.8912 1.7822,-1.029 -1.4275,-2.4725 -1.7649,1.019 z" /><g
|
||||
d="m 2317.1069,1180.0291 c 3.44,-12.8518 -4.188,-26.0638 -17.0457,-29.5039 -12.8508,-3.4463 -26.0656,4.181 -29.5106,17.038 -3.442,12.8483 4.1861,26.0626 17.0426,29.4987 12.8529,3.4498 26.0657,-4.1809 29.5148,-17.0288" /><g
|
||||
id="g9616"
|
||||
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-441.19432,1261.6797)"><g
|
||||
style="opacity:0.5"
|
||||
@ -18876,33 +19302,13 @@
|
||||
id="path9652"
|
||||
d="m 2155.9971,1458.6238 c 3.4391,-12.8513 -4.1877,-26.0653 -17.0452,-29.5031 -12.8518,-3.448 -26.0647,4.1805 -29.5098,17.0375 -3.4419,12.8483 4.1874,26.0608 17.0422,29.4979 12.8537,3.4493 26.0684,-4.1802 29.5157,-17.0293" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9654"
|
||||
d="m 2294.7658,1547.6081 c -1.1994,0.6925 -2.5199,0.3394 -3.2129,-0.8609 -0.64,-1.1085 -0.3753,-2.4981 0.8432,-3.2016 1.2003,-0.693 2.5026,-0.3294 3.2056,0.8883 0.672,1.1639 0.3653,2.4807 -0.8359,3.1742 m -3.8397,-6.6086 c -2.7998,1.6165 -4.0442,4.7113 -2.4172,7.5294 0.882,1.5276 2.1465,2.3737 3.7363,3.1533 l 5.7869,2.8412 3.691,-2.131 -5.705,-2.5733 -0.107,-0.059 c 0.2889,-0.046 0.7032,-0.212 0.9942,-0.38 2.2542,-1.3015 3.2419,-4.1269 1.7929,-6.6366 -1.69,-2.9272 -4.9904,-3.3496 -7.7721,-1.7436" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9656"
|
||||
d="m 2477.2803,1275.7735 c 3.4398,-12.854 -4.1873,-26.0666 -17.0467,-29.5057 -12.8525,-3.4453 -26.0682,4.1825 -29.5141,17.04 -3.441,12.8501 4.1851,26.061 17.0436,29.5005 12.8527,3.4476 26.0674,-4.1819 29.5175,-17.0303" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9658"
|
||||
d="m 2290.2764,1167.9497 c -2.3452,1.354 -3.885,3.6009 -3.1906,6.3997 l 3.2672,-0.891 c -0.2575,-0.9921 0.095,-2.1884 1.2584,-2.8604 0.873,-0.504 2.1252,-0.6451 2.8177,0.5544 0.7555,1.3086 -0.3701,2.4688 -1.6415,3.2028 l -0.8192,0.473 1.291,2.2361 0.892,-0.515 c 1.1449,-0.661 2.4223,-1.0105 3.1358,0.2253 0.536,0.9284 0.037,1.8709 -0.7991,2.3539 -0.873,0.504 -1.8896,0.3393 -2.5936,-0.4182 l -2.4583,2.2922 c 1.8679,1.8072 4.5448,1.7397 6.6899,0.5012 2.2733,-1.3125 3.8556,-3.7779 2.4281,-6.2504 -0.819,-1.4186 -2.3373,-1.9484 -3.7803,-1.5517 l -0.031,-0.054 c 1.2554,-1.1856 1.58,-2.9734 0.751,-4.4093 -1.6275,-2.8189 -4.8541,-2.6534 -7.2175,-1.2889" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#2f2d2e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9660"
|
||||
d="m 2286.0179,1406.4433 53.807,-31.0655 c 1.4099,-0.814 1.8965,-2.6192 1.082,-4.0299 l -31.0635,-53.8036 c -0.8155,-1.4125 -2.6241,-1.8971 -4.034,-1.0831 l -53.807,31.0655 c -1.4125,0.8155 -1.8911,2.6206 -1.0756,4.0331 l 31.0635,53.8036 c 0.8145,1.4107 2.6151,1.8954 4.0276,1.0799" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9566"
|
||||
d="m 2449.4247,1447.2379 5.459,9.4553 -3.4708,-0.4696 -0.3327,3.0777 6.0325,0.6626 2.799,-1.616 -7.4325,-12.8735 -3.0545,1.7635 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9610"
|
||||
d="m 2445.2521,1266.2149 1.4695,2.5453 7.6431,1.6482 c 0.983,0.2327 1.7478,0.5913 2.1993,1.3734 0.525,0.9093 0.256,1.9133 -0.7079,2.4698 -1.0184,0.588 -2.1533,0.1763 -2.9422,-0.896 l -2.6961,2.0902 c 1.792,2.4318 4.7932,2.7601 7.303,1.3111 2.3634,-1.3645 3.9304,-3.9424 2.3769,-6.6331 -1.0605,-1.8368 -2.7525,-2.2895 -4.5428,-2.6623 l -4.5147,-0.9337 5.2542,-3.0335 -1.5325,-2.6544 -9.3098,5.375 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path9606"
|
||||
d="m 2127.654,1446.4693 c -2.3452,1.354 -3.5771,3.7142 -3.0009,6.0962 l 3.2748,-0.7498 c -0.2413,-1.05 0.1809,-2.1667 1.1811,-2.7442 1.0358,-0.598 2.2944,-0.476 3.0084,0.7607 0.8815,1.5268 -0.2486,2.7612 -1.5026,3.4852 -0.9094,0.525 -2.373,1.056 -3.4704,1.2531 l 4.5603,7.1867 7.892,-4.5565 -1.512,-2.6188 -5.1831,2.9925 -1.2838,-1.9736 c 0.4339,-0.1304 0.9815,-0.398 1.3634,-0.6185 2.5825,-1.491 3.8569,-4.0697 2.2929,-6.7786 -1.806,-3.1281 -5.0921,-3.1939 -7.6201,-1.7344" /><g
|
||||
d="m 2286.0179,1406.4433 53.807,-31.0655 c 1.4099,-0.814 1.8965,-2.6192 1.082,-4.0299 l -31.0635,-53.8036 c -0.8155,-1.4125 -2.6241,-1.8971 -4.034,-1.0831 l -53.807,31.0655 c -1.4125,0.8155 -1.8911,2.6206 -1.0756,4.0331 l 31.0635,53.8036 c 0.8145,1.4107 2.6151,1.8954 4.0276,1.0799" /><g
|
||||
style="display:inline"
|
||||
transform="matrix(0.11287894,-0.06517068,-0.06517068,-0.11287894,2391.2379,1650.5793)"
|
||||
id="g6140-8-69"><g
|
||||
@ -19027,7 +19433,59 @@
|
||||
id="path4400-5-2"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><g
|
||||
transform="matrix(0.86602541,-0.49999998,-0.49999998,-0.86602541,0,0)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15476-44-6"><path
|
||||
d="M 1110.0232,-2331.8683 L 1114.5417,-2331.8683 L 1116.1705,-2323.262 L 1118.5454,-2331.8683 L 1123.0534,-2331.8683 L 1125.4388,-2323.262 L 1127.0676,-2331.8683 L 1131.5651,-2331.8683 L 1128.171,-2316.4631 L 1123.5053,-2316.4631 L 1120.8047,-2326.1623 L 1118.1145,-2316.4631 L 1113.4489,-2316.4631 L 1110.0232,-2331.8683 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16135" /></g><g
|
||||
transform="matrix(0.86602541,-0.49999998,-0.49999998,-0.86602541,0,0)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15992-1"><path
|
||||
d="M 1384.0041,-2492.4198 L 1388.4491,-2492.4198 L 1394.2497,-2483.8976 L 1394.2497,-2492.4198 L 1398.7367,-2492.4198 L 1398.7367,-2477.0146 L 1394.2497,-2477.0146 L 1388.4806,-2485.4738 L 1388.4806,-2477.0146 L 1384.0041,-2477.0146 L 1384.0041,-2492.4198 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16151" /><path
|
||||
d="M 1401.9102,-2492.4198 L 1414.6672,-2492.4198 L 1414.6672,-2489.1307 L 1406.681,-2489.1307 L 1406.681,-2486.6823 L 1414.0893,-2486.6823 L 1414.0893,-2483.5403 L 1406.681,-2483.5403 L 1406.681,-2480.5034 L 1414.8984,-2480.5034 L 1414.8984,-2477.0146 L 1401.9102,-2477.0146 L 1401.9102,-2492.4198 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16153" /></g><g
|
||||
transform="matrix(0.86602541,-0.49999998,-0.49999998,-0.86602541,0,0)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15996-0"><path
|
||||
d="M 1384.9357,-2160.8441 L 1389.4647,-2161.1278 Q 1389.6118,-2160.0244 1390.0637,-2159.4465 Q 1390.7993,-2158.5112 1392.1653,-2158.5112 Q 1393.1846,-2158.5112 1393.7311,-2158.9841 Q 1394.288,-2159.4675 1394.288,-2160.098 Q 1394.288,-2160.697 1393.7626,-2161.1698 Q 1393.2372,-2161.6427 1391.3247,-2162.063 Q 1388.1932,-2162.7671 1386.8587,-2163.9335 Q 1385.5136,-2165.0999 1385.5136,-2166.9073 Q 1385.5136,-2168.0948 1386.1967,-2169.1456 Q 1386.8902,-2170.2069 1388.2668,-2170.8059 Q 1389.6539,-2171.4154 1392.0603,-2171.4154 Q 1395.0131,-2171.4154 1396.5578,-2170.312 Q 1398.113,-2169.2192 1398.4073,-2166.8233 L 1393.9202,-2166.5606 Q 1393.7416,-2167.6009 1393.1636,-2168.0738 Q 1392.5962,-2168.5466 1391.5874,-2168.5466 Q 1390.7572,-2168.5466 1390.3369,-2168.1893 Q 1389.9166,-2167.8426 1389.9166,-2167.3382 Q 1389.9166,-2166.9704 1390.2634,-2166.6762 Q 1390.5996,-2166.3714 1391.8606,-2166.1087 Q 1394.9816,-2165.4362 1396.3266,-2164.7426 Q 1397.6822,-2164.0596 1398.2917,-2163.0403 Q 1398.9117,-2162.021 1398.9117,-2160.76 Q 1398.9117,-2159.2783 1398.092,-2158.0279 Q 1397.2724,-2156.7774 1395.8012,-2156.1259 Q 1394.3301,-2155.4849 1392.0918,-2155.4849 Q 1388.1617,-2155.4849 1386.6485,-2156.998 Q 1385.1353,-2158.5112 1384.9357,-2160.8441 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16143" /><path
|
||||
d="M 1401.3075,-2171.1527 L 1414.0646,-2171.1527 L 1414.0646,-2167.8636 L 1406.0783,-2167.8636 L 1406.0783,-2165.4152 L 1413.4866,-2165.4152 L 1413.4866,-2162.2732 L 1406.0783,-2162.2732 L 1406.0783,-2159.2363 L 1414.2958,-2159.2363 L 1414.2958,-2155.7476 L 1401.3075,-2155.7476 L 1401.3075,-2171.1527 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16145" /></g><g
|
||||
transform="matrix(0.86602541,-0.49999998,-0.49999998,-0.86602541,0,0)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16000-48"><path
|
||||
d="M 1483.9622,-2334.1549 L 1496.7192,-2334.1549 L 1496.7192,-2330.8658 L 1488.733,-2330.8658 L 1488.733,-2328.4174 L 1496.1413,-2328.4174 L 1496.1413,-2325.2754 L 1488.733,-2325.2754 L 1488.733,-2322.2385 L 1496.9504,-2322.2385 L 1496.9504,-2318.7498 L 1483.9622,-2318.7498 L 1483.9622,-2334.1549 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16148" /></g><g
|
||||
transform="matrix(0.86602541,-0.49999998,-0.49999998,-0.86602541,0,0)"
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16004-6"><path
|
||||
d="M 1193.9402,-2160.1805 L 1198.4692,-2160.4642 Q 1198.6164,-2159.3608 1199.0682,-2158.7829 Q 1199.8038,-2157.8477 1201.1699,-2157.8477 Q 1202.1892,-2157.8477 1202.7356,-2158.3205 Q 1203.2925,-2158.8039 1203.2925,-2159.4344 Q 1203.2925,-2160.0334 1202.7671,-2160.5062 Q 1202.2417,-2160.9791 1200.3292,-2161.3995 Q 1197.1977,-2162.1035 1195.8632,-2163.2699 Q 1194.5181,-2164.4363 1194.5181,-2166.2438 Q 1194.5181,-2167.4312 1195.2012,-2168.482 Q 1195.8947,-2169.5434 1197.2713,-2170.1423 Q 1198.6584,-2170.7518 1201.0648,-2170.7518 Q 1204.0176,-2170.7518 1205.5623,-2169.6484 Q 1207.1175,-2168.5556 1207.4118,-2166.1597 L 1202.9247,-2165.897 Q 1202.7461,-2166.9373 1202.1681,-2167.4102 Q 1201.6007,-2167.8831 1200.5919,-2167.8831 Q 1199.7618,-2167.8831 1199.3414,-2167.5258 Q 1198.9211,-2167.179 1198.9211,-2166.6746 Q 1198.9211,-2166.3068 1199.2679,-2166.0126 Q 1199.6041,-2165.7078 1200.8651,-2165.4451 Q 1203.9861,-2164.7726 1205.3311,-2164.0791 Q 1206.6867,-2163.396 1207.2962,-2162.3767 Q 1207.9162,-2161.3574 1207.9162,-2160.0964 Q 1207.9162,-2158.6148 1207.0965,-2157.3643 Q 1206.2769,-2156.1138 1204.8057,-2155.4623 Q 1203.3346,-2154.8213 1201.0963,-2154.8213 Q 1197.1662,-2154.8213 1195.653,-2156.3345 Q 1194.1398,-2157.8477 1193.9402,-2160.1805 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16138" /><path
|
||||
d="M 1208.7358,-2170.4891 L 1213.2544,-2170.4891 L 1214.8832,-2161.8828 L 1217.258,-2170.4891 L 1221.7661,-2170.4891 L 1224.1514,-2161.8828 L 1225.7802,-2170.4891 L 1230.2778,-2170.4891 L 1226.8836,-2155.084 L 1222.2179,-2155.084 L 1219.5173,-2164.7831 L 1216.8272,-2155.084 L 1212.1615,-2155.084 L 1208.7358,-2170.4891 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16140" /></g><g
|
||||
transform="matrix(0.86602541,-0.49999998,-0.49999998,-0.86602541,0,0)"
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16008-9"><path
|
||||
d="M 1195.3174,-2495.2032 L 1199.7624,-2495.2032 L 1205.5629,-2486.681 L 1205.5629,-2495.2032 L 1210.0499,-2495.2032 L 1210.0499,-2479.7981 L 1205.5629,-2479.7981 L 1199.7939,-2488.2572 L 1199.7939,-2479.7981 L 1195.3174,-2479.7981 L 1195.3174,-2495.2032 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16156" /><path
|
||||
d="M 1211.6472,-2495.2032 L 1216.1658,-2495.2032 L 1217.7945,-2486.5969 L 1220.1694,-2495.2032 L 1224.6775,-2495.2032 L 1227.0628,-2486.5969 L 1228.6916,-2495.2032 L 1233.1891,-2495.2032 L 1229.795,-2479.7981 L 1225.1293,-2479.7981 L 1222.4287,-2489.4972 L 1219.7386,-2479.7981 L 1215.0729,-2479.7981 L 1211.6472,-2495.2032 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16158" /></g></g></g><g
|
||||
id="quad-hexa-X_reverse"
|
||||
transform="matrix(1.0825318,-0.625,-0.625,-1.0825318,1114.0558,6851.5547)"><path
|
||||
d="m 2441.623,1269.3721 c 3.326,-1.922 7.052,-1.695 8.32,0.508 c 1.272,2.197 -0.396,5.537 -3.722,7.457 l -298.823,172.526 c -3.325,1.92 -7.048,1.691 -8.32,-0.508 c -1.269,-2.199 0.399,-5.539 3.725,-7.459 l 298.82,-172.524 z"
|
||||
@ -19260,10 +19718,6 @@
|
||||
d="m 2317.1069,1180.0291 c 3.44,-12.8518 -4.188,-26.0638 -17.0457,-29.5039 c -12.8508,-3.4463 -26.0656,4.181 -29.5106,17.038 c -3.442,12.8483 4.1861,26.0626 17.0426,29.4987 c 12.8529,3.4498 26.0657,-4.1809 29.5148,-17.0288"
|
||||
id="path7008"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 2133.6613,1269.979 l -0.054,0.032 l -5.805,-3.0005 l 3.109,-1.795 l 2.7505,4.764 z m -1.3417,-8.874 l -1.449,-2.5098 l -2.8544,1.648 l 1.449,2.5098 l -6.0544,3.4955 l 1.48,2.5634 l 9.7403,4.7768 l 3.6547,-2.11 l -4.556,-7.8912 l 1.7822,-1.029 l -1.4275,-2.4725 l -1.7649,1.019 z"
|
||||
id="path7010"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><g
|
||||
transform="matrix(0.8660254,-0.5,0.5,0.8660254,-441.19432,1261.6797)"
|
||||
id="g7012"><g
|
||||
@ -19302,33 +19756,13 @@
|
||||
id="path7040"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 2294.7658,1547.6081 c -1.1994,0.6925 -2.5199,0.3394 -3.2129,-0.8609 c -0.64,-1.1085 -0.3753,-2.4981 0.8432,-3.2016 c 1.2003,-0.693 2.5026,-0.3294 3.2056,0.8883 c 0.672,1.1639 0.3653,2.4807 -0.8359,3.1742 m -3.8397,-6.6086 c -2.7998,1.6165 -4.0442,4.7113 -2.4172,7.5294 c 0.882,1.5276 2.1465,2.3737 3.7363,3.1533 l 5.7869,2.8412 l 3.691,-2.131 l -5.705,-2.5733 l -0.107,-0.059 c 0.2889,-0.046 0.7032,-0.212 0.9942,-0.38 c 2.2542,-1.3015 3.2419,-4.1269 1.7929,-6.6366 c -1.69,-2.9272 -4.9904,-3.3496 -7.7721,-1.7436"
|
||||
id="path7042"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 2477.2803,1275.7735 c 3.4398,-12.854 -4.1873,-26.0666 -17.0467,-29.5057 c -12.8525,-3.4453 -26.0682,4.1825 -29.5141,17.04 c -3.441,12.8501 4.1851,26.061 17.0436,29.5005 c 12.8527,3.4476 26.0674,-4.1819 29.5175,-17.0303"
|
||||
id="path7044"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 2290.2764,1167.9497 c -2.3452,1.354 -3.885,3.6009 -3.1906,6.3997 l 3.2672,-0.891 c -0.2575,-0.9921 0.095,-2.1884 1.2584,-2.8604 c 0.873,-0.504 2.1252,-0.6451 2.8177,0.5544 c 0.7555,1.3086 -0.3701,2.4688 -1.6415,3.2028 l -0.8192,0.473 l 1.291,2.2361 l 0.892,-0.515 c 1.1449,-0.661 2.4223,-1.0105 3.1358,0.2253 c 0.536,0.9284 0.037,1.8709 -0.7991,2.3539 c -0.873,0.504 -1.8896,0.3393 -2.5936,-0.4182 l -2.4583,2.2922 c 1.8679,1.8072 4.5448,1.7397 6.6899,0.5012 c 2.2733,-1.3125 3.8556,-3.7779 2.4281,-6.2504 c -0.819,-1.4186 -2.3373,-1.9484 -3.7803,-1.5517 l -0.031,-0.054 c 1.2554,-1.1856 1.58,-2.9734 0.751,-4.4093 c -1.6275,-2.8189 -4.8541,-2.6534 -7.2175,-1.2889"
|
||||
id="path7046"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 2286.0179,1406.4433 l 53.807,-31.0655 c 1.4099,-0.814 1.8965,-2.6192 1.082,-4.0299 l -31.0635,-53.8036 c -0.8155,-1.4125 -2.6241,-1.8971 -4.034,-1.0831 l -53.807,31.0655 c -1.4125,0.8155 -1.8911,2.6206 -1.0756,4.0331 l 31.0635,53.8036 c 0.8145,1.4107 2.6151,1.8954 4.0276,1.0799"
|
||||
id="path7048"
|
||||
style="fill:#2f2d2e;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 2449.4247,1447.2379 l 5.459,9.4553 l -3.4708,-0.4696 l -0.3327,3.0777 l 6.0325,0.6626 l 2.799,-1.616 l -7.4325,-12.8735 l -3.0545,1.7635 z"
|
||||
id="path7056"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 2445.2521,1266.2149 l 1.4695,2.5453 l 7.6431,1.6482 c 0.983,0.2327 1.7478,0.5913 2.1993,1.3734 c 0.525,0.9093 0.256,1.9133 -0.7079,2.4698 c -1.0184,0.588 -2.1533,0.1763 -2.9422,-0.896 l -2.6961,2.0902 c 1.792,2.4318 4.7932,2.7601 7.303,1.3111 c 2.3634,-1.3645 3.9304,-3.9424 2.3769,-6.6331 c -1.0605,-1.8368 -2.7525,-2.2895 -4.5428,-2.6623 l -4.5147,-0.9337 l 5.2542,-3.0335 l -1.5325,-2.6544 l -9.3098,5.375 z"
|
||||
id="path7058"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 2127.654,1446.4693 c -2.3452,1.354 -3.5771,3.7142 -3.0009,6.0962 l 3.2748,-0.7498 c -0.2413,-1.05 0.1809,-2.1667 1.1811,-2.7442 c 1.0358,-0.598 2.2944,-0.476 3.0084,0.7607 c 0.8815,1.5268 -0.2486,2.7612 -1.5026,3.4852 c -0.9094,0.525 -2.373,1.056 -3.4704,1.2531 l 4.5603,7.1867 l 7.892,-4.5565 l -1.512,-2.6188 l -5.1831,2.9925 l -1.2838,-1.9736 c 0.4339,-0.1304 0.9815,-0.398 1.3634,-0.6185 c 2.5825,-1.491 3.8569,-4.0697 2.2929,-6.7786 c -1.806,-3.1281 -5.0921,-3.1939 -7.6201,-1.7344"
|
||||
id="path7060"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><g
|
||||
style="display:inline"
|
||||
transform="matrix(0.11287894,-0.06517068,-0.06517068,-0.11287894,2391.2379,1650.5793)"
|
||||
@ -19454,7 +19888,89 @@
|
||||
id="path4400-5-47"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g><text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text15476-44-6-7"
|
||||
y="-2316.4629"
|
||||
x="1110.0337"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"
|
||||
transform="matrix(0.86602541,-0.49999998,-0.49999998,-0.86602541,0,0)"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="-2316.4629"
|
||||
x="1110.0337"
|
||||
id="tspan15478-4-7"
|
||||
sodipodi:role="line">W</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="1382.3964"
|
||||
y="-2477.0146"
|
||||
id="text15992-1-0"
|
||||
sodipodi:linespacing="125%"
|
||||
transform="matrix(0.86602541,-0.49999998,-0.49999998,-0.86602541,0,0)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan15994-8"
|
||||
x="1382.3964"
|
||||
y="-2477.0146"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">NE</tspan></text>
|
||||
<text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text15996-0-9"
|
||||
y="-2155.7476"
|
||||
x="1384.1896"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"
|
||||
transform="matrix(0.86602541,-0.49999998,-0.49999998,-0.86602541,0,0)"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="-2155.7476"
|
||||
x="1384.1896"
|
||||
id="tspan15998-4"
|
||||
sodipodi:role="line">SE</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="1482.3965"
|
||||
y="-2318.7495"
|
||||
id="text16000-48-1"
|
||||
sodipodi:linespacing="125%"
|
||||
transform="matrix(0.86602541,-0.49999998,-0.49999998,-0.86602541,0,0)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan16002-1"
|
||||
x="1482.3965"
|
||||
y="-2318.7495"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">E</tspan></text>
|
||||
<text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text16004-6-6"
|
||||
y="-2155.084"
|
||||
x="1193.1941"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
transform="matrix(0.86602541,-0.49999998,-0.49999998,-0.86602541,0,0)"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="-2155.084"
|
||||
x="1193.1941"
|
||||
id="tspan16006-6"
|
||||
sodipodi:role="line">SW</tspan></text>
|
||||
<text
|
||||
inkscape:transform-center-y="-19.642874"
|
||||
inkscape:transform-center-x="-7.6388955"
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="1193.7096"
|
||||
y="-2479.7979"
|
||||
id="text16008-9-5"
|
||||
sodipodi:linespacing="125%"
|
||||
transform="matrix(0.86602541,-0.49999998,-0.49999998,-0.86602541,0,0)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan16010-8"
|
||||
x="1193.7096"
|
||||
y="-2479.7979"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">NW</tspan></text>
|
||||
</g><g
|
||||
transform="matrix(1.1548494,0.47835429,-0.47835429,1.1548494,762.32743,1094.1058)"
|
||||
id="quad-octo-X_reverse"><path
|
||||
d="m 2872.749,1120.5303 c -3.836,-3.839 -8.398,-5.49 -10.195,-3.691 c -1.795,1.795 -0.143,6.359 3.692,10.192 l 344.527,344.527 c 3.833,3.834 8.397,5.487 10.193,3.692 c 1.797,-1.797 0.142,-6.362 -3.692,-10.198 l -344.525,-344.522 z"
|
||||
@ -19567,17 +20083,9 @@
|
||||
id="path7068"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 3213.529,1465.6527 l -0.058,0.024 l -1.1537,6.4311 l 3.3167,-1.3738 l -2.1048,-5.0814 z m 6.2231,6.4657 l 1.1094,2.6784 l -3.0451,1.2613 l -1.1094,-2.6783 l -6.4598,2.6757 l -1.1324,-2.7338 l 2.1399,-10.6354 l 3.8988,-1.615 l 3.4866,8.4175 l 1.9023,-0.7879 l 1.0925,2.6376 l -1.8828,0.7799 z"
|
||||
id="path7070"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 3295.0106,1274.4712 c 12.2933,5.0997 18.1315,19.1944 13.0326,31.4896 c -5.0908,12.294 -19.1848,18.1341 -31.484,13.0411 c -12.2912,-5.0919 -18.1287,-19.1848 -13.028,-31.4785 c 5.0883,-12.2973 19.1866,-18.1349 31.482,-13.0511"
|
||||
id="path7072"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 3288.5476,1303.9523 c -2.5018,1.0363 -5.2218,0.89 -7.0195,-1.3646 l 2.6958,-2.0497 c 0.6299,0.8074 1.7937,1.2573 3.0354,0.7429 c 0.9313,-0.3857 1.8055,-1.2933 1.2751,-2.5738 c -0.5783,-1.396 -2.1837,-1.2084 -3.5399,-0.6466 l -0.874,0.362 l -0.9885,-2.3864 l 0.9516,-0.3941 c 1.2214,-0.5059 2.2763,-1.3066 1.7302,-2.6249 c -0.4102,-0.9904 -1.4611,-1.1678 -2.3536,-0.7981 c -0.9312,0.3857 -1.4197,1.2916 -1.2474,2.3113 l -3.315,0.5548 c -0.2963,-2.5811 1.3864,-4.6646 3.6749,-5.6125 c 2.4252,-1.0046 5.3443,-0.759 6.4369,1.8787 c 0.6272,1.5142 0.1229,3.0404 -1.0699,3.9447 l 0.024,0.057 c 1.7044,-0.2753 3.3207,0.5565 3.9552,2.0883 c 1.2453,3.0063 -0.8498,5.4663 -3.3711,6.5107"
|
||||
id="path7074"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><g
|
||||
transform="matrix(0.92387953,-0.38268343,-0.38268343,-0.92387953,819.86593,3637.7588)"
|
||||
id="g7076"><g
|
||||
@ -19657,17 +20165,9 @@
|
||||
id="path7148"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 3213.0601,1132.0905 l -1.1247,-2.7153 l 3.3452,-7.0671 c 0.4129,-0.9212 0.5949,-1.7466 0.2493,-2.5809 c -0.4018,-0.9701 -1.3631,-1.3675 -2.3904,-0.9419 c -1.0865,0.45 -1.4498,1.6007 -1.0803,2.8796 l -3.2986,0.8662 c -0.8393,-2.9016 0.7282,-5.483 3.4047,-6.5916 c 2.5222,-1.0448 5.5204,-0.7182 6.7093,2.1522 c 0.8117,1.9596 0.1408,3.5775 -0.6542,5.2252 l -2.0076,4.1501 l 5.6061,-2.3221 l 1.1729,2.8317 l -9.9317,4.1139 z"
|
||||
id="path7150"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 3052.6884,1030.2894 c 12.2944,5.0971 18.1327,19.1918 13.0318,31.4878 c -5.0898,12.2936 -19.1879,18.1343 -31.4839,13.0411 c -12.2896,-5.0905 -18.1278,-19.1852 -13.0288,-31.4804 c 5.0874,-12.2969 19.1855,-18.1322 31.4783,-13.0496"
|
||||
id="path7152"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 3045.4347,1059.6656 l -4.1781,-10.0869 l -1.7404,3.0394 l -2.6452,-1.6093 l 3.1458,-5.1888 l 2.9879,-1.2376 l 5.6885,13.7335 l -3.2585,1.3497 z"
|
||||
id="path7154"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><g
|
||||
transform="matrix(0.92387953,-0.38268343,-0.38268343,-0.92387953,708.86433,3563.4688)"
|
||||
id="g7156"><g
|
||||
@ -19747,17 +20247,9 @@
|
||||
id="path7228"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 2868.4518,1119.6804 c -0.971,0.4022 -1.3484,1.3541 -0.9788,2.2466 c 0.3617,0.873 1.2956,1.3716 2.3044,0.9537 c 0.9498,-0.3934 1.3352,-1.4384 0.9736,-2.3115 c -0.3697,-0.8925 -1.3882,-1.2661 -2.2992,-0.8888 m 2.3543,5.6837 c -1.1262,0.4665 -1.5913,1.5911 -1.1497,2.6572 c 0.4581,1.1059 1.55,1.4947 2.6762,1.0282 c 1.1244,-0.4658 1.6031,-1.5051 1.145,-2.611 c -0.4336,-1.0467 -1.5666,-1.5321 -2.6715,-1.0744 m 2.5953,6.2658 c -2.7152,1.1247 -5.7313,0.7601 -6.9287,-2.1307 c -0.6908,-1.6676 -0.055,-3.3176 1.1062,-4.2985 l -0.016,-0.039 c -1.3674,0.044 -2.6981,-0.5872 -3.3245,-2.0996 c -1.0528,-2.5416 0.6276,-4.8504 3.1692,-5.9032 c 2.5212,-1.0443 5.3373,-0.6662 6.3901,1.8754 c 0.6264,1.5124 0.2025,2.9609 -0.8501,3.8742 l 0.024,0.058 c 1.5373,-0.1821 3.1461,0.6289 3.8127,2.2383 c 1.1975,2.8909 -0.6676,5.3 -3.3829,6.4247"
|
||||
id="path7230"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 2807.8423,1271.9019 c 12.2918,5.096 18.1301,19.1907 13.0303,31.4841 c -5.0882,12.295 -19.1873,18.1329 -31.4839,13.0411 c -12.2914,-5.0898 -18.127,-19.1834 -13.0288,-31.4804 c 5.0899,-12.2937 19.1846,-18.1319 31.483,-13.0407"
|
||||
id="path7232"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 2801.0304,1301.0919 l -3.7833,1.5671 l 1.0365,-13.247 l -6.4995,2.6922 l -1.1568,-2.7929 l 9.9714,-4.1303 l 1.0769,2.5998 l -0.6452,13.3111 z"
|
||||
id="path7234"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><g
|
||||
transform="matrix(0.92387953,-0.38268343,-0.38268343,-0.92387953,634.62023,3674.4374)"
|
||||
id="g7236"><g
|
||||
@ -19837,17 +20329,9 @@
|
||||
id="path7308"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 2866.7107,1468.5768 c -1.2814,0.5308 -1.8029,1.7934 -1.2729,3.073 c 0.4902,1.1835 1.7533,1.8184 3.0532,1.28 c 1.2796,-0.53 1.7834,-1.7832 1.2449,-3.0831 c -0.5143,-1.2417 -1.7457,-1.7999 -3.0252,-1.2699 m 2.9054,7.0692 c -2.9878,1.2376 -6.1992,0.3414 -7.4449,-2.6659 c -0.675,-1.6297 -0.5762,-3.147 -0.2281,-4.8834 l 1.2682,-6.3193 l 3.9385,-1.6314 l -1.4305,6.0922 l -0.018,0.1201 c 0.2114,-0.2001 0.5944,-0.428 0.9048,-0.5566 c 2.4049,-0.9961 5.248,-0.059 6.3566,2.6177 c 1.2935,3.1227 -0.3787,5.9974 -3.3462,7.2266"
|
||||
id="path7310"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 3049.0238,1516.7708 c 12.2945,5.0972 18.1301,19.1908 13.0311,31.486 c -5.089,12.2932 -19.1883,18.1333 -31.4849,13.0415 c -12.291,-5.0942 -18.1267,-19.1879 -13.028,-31.4786 c 5.0882,-12.2951 19.1858,-18.1367 31.4801,-13.0503"
|
||||
id="path7312"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><path
|
||||
d="m 3042.4244,1546.2874 c -2.5028,1.0366 -5.1243,0.5769 -6.6643,-1.33 l 2.5894,-2.142 c 0.6848,0.8302 1.8278,1.175 2.894,0.7334 c 1.1058,-0.4581 1.7762,-1.5313 1.2297,-2.8506 c -0.6747,-1.6288 -2.3421,-1.4837 -3.6808,-0.9291 c -0.97,0.4018 -2.2809,1.2403 -3.1077,1.9908 l -2.9241,-7.9924 l 8.4193,-3.4874 l 1.1572,2.7938 l -5.5284,2.29 l 0.7823,2.2206 c 0.3686,-0.2652 0.9148,-0.538 1.3213,-0.7064 c 2.755,-1.1411 5.5766,-0.5824 6.7736,2.3075 c 1.3823,3.3371 -0.5657,5.9851 -3.2615,7.1018"
|
||||
id="path7314"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
inkscape:connector-curvature="0" /><g
|
||||
transform="matrix(0.92387953,-0.38268343,-0.38268343,-0.92387953,709.12442,3665.0152)"
|
||||
id="g7316"><path
|
||||
@ -19985,7 +20469,111 @@
|
||||
id="path4400-5-24"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g></g><text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.50800514px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="2389.0325"
|
||||
y="2143.0269"
|
||||
id="text15992-1-2-6-3-8-5"
|
||||
sodipodi:linespacing="125%"
|
||||
transform="matrix(0.92387953,-0.38268344,0.38268344,0.92387953,0,0)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan15994-8-9-1-5"
|
||||
x="2389.0325"
|
||||
y="2143.0269"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">NNE</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.50800514px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="2521.1233"
|
||||
y="2274.0901"
|
||||
id="text16607-7"
|
||||
sodipodi:linespacing="125%"
|
||||
transform="matrix(0.92387953,-0.38268344,0.38268344,0.92387953,0,0)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan16609"
|
||||
x="2521.1233"
|
||||
y="2274.0901"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">ENE</tspan></text>
|
||||
<text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text16611-7"
|
||||
y="2461.3569"
|
||||
x="2521.3174"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.50800514px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"
|
||||
transform="matrix(0.92387953,-0.38268344,0.38268344,0.92387953,0,0)"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="2461.3569"
|
||||
x="2521.3174"
|
||||
id="tspan16613"
|
||||
sodipodi:role="line">ESE</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.50800514px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="2389.6982"
|
||||
y="2593.696"
|
||||
id="text16615-1"
|
||||
sodipodi:linespacing="125%"
|
||||
transform="matrix(0.92387953,-0.38268344,0.38268344,0.92387953,0,0)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan16617"
|
||||
x="2389.6982"
|
||||
y="2593.696"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">SSE</tspan></text>
|
||||
<text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text16619-7"
|
||||
y="2591.073"
|
||||
x="2198.97"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.50800514px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"
|
||||
transform="matrix(0.92387953,-0.38268344,0.38268344,0.92387953,0,0)"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="2591.073"
|
||||
x="2198.97"
|
||||
id="tspan16621"
|
||||
sodipodi:role="line">SSW</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.50800514px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="2064.2373"
|
||||
y="2459.6797"
|
||||
id="text16623-4"
|
||||
sodipodi:linespacing="125%"
|
||||
transform="matrix(0.92387953,-0.38268344,0.38268344,0.92387953,0,0)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan16625"
|
||||
x="2064.2373"
|
||||
y="2459.6797"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">WSW</tspan></text>
|
||||
<text
|
||||
transform="matrix(0.90392733,-0.37441896,0.39113033,0.94427213,0,0)"
|
||||
sodipodi:linespacing="125%"
|
||||
id="text16627-6"
|
||||
y="2223.4683"
|
||||
x="2113.5811"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.15149689px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="2223.4683"
|
||||
x="2113.5811"
|
||||
id="tspan16629"
|
||||
sodipodi:role="line">WNW</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.50800514px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="2199.1982"
|
||||
y="2143.2842"
|
||||
id="text16631-9"
|
||||
sodipodi:linespacing="125%"
|
||||
transform="matrix(0.92387953,-0.38268344,0.38268344,0.92387953,0,0)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan16633"
|
||||
x="2199.1982"
|
||||
y="2143.2842"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">NNW</tspan></text>
|
||||
</g><g
|
||||
id="quad-octo-X"
|
||||
transform="matrix(1.1548494,0.47835429,-0.47835429,1.1548494,768.18514,-3396.4004)"><path
|
||||
inkscape:connector-curvature="0"
|
||||
@ -20099,17 +20687,9 @@
|
||||
id="path7454"
|
||||
d="m 3223.7647,1447.232 c 12.2892,5.095 18.1283,19.1893 13.0303,31.4841 c -5.0897,12.2914 -19.1811,18.1325 -31.4784,13.0388 c -12.2896,-5.0905 -18.1304,-19.1863 -13.0373,-31.4747 c 5.0891,-12.2955 19.184,-18.1359 31.4783,-13.0496" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7456"
|
||||
d="m 3213.529,1465.6527 l -0.058,0.024 l -1.1537,6.4311 l 3.3167,-1.3738 l -2.1048,-5.0814 z m 6.2231,6.4657 l 1.1094,2.6784 l -3.0451,1.2613 l -1.1094,-2.6783 l -6.4598,2.6757 l -1.1324,-2.7338 l 2.1399,-10.6354 l 3.8988,-1.615 l 3.4866,8.4175 l 1.9023,-0.7879 l 1.0925,2.6376 l -1.8828,0.7799 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7458"
|
||||
d="m 3295.0106,1274.4712 c 12.2933,5.0997 18.1315,19.1944 13.0326,31.4896 c -5.0908,12.294 -19.1848,18.1341 -31.484,13.0411 c -12.2912,-5.0919 -18.1287,-19.1848 -13.028,-31.4785 c 5.0883,-12.2973 19.1866,-18.1349 31.482,-13.0511" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7460"
|
||||
d="m 3288.5476,1303.9523 c -2.5018,1.0363 -5.2218,0.89 -7.0195,-1.3646 l 2.6958,-2.0497 c 0.6299,0.8074 1.7937,1.2573 3.0354,0.7429 c 0.9313,-0.3857 1.8055,-1.2933 1.2751,-2.5738 c -0.5783,-1.396 -2.1837,-1.2084 -3.5399,-0.6466 l -0.874,0.362 l -0.9885,-2.3864 l 0.9516,-0.3941 c 1.2214,-0.5059 2.2763,-1.3066 1.7302,-2.6249 c -0.4102,-0.9904 -1.4611,-1.1678 -2.3536,-0.7981 c -0.9312,0.3857 -1.4197,1.2916 -1.2474,2.3113 l -3.315,0.5548 c -0.2963,-2.5811 1.3864,-4.6646 3.6749,-5.6125 c 2.4252,-1.0046 5.3443,-0.759 6.4369,1.8787 c 0.6272,1.5142 0.1229,3.0404 -1.0699,3.9447 l 0.024,0.057 c 1.7044,-0.2753 3.3207,0.5565 3.9552,2.0883 c 1.2453,3.0063 -0.8498,5.4663 -3.3711,6.5107" /><g
|
||||
d="m 3295.0106,1274.4712 c 12.2933,5.0997 18.1315,19.1944 13.0326,31.4896 c -5.0908,12.294 -19.1848,18.1341 -31.484,13.0411 c -12.2912,-5.0919 -18.1287,-19.1848 -13.028,-31.4785 c 5.0883,-12.2973 19.1866,-18.1349 31.482,-13.0511" /><g
|
||||
id="g7462"
|
||||
transform="matrix(0.92387953,-0.38268343,-0.38268343,-0.92387953,819.86593,3637.7588)"><g
|
||||
style="opacity:0.5"
|
||||
@ -20189,17 +20769,9 @@
|
||||
id="path7534"
|
||||
d="m 3224.0177,1101.1884 c 12.2908,5.0986 18.1277,19.1928 13.0303,31.4841 c -5.0882,12.2951 -19.1847,18.134 -31.4802,13.0395 c -12.2911,-5.0941 -18.1299,-19.1875 -13.0288,-31.4804 c 5.0869,-12.2956 19.1843,-18.1349 31.4783,-13.0495" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7536"
|
||||
d="m 3213.0601,1132.0905 l -1.1247,-2.7153 l 3.3452,-7.0671 c 0.4129,-0.9212 0.5949,-1.7466 0.2493,-2.5809 c -0.4018,-0.9701 -1.3631,-1.3675 -2.3904,-0.9419 c -1.0865,0.45 -1.4498,1.6007 -1.0803,2.8796 l -3.2986,0.8662 c -0.8393,-2.9016 0.7282,-5.483 3.4047,-6.5916 c 2.5222,-1.0448 5.5204,-0.7182 6.7093,2.1522 c 0.8117,1.9596 0.1408,3.5775 -0.6542,5.2252 l -2.0076,4.1501 l 5.6061,-2.3221 l 1.1729,2.8317 l -9.9317,4.1139 z" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7538"
|
||||
d="m 3052.6884,1030.2894 c 12.2944,5.0971 18.1327,19.1918 13.0318,31.4878 c -5.0898,12.2936 -19.1879,18.1343 -31.4839,13.0411 c -12.2896,-5.0905 -18.1278,-19.1852 -13.0288,-31.4804 c 5.0874,-12.2969 19.1855,-18.1322 31.4783,-13.0496" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7540"
|
||||
d="m 3045.4347,1059.6656 l -4.1781,-10.0869 l -1.7404,3.0394 l -2.6452,-1.6093 l 3.1458,-5.1888 l 2.9879,-1.2376 l 5.6885,13.7335 l -3.2585,1.3497 z" /><g
|
||||
d="m 3052.6884,1030.2894 c 12.2944,5.0971 18.1327,19.1918 13.0318,31.4878 c -5.0898,12.2936 -19.1879,18.1343 -31.4839,13.0411 c -12.2896,-5.0905 -18.1278,-19.1852 -13.0288,-31.4804 c 5.0874,-12.2969 19.1855,-18.1322 31.4783,-13.0496" /><g
|
||||
id="g7542"
|
||||
transform="matrix(0.92387953,-0.38268343,-0.38268343,-0.92387953,708.86433,3563.4688)"><g
|
||||
style="opacity:0.5"
|
||||
@ -20279,17 +20851,9 @@
|
||||
id="path7614"
|
||||
d="m 2879.8755,1102.1527 c 12.2919,5.0961 18.1293,19.1889 13.03,31.4832 c -5.0886,12.2941 -19.1839,18.1337 -31.4812,13.0399 c -12.2882,-5.0899 -18.1272,-19.1865 -13.028,-31.4785 c 5.0878,-12.296 19.1832,-18.1324 31.4802,-13.0396" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7616"
|
||||
d="m 2868.4518,1119.6804 c -0.971,0.4022 -1.3484,1.3541 -0.9788,2.2466 c 0.3617,0.873 1.2956,1.3716 2.3044,0.9537 c 0.9498,-0.3934 1.3352,-1.4384 0.9736,-2.3115 c -0.3697,-0.8925 -1.3882,-1.2661 -2.2992,-0.8888 m 2.3543,5.6837 c -1.1262,0.4665 -1.5913,1.5911 -1.1497,2.6572 c 0.4581,1.1059 1.55,1.4947 2.6762,1.0282 c 1.1244,-0.4658 1.6031,-1.5051 1.145,-2.611 c -0.4336,-1.0467 -1.5666,-1.5321 -2.6715,-1.0744 m 2.5953,6.2658 c -2.7152,1.1247 -5.7313,0.7601 -6.9287,-2.1307 c -0.6908,-1.6676 -0.055,-3.3176 1.1062,-4.2985 l -0.016,-0.039 c -1.3674,0.044 -2.6981,-0.5872 -3.3245,-2.0996 c -1.0528,-2.5416 0.6276,-4.8504 3.1692,-5.9032 c 2.5212,-1.0443 5.3373,-0.6662 6.3901,1.8754 c 0.6264,1.5124 0.2025,2.9609 -0.8501,3.8742 l 0.024,0.058 c 1.5373,-0.1821 3.1461,0.6289 3.8127,2.2383 c 1.1975,2.8909 -0.6676,5.3 -3.3829,6.4247" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7618"
|
||||
d="m 2807.8423,1271.9019 c 12.2918,5.096 18.1301,19.1907 13.0303,31.4841 c -5.0882,12.295 -19.1873,18.1329 -31.4839,13.0411 c -12.2914,-5.0898 -18.127,-19.1834 -13.0288,-31.4804 c 5.0899,-12.2937 19.1846,-18.1319 31.483,-13.0407" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7620"
|
||||
d="m 2801.0304,1301.0919 l -3.7833,1.5671 l 1.0365,-13.247 l -6.4995,2.6922 l -1.1568,-2.7929 l 9.9714,-4.1303 l 1.0769,2.5998 l -0.6452,13.3111 z" /><g
|
||||
d="m 2807.8423,1271.9019 c 12.2918,5.096 18.1301,19.1907 13.0303,31.4841 c -5.0882,12.295 -19.1873,18.1329 -31.4839,13.0411 c -12.2914,-5.0898 -18.127,-19.1834 -13.0288,-31.4804 c 5.0899,-12.2937 19.1846,-18.1319 31.483,-13.0407" /><g
|
||||
id="g7622"
|
||||
transform="matrix(0.92387953,-0.38268343,-0.38268343,-0.92387953,634.62023,3674.4374)"><g
|
||||
style="opacity:0.5"
|
||||
@ -20369,17 +20933,9 @@
|
||||
id="path7694"
|
||||
d="m 2876.1118,1446.1763 c 12.2892,5.0949 18.1274,19.1896 13.0303,31.4841 c -5.0889,12.2932 -19.1864,18.1326 -31.4812,13.0399 c -12.2894,-5.0927 -18.1268,-19.1856 -13.028,-31.4785 c 5.0863,-12.2943 19.1812,-18.1348 31.4764,-13.0488" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7696"
|
||||
d="m 2866.7107,1468.5768 c -1.2814,0.5308 -1.8029,1.7934 -1.2729,3.073 c 0.4902,1.1835 1.7533,1.8184 3.0532,1.28 c 1.2796,-0.53 1.7834,-1.7832 1.2449,-3.0831 c -0.5143,-1.2417 -1.7457,-1.7999 -3.0252,-1.2699 m 2.9054,7.0692 c -2.9878,1.2376 -6.1992,0.3414 -7.4449,-2.6659 c -0.675,-1.6297 -0.5762,-3.147 -0.2281,-4.8834 l 1.2682,-6.3193 l 3.9385,-1.6314 l -1.4305,6.0922 l -0.018,0.1201 c 0.2114,-0.2001 0.5944,-0.428 0.9048,-0.5566 c 2.4049,-0.9961 5.248,-0.059 6.3566,2.6177 c 1.2935,3.1227 -0.3787,5.9974 -3.3462,7.2266" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#48484a;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7698"
|
||||
d="m 3049.0238,1516.7708 c 12.2945,5.0972 18.1301,19.1908 13.0311,31.486 c -5.089,12.2932 -19.1883,18.1333 -31.4849,13.0415 c -12.291,-5.0942 -18.1267,-19.1879 -13.028,-31.4786 c 5.0882,-12.2951 19.1858,-18.1367 31.4801,-13.0503" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path7700"
|
||||
d="m 3042.4244,1546.2874 c -2.5028,1.0366 -5.1243,0.5769 -6.6643,-1.33 l 2.5894,-2.142 c 0.6848,0.8302 1.8278,1.175 2.894,0.7334 c 1.1058,-0.4581 1.7762,-1.5313 1.2297,-2.8506 c -0.6747,-1.6288 -2.3421,-1.4837 -3.6808,-0.9291 c -0.97,0.4018 -2.2809,1.2403 -3.1077,1.9908 l -2.9241,-7.9924 l 8.4193,-3.4874 l 1.1572,2.7938 l -5.5284,2.29 l 0.7823,2.2206 c 0.3686,-0.2652 0.9148,-0.538 1.3213,-0.7064 c 2.755,-1.1411 5.5766,-0.5824 6.7736,2.3075 c 1.3823,3.3371 -0.5657,5.9851 -3.2615,7.1018" /><g
|
||||
d="m 3049.0238,1516.7708 c 12.2945,5.0972 18.1301,19.1908 13.0311,31.486 c -5.089,12.2932 -19.1883,18.1333 -31.4849,13.0415 c -12.291,-5.0942 -18.1267,-19.1879 -13.028,-31.4786 c 5.0882,-12.2951 19.1858,-18.1367 31.4801,-13.0503" /><g
|
||||
id="g7702"
|
||||
transform="matrix(0.92387953,-0.38268343,-0.38268343,-0.92387953,709.12442,3665.0152)"><path
|
||||
inkscape:connector-curvature="0"
|
||||
@ -20520,7 +21076,154 @@
|
||||
id="path4400-5-0"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:Prototype;-inkscape-font-specification:Prototype;letter-spacing:0px;word-spacing:0px;fill:#ff6000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
d="m 961.2594,723.76703 q 0,-0.8 0.9106,-0.8 l 7.4667,0 q 0.9106,0 0.9106,-0.8 l 0,-8.15999 q 0,-0.8 -0.9106,-0.8 l -7.4667,0 q -0.9106,0 -0.9106,-0.8 l 0,-10 q 0,-0.8 -0.9106,-0.8 l -9.2879,0 q -0.9106,0 -0.9106,0.8 l 0,10 q 0,0.8 -0.9105,0.8 l -4.8261,0 q -0.9106,0 -0.9106,0.8 l 0,8.15999 q 0,0.8 0.9106,0.8 l 4.8261,0 q 0.9105,0 0.9105,0.8 l 0,24.96001 q 0,2.48 2.2765,4.32 q 2.2764,1.84 5.7366,1.84 l 11.4733,0 q 0.9106,0 0.9106,-0.8 l 0,-8.16 q 0,-0.72 -0.7285,-0.8 l -7.6488,0 q -0.9106,0 -0.9106,-0.8 l 0,-20.56001 z"
|
||||
inkscape:connector-curvature="0" /></g></g></g></g><g
|
||||
inkscape:connector-curvature="0" /></g></g></g><g
|
||||
transform="matrix(0.92387953,-0.38268344,0.38268344,0.92387953,0,0)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.50800514px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15992-1-2-6-3-8"><path
|
||||
d="M 2390.2657,2131.2101 L 2393.6753,2131.2101 L 2398.1248,2137.7472 L 2398.1248,2131.2101 L 2401.5666,2131.2101 L 2401.5666,2143.0269 L 2398.1248,2143.0269 L 2393.6995,2136.5381 L 2393.6995,2143.0269 L 2390.2657,2143.0269 L 2390.2657,2131.2101 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16699" /><path
|
||||
d="M 2404.0332,2131.2101 L 2407.4428,2131.2101 L 2411.8922,2137.7472 L 2411.8922,2131.2101 L 2415.334,2131.2101 L 2415.334,2143.0269 L 2411.8922,2143.0269 L 2407.4669,2136.5381 L 2407.4669,2143.0269 L 2404.0332,2143.0269 L 2404.0332,2131.2101 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16701" /><path
|
||||
d="M 2417.7683,2131.2101 L 2427.5538,2131.2101 L 2427.5538,2133.733 L 2421.4278,2133.733 L 2421.4278,2135.6112 L 2427.1105,2135.6112 L 2427.1105,2138.0213 L 2421.4278,2138.0213 L 2421.4278,2140.3508 L 2427.7312,2140.3508 L 2427.7312,2143.0269 L 2417.7683,2143.0269 L 2417.7683,2131.2101 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16703" /></g><text
|
||||
sodipodi:linespacing="125%"
|
||||
id="text15996-0-3-1-1-24"
|
||||
y="2781.6484"
|
||||
x="2416.271"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"
|
||||
transform="matrix(0.92387953,-0.38268344,0.38268344,0.92387953,0,0)"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="2781.6484"
|
||||
x="2416.271"
|
||||
id="tspan15998-4-4-2-5"
|
||||
sodipodi:role="line">SE</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="2211.9648"
|
||||
y="2781.6484"
|
||||
id="text16343-6-5"
|
||||
sodipodi:linespacing="125%"
|
||||
transform="matrix(0.92387953,-0.38268344,0.38268344,0.92387953,0,0)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan16345-9-2"
|
||||
x="2211.9648"
|
||||
y="2781.6484"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '">S</tspan></text>
|
||||
<text
|
||||
transform="matrix(0.92387953,-0.38268344,0.38268344,0.92387953,0,0)"
|
||||
sodipodi:linespacing="125%"
|
||||
id="text16603"
|
||||
y="2274.0901"
|
||||
x="2521.1233"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.50800514px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
xml:space="preserve"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
y="2274.0901"
|
||||
x="2521.1233"
|
||||
id="tspan16605"
|
||||
sodipodi:role="line">ENE</tspan></text>
|
||||
<g
|
||||
transform="matrix(0.92387953,-0.38268344,0.38268344,0.92387953,0,0)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.50800514px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16607"><path
|
||||
d="M 2522.3243,2262.2733 L 2532.1098,2262.2733 L 2532.1098,2264.7963 L 2525.9838,2264.7963 L 2525.9838,2266.6744 L 2531.6665,2266.6744 L 2531.6665,2269.0845 L 2525.9838,2269.0845 L 2525.9838,2271.414 L 2532.2872,2271.414 L 2532.2872,2274.0901 L 2522.3243,2274.0901 L 2522.3243,2262.2733 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16692" /><path
|
||||
d="M 2534.2862,2262.2733 L 2537.6958,2262.2733 L 2542.1452,2268.8104 L 2542.1452,2262.2733 L 2545.5871,2262.2733 L 2545.5871,2274.0901 L 2542.1452,2274.0901 L 2537.72,2267.6013 L 2537.72,2274.0901 L 2534.2862,2274.0901 L 2534.2862,2262.2733 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16694" /><path
|
||||
d="M 2548.0213,2262.2733 L 2557.8069,2262.2733 L 2557.8069,2264.7963 L 2551.6808,2264.7963 L 2551.6808,2266.6744 L 2557.3635,2266.6744 L 2557.3635,2269.0845 L 2551.6808,2269.0845 L 2551.6808,2271.414 L 2557.9842,2271.414 L 2557.9842,2274.0901 L 2548.0213,2274.0901 L 2548.0213,2262.2733 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16696" /></g><g
|
||||
transform="matrix(0.92387953,-0.38268344,0.38268344,0.92387953,0,0)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.50800514px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16611"><path
|
||||
d="M 2522.5184,2449.5402 L 2532.3039,2449.5402 L 2532.3039,2452.0631 L 2526.1779,2452.0631 L 2526.1779,2453.9412 L 2531.8606,2453.9412 L 2531.8606,2456.3513 L 2526.1779,2456.3513 L 2526.1779,2458.6808 L 2532.4812,2458.6808 L 2532.4812,2461.3569 L 2522.5184,2461.3569 L 2522.5184,2449.5402 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16685" /><path
|
||||
d="M 2533.8193,2457.4476 L 2537.2934,2457.2299 Q 2537.4062,2458.0763 2537.7528,2458.5196 Q 2538.3171,2459.237 2539.365,2459.237 Q 2540.1468,2459.237 2540.566,2458.8743 Q 2540.9932,2458.5035 2540.9932,2458.0199 Q 2540.9932,2457.5604 2540.5902,2457.1977 Q 2540.1871,2456.835 2538.7201,2456.5125 Q 2536.3181,2455.9725 2535.2944,2455.0778 Q 2534.2626,2454.183 2534.2626,2452.7966 Q 2534.2626,2451.8858 2534.7866,2451.0797 Q 2535.3186,2450.2656 2536.3745,2449.8062 Q 2537.4385,2449.3387 2539.2843,2449.3387 Q 2541.5494,2449.3387 2542.7343,2450.185 Q 2543.9272,2451.0233 2544.1529,2452.8611 L 2540.7111,2453.0626 Q 2540.574,2452.2646 2540.1307,2451.9019 Q 2539.6954,2451.5392 2538.9216,2451.5392 Q 2538.2848,2451.5392 2537.9624,2451.8132 Q 2537.64,2452.0792 2537.64,2452.4661 Q 2537.64,2452.7483 2537.906,2452.974 Q 2538.1639,2453.2077 2539.1312,2453.4092 Q 2541.5252,2453.9251 2542.5569,2454.4571 Q 2543.5967,2454.981 2544.0643,2455.7629 Q 2544.5398,2456.5448 2544.5398,2457.5121 Q 2544.5398,2458.6486 2543.9111,2459.6078 Q 2543.2824,2460.567 2542.1539,2461.0668 Q 2541.0254,2461.5584 2539.3085,2461.5584 Q 2536.2939,2461.5584 2535.1332,2460.3977 Q 2533.9724,2459.237 2533.8193,2457.4476 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16687" /><path
|
||||
d="M 2546.3776,2449.5402 L 2556.1631,2449.5402 L 2556.1631,2452.0631 L 2550.0371,2452.0631 L 2550.0371,2453.9412 L 2555.7198,2453.9412 L 2555.7198,2456.3513 L 2550.0371,2456.3513 L 2550.0371,2458.6808 L 2556.3405,2458.6808 L 2556.3405,2461.3569 L 2546.3776,2461.3569 L 2546.3776,2449.5402 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16689" /></g><g
|
||||
transform="matrix(0.92387953,-0.38268344,0.38268344,0.92387953,0,0)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.50800514px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16615"><path
|
||||
d="M 2390.2705,2589.7867 L 2393.7446,2589.569 Q 2393.8575,2590.4154 2394.2041,2590.8587 Q 2394.7683,2591.5761 2395.8162,2591.5761 Q 2396.5981,2591.5761 2397.0172,2591.2134 Q 2397.4444,2590.8426 2397.4444,2590.359 Q 2397.4444,2589.8995 2397.0414,2589.5368 Q 2396.6384,2589.1741 2395.1714,2588.8517 Q 2392.7693,2588.3116 2391.7456,2587.4169 Q 2390.7139,2586.5222 2390.7139,2585.1357 Q 2390.7139,2584.2249 2391.2378,2583.4188 Q 2391.7698,2582.6047 2392.8257,2582.1453 Q 2393.8897,2581.6778 2395.7356,2581.6778 Q 2398.0006,2581.6778 2399.1855,2582.5241 Q 2400.3785,2583.3624 2400.6042,2585.2002 L 2397.1623,2585.4017 Q 2397.0253,2584.6037 2396.582,2584.241 Q 2396.1467,2583.8783 2395.3729,2583.8783 Q 2394.7361,2583.8783 2394.4137,2584.1524 Q 2394.0912,2584.4184 2394.0912,2584.8053 Q 2394.0912,2585.0874 2394.3572,2585.3131 Q 2394.6152,2585.5468 2395.5824,2585.7483 Q 2397.9764,2586.2642 2399.0082,2586.7962 Q 2400.048,2587.3202 2400.5155,2588.102 Q 2400.9911,2588.8839 2400.9911,2589.8512 Q 2400.9911,2590.9877 2400.3623,2591.9469 Q 2399.7336,2592.9061 2398.6051,2593.4059 Q 2397.4767,2593.8976 2395.7598,2593.8976 Q 2392.7451,2593.8976 2391.5844,2592.7368 Q 2390.4237,2591.5761 2390.2705,2589.7867 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16678" /><path
|
||||
d="M 2402.2002,2589.7867 L 2405.6743,2589.569 Q 2405.7871,2590.4154 2406.1337,2590.8587 Q 2406.6979,2591.5761 2407.7458,2591.5761 Q 2408.5277,2591.5761 2408.9468,2591.2134 Q 2409.374,2590.8426 2409.374,2590.359 Q 2409.374,2589.8995 2408.971,2589.5368 Q 2408.568,2589.1741 2407.101,2588.8517 Q 2404.6989,2588.3116 2403.6752,2587.4169 Q 2402.6435,2586.5222 2402.6435,2585.1357 Q 2402.6435,2584.2249 2403.1674,2583.4188 Q 2403.6994,2582.6047 2404.7553,2582.1453 Q 2405.8193,2581.6778 2407.6652,2581.6778 Q 2409.9302,2581.6778 2411.1151,2582.5241 Q 2412.3081,2583.3624 2412.5338,2585.2002 L 2409.0919,2585.4017 Q 2408.9549,2584.6037 2408.5116,2584.241 Q 2408.0763,2583.8783 2407.3025,2583.8783 Q 2406.6657,2583.8783 2406.3433,2584.1524 Q 2406.0209,2584.4184 2406.0209,2584.8053 Q 2406.0209,2585.0874 2406.2869,2585.3131 Q 2406.5448,2585.5468 2407.5121,2585.7483 Q 2409.906,2586.2642 2410.9378,2586.7962 Q 2411.9776,2587.3202 2412.4451,2588.102 Q 2412.9207,2588.8839 2412.9207,2589.8512 Q 2412.9207,2590.9877 2412.292,2591.9469 Q 2411.6632,2592.9061 2410.5348,2593.4059 Q 2409.4063,2593.8976 2407.6894,2593.8976 Q 2404.6747,2593.8976 2403.514,2592.7368 Q 2402.3533,2591.5761 2402.2002,2589.7867 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16680" /><path
|
||||
d="M 2414.7585,2581.8793 L 2424.544,2581.8793 L 2424.544,2584.4022 L 2418.418,2584.4022 L 2418.418,2586.2803 L 2424.1007,2586.2803 L 2424.1007,2588.6904 L 2418.418,2588.6904 L 2418.418,2591.0199 L 2424.7213,2591.0199 L 2424.7213,2593.696 L 2414.7585,2593.696 L 2414.7585,2581.8793 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16682" /></g><g
|
||||
transform="matrix(0.92387953,-0.38268344,0.38268344,0.92387953,0,0)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.50800514px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16619"><path
|
||||
d="M 2199.5423,2587.1636 L 2203.0164,2586.946 Q 2203.1292,2587.7924 2203.4758,2588.2357 Q 2204.0401,2588.9531 2205.0879,2588.9531 Q 2205.8698,2588.9531 2206.2889,2588.5903 Q 2206.7162,2588.2196 2206.7162,2587.7359 Q 2206.7162,2587.2765 2206.3131,2586.9138 Q 2205.9101,2586.551 2204.4431,2586.2286 Q 2202.041,2585.6886 2201.0174,2584.7938 Q 2199.9856,2583.8991 2199.9856,2582.5127 Q 2199.9856,2581.6019 2200.5095,2580.7958 Q 2201.0415,2579.9817 2202.0975,2579.5222 Q 2203.1615,2579.0547 2205.0073,2579.0547 Q 2207.2723,2579.0547 2208.4572,2579.9011 Q 2209.6502,2580.7394 2209.8759,2582.5772 L 2206.434,2582.7787 Q 2206.297,2581.9807 2205.8537,2581.618 Q 2205.4184,2581.2552 2204.6446,2581.2552 Q 2204.0078,2581.2552 2203.6854,2581.5293 Q 2203.363,2581.7953 2203.363,2582.1822 Q 2203.363,2582.4643 2203.629,2582.69 Q 2203.8869,2582.9238 2204.8542,2583.1253 Q 2207.2482,2583.6412 2208.2799,2584.1732 Q 2209.3197,2584.6971 2209.7872,2585.479 Q 2210.2628,2586.2609 2210.2628,2587.2281 Q 2210.2628,2588.3647 2209.6341,2589.3239 Q 2209.0054,2590.2831 2207.8769,2590.7828 Q 2206.7484,2591.2745 2205.0315,2591.2745 Q 2202.0169,2591.2745 2200.8561,2590.1138 Q 2199.6954,2588.9531 2199.5423,2587.1636 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16671" /><path
|
||||
d="M 2211.4719,2587.1636 L 2214.946,2586.946 Q 2215.0588,2587.7924 2215.4054,2588.2357 Q 2215.9697,2588.9531 2217.0175,2588.9531 Q 2217.7994,2588.9531 2218.2186,2588.5903 Q 2218.6458,2588.2196 2218.6458,2587.7359 Q 2218.6458,2587.2765 2218.2427,2586.9138 Q 2217.8397,2586.551 2216.3727,2586.2286 Q 2213.9707,2585.6886 2212.947,2584.7938 Q 2211.9152,2583.8991 2211.9152,2582.5127 Q 2211.9152,2581.6019 2212.4391,2580.7958 Q 2212.9711,2579.9817 2214.0271,2579.5222 Q 2215.0911,2579.0547 2216.9369,2579.0547 Q 2219.2019,2579.0547 2220.3869,2579.9011 Q 2221.5798,2580.7394 2221.8055,2582.5772 L 2218.3637,2582.7787 Q 2218.2266,2581.9807 2217.7833,2581.618 Q 2217.348,2581.2552 2216.5742,2581.2552 Q 2215.9374,2581.2552 2215.615,2581.5293 Q 2215.2926,2581.7953 2215.2926,2582.1822 Q 2215.2926,2582.4643 2215.5586,2582.69 Q 2215.8165,2582.9238 2216.7838,2583.1253 Q 2219.1778,2583.6412 2220.2095,2584.1732 Q 2221.2493,2584.6971 2221.7168,2585.479 Q 2222.1924,2586.2609 2222.1924,2587.2281 Q 2222.1924,2588.3647 2221.5637,2589.3239 Q 2220.935,2590.2831 2219.8065,2590.7828 Q 2218.678,2591.2745 2216.9611,2591.2745 Q 2213.9465,2591.2745 2212.7858,2590.1138 Q 2211.625,2588.9531 2211.4719,2587.1636 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16673" /><path
|
||||
d="M 2222.8211,2579.2562 L 2226.2872,2579.2562 L 2227.5366,2585.8578 L 2229.3582,2579.2562 L 2232.8162,2579.2562 L 2234.646,2585.8578 L 2235.8953,2579.2562 L 2239.3453,2579.2562 L 2236.7417,2591.073 L 2233.1628,2591.073 L 2231.0913,2583.6331 L 2229.0278,2591.073 L 2225.4489,2591.073 L 2222.8211,2579.2562 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16675" /></g><g
|
||||
transform="matrix(0.92387953,-0.38268344,0.38268344,0.92387953,0,0)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.50800514px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16623"><path
|
||||
d="M 2064.2292,2447.8629 L 2067.6953,2447.8629 L 2068.9447,2454.4645 L 2070.7663,2447.8629 L 2074.2243,2447.8629 L 2076.0541,2454.4645 L 2077.3035,2447.8629 L 2080.7534,2447.8629 L 2078.1498,2459.6797 L 2074.5709,2459.6797 L 2072.4994,2452.2398 L 2070.4359,2459.6797 L 2066.857,2459.6797 L 2064.2292,2447.8629 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16664" /><path
|
||||
d="M 2081.3176,2455.7703 L 2084.7917,2455.5527 Q 2084.9046,2456.399 2085.2512,2456.8424 Q 2085.8154,2457.5598 2086.8633,2457.5598 Q 2087.6451,2457.5598 2088.0643,2457.197 Q 2088.4915,2456.8263 2088.4915,2456.3426 Q 2088.4915,2455.8832 2088.0885,2455.5204 Q 2087.6854,2455.1577 2086.2184,2454.8353 Q 2083.8164,2454.2952 2082.7927,2453.4005 Q 2081.7609,2452.5058 2081.7609,2451.1194 Q 2081.7609,2450.2085 2082.2849,2449.4025 Q 2082.8169,2448.5884 2083.8728,2448.1289 Q 2084.9368,2447.6614 2086.7827,2447.6614 Q 2089.0477,2447.6614 2090.2326,2448.5078 Q 2091.4255,2449.3461 2091.6512,2451.1839 L 2088.2094,2451.3854 Q 2088.0723,2450.5874 2087.629,2450.2247 Q 2087.1937,2449.8619 2086.4199,2449.8619 Q 2085.7832,2449.8619 2085.4607,2450.136 Q 2085.1383,2450.402 2085.1383,2450.7889 Q 2085.1383,2451.071 2085.4043,2451.2967 Q 2085.6622,2451.5305 2086.6295,2451.732 Q 2089.0235,2452.2479 2090.0552,2452.7799 Q 2091.0951,2453.3038 2091.5626,2454.0857 Q 2092.0381,2454.8675 2092.0381,2455.8348 Q 2092.0381,2456.9713 2091.4094,2457.9305 Q 2090.7807,2458.8898 2089.6522,2459.3895 Q 2088.5237,2459.8812 2086.8068,2459.8812 Q 2083.7922,2459.8812 2082.6315,2458.7205 Q 2081.4708,2457.5598 2081.3176,2455.7703 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16666" /><path
|
||||
d="M 2092.6669,2447.8629 L 2096.1329,2447.8629 L 2097.3823,2454.4645 L 2099.204,2447.8629 L 2102.6619,2447.8629 L 2104.4917,2454.4645 L 2105.7411,2447.8629 L 2109.191,2447.8629 L 2106.5874,2459.6797 L 2103.0085,2459.6797 L 2100.937,2452.2398 L 2098.8735,2459.6797 L 2095.2946,2459.6797 L 2092.6669,2447.8629 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16668" /></g><g
|
||||
transform="matrix(0.90392733,-0.37441897,0.39113033,0.94427213,0,0)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.15149689px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16627"><path
|
||||
d="M 2113.5729,2211.9069 L 2116.9641,2211.9069 L 2118.1865,2218.366 L 2119.9689,2211.9069 L 2123.3522,2211.9069 L 2125.1424,2218.366 L 2126.3648,2211.9069 L 2129.7402,2211.9069 L 2127.1929,2223.4685 L 2123.6913,2223.4685 L 2121.6644,2216.1893 L 2119.6455,2223.4685 L 2116.1439,2223.4685 L 2113.5729,2211.9069 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16713" /><path
|
||||
d="M 2130.9389,2211.9069 L 2134.2749,2211.9069 L 2138.6282,2218.3029 L 2138.6282,2211.9069 L 2141.9958,2211.9069 L 2141.9958,2223.4685 L 2138.6282,2223.4685 L 2134.2986,2217.1199 L 2134.2986,2223.4685 L 2130.9389,2223.4685 L 2130.9389,2211.9069 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16715" /><path
|
||||
d="M 2143.1945,2211.9069 L 2146.5857,2211.9069 L 2147.8081,2218.366 L 2149.5904,2211.9069 L 2152.9737,2211.9069 L 2154.764,2218.366 L 2155.9864,2211.9069 L 2159.3618,2211.9069 L 2156.8145,2223.4685 L 2153.3129,2223.4685 L 2151.286,2216.1893 L 2149.2671,2223.4685 L 2145.7655,2223.4685 L 2143.1945,2211.9069 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16717" /></g><g
|
||||
transform="matrix(0.92387953,-0.38268344,0.38268344,0.92387953,0,0)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.50800514px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text16631"><path
|
||||
d="M 2200.4315,2131.4674 L 2203.8411,2131.4674 L 2208.2905,2138.0045 L 2208.2905,2131.4674 L 2211.7324,2131.4674 L 2211.7324,2143.2842 L 2208.2905,2143.2842 L 2203.8653,2136.7954 L 2203.8653,2143.2842 L 2200.4315,2143.2842 L 2200.4315,2131.4674 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16706" /><path
|
||||
d="M 2214.1989,2131.4674 L 2217.6085,2131.4674 L 2222.058,2138.0045 L 2222.058,2131.4674 L 2225.4998,2131.4674 L 2225.4998,2143.2842 L 2222.058,2143.2842 L 2217.6327,2136.7954 L 2217.6327,2143.2842 L 2214.1989,2143.2842 L 2214.1989,2131.4674 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16708" /><path
|
||||
d="M 2226.725,2131.4674 L 2230.1911,2131.4674 L 2231.4404,2138.069 L 2233.2621,2131.4674 L 2236.7201,2131.4674 L 2238.5498,2138.069 L 2239.7992,2131.4674 L 2243.2491,2131.4674 L 2240.6456,2143.2842 L 2237.0667,2143.2842 L 2234.9951,2135.8443 L 2232.9316,2143.2842 L 2229.3528,2143.2842 L 2226.725,2131.4674 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, '"
|
||||
id="path16710" /></g><text
|
||||
xml:space="preserve"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
x="2216.3367"
|
||||
y="2136.9697"
|
||||
id="text16635"
|
||||
sodipodi:linespacing="125%"
|
||||
transform="matrix(0.92387953,-0.38268343,0.38268343,0.92387953,0,0)"><tspan
|
||||
sodipodi:role="line"
|
||||
id="tspan16637"
|
||||
x="2216.3367"
|
||||
y="2136.9697" /></text>
|
||||
</g><g
|
||||
id="quad-h_reverse"><g
|
||||
id="g9602"><path
|
||||
d="M 1266.8633,4024.9857 C 1269.8813,4024.9857 1272.3249,4022.8901 1272.3249,4020.3018 C 1272.3249,4017.7165 1269.8796,4015.6194 1266.8633,4015.6179 L 995.86673,4015.6201 C 992.84874,4015.6201 990.40508,4017.7158 990.40508,4020.304 C 990.40508,4022.8894 992.85041,4024.9865 995.86687,4024.9879 L 1266.8633,4024.9857 z"
|
||||
@ -20756,4 +21459,15 @@
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:url(#linearGradient8844);stroke:none"
|
||||
id="path9764-6"
|
||||
d="M 1001.67,1438.583 L 1004.365,1438.583 L 1004.365,1421.855 L 1021.094,1421.855 L 1021.094,1438.583 L 1024.082,1438.583 L 1012.877,1449.788 L 1001.67,1438.583 z" /></g></g></svg>
|
||||
d="M 1001.67,1438.583 L 1004.365,1438.583 L 1004.365,1421.855 L 1021.094,1421.855 L 1021.094,1438.583 L 1024.082,1438.583 L 1012.877,1449.788 L 1001.67,1438.583 z" /></g></g><g
|
||||
transform="matrix(1.25,0,0,1.25,-239.24387,3703.6743)"
|
||||
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:21.52092552px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#716a5f;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||
id="text15472-3"><path
|
||||
inkscape:connector-curvature="0"
|
||||
d="M 216.73991,-1511.9997 L 221.1849,-1511.9997 L 226.98546,-1503.4775 L 226.98546,-1511.9997 L 231.47249,-1511.9997 L 231.47249,-1496.5946 L 226.98546,-1496.5946 L 221.21643,-1505.0538 L 221.21643,-1496.5946 L 216.73991,-1496.5946 L 216.73991,-1511.9997 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#716a5f;fill-opacity:1"
|
||||
id="path16778-8" /><path
|
||||
inkscape:connector-curvature="0"
|
||||
d="M 233.06975,-1511.9997 L 237.5883,-1511.9997 L 239.21708,-1503.3935 L 241.59195,-1511.9997 L 246.1,-1511.9997 L 248.48537,-1503.3935 L 250.11415,-1511.9997 L 254.61169,-1511.9997 L 251.21752,-1496.5946 L 246.55185,-1496.5946 L 243.85123,-1506.2937 L 241.16111,-1496.5946 L 236.49544,-1496.5946 L 233.06975,-1511.9997 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';fill:#716a5f;fill-opacity:1"
|
||||
id="path16780-4" /></g></svg>
|
Before Width: | Height: | Size: 1.4 MiB After Width: | Height: | Size: 1.5 MiB |
@ -18,7 +18,7 @@
|
||||
<widget class="QTabWidget" name="tabWidget_3">
|
||||
<widget class="QWidget" name="tabWidget_3Page1">
|
||||
<attribute name="title">
|
||||
<string>OPLink configuration</string>
|
||||
<string>OPLink Configuration</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<property name="leftMargin">
|
||||
@ -36,7 +36,7 @@
|
||||
<property name="spacing">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item row="0" column="0" colspan="2">
|
||||
<item row="0" column="0">
|
||||
<widget class="QScrollArea" name="scrollArea">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
@ -54,658 +54,20 @@
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_5">
|
||||
<item row="0" column="1">
|
||||
<widget class="QGroupBox" name="groupBox">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
<item row="0" column="3">
|
||||
<spacer name="horizontalSpacer_3">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Configuration</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
<item row="4" column="4">
|
||||
<widget class="QComboBox" name="ComSpeed">
|
||||
<property name="statusTip">
|
||||
<string>Com speed in bps.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="3">
|
||||
<widget class="QLabel" name="ComSpeedLabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Com Speed</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="9" column="3">
|
||||
<widget class="QLabel" name="VCPPortLabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>VCP Port</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="4">
|
||||
<widget class="QComboBox" name="FlexiPort">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Choose the function for the flexi port</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="3">
|
||||
<widget class="QLabel" name="MainPortLabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Main Port</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="4">
|
||||
<widget class="QComboBox" name="MainPort">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Choose the function for the main port</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="9" column="4">
|
||||
<widget class="QComboBox" name="VCPPort">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Choose the function for the USB virtual com port</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="4">
|
||||
<widget class="QComboBox" name="MaxRFTxPower">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Set the maximum TX output power the modem will use (mW)</string>
|
||||
</property>
|
||||
<property name="layoutDirection">
|
||||
<enum>Qt::LeftToRight</enum>
|
||||
</property>
|
||||
<property name="modelColumn">
|
||||
<number>0</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="3">
|
||||
<widget class="QLabel" name="MaxRFTxPowerLabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Max Power</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="10" column="4">
|
||||
<widget class="QComboBox" name="FlexiIOPort"/>
|
||||
</item>
|
||||
<item row="10" column="3">
|
||||
<widget class="QLabel" name="FlexiIOPortLabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>FlexiIO Port</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="1">
|
||||
<widget class="QSpinBox" name="MaximumChannel">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>60</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Channel 0 is 430 MHz, channel 250 is 440 MHz, and the channel spacing is 40 KHz.</string>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>250</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="3">
|
||||
<widget class="QLabel" name="FlexiPortLabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Flexi Port</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0">
|
||||
<widget class="QLabel" name="MaximumChannelLabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Max Chan</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="0">
|
||||
<widget class="QLabel" name="MinimumChannelLabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Min Chan</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="1">
|
||||
<widget class="QSpinBox" name="MinimumChannel">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>60</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Channel 0 is 430 MHz, channel 250 is 440 MHz, and the channel spacing is 40 KHz.</string>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>250</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="10" column="0" colspan="2">
|
||||
<widget class="QCheckBox" name="Coordinator">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="statusTip">
|
||||
<string>This modem will be a coordinator and other modems will bind to it.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Coordinator</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="2">
|
||||
<widget class="QLabel" name="MaxFreq">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>110</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>440.000 (MHz)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="2">
|
||||
<widget class="QLabel" name="MinFreq">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>110</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>430.000 (MHz)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<widget class="QCheckBox" name="OneWayLink">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="acceptDrops">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="statusTip">
|
||||
<string>If selected, data will only be transmitted from the coordinator to the Rx modem.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>One-Way</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QCheckBox" name="PPMOnly">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="statusTip">
|
||||
<string>Only PPM packets will be transmitted.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>PPM Only</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QCheckBox" name="PPM">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="statusTip">
|
||||
<string>PPM packets will be received by this modem. Must be selected if Coordinator modem is configured for PPM.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>PPM</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QGroupBox" name="PairingGroupBox">
|
||||
<property name="title">
|
||||
<string>Remote modems</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_3">
|
||||
<item row="5" column="3">
|
||||
<widget class="QLabel" name="PairSignalStrengthLabel4">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>-100dB</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="2">
|
||||
<widget class="QProgressBar" name="PairSignalStrengthBar4">
|
||||
<property name="minimum">
|
||||
<number>-127</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="textVisible">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="format">
|
||||
<string>%v dBm</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="3">
|
||||
<widget class="QLabel" name="PairSignalStrengthLabel2">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>-100dB</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QLineEdit" name="PairID2">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>100</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="2">
|
||||
<widget class="QProgressBar" name="PairSignalStrengthBar2">
|
||||
<property name="minimum">
|
||||
<number>-127</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="textVisible">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="format">
|
||||
<string>%v dBm</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<widget class="QLineEdit" name="PairID4">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>100</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="2">
|
||||
<widget class="QProgressBar" name="PairSignalStrengthBar1">
|
||||
<property name="minimum">
|
||||
<number>-127</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>-127</number>
|
||||
</property>
|
||||
<property name="textVisible">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="format">
|
||||
<string>%v dBm</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="3">
|
||||
<widget class="QLabel" name="PairSignalStrengthLabel1">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>-100dB</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="2">
|
||||
<widget class="QProgressBar" name="PairSignalStrengthBar3">
|
||||
<property name="minimum">
|
||||
<number>-127</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="textVisible">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="format">
|
||||
<string>%v dBm</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="3">
|
||||
<widget class="QLabel" name="PairSignalStrengthLabel3">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>-100dB</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<widget class="QLineEdit" name="PairID3">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>100</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QLineEdit" name="PairID1">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>100</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="placeholderText">
|
||||
<string>12345678</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QPushButton" name="Bind2">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Bind</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QPushButton" name="Bind1">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Bind</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<widget class="QPushButton" name="Bind4">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Bind</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QPushButton" name="Bind3">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Bind</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0">
|
||||
<widget class="QLabel" name="CoordIDLabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="layoutDirection">
|
||||
<enum>Qt::LeftToRight</enum>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Coordinator ID</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="1">
|
||||
<widget class="QLineEdit" name="CoordID">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>100</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>This is the coordinator id we currently are bound to.</p><p>To manually bind to a specific coordinator, just type</p><p>or paste its device id in this box and save.</p><p>The device must be rebooted for the binding to take place.</p></body></html></string>
|
||||
</property>
|
||||
<property name="maxLength">
|
||||
<number>8</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0" colspan="2">
|
||||
<item row="1" column="0" colspan="3">
|
||||
<widget class="QGroupBox" name="groupBox_3">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
@ -713,6 +75,12 @@
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>1050</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
@ -759,6 +127,9 @@
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="maxLength">
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="frame">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
@ -769,7 +140,7 @@
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="placeholderText">
|
||||
<string>12345678</string>
|
||||
<string>AA00FF99</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -816,7 +187,7 @@
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>The modems current state</string>
|
||||
<string>The modems current state.</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||
@ -1508,7 +879,7 @@
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Tx Failure</string>
|
||||
<string>TX Failure</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
@ -1789,6 +1160,711 @@
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<widget class="QGroupBox" name="PairingGroupBox">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>150</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>RX Level</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_3">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="PairSignalStrengthLabel1">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>100</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>-100dB</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QProgressBar" name="PairSignalStrengthBar1">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>30</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="baseSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="layoutDirection">
|
||||
<enum>Qt::RightToLeft</enum>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<number>-127</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>-127</number>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
<property name="textVisible">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="invertedAppearance">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="format">
|
||||
<string>%v dBm</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QGroupBox" name="groupBox">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>900</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Configuration</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
<item row="1" column="7">
|
||||
<widget class="QComboBox" name="ComSpeed">
|
||||
<property name="toolTip">
|
||||
<string>Com speed in bps.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="18" column="6">
|
||||
<widget class="QLabel" name="FlexiIOPortLabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>FlexiIO Port</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="7">
|
||||
<widget class="QComboBox" name="MainPort">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Choose the function for the main port.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="7">
|
||||
<widget class="QComboBox" name="MaxRFTxPower">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Set the maximum TX output power the modem will use (mW)
|
||||
0 to disable the modem.</string>
|
||||
</property>
|
||||
<property name="layoutDirection">
|
||||
<enum>Qt::LeftToRight</enum>
|
||||
</property>
|
||||
<property name="modelColumn">
|
||||
<number>0</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="6">
|
||||
<widget class="QLabel" name="MainPortLabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Main Port</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="18" column="7">
|
||||
<widget class="QComboBox" name="FlexiIOPort"/>
|
||||
</item>
|
||||
<item row="0" column="6">
|
||||
<widget class="QLabel" name="MaxRFTxPowerLabel">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Max Power</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="6">
|
||||
<widget class="QLabel" name="ComSpeedLabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Com Speed</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QCheckBox" name="PPMOnly">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Only PPM packets will be transmitted and baudrate set to 9600bauds by default.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>PPM Only</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QCheckBox" name="PPM">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>PPM packets will be received by this modem.
|
||||
Must be selected if Coordinator modem is configured for PPM.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>PPM</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="CoordIDLabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="layoutDirection">
|
||||
<enum>Qt::LeftToRight</enum>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Coordinator ID</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="customDeviceIDLabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Device ID</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QLineEdit" name="CustomDeviceID">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>90</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Enter your custom ID for this device as a hexadecimal value,
|
||||
this allows device clones. Be sure only one device with this
|
||||
ID transmits at the same time!
|
||||
Leave blank to use autogenerated Device ID.</string>
|
||||
</property>
|
||||
<property name="maxLength">
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="frame">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
<property name="readOnly">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="placeholderText">
|
||||
<string>AA00FF99</string>
|
||||
</property>
|
||||
<property name="cursorMoveStyle">
|
||||
<enum>Qt::LogicalMoveStyle</enum>
|
||||
</property>
|
||||
<property name="clearButtonEnabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLineEdit" name="CoordID">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>90</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>This is the coordinator ID we currently are bound to.
|
||||
To manually bind to a specific coordinator, just type
|
||||
or paste its device ID in this box and save.
|
||||
The device must be rebooted for the binding to take place.</string>
|
||||
</property>
|
||||
<property name="maxLength">
|
||||
<number>8</number>
|
||||
</property>
|
||||
<property name="cursorMoveStyle">
|
||||
<enum>Qt::LogicalMoveStyle</enum>
|
||||
</property>
|
||||
<property name="clearButtonEnabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="2">
|
||||
<widget class="QCheckBox" name="OneWayLink">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="acceptDrops">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>If selected, data will only be transmitted from the coordinator to the Rx modem.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>One-Way</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<widget class="QCheckBox" name="Coordinator">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>32</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>This modem will be a coordinator and other modems will bind to it.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Coordinator</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="7">
|
||||
<widget class="QComboBox" name="FlexiPort">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Choose the function for the flexi port.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="6">
|
||||
<widget class="QLabel" name="FlexiPortLabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Flexi Port</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="7">
|
||||
<widget class="QComboBox" name="VCPPort">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Choose the function for the USB virtual com port.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="6">
|
||||
<widget class="QLabel" name="VCPPortLabel">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>VCP Port</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="MaximumChannelLabel">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>80</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Max Chan</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QLabel" name="MinimumChannelLabel">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>80</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Min Chan</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1" colspan="2">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<item>
|
||||
<widget class="QSpinBox" name="MinimumChannel">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>60</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Channel 0 is 430 MHz, channel 250 is 440 MHz, and the channel spacing is 40 KHz.</string>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>250</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="MinFreq">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>430.000 (MHz)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="3" column="1" colspan="2">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<widget class="QSpinBox" name="MaximumChannel">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>60</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>50</weight>
|
||||
<bold>false</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Channel 0 is 430 MHz, channel 250 is 440 MHz, and the channel spacing is 40 KHz.</string>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>250</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="MaxFreq">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>440.000 (MHz)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="1" column="5">
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
@ -1861,7 +1937,7 @@
|
||||
<item>
|
||||
<widget class="QPushButton" name="Apply">
|
||||
<property name="toolTip">
|
||||
<string>Send settings to the board but do not save to the non-volatile memory</string>
|
||||
<string>Send settings to the board but do not save to the non-volatile memory.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Apply</string>
|
||||
@ -1871,7 +1947,7 @@
|
||||
<item>
|
||||
<widget class="QPushButton" name="Save">
|
||||
<property name="toolTip">
|
||||
<string>Send settings to the board and save to the non-volatile memory</string>
|
||||
<string>Send settings to the board and save to the non-volatile memory.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Save</string>
|
||||
@ -1886,10 +1962,6 @@
|
||||
</layout>
|
||||
</widget>
|
||||
<tabstops>
|
||||
<tabstop>PairID1</tabstop>
|
||||
<tabstop>PairID2</tabstop>
|
||||
<tabstop>PairID3</tabstop>
|
||||
<tabstop>PairID4</tabstop>
|
||||
<tabstop>FirmwareVersion</tabstop>
|
||||
<tabstop>SerialNumber</tabstop>
|
||||
<tabstop>Apply</tabstop>
|
||||
|
@ -2,7 +2,8 @@
|
||||
******************************************************************************
|
||||
*
|
||||
* @file flightgearbridge.h
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2015.
|
||||
* @addtogroup GCSPlugins GCS Plugins
|
||||
* @{
|
||||
* @addtogroup HITLPlugin HITL Plugin
|
||||
@ -269,7 +270,7 @@ void FGSimulator::processUpdate(const QByteArray & inp)
|
||||
// Get pressure (kpa)
|
||||
float pressure = fields[20].toFloat() * INHG2KPA;
|
||||
// Get VelocityState Down (m/s)
|
||||
float velocityStateDown = -fields[21].toFloat() * FPS2CMPS * 1e-2f;
|
||||
float velocityStateDown = fields[21].toFloat() * FPS2CMPS * 1e-2f;
|
||||
// Get VelocityState East (m/s)
|
||||
float velocityStateEast = fields[22].toFloat() * FPS2CMPS * 1e-2f;
|
||||
// Get VelocityState Down (m/s)
|
||||
|
@ -2,7 +2,8 @@
|
||||
******************************************************************************
|
||||
*
|
||||
* @file browseritemdelegate.cpp
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||
* @addtogroup GCSPlugins GCS Plugins
|
||||
* @{
|
||||
* @addtogroup UAVObjectBrowserPlugin UAVObject Browser Plugin
|
||||
@ -34,20 +35,19 @@ BrowserItemDelegate::BrowserItemDelegate(QObject *parent) :
|
||||
|
||||
QWidget *BrowserItemDelegate::createEditor(QWidget *parent,
|
||||
const QStyleOptionViewItem & option,
|
||||
const QModelIndex & index) const
|
||||
const QModelIndex &index) const
|
||||
{
|
||||
Q_UNUSED(option)
|
||||
FieldTreeItem * item = static_cast<FieldTreeItem *>(index.internalPointer());
|
||||
FieldTreeItem * item = static_cast<FieldTreeItem *>(index.data(Qt::UserRole).value<void *>());
|
||||
QWidget *editor = item->createEditor(parent);
|
||||
Q_ASSERT(editor);
|
||||
return editor;
|
||||
}
|
||||
|
||||
|
||||
void BrowserItemDelegate::setEditorData(QWidget *editor,
|
||||
const QModelIndex &index) const
|
||||
{
|
||||
FieldTreeItem *item = static_cast<FieldTreeItem *>(index.internalPointer());
|
||||
FieldTreeItem *item = static_cast<FieldTreeItem *>(index.data(Qt::UserRole).value<void *>());
|
||||
QVariant value = index.model()->data(index, Qt::EditRole);
|
||||
|
||||
item->setEditorValue(editor, value);
|
||||
@ -56,15 +56,18 @@ void BrowserItemDelegate::setEditorData(QWidget *editor,
|
||||
void BrowserItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
|
||||
const QModelIndex &index) const
|
||||
{
|
||||
FieldTreeItem *item = static_cast<FieldTreeItem *>(index.internalPointer());
|
||||
FieldTreeItem *item = static_cast<FieldTreeItem *>(index.data(Qt::UserRole).value<void *>());
|
||||
QVariant value = item->getEditorValue(editor);
|
||||
|
||||
model->setData(index, value, Qt::EditRole);
|
||||
bool ret = model->setData(index, value, Qt::EditRole);
|
||||
|
||||
Q_ASSERT(ret);
|
||||
}
|
||||
|
||||
void BrowserItemDelegate::updateEditorGeometry(QWidget *editor,
|
||||
const QStyleOptionViewItem &option, const QModelIndex & /* index */) const
|
||||
const QStyleOptionViewItem &option, const QModelIndex &index) const
|
||||
{
|
||||
Q_UNUSED(index);
|
||||
editor->setGeometry(option.rect);
|
||||
}
|
||||
|
||||
|
@ -2,7 +2,8 @@
|
||||
******************************************************************************
|
||||
*
|
||||
* @file browseritemdelegate.h
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||
* @addtogroup GCSPlugins GCS Plugins
|
||||
* @{
|
||||
* @addtogroup UAVObjectBrowserPlugin UAVObject Browser Plugin
|
||||
@ -46,11 +47,6 @@ public:
|
||||
const QStyleOptionViewItem &option, const QModelIndex &index) const;
|
||||
QSize sizeHint(const QStyleOptionViewItem & option,
|
||||
const QModelIndex &index) const;
|
||||
|
||||
|
||||
signals:
|
||||
|
||||
public slots:
|
||||
};
|
||||
|
||||
#endif // BROWSERITEMDELEGATE_H
|
||||
|
@ -259,7 +259,7 @@ public:
|
||||
|
||||
DataObjectTreeItem *findDataObjectTreeItemByObjectId(quint32 objectId)
|
||||
{
|
||||
return m_objectTreeItemsPerObjectIds.contains(objectId) ? m_objectTreeItemsPerObjectIds[objectId] : 0;
|
||||
return m_objectTreeItemsPerObjectIds.value(objectId, 0);
|
||||
}
|
||||
|
||||
void addMetaObjectTreeItem(quint32 objectId, MetaObjectTreeItem *oti)
|
||||
@ -269,7 +269,7 @@ public:
|
||||
|
||||
MetaObjectTreeItem *findMetaObjectTreeItemByObjectId(quint32 objectId)
|
||||
{
|
||||
return m_metaObjectTreeItemsPerObjectIds.contains(objectId) ? m_metaObjectTreeItemsPerObjectIds[objectId] : 0;
|
||||
return m_metaObjectTreeItemsPerObjectIds.value(objectId, 0);
|
||||
}
|
||||
|
||||
QList<MetaObjectTreeItem *> getMetaObjectItems();
|
||||
|
@ -204,6 +204,40 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeType">
|
||||
<enum>QSizePolicy::Preferred</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>10</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="searchLine">
|
||||
<property name="placeholderText">
|
||||
<string>type filter text</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="searchClearButton">
|
||||
<property name="text">
|
||||
<string>Clear</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset theme="fileclose">
|
||||
<normaloff>.</normaloff>.</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_3">
|
||||
<property name="orientation">
|
||||
@ -273,6 +307,7 @@
|
||||
<string>This space shows a description of the selected UAVObject.</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLineEdit" name="lineEdit"/>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
|
@ -2,7 +2,9 @@
|
||||
******************************************************************************
|
||||
*
|
||||
* @file uavobjectbrowserwidget.cpp
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* Tau Labs, http://taulabs.org, Copyright (C) 2013
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||
* @addtogroup GCSPlugins GCS Plugins
|
||||
* @{
|
||||
* @addtogroup UAVObjectBrowserPlugin UAVObject Browser Plugin
|
||||
@ -43,39 +45,54 @@
|
||||
|
||||
UAVObjectBrowserWidget::UAVObjectBrowserWidget(QWidget *parent) : QWidget(parent)
|
||||
{
|
||||
m_browser = new Ui_UAVObjectBrowser();
|
||||
m_viewoptions = new Ui_viewoptions();
|
||||
m_viewoptionsDialog = new QDialog(this);
|
||||
|
||||
m_viewoptions = new Ui_viewoptions();
|
||||
m_viewoptions->setupUi(m_viewoptionsDialog);
|
||||
|
||||
m_model = new UAVObjectTreeModel(this);
|
||||
|
||||
m_modelProxy = new TreeSortFilterProxyModel(this);
|
||||
m_modelProxy->setSourceModel(m_model);
|
||||
m_modelProxy->setDynamicSortFilter(true);
|
||||
|
||||
m_browser = new Ui_UAVObjectBrowser();
|
||||
m_browser->setupUi(this);
|
||||
m_model = new UAVObjectTreeModel();
|
||||
m_browser->treeView->setModel(m_model);
|
||||
m_browser->treeView->setModel(m_modelProxy);
|
||||
m_browser->treeView->setColumnWidth(0, 300);
|
||||
|
||||
BrowserItemDelegate *m_delegate = new BrowserItemDelegate();
|
||||
m_browser->treeView->setItemDelegate(m_delegate);
|
||||
m_browser->treeView->setItemDelegate(new BrowserItemDelegate());
|
||||
m_browser->treeView->setEditTriggers(QAbstractItemView::AllEditTriggers);
|
||||
m_browser->treeView->setSelectionBehavior(QAbstractItemView::SelectItems);
|
||||
|
||||
m_mustacheTemplate = loadFileIntoString(QString(":/uavobjectbrowser/resources/uavodescription.mustache"));
|
||||
|
||||
showMetaData(m_viewoptions->cbMetaData->isChecked());
|
||||
showDescription(m_viewoptions->cbDescription->isChecked());
|
||||
|
||||
connect(m_browser->treeView->selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)),
|
||||
this, SLOT(currentChanged(QModelIndex, QModelIndex)), Qt::UniqueConnection);
|
||||
connect(m_viewoptions->cbMetaData, SIGNAL(toggled(bool)), this, SLOT(showMetaData(bool)));
|
||||
connect(m_viewoptions->cbCategorized, SIGNAL(toggled(bool)), this, SLOT(categorize(bool)));
|
||||
connect(m_viewoptions->cbDescription, SIGNAL(toggled(bool)), this, SLOT(showDescription(bool)));
|
||||
connect(m_browser->saveSDButton, SIGNAL(clicked()), this, SLOT(saveObject()));
|
||||
connect(m_browser->readSDButton, SIGNAL(clicked()), this, SLOT(loadObject()));
|
||||
connect(m_browser->eraseSDButton, SIGNAL(clicked()), this, SLOT(eraseObject()));
|
||||
connect(m_browser->sendButton, SIGNAL(clicked()), this, SLOT(sendUpdate()));
|
||||
connect(m_browser->requestButton, SIGNAL(clicked()), this, SLOT(requestUpdate()));
|
||||
connect(m_browser->eraseSDButton, SIGNAL(clicked()), this, SLOT(eraseObject()));
|
||||
connect(m_browser->tbView, SIGNAL(clicked()), this, SLOT(viewSlot()));
|
||||
connect(m_browser->splitter, SIGNAL(splitterMoved(int, int)), this, SLOT(splitterMoved()));
|
||||
|
||||
connect(m_viewoptions->cbMetaData, SIGNAL(toggled(bool)), this, SLOT(showMetaData(bool)));
|
||||
connect(m_viewoptions->cbMetaData, SIGNAL(toggled(bool)), this, SLOT(viewOptionsChangedSlot()));
|
||||
connect(m_viewoptions->cbCategorized, SIGNAL(toggled(bool)), this, SLOT(categorize(bool)));
|
||||
connect(m_viewoptions->cbCategorized, SIGNAL(toggled(bool)), this, SLOT(viewOptionsChangedSlot()));
|
||||
connect(m_viewoptions->cbDescription, SIGNAL(toggled(bool)), this, SLOT(showDescription(bool)));
|
||||
connect(m_viewoptions->cbDescription, SIGNAL(toggled(bool)), this, SLOT(viewOptionsChangedSlot()));
|
||||
connect(m_viewoptions->cbScientific, SIGNAL(toggled(bool)), this, SLOT(useScientificNotation(bool)));
|
||||
connect(m_viewoptions->cbScientific, SIGNAL(toggled(bool)), this, SLOT(viewOptionsChangedSlot()));
|
||||
connect(m_viewoptions->cbMetaData, SIGNAL(toggled(bool)), this, SLOT(viewOptionsChangedSlot()));
|
||||
connect(m_viewoptions->cbCategorized, SIGNAL(toggled(bool)), this, SLOT(viewOptionsChangedSlot()));
|
||||
connect(m_viewoptions->cbDescription, SIGNAL(toggled(bool)), this, SLOT(viewOptionsChangedSlot()));
|
||||
connect(m_browser->splitter, SIGNAL(splitterMoved(int, int)), this, SLOT(splitterMoved()));
|
||||
|
||||
// search field and button
|
||||
connect(m_browser->searchLine, SIGNAL(textChanged(QString)), this, SLOT(searchLineChanged(QString)));
|
||||
connect(m_browser->searchClearButton, SIGNAL(clicked(bool)), this, SLOT(searchTextCleared()));
|
||||
|
||||
enableSendRequest(false);
|
||||
}
|
||||
|
||||
@ -99,9 +116,12 @@ void UAVObjectBrowserWidget::setSplitterState(QByteArray state)
|
||||
|
||||
void UAVObjectBrowserWidget::showMetaData(bool show)
|
||||
{
|
||||
// TODO update the model directly instead of hiding rows...
|
||||
QList<QModelIndex> metaIndexes = m_model->getMetaDataIndexes();
|
||||
foreach(QModelIndex index, metaIndexes) {
|
||||
m_browser->treeView->setRowHidden(index.row(), index.parent(), !show);
|
||||
foreach(QModelIndex modelIndex, metaIndexes) {
|
||||
QModelIndex proxyModelIndex = m_modelProxy->mapFromSource(modelIndex);
|
||||
|
||||
m_browser->treeView->setRowHidden(proxyModelIndex.row(), proxyModelIndex.parent(), !show);
|
||||
}
|
||||
}
|
||||
|
||||
@ -112,62 +132,82 @@ void UAVObjectBrowserWidget::showDescription(bool show)
|
||||
|
||||
void UAVObjectBrowserWidget::categorize(bool categorize)
|
||||
{
|
||||
// TODO we should update the model instead of rebuilding it
|
||||
// a side effect of rebuilding is that some state is lost (expand state, ...)
|
||||
UAVObjectTreeModel *model = new UAVObjectTreeModel(0, categorize, m_viewoptions->cbScientific->isChecked());
|
||||
|
||||
model->setRecentlyUpdatedColor(m_recentlyUpdatedColor);
|
||||
model->setManuallyChangedColor(m_manuallyChangedColor);
|
||||
model->setRecentlyUpdatedTimeout(m_recentlyUpdatedTimeout);
|
||||
model->setOnlyHilightChangedValues(m_onlyHilightChangedValues);
|
||||
model->setUnknowObjectColor(m_unknownObjectColor);
|
||||
|
||||
UAVObjectTreeModel *tmpModel = m_model;
|
||||
|
||||
m_model = new UAVObjectTreeModel(0, categorize, m_viewoptions->cbScientific->isChecked());
|
||||
m_model->setRecentlyUpdatedColor(m_recentlyUpdatedColor);
|
||||
m_model->setManuallyChangedColor(m_manuallyChangedColor);
|
||||
m_model->setRecentlyUpdatedTimeout(m_recentlyUpdatedTimeout);
|
||||
m_model->setOnlyHilightChangedValues(m_onlyHilightChangedValues);
|
||||
m_model->setUnknowObjectColor(m_unknownObjectColor);
|
||||
m_browser->treeView->setModel(m_model);
|
||||
showMetaData(m_viewoptions->cbMetaData->isChecked());
|
||||
connect(m_browser->treeView->selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)), this, SLOT(currentChanged(QModelIndex, QModelIndex)), Qt::UniqueConnection);
|
||||
|
||||
m_model = model;
|
||||
m_modelProxy->setSourceModel(m_model);
|
||||
delete tmpModel;
|
||||
|
||||
showMetaData(m_viewoptions->cbMetaData->isChecked());
|
||||
|
||||
// force an expand all if search text is not empty
|
||||
if (!m_browser->searchLine->text().isEmpty()) {
|
||||
searchLineChanged(m_browser->searchLine->text());
|
||||
}
|
||||
}
|
||||
|
||||
void UAVObjectBrowserWidget::useScientificNotation(bool scientific)
|
||||
{
|
||||
// TODO we should update the model instead of rebuilding it
|
||||
// a side effect of rebuilding is that some state is lost (expand state, ...)
|
||||
UAVObjectTreeModel *model = new UAVObjectTreeModel(0, m_viewoptions->cbCategorized->isChecked(), scientific);
|
||||
|
||||
model->setManuallyChangedColor(m_manuallyChangedColor);
|
||||
model->setRecentlyUpdatedTimeout(m_recentlyUpdatedTimeout);
|
||||
model->setUnknowObjectColor(m_unknownObjectColor);
|
||||
|
||||
UAVObjectTreeModel *tmpModel = m_model;
|
||||
|
||||
m_model = new UAVObjectTreeModel(0, m_viewoptions->cbCategorized->isChecked(), scientific);
|
||||
m_model->setRecentlyUpdatedColor(m_recentlyUpdatedColor);
|
||||
m_model->setManuallyChangedColor(m_manuallyChangedColor);
|
||||
m_model->setRecentlyUpdatedTimeout(m_recentlyUpdatedTimeout);
|
||||
m_model->setUnknowObjectColor(m_unknownObjectColor);
|
||||
m_browser->treeView->setModel(m_model);
|
||||
showMetaData(m_viewoptions->cbMetaData->isChecked());
|
||||
connect(m_browser->treeView->selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)), this, SLOT(currentChanged(QModelIndex, QModelIndex)), Qt::UniqueConnection);
|
||||
|
||||
m_model = model;
|
||||
m_modelProxy->setSourceModel(m_model);
|
||||
delete tmpModel;
|
||||
|
||||
showMetaData(m_viewoptions->cbMetaData->isChecked());
|
||||
|
||||
// force an expand all if search text is not empty
|
||||
if (!m_browser->searchLine->text().isEmpty()) {
|
||||
searchLineChanged(m_browser->searchLine->text());
|
||||
}
|
||||
}
|
||||
|
||||
void UAVObjectBrowserWidget::sendUpdate()
|
||||
{
|
||||
// TODO why steal focus ?
|
||||
this->setFocus();
|
||||
|
||||
ObjectTreeItem *objItem = findCurrentObjectTreeItem();
|
||||
Q_ASSERT(objItem);
|
||||
objItem->apply();
|
||||
UAVObject *obj = objItem->object();
|
||||
Q_ASSERT(obj);
|
||||
obj->updated();
|
||||
|
||||
if (objItem != NULL) {
|
||||
objItem->apply();
|
||||
UAVObject *obj = objItem->object();
|
||||
Q_ASSERT(obj);
|
||||
obj->updated();
|
||||
}
|
||||
}
|
||||
|
||||
void UAVObjectBrowserWidget::requestUpdate()
|
||||
{
|
||||
ObjectTreeItem *objItem = findCurrentObjectTreeItem();
|
||||
|
||||
Q_ASSERT(objItem);
|
||||
UAVObject *obj = objItem->object();
|
||||
Q_ASSERT(obj);
|
||||
obj->requestUpdate();
|
||||
if (objItem != NULL) {
|
||||
UAVObject *obj = objItem->object();
|
||||
Q_ASSERT(obj);
|
||||
obj->requestUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
ObjectTreeItem *UAVObjectBrowserWidget::findCurrentObjectTreeItem()
|
||||
{
|
||||
QModelIndex current = m_browser->treeView->currentIndex();
|
||||
TreeItem *item = static_cast<TreeItem *>(current.internalPointer());
|
||||
TreeItem *item = static_cast<TreeItem *>(current.data(Qt::UserRole).value<void *>());
|
||||
ObjectTreeItem *objItem = 0;
|
||||
|
||||
while (item) {
|
||||
@ -193,15 +233,20 @@ QString UAVObjectBrowserWidget::loadFileIntoString(QString fileName)
|
||||
|
||||
void UAVObjectBrowserWidget::saveObject()
|
||||
{
|
||||
// TODO why steal focus ?
|
||||
this->setFocus();
|
||||
|
||||
// Send update so that the latest value is saved
|
||||
sendUpdate();
|
||||
|
||||
// Save object
|
||||
ObjectTreeItem *objItem = findCurrentObjectTreeItem();
|
||||
Q_ASSERT(objItem);
|
||||
UAVObject *obj = objItem->object();
|
||||
Q_ASSERT(obj);
|
||||
updateObjectPersistance(ObjectPersistence::OPERATION_SAVE, obj);
|
||||
|
||||
if (objItem != NULL) {
|
||||
UAVObject *obj = objItem->object();
|
||||
Q_ASSERT(obj);
|
||||
updateObjectPersistance(ObjectPersistence::OPERATION_SAVE, obj);
|
||||
}
|
||||
}
|
||||
|
||||
void UAVObjectBrowserWidget::loadObject()
|
||||
@ -209,22 +254,24 @@ void UAVObjectBrowserWidget::loadObject()
|
||||
// Load object
|
||||
ObjectTreeItem *objItem = findCurrentObjectTreeItem();
|
||||
|
||||
Q_ASSERT(objItem);
|
||||
UAVObject *obj = objItem->object();
|
||||
Q_ASSERT(obj);
|
||||
updateObjectPersistance(ObjectPersistence::OPERATION_LOAD, obj);
|
||||
// Retrieve object so that latest value is displayed
|
||||
requestUpdate();
|
||||
if (objItem != NULL) {
|
||||
UAVObject *obj = objItem->object();
|
||||
Q_ASSERT(obj);
|
||||
updateObjectPersistance(ObjectPersistence::OPERATION_LOAD, obj);
|
||||
// Retrieve object so that latest value is displayed
|
||||
requestUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
void UAVObjectBrowserWidget::eraseObject()
|
||||
{
|
||||
ObjectTreeItem *objItem = findCurrentObjectTreeItem();
|
||||
|
||||
Q_ASSERT(objItem);
|
||||
UAVObject *obj = objItem->object();
|
||||
Q_ASSERT(obj);
|
||||
updateObjectPersistance(ObjectPersistence::OPERATION_DELETE, obj);
|
||||
if (objItem != NULL) {
|
||||
UAVObject *obj = objItem->object();
|
||||
Q_ASSERT(obj);
|
||||
updateObjectPersistance(ObjectPersistence::OPERATION_DELETE, obj);
|
||||
}
|
||||
}
|
||||
|
||||
void UAVObjectBrowserWidget::updateObjectPersistance(ObjectPersistence::OperationOptions op, UAVObject *obj)
|
||||
@ -248,9 +295,9 @@ void UAVObjectBrowserWidget::currentChanged(const QModelIndex ¤t, const QM
|
||||
{
|
||||
Q_UNUSED(previous);
|
||||
|
||||
TreeItem *item = static_cast<TreeItem *>(current.internalPointer());
|
||||
TreeItem *item = static_cast<TreeItem *>(current.data(Qt::UserRole).value<void *>());
|
||||
bool enable = true;
|
||||
if (current == QModelIndex()) {
|
||||
if (!current.isValid()) {
|
||||
enable = false;
|
||||
}
|
||||
TopTreeItem *top = dynamic_cast<TopTreeItem *>(item);
|
||||
@ -388,3 +435,94 @@ void UAVObjectBrowserWidget::updateDescription()
|
||||
}
|
||||
m_browser->descriptionText->setText("");
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief UAVObjectBrowserWidget::searchTextChanged Looks for matching text in the UAVO fields
|
||||
*/
|
||||
|
||||
void UAVObjectBrowserWidget::searchLineChanged(QString searchText)
|
||||
{
|
||||
m_modelProxy->setFilterRegExp(QRegExp(searchText, Qt::CaseInsensitive, QRegExp::FixedString));
|
||||
if (!searchText.isEmpty()) {
|
||||
m_browser->treeView->expandAll();
|
||||
} else {
|
||||
m_browser->treeView->collapseAll();
|
||||
}
|
||||
}
|
||||
|
||||
void UAVObjectBrowserWidget::searchTextCleared()
|
||||
{
|
||||
m_browser->searchLine->clear();
|
||||
}
|
||||
|
||||
TreeSortFilterProxyModel::TreeSortFilterProxyModel(QObject *p) :
|
||||
QSortFilterProxyModel(p)
|
||||
{
|
||||
Q_ASSERT(p);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief TreeSortFilterProxyModel::filterAcceptsRow Taken from
|
||||
* http://qt-project.org/forums/viewthread/7782. This proxy model
|
||||
* will accept rows:
|
||||
* - That match themselves, or
|
||||
* - That have a parent that matches (on its own), or
|
||||
* - That have a child that matches.
|
||||
* @param sourceRow
|
||||
* @param sourceParent
|
||||
* @return
|
||||
*/
|
||||
bool TreeSortFilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
|
||||
{
|
||||
if (filterAcceptsRowItself(source_row, source_parent)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// accept if any of the parents is accepted on it's own merits
|
||||
QModelIndex parent = source_parent;
|
||||
while (parent.isValid()) {
|
||||
if (filterAcceptsRowItself(parent.row(), parent.parent())) {
|
||||
return true;
|
||||
}
|
||||
parent = parent.parent();
|
||||
}
|
||||
|
||||
// accept if any of the children is accepted on it's own merits
|
||||
if (hasAcceptedChildren(source_row, source_parent)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool TreeSortFilterProxyModel::filterAcceptsRowItself(int source_row, const QModelIndex &source_parent) const
|
||||
{
|
||||
return QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent);
|
||||
}
|
||||
|
||||
bool TreeSortFilterProxyModel::hasAcceptedChildren(int source_row, const QModelIndex &source_parent) const
|
||||
{
|
||||
QModelIndex item = sourceModel()->index(source_row, 0, source_parent);
|
||||
|
||||
if (!item.isValid()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// check if there are children
|
||||
int childCount = item.model()->rowCount(item);
|
||||
if (childCount == 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
for (int i = 0; i < childCount; ++i) {
|
||||
if (filterAcceptsRowItself(i, item)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (hasAcceptedChildren(i, item)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
@ -2,7 +2,9 @@
|
||||
******************************************************************************
|
||||
*
|
||||
* @file uavobjectbrowserwidget.h
|
||||
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||
* @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2016.
|
||||
* Tau Labs, http://taulabs.org, Copyright (C) 2013
|
||||
* The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
|
||||
* @addtogroup GCSPlugins GCS Plugins
|
||||
* @{
|
||||
* @addtogroup UAVObjectBrowserPlugin UAVObject Browser Plugin
|
||||
@ -28,16 +30,30 @@
|
||||
#ifndef UAVOBJECTBROWSERWIDGET_H_
|
||||
#define UAVOBJECTBROWSERWIDGET_H_
|
||||
|
||||
#include "uavobjecttreemodel.h"
|
||||
|
||||
#include "objectpersistence.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QTreeView>
|
||||
#include "objectpersistence.h"
|
||||
#include "uavobjecttreemodel.h"
|
||||
#include <QKeyEvent>
|
||||
#include <QSortFilterProxyModel>
|
||||
|
||||
class QPushButton;
|
||||
class ObjectTreeItem;
|
||||
class Ui_UAVObjectBrowser;
|
||||
class Ui_viewoptions;
|
||||
|
||||
class TreeSortFilterProxyModel : public QSortFilterProxyModel {
|
||||
public:
|
||||
TreeSortFilterProxyModel(QObject *parent);
|
||||
|
||||
protected:
|
||||
bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
|
||||
bool filterAcceptsRowItself(int source_row, const QModelIndex &source_parent) const;
|
||||
bool hasAcceptedChildren(int source_row, const QModelIndex &source_parent) const;
|
||||
};
|
||||
|
||||
class UAVObjectBrowserWidget : public QWidget {
|
||||
Q_OBJECT
|
||||
|
||||
@ -72,6 +88,7 @@ public:
|
||||
}
|
||||
void setViewOptions(bool categorized, bool scientific, bool metadata, bool description);
|
||||
void setSplitterState(QByteArray state);
|
||||
|
||||
public slots:
|
||||
void showMetaData(bool show);
|
||||
void showDescription(bool show);
|
||||
@ -87,18 +104,21 @@ private slots:
|
||||
void currentChanged(const QModelIndex ¤t, const QModelIndex &previous);
|
||||
void viewSlot();
|
||||
void viewOptionsChangedSlot();
|
||||
void searchLineChanged(QString searchText);
|
||||
void searchTextCleared();
|
||||
void splitterMoved();
|
||||
QString createObjectDescription(UAVObject *object);
|
||||
|
||||
signals:
|
||||
void viewOptionsChanged(bool categorized, bool scientific, bool metadata, bool description);
|
||||
void splitterChanged(QByteArray state);
|
||||
|
||||
private:
|
||||
QPushButton *m_requestUpdate;
|
||||
QPushButton *m_sendUpdate;
|
||||
Ui_UAVObjectBrowser *m_browser;
|
||||
Ui_viewoptions *m_viewoptions;
|
||||
QDialog *m_viewoptionsDialog;
|
||||
UAVObjectTreeModel *m_model;
|
||||
TreeSortFilterProxyModel *m_modelProxy;
|
||||
|
||||
int m_recentlyUpdatedTimeout;
|
||||
QColor m_unknownObjectColor;
|
||||
|
@ -68,20 +68,23 @@ UAVObjectTreeModel::~UAVObjectTreeModel()
|
||||
|
||||
void UAVObjectTreeModel::setupModelData(UAVObjectManager *objManager)
|
||||
{
|
||||
m_settingsTree = new TopTreeItem(tr("Settings"));
|
||||
m_settingsTree->setHighlightManager(m_highlightManager);
|
||||
connect(m_settingsTree, SIGNAL(updateHighlight(TreeItem *)), this, SLOT(updateHighlight(TreeItem *)));
|
||||
|
||||
m_nonSettingsTree = new TopTreeItem(tr("Data Objects"));
|
||||
m_nonSettingsTree->setHighlightManager(m_highlightManager);
|
||||
connect(m_nonSettingsTree, SIGNAL(updateHighlight(TreeItem *)), this, SLOT(updateHighlight(TreeItem *)));
|
||||
|
||||
// root
|
||||
QList<QVariant> rootData;
|
||||
rootData << tr("Property") << tr("Value") << tr("Unit");
|
||||
m_rootItem = new TreeItem(rootData);
|
||||
|
||||
m_settingsTree = new TopTreeItem(tr("Settings"), m_rootItem);
|
||||
m_settingsTree->setHighlightManager(m_highlightManager);
|
||||
m_rootItem->appendChild(m_settingsTree);
|
||||
m_nonSettingsTree = new TopTreeItem(tr("Data Objects"), m_rootItem);
|
||||
m_nonSettingsTree->setHighlightManager(m_highlightManager);
|
||||
m_rootItem->appendChild(m_nonSettingsTree);
|
||||
m_rootItem = new TreeItem(rootData);
|
||||
m_rootItem->setHighlightManager(m_highlightManager);
|
||||
connect(m_settingsTree, SIGNAL(updateHighlight(TreeItem *)), this, SLOT(updateHighlight(TreeItem *)));
|
||||
connect(m_nonSettingsTree, SIGNAL(updateHighlight(TreeItem *)), this, SLOT(updateHighlight(TreeItem *)));
|
||||
|
||||
// tree item takes ownership of its children
|
||||
m_rootItem->appendChild(m_settingsTree);
|
||||
m_rootItem->appendChild(m_nonSettingsTree);
|
||||
|
||||
QList< QList<UAVDataObject *> > objList = objManager->getDataObjects();
|
||||
foreach(QList<UAVDataObject *> list, objList) {
|
||||
@ -258,8 +261,7 @@ void UAVObjectTreeModel::addSingleField(int index, UAVObjectField *field, TreeIt
|
||||
parent->appendChild(item);
|
||||
}
|
||||
|
||||
QModelIndex UAVObjectTreeModel::index(int row, int column, const QModelIndex &parent)
|
||||
const
|
||||
QModelIndex UAVObjectTreeModel::index(int row, int column, const QModelIndex &parent) const
|
||||
{
|
||||
if (!hasIndex(row, column, parent)) {
|
||||
return QModelIndex();
|
||||
@ -306,10 +308,11 @@ QModelIndex UAVObjectTreeModel::parent(const QModelIndex &index) const
|
||||
return QModelIndex();
|
||||
}
|
||||
|
||||
TreeItem *childItem = static_cast<TreeItem *>(index.internalPointer());
|
||||
TreeItem *parentItem = childItem->parent();
|
||||
TreeItem *item = static_cast<TreeItem *>(index.internalPointer());
|
||||
|
||||
if (parentItem == m_rootItem) {
|
||||
TreeItem *parentItem = item->parent();
|
||||
if (!parentItem) {
|
||||
// item is root has no parent...
|
||||
return QModelIndex();
|
||||
}
|
||||
|
||||
@ -363,50 +366,56 @@ QVariant UAVObjectTreeModel::data(const QModelIndex &index, int role) const
|
||||
|
||||
TreeItem *item = static_cast<TreeItem *>(index.internalPointer());
|
||||
|
||||
if (index.column() == TreeItem::DATA_COLUMN && role == Qt::EditRole) {
|
||||
switch (role) {
|
||||
case Qt::DisplayRole:
|
||||
if (index.column() == TreeItem::DATA_COLUMN) {
|
||||
EnumFieldTreeItem *fieldItem = dynamic_cast<EnumFieldTreeItem *>(item);
|
||||
if (fieldItem) {
|
||||
int enumIndex = fieldItem->data(index.column()).toInt();
|
||||
return fieldItem->enumOptions(enumIndex);
|
||||
}
|
||||
}
|
||||
return item->data(index.column());
|
||||
}
|
||||
|
||||
if (role == Qt::ToolTipRole) {
|
||||
case Qt::EditRole:
|
||||
if (index.column() == TreeItem::DATA_COLUMN) {
|
||||
return item->data(index.column());
|
||||
}
|
||||
return QVariant();
|
||||
|
||||
case Qt::ToolTipRole:
|
||||
return item->description();
|
||||
}
|
||||
|
||||
if (role == Qt::ForegroundRole) {
|
||||
case Qt::ForegroundRole:
|
||||
if (!dynamic_cast<TopTreeItem *>(item) && !item->isKnown()) {
|
||||
return QVariant(m_unknownObjectColor);
|
||||
return m_unknownObjectColor;
|
||||
}
|
||||
}
|
||||
return QVariant();
|
||||
|
||||
if (index.column() == 0 && role == Qt::BackgroundRole) {
|
||||
if (!dynamic_cast<TopTreeItem *>(item) && item->highlighted()) {
|
||||
return QVariant(m_recentlyUpdatedColor);
|
||||
case Qt::BackgroundRole:
|
||||
if (index.column() == TreeItem::TITLE_COLUMN) {
|
||||
if (!dynamic_cast<TopTreeItem *>(item) && item->highlighted()) {
|
||||
return m_recentlyUpdatedColor;
|
||||
}
|
||||
} else if (index.column() == TreeItem::DATA_COLUMN) {
|
||||
FieldTreeItem *fieldItem = dynamic_cast<FieldTreeItem *>(item);
|
||||
if (fieldItem && fieldItem->highlighted()) {
|
||||
return m_recentlyUpdatedColor;
|
||||
}
|
||||
if (fieldItem && fieldItem->changed()) {
|
||||
return m_manuallyChangedColor;
|
||||
}
|
||||
}
|
||||
}
|
||||
return QVariant();
|
||||
|
||||
if (index.column() == TreeItem::DATA_COLUMN && role == Qt::BackgroundRole) {
|
||||
FieldTreeItem *fieldItem = dynamic_cast<FieldTreeItem *>(item);
|
||||
if (fieldItem && fieldItem->highlighted()) {
|
||||
return QVariant(m_recentlyUpdatedColor);
|
||||
}
|
||||
case Qt::UserRole:
|
||||
// UserRole gives access to TreeItem
|
||||
// cast to void* is necessary
|
||||
return qVariantFromValue((void *)item);
|
||||
|
||||
if (fieldItem && fieldItem->changed()) {
|
||||
return QVariant(m_manuallyChangedColor);
|
||||
}
|
||||
}
|
||||
|
||||
if (role != Qt::DisplayRole) {
|
||||
default:
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
if (index.column() == TreeItem::DATA_COLUMN) {
|
||||
EnumFieldTreeItem *fieldItem = dynamic_cast<EnumFieldTreeItem *>(item);
|
||||
if (fieldItem) {
|
||||
int enumIndex = fieldItem->data(index.column()).toInt();
|
||||
return fieldItem->enumOptions(enumIndex);
|
||||
}
|
||||
}
|
||||
|
||||
return item->data(index.column());
|
||||
}
|
||||
|
||||
bool UAVObjectTreeModel::setData(const QModelIndex &index, const QVariant & value, int role)
|
||||
|
@ -28,7 +28,7 @@ OPT_QT := qt56
|
||||
TRUSTY_DEPS_SED := s/qml-module-.*/$(OPT_QT)quickcontrols/g; \
|
||||
s/qt5-default.*/$(OPT_QT)-meta-minimal, $(OPT_QT)svg, $(OPT_QT)script, $(OPT_QT)serialport, $(OPT_QT)multimedia, $(OPT_QT)translations, $(OPT_QT)tools/g;
|
||||
|
||||
# Leave off Qt and ARM compiler dependencies if calling package target under the assumption that
|
||||
# Leave off Qt and OSG dependencies if calling package target under the assumption that
|
||||
# OP is providing them or the user already has them installed because OP is already built.
|
||||
PACKAGE_DEPS_SED := s/python.*/python/;s/{misc:Depends}.*/{misc:Depends}/;
|
||||
|
||||
@ -37,15 +37,16 @@ package: debian
|
||||
@$(ECHO) "Building Linux package, please wait..."
|
||||
$(V1) sed -i -e "$(PACKAGE_DEPS_SED)" debian/control
|
||||
$(V1) sed -i -e 's,config_new.*, --help > /dev/null,' debian/rules
|
||||
$(V1) dpkg-buildpackage -b -us -uc -nc
|
||||
$(V1) dpkg-buildpackage -b -us -uc -nc $(DPKG_BUILDPACKAGE_OPTS)
|
||||
$(V1) mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).deb $(BUILD_DIR)
|
||||
$(V1) mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).changes $(BUILD_DIR)
|
||||
$(V1) rm -r debian
|
||||
|
||||
DEBIAN_DIR_FILES := changelog compat control copyright rules source/format
|
||||
.PHONY: debian
|
||||
debian: $(DEB_DIR)
|
||||
$(V1) rm -rf debian
|
||||
$(V1) cp -r $(DEB_DIR) debian
|
||||
$(V1) rm -rf debian && mkdir debian
|
||||
$(V1) cd $(DEB_DIR) $(foreach file,$(DEBIAN_DIR_FILES), && cp --parents $(file) $(ROOT_DIR)/debian)
|
||||
$(V1) cp -T package/linux/45-uav.rules debian/$(DEB_NAME).udev
|
||||
$(V1) $(SED_SCRIPT) debian/changelog debian/control
|
||||
ifeq ($(DEB_DIST), trusty)
|
||||
@ -56,7 +57,7 @@ endif
|
||||
|
||||
.PHONY: package_src
|
||||
package_src: $(DEB_ORIG_SRC_NAME) $(DEB_PACKAGE_DIR)
|
||||
$(V1) cd $(DEB_PACKAGE_DIR) && dpkg-buildpackage -S -us -uc
|
||||
$(V1) cd $(DEB_PACKAGE_DIR) && dpkg-buildpackage -S -us -uc $(DPKG_BUILDPACKAGE_OPTS)
|
||||
|
||||
$(DEB_ORIG_SRC): $(DIST_TAR_GZ) | $(PACKAGE_DIR)
|
||||
$(V1) cp $(DIST_TAR_GZ) $(DEB_ORIG_SRC)
|
||||
|
@ -2,7 +2,7 @@ Source: <NAME>
|
||||
Section: electronics
|
||||
Priority: optional
|
||||
Maintainer: The LibrePilot Project <<EMAIL>>
|
||||
Build-Depends: debhelper (>= 9), libudev-dev, libusb-1.0-0-dev, libsdl1.2-dev, python, libopenscenegraph-dev, qt5-default, qttools5-dev-tools, libqt5svg5-dev, qtdeclarative5-dev, qml-module-qtquick-controls, libqt5serialport5-dev, qtmultimedia5-dev, qtscript5-dev, libqt5opengl5-dev
|
||||
Build-Depends: debhelper (>= 9), libudev-dev, libusb-1.0-0-dev, libsdl1.2-dev, python, libopenscenegraph-dev, libosgearth-dev, qt5-default, qttools5-dev-tools, libqt5svg5-dev, qtdeclarative5-dev, qml-module-qtquick-controls, libqt5serialport5-dev, qtmultimedia5-dev, qtscript5-dev, libqt5opengl5-dev
|
||||
Standards-Version: 3.9.5
|
||||
Homepage: <URL>
|
||||
Vcs-Git: <GIT_URL>
|
||||
@ -10,5 +10,5 @@ Vcs-Browser: <GITWEB_URL>
|
||||
|
||||
Package: <NAME>
|
||||
Architecture: any
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, qml-module-qtquick-controls, qml-module-qtquick-dialogs, qml-module-qtquick-xmllistmodel, qml-module-qtquick-localstorage, qml-module-qtquick-particles2, qml-module-qtquick-window2, qml-module-qtquick2
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, openscenegraph-plugin-osgearth, qml-module-qtquick-controls, qml-module-qtquick-dialogs, qml-module-qtquick-xmllistmodel, qml-module-qtquick-localstorage, qml-module-qtquick-particles2, qml-module-qtquick-window2, qml-module-qtquick2
|
||||
Description: <DESCRIPTION>
|
||||
|
@ -12,7 +12,7 @@ export DH_OPTIONS
|
||||
dh $@
|
||||
|
||||
override_dh_auto_configure:
|
||||
$(MAKE) config_new GCS_EXTRA_CONF=osg WITH_PREBUILT_FW=$(CURDIR)/firmware
|
||||
$(MAKE) config_new GCS_EXTRA_CONF='osg osgearth' WITH_PREBUILT_FW=$(CURDIR)/firmware
|
||||
|
||||
override_dh_auto_build:
|
||||
dh_auto_build -- opfw_resource gcs
|
||||
|
@ -2,7 +2,7 @@
|
||||
<object name="ActuatorSettings" singleinstance="true" settings="true" category="Control">
|
||||
<description>Settings for the @ref ActuatorModule that controls the channel assignments for the mixer based on AircraftType</description>
|
||||
<field name="BankUpdateFreq" units="Hz" type="uint16" elements="6" defaultvalue="50"/>
|
||||
<field name="BankMode" type="enum" units="" elements="6" options="PWM,PWMSync,OneShot125" defaultvalue="PWM"/>
|
||||
<field name="BankMode" type="enum" units="" elements="6" options="PWM,PWMSync,OneShot125,OneShot42,MultiShot" defaultvalue="PWM"/>
|
||||
<field name="ChannelMax" units="us" type="int16" elements="12" defaultvalue="1000"/>
|
||||
<field name="ChannelNeutral" units="us" type="int16" elements="12" defaultvalue="1000"/>
|
||||
<field name="ChannelMin" units="us" type="int16" elements="12" defaultvalue="1000"/>
|
||||
|
@ -3,54 +3,43 @@
|
||||
<description>Settings for the @ref FixedWingPathFollowerModule</description>
|
||||
|
||||
<!-- these coefficients control desired movement in airspace -->
|
||||
<field name="HorizontalVelMax" units="m/s" type="float" elements="1" defaultvalue="20"/>
|
||||
<!-- Maximum speed the autopilot will try to achieve, usually for long distances -->
|
||||
<field name="HorizontalVelMin" units="m/s" type="float" elements="1" defaultvalue="10"/>
|
||||
<!-- V_y, Minimum speed the autopilot will try to fly, for example when loitering -->
|
||||
<field name="VerticalVelMax" units="m/s" type="float" elements="1" defaultvalue="10"/>
|
||||
<!-- maximum allowed climb or sink rate in guided flight-->
|
||||
<field name="HorizontalVelMax" units="m/s" type="float" elements="1" defaultvalue="20" description="Maximum speed the autopilot will try to achieve, usually for long distances" />
|
||||
<field name="HorizontalVelMin" units="m/s" type="float" elements="1" defaultvalue="10" description="Minimum speed the autopilot will try to fly, for example when loitering" />
|
||||
<field name="VerticalVelMax" units="m/s" type="float" elements="1" defaultvalue="10" description="maximum allowed climb or sink rate in guided flight" />
|
||||
|
||||
<field name="CourseFeedForward" units="s" type="float" elements="1" defaultvalue="3.0"/>
|
||||
<!-- how many seconds to plan the flight vector ahead when initiating necessary heading changes - increase for planes with sluggish response -->
|
||||
<field name="ReverseCourseOverlap" units="deg" type="float" elements="1" defaultvalue="20.0"/>
|
||||
<!-- how big the overlapping area behind the plane is, where, if the desired course lies behind, the current bank angle will determine if the plane goes left or right -->
|
||||
<field name="CourseFeedForward" units="s" type="float" elements="1" defaultvalue="1.0" description="how many seconds to plan the flight vector ahead when initiating necessary heading changes - increase for planes with sluggish response" />
|
||||
<field name="ReverseCourseOverlap" units="deg" type="float" elements="1" defaultvalue="20.0" description="how big the overlapping area behind the plane is, where, if the desired course lies in, the plane will not change bank angle while turning (to prevent oscillation)" />
|
||||
|
||||
<field name="HorizontalPosP" units="(m/s)/m" type="float" elements="1" defaultvalue="0.2"/>
|
||||
<!-- proportional coefficient for correction vector in path vector field to get back on course - reduce for fast planes to prevent course oscillations -->
|
||||
<field name="VerticalPosP" units="(m/s)/m" type="float" elements="1" defaultvalue="0.4"/>
|
||||
<!-- proportional coefficient for desired vertical speed in relation to altitude displacement-->
|
||||
<field name="HorizontalPosP" units="(m/s)/m" type="float" elements="1" defaultvalue="0.2" description="proportional coefficient for correction vector in path vector field to get back on course - reduce for fast planes to prevent course oscillations" />
|
||||
<field name="VerticalPosP" units="(m/s)/m" type="float" elements="1" defaultvalue="0.4" description="proportional coefficient for desired vertical speed in relation to altitude displacement - reduce if plane is oscillating vertically, increase if altitude is not held reliably" />
|
||||
|
||||
<field name="UseAirspeedSensor" units="bool" type="enum" elements="1" options="False,True" defaultvalue="True" description="allows to ignore the airspeed sensor, set to false if you have none, which will trigger fallback algorithm without indicating a fault" />
|
||||
|
||||
<!-- these coefficients control actual control outputs -->
|
||||
<field name="CoursePI" units="deg/deg" type="float" elements="3" elementnames="Kp,Ki,ILimit" defaultvalue="0.2, 0, 0"/>
|
||||
<!-- coefficients for desired bank angle in relation to ground bearing error - this controls heading -->
|
||||
<field name="CoursePI" units="deg/deg" type="float" elements="3" elementnames="Kp,Ki,ILimit" defaultvalue="0.2,0,0" description="coefficients for desired bank angle in relation to ground bearing error - this controls heading" />
|
||||
|
||||
<field name="SpeedPI" units="deg / (m/s)" type="float" elements="3" elementnames="Kp,Ki,ILimit" defaultvalue="2.5, .25, 10"/>
|
||||
<!-- coefficients for desired pitch
|
||||
in relation to speed error IASerror -->
|
||||
<field name="VerticalToPitchCrossFeed" units="deg / (m/s)" type="float" elementnames="Kp,Max" defaultvalue="5, 10"/>
|
||||
<!-- coefficients for adjusting desired pitch
|
||||
in relation to "vertical speed error -->
|
||||
<field name="AirspeedToPowerCrossFeed" units="1 / (m/s)" type="float" elementnames="Kp,Max" defaultvalue="0.2, 1"/>
|
||||
<!-- proportional coefficient for adjusting vertical speed error for power calculation
|
||||
in relation to airspeed error IASerror -->
|
||||
<field name="PowerPI" units="1/(m/s)" type="float" elements="3" elementnames="Kp,Ki,ILimit" defaultvalue="0.01,0.05,0.5"/>
|
||||
<!-- proportional coefficient for desired thrust
|
||||
in relation to vertical speed error (absolute but including crossfeed) -->
|
||||
<field name="SpeedPI" units="deg / (m/s)" type="float" elements="3" elementnames="Kp,Ki,ILimit" defaultvalue="2.5,.25,10" description="coefficients for desired pitch in relation to speed error" />
|
||||
<field name="VerticalToPitchCrossFeed" units="deg / (m/s)" type="float" elementnames="Kp,Max" defaultvalue="5,10" description="coefficients for adjusting desired pitch in relation to vertical speed error" />
|
||||
<field name="AirspeedToPowerCrossFeed" units="1 / (m/s)" type="float" elementnames="Kp,Max" defaultvalue="0.2,1" description="proportional coefficient for adjusting vertical speed error for power calculation in relation to airspeed error" />
|
||||
<field name="PowerPI" units="1/(m/s)" type="float" elements="3" elementnames="Kp,Ki,ILimit" defaultvalue="0.01,0.05,0.5" description="proportional coefficient for desired thrust in relation to vertical speed error (absolute but including crossfeed)" />
|
||||
|
||||
<!-- output limits -->
|
||||
<field name="RollLimit" units="deg" type="float" elements="3" elementnames="Min,Neutral,Max" defaultvalue="-45,0,45" />
|
||||
<!-- maximum allowed bank angles in navigates flight -->
|
||||
<field name="PitchLimit" units="deg" type="float" elements="3" elementnames="Min,Neutral,Max" defaultvalue="-10,5,20" />
|
||||
<!-- maximum allowed pitch angles and setpoint for neutral pitch -->
|
||||
<field name="ThrustLimit" units="" type="float" elements="3" elementnames="Min,Neutral,Max" defaultvalue="0.1,0.5,0.9" />
|
||||
<!-- minimum and maximum allowed thrust and setpoint for cruise speed -->
|
||||
<field name="Safetymargins" units="" type="float"
|
||||
elementnames="Wind, Stallspeed, Lowspeed, Highspeed, Overspeed, Lowpower, Highpower, Pitchcontrol"
|
||||
defaultvalue="90, 1.0, 0.5, 1.5, 1.0, 1, 0, 1" />
|
||||
<!-- Wind: degrees of crabbing allowed
|
||||
Speeds: percentage (1.0=100%) of the limit to be over/onder
|
||||
Power & Control: flag to turn on/off 0.0 =off 1.0 = on -->
|
||||
<field name="UpdatePeriod" units="ms" type="int32" elements="1" defaultvalue="100"/>
|
||||
<field name="RollLimit" units="deg" type="float" elements="3" elementnames="Min,Neutral,Max" defaultvalue="-45,0,45" description="maximum allowed bank angles in navigates flight" />
|
||||
<field name="PitchLimit" units="deg" type="float" elements="3" elementnames="Min,Neutral,Max" defaultvalue="-10,5,20" description="maximum allowed pitch angles and setpoint for neutral pitch" />
|
||||
<field name="ThrustLimit" units="" type="float" elements="3" elementnames="Min,Neutral,Max" defaultvalue="0.1,0.5,0.9" description="minimum and maximum allowed thrust and setpoint for cruise speed" />
|
||||
<field name="Safetymargins" units="" type="float"
|
||||
elementnames="Wind,Stallspeed,Lowspeed,Highspeed,Overspeed,Lowpower,Highpower,Rollcontrol,Pitchcontrol"
|
||||
defaultvalue="1,1.0,0.5,1.5,1.0,1,0,1,1"
|
||||
description="Wind: degrees of crabbing allowed -- Speeds: percentage (1.0=100%) of the limit to be over/under -- Power & Control: flag to turn on/off 0.0=off 1.0 = on" />
|
||||
<field name="SafetyCutoffLimits" units="" type="float"
|
||||
elementnames="RollDeg,PitchDeg,YawDeg,MaxDecelerationDeltaMPS" defaultvalue="25.0,25.0,25.0,4.0"
|
||||
description="maximum margins from attempted attitude allowed during takeoff -- In flight Roll/Pitch are added to RollLimit/PitchLimit as max limits - throttle is cut when beyond if roll > RollLimit.Max + TakeOffLimits.RollDeg the same happens when MaxDecelerationDeltaMPS below Lowspeed limit if speed < Safetymargins.Lowspeed*HorizontalVelMin - TakeOffLimits.MaxDecelerationDeltaMPS" />
|
||||
|
||||
|
||||
<field name="TakeOffPitch" units="deg" type="float" elements="1" defaultvalue="25.0" description="pitch angle in autotakeoff mode" />
|
||||
<field name="LandingPitch" units="deg" type="float" elements="1" defaultvalue="7.5" description="pitch angle in autoland mode" />
|
||||
|
||||
<field name="UpdatePeriod" units="ms" type="int32" elements="1" defaultvalue="100" description="update period of pathfollower" />
|
||||
|
||||
<access gcs="readwrite" flight="readwrite"/>
|
||||
<telemetrygcs acked="true" updatemode="onchange" period="0"/>
|
||||
|
@ -4,7 +4,7 @@
|
||||
<field name="Error" units="" type="float" elementnames="Course,Speed,Power" />
|
||||
<field name="ErrorInt" units="" type="float" elementnames="Course,Speed,Power" />
|
||||
<field name="Command" units="" type="float" elementnames="Course,Speed,Power" />
|
||||
<field name="Errors" units="" type="uint8" elementnames="Wind,Stallspeed,Lowspeed,Highspeed,Overspeed,Lowpower,Highpower,Pitchcontrol" />
|
||||
<field name="Errors" units="" type="uint8" elementnames="Wind,Stallspeed,Lowspeed,Highspeed,Overspeed,Lowpower,Highpower,Rollcontrol,Pitchcontrol,AirspeedSensor" />
|
||||
<access gcs="readwrite" flight="readwrite"/>
|
||||
<telemetrygcs acked="false" updatemode="manual" period="0"/>
|
||||
<telemetryflight acked="false" updatemode="periodic" period="500"/>
|
||||
|
@ -94,6 +94,7 @@
|
||||
<field name="AutoTakeOffHeight" units="m" type="float" elements="1" defaultvalue="2.5" description="height in meters above arming altitude to climb to during autotakeoff"/>
|
||||
<field name="PositionHoldOffset" units="m" type="float" elementnames="Horizontal,Vertical" defaultvalue="30,15" description="stick sensitivity for position roam modes"/>
|
||||
<field name="VarioControlLowPassAlpha" units="" type="float" elements="1" defaultvalue="0.98" description="stick low pass filter for position roam modes"/>
|
||||
<field name="FlightModeChangeRestartsPathPlan" units="bool" type="enum" elements="1" options="False,True" defaultvalue="True" description="wether a path plan should continue when interrupted by flight mode change (False), or restart from waypoint 0 (True)"/>
|
||||
<access gcs="readwrite" flight="readwrite"/>
|
||||
<telemetrygcs acked="true" updatemode="onchange" period="0"/>
|
||||
<telemetryflight acked="true" updatemode="onchange" period="0"/>
|
||||
|
@ -13,6 +13,7 @@
|
||||
<field name="MaxRFPower" units="mW" type="enum" elements="1" options="0,1.25,1.6,3.16,6.3,12.6,25,50,100" defaultvalue="0"/>
|
||||
<field name="MinChannel" units="" type="uint8" elements="1" defaultvalue="0"/>
|
||||
<field name="MaxChannel" units="" type="uint8" elements="1" defaultvalue="250"/>
|
||||
<field name="CustomDeviceID" units="hex" type="uint32" elements="1" defaultvalue="0"/>
|
||||
|
||||
<access gcs="readwrite" flight="readwrite"/>
|
||||
<telemetrygcs acked="true" updatemode="onchange" period="0"/>
|
||||
|
Loading…
x
Reference in New Issue
Block a user