To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

Commit 1d7bbc56 authored by remartin's avatar remartin
Browse files

Cosmetics.

parent 3c25f047
......@@ -69,7 +69,7 @@ namespace d_fall_pps{
//bool foundTarget = false;
bool finishedCalibration = false;
int frequencyDivision = 150; // 67 Hz by UWB.
int frequencyDivision = 5; // 67 Hz by UWB.
int clockState = 1;
// Received data from the target/crazyflie
......
......@@ -30,8 +30,6 @@
//
// ----------------------------------------------------------------------------------
//#include<iostream>
#include<stdio.h>
#include "../../include/spotlightManager.h"
using namespace std;
......@@ -39,10 +37,8 @@ using namespace std;
int main(){
for(int i = 0; i<10; i++){
printf("Globifisch\n");
//cout << "GlobiSchnaegg";
}
spotlightManager slM;
//slM.setPTmanually(false);
......
......@@ -26,8 +26,8 @@
#
#
# DESCRIPTION:
# Compiles the spotlight files only. Used for testing purposes.
# Run with 'bash customCooker.sh'.
# Compiles the intensityLogger files. Used for testing purposes.
# Run with 'bash cookIntensityLogger.sh'.
#
# ----------------------------------------------------------------------------------
......
# Copyright (C) 2018, ETH Zurich, D-dddITET
# Martin Reinhard remartin @ee.ethz.ch
#
# This file is part of D-FaLL-System.
#
# D-FaLL-System 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.
#
# D-FaLL-System 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 D-FaLL-System. If not, see <http://www.gnu.org/licenses/>.
#
#
# ----------------------------------------------------------------------------------
# DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M
# D D F aaa L L S Y Y S T E MM MM
# D D --- FFFF a a L L --- SSS Y SSS T EEE M M M
# D D F a aa L L S Y S T E M M
# DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M
#
#
# DESCRIPTION:
# Displays everything received at the /ttyACMx port of interest in the terminal
# and saves it in a log file.
# Run with 'bash eavesdropper.sh'.
#
# ----------------------------------------------------------------------------------
echo 'Eavesdropper in position. Which ttyACM port to listen to?'
......
// Copyright (C) 2018, ETH Zurich, D-ITET
// Martin Reinhard remartin @ee.ethz.ch
//
// This file is part of D-FaLL-System.
//
// D-FaLL-System 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.
//
// D-FaLL-System 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 D-FaLL-System. If not, see <http://www.gnu.org/licenses/>.
//
//
// ----------------------------------------------------------------------------------
// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M
// D D F aaa L L S Y Y S T E MM MM
// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M
// D D F a aa L L S Y S T E M M
// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M
//
//
// DESCRIPTION:
// Writes intensity values delivered by a sensor on an Arduino to a .txt file.
//
// ----------------------------------------------------------------------------------
#include "intensityLogger.h"
......@@ -159,7 +190,6 @@ int intensityLogger::startConnection(const char* port){
return 1;
}
void intensityLogger::closeConnection(){
if (_port != "" && _isConnected)
close(tty_fd); // Port release
......
// Copyright (C) 2018, ETH Zurich, D-ITET
// Martin Reinhard remartin @ee.ethz.ch
//
// This file is part of D-FaLL-System.
//
// D-FaLL-System 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.
//
// D-FaLL-System 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 D-FaLL-System. If not, see <http://www.gnu.org/licenses/>.
//
//
// ----------------------------------------------------------------------------------
// DDDD FFFFF L L SSSS Y Y SSSS TTTTT EEEEE M M
// D D F aaa L L S Y Y S T E MM MM
// D D --- FFFF a a L L --- SSS Y SSS T EEE M M M
// D D F a aa L L S Y S T E M M
// DDDD F aa a LLLL LLLL SSSS Y SSSS T EEEEE M M
//
//
// DESCRIPTION:
// Writes intensity values delivered by a sensor on an Arduino to a .txt file.
//
// ----------------------------------------------------------------------------------
#pragma once
#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
......@@ -14,7 +44,6 @@
#include <string>
#include <vector>
#include <ctime>
#include <chrono>
#include <fstream>
......
......@@ -255,7 +255,7 @@ void d_fall_pps::calculateXYZ(const std_msgs::UInt32MultiArray& distances, doubl
dist[i] = distances.data[i] / 100.0; //in dm
lastDistances[i] = dist[i];
//ROS_INFO("Distance of Anchor %i is %f.", i+1, dist[i]);
if(distances.data[i] == 0)
printError[i] = true;
......
......@@ -40,7 +40,6 @@ int main(int argc, char* argv[]){
for(int i = 0; i<10; i++){
printf("Globifisch\n");
//cout << "GlobiSchnaegg";
}
// ROS stuff:
......
......@@ -41,6 +41,8 @@
using namespace std;
spotlightManager::spotlightManager(){
defaultChannel = 10; //Value between 0 and 255.
......@@ -49,6 +51,9 @@ spotlightManager::spotlightManager(){
posColour = 9; // Where Red, Green, Blue and White are.
updateFrequency = 30.0; // Should be below 55 (Aruino), > 40 makes no sense (DMX)
for(int hans = 0; hans < 14; hans++){
dmxValues[hans] = 0;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment