Skip to content

Commit

Permalink
adapted version number and deleting temp directories before upload
Browse files Browse the repository at this point in the history
  • Loading branch information
@ulrichard
ulrichard committed Jan 19, 2012
1 parent 6c00c8b commit 4e7b25f
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 33 deletions.
57 changes: 33 additions & 24 deletions debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,147 +1,156 @@
arexx-robot-arm (1.5-24~maverick) maverick; urgency=low
arexx-robot-arm (1.5-25~precise) precise; urgency=low

* managing arm lib and examples locally
* compiling examples with cmake
* changes to the arm lib fo use with c++ for rosserial
* simplified the folder structure for the temp build directories

-- Richard Ulrich <richi@paraeasy.ch> Thu, 19 Jan 2011 21:34:00 +0100

arexx-robot-arm (1.5-24~precise) precise; urgency=low

* dropped gcc-avr dependencies from the robotloader

-- Richard Ulrich <richi@paraeasy.ch> Mon, 9 Jan 2011 21:15:00 +0100

arexx-robot-arm (1.5-23~maverick) maverick; urgency=low
arexx-robot-arm (1.5-23~precise) precise; urgency=low

* corrected dependency field

-- Richard Ulrich <richi@paraeasy.ch> Mon, 9 Jan 2011 20:15:00 +0100

arexx-robot-arm (1.5-22~maverick) maverick; urgency=low
arexx-robot-arm (1.5-22~precise) precise; urgency=low

* installing the static lib

-- Richard Ulrich <richi@paraeasy.ch> Mon, 9 Jan 2011 00:15:00 +0100

arexx-robot-arm (1.5-21~maverick) maverick; urgency=low
arexx-robot-arm (1.5-21~precise) precise; urgency=low

* write last position into a config file using libconfig++

-- Richard Ulrich <richi@paraeasy.ch> Sun, 8 Jan 2011 23:37:00 +0100

arexx-robot-arm (1.5-21~maverick) maverick; urgency=low
arexx-robot-arm (1.5-21~precise) precise; urgency=low

* install the cmake files
* added spin boxes

-- Richard Ulrich <richi@paraeasy.ch> Sun, 8 Jan 2011 22:37:00 +0100

arexx-robot-arm (1.5-20~maverick) maverick; urgency=low
arexx-robot-arm (1.5-20~precise) precise; urgency=low

* more restrictive .install files

-- Richard Ulrich <richi@paraeasy.ch> Sun, 8 Jan 2011 20:41:00 +0100

arexx-robot-arm (1.5-19~maverick) maverick; urgency=low
arexx-robot-arm (1.5-19~precise) precise; urgency=low

* renamed packages
* more restrictive .install file

-- Richard Ulrich <richi@paraeasy.ch> Sun, 8 Jan 2011 10:58:00 +0100

arexx-robot-arm (1.5-18~maverick) maverick; urgency=low
arexx-robot-arm (1.5-18~precise) precise; urgency=low

* Added missing boos build dependencies

-- Richard Ulrich <richi@paraeasy.ch> Sat, 7 Jan 2011 22:18:00 +0100

arexx-robot-arm (1.5-17~maverick) maverick; urgency=low
arexx-robot-arm (1.5-17~precise) precise; urgency=low

* c doesn't know bool

-- Richard Ulrich <richi@paraeasy.ch> Sat, 7 Jan 2011 00:40:00 +0100

arexx-robot-arm (1.5-16~maverick) maverick; urgency=low
arexx-robot-arm (1.5-16~precise) precise; urgency=low

* added build dependency to cmake
* arm moves when changing the sliders in the qt app

-- Richard Ulrich <richi@paraeasy.ch> Fri, 6 Jan 2011 20:15:00 +0100

arexx-robot-arm (1.5-15~maverick) maverick; urgency=low
arexx-robot-arm (1.5-15~precise) precise; urgency=low

* Got the first hex built with cmake

-- Richard Ulrich <richi@paraeasy.ch> Thu, 5 Jan 2011 20:12:00 +0200

arexx-robot-arm (1.5-14~maverick) maverick; urgency=low
arexx-robot-arm (1.5-14~precise) precise; urgency=low

* Building the lib with cmake

-- Richard Ulrich <richi@paraeasy.ch> Wed, 4 Jan 2011 22:12:00 +0200

arexx-robot-arm (1.5-12~maverick) maverick; urgency=low
arexx-robot-arm (1.5-12~precise) precise; urgency=low

* splitted into separate packages

-- Richard Ulrich <richi@paraeasy.ch> Mon, 2 Jan 2011 20:11:00 +0200

robotloader (1.5-11~maverick) maverick; urgency=low
robotloader (1.5-11~precise) precise; urgency=low

* typo

-- Richard Ulrich <richi@paraeasy.ch> Mon, 2 Jan 2011 01:23:00 +0200

robotloader (1.5-10~maverick) maverick; urgency=low
robotloader (1.5-10~precise) precise; urgency=low

* including a reduced set of libs

-- Richard Ulrich <richi@paraeasy.ch> Sun, 1 Jan 2011 23:05:00 +0200

robotloader (1.5-9~maverick) maverick; urgency=low
robotloader (1.5-9~precise) precise; urgency=low

* adapted to the RACS zip structure

-- Richard Ulrich <richi@paraeasy.ch> Sat, 31 Dec 2011 01:12:00 +0200

robotloader (1.5-8~maverick) maverick; urgency=low
robotloader (1.5-8~precise) precise; urgency=low

* added missing file

-- Richard Ulrich <richi@paraeasy.ch> Sat, 31 Dec 2011 00:40:00 +0200

robotloader (1.5-7~maverick) maverick; urgency=low
robotloader (1.5-7~precise) precise; urgency=low

* Added an icon
* Trying to put the configuration to /etc and provide a symbolic link in the app directory
* Adding the RACS hex to the examples directory

-- Richard Ulrich <richi@paraeasy.ch> Fri, 30 Dec 2011 22:40:00 +0200

robotloader (1.5-6~maverick) maverick; urgency=low
robotloader (1.5-6~precise) precise; urgency=low

* don't even try downloading

-- Richard Ulrich <richi@paraeasy.ch> Fri, 30 Dec 2011 20:40:00 +0200

robotloader (1.5-5~maverick) maverick; urgency=low
robotloader (1.5-5~precise) precise; urgency=low

* don't even try downloading

-- Richard Ulrich <richi@paraeasy.ch> Thu, 29 Dec 2011 23:40:00 +0200

robotloader (1.5-4~maverick) maverick; urgency=low
robotloader (1.5-4~precise) precise; urgency=low

* added build dependency to unzip

-- Richard Ulrich <richi@paraeasy.ch> Thu, 29 Dec 2011 23:20:00 +0200

robotloader (1.5-3~maverick) maverick; urgency=low
robotloader (1.5-3~precise) precise; urgency=low

* The launchpad uild host can't download the zip files, so I added them to git.

-- Richard Ulrich <richi@paraeasy.ch> Thu, 29 Dec 2011 22:51:00 +0200

robotloader (1.5-2~maverick) maverick; urgency=low
robotloader (1.5-2~precise) precise; urgency=low

* added build dependency to debhelper

-- Richard Ulrich <richi@paraeasy.ch> Thu, 29 Dec 2011 22:05:00 +0200

robotloader (1.5-1~maverick) maverick; urgency=low
robotloader (1.5-1~precise) precise; urgency=low

* initial debian package

Expand Down
4 changes: 2 additions & 2 deletions debian/rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ build: build-stamp

#lib
mkdir -p $(CURDIR)/build/lib
(cd $(CURDIR)/build/lib; cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=1 -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_TOOLCHAIN_FILE:PATH=$(CURDIR)/examples/RobotArmLib/arexx_robot_arm_crosscompile.cmake $(CURDIR)/examples/RobotArmLib )
(cd $(CURDIR)/build/lib; cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=1 -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_TOOLCHAIN_FILE:PATH=$(CURDIR)/examples/RobotArmLib/arexx_robot_arm_crosscompile.cmake -DCMAKE_MODULE_PATH:PATH=$(CURDIR)/examples/RobotArmLib $(CURDIR)/examples/RobotArmLib )
(cd $(CURDIR)/build/lib; $(MAKE) )

#examples
mkdir -p $(CURDIR)/build/examples
(cd $(CURDIR)/build/examples; cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=1 -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_TOOLCHAIN_FILE:PATH=$(CURDIR)/examples/RobotArmLib/arexx_robot_arm_crosscompile.cmake $(CURDIR)/examples/RobotArmExamples )
(cd $(CURDIR)/build/examples; cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=1 -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_TOOLCHAIN_FILE:PATH=$(CURDIR)/examples/RobotArmLib/arexx_robot_arm_crosscompile.cmake -DCMAKE_MODULE_PATH:PATH=$(CURDIR)/examples/RobotArmLib -DArexxRobotArm_INCLUDE_DIR:PATH=$(CURDIR)/examples/RobotArmLib -DArexxRobotArm_LIBRARY:PATH=$(CURDIR)/build/lib/libarexx_robot_arm.a $(CURDIR)/examples/RobotArmExamples )
(cd $(CURDIR)/build/examples; $(MAKE) )

#racsqt
Expand Down
9 changes: 2 additions & 7 deletions examples/RobotArmExamples/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ MACRO(BUILD_ROBOT_ARM_EXAMPLE FOLDER_NAME)
ADD_ROBOT_ARM_EXECUTABLE(${FOLDER_NAME} ${SOURCE_FILES})
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${FOLDER_NAME}.hex DESTINATION ${CMAKE_INSTALL_PREFIX}/share/robotloader/examples/${FOLDER_NAME})
INSTALL(DIRECTORY ${FOLDER_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/robotloader/examples/${FOLDER_NAME})
ENDMACRO(ADD_ROBOT_ARM_EXECUTABLE)
ENDMACRO(BUILD_ROBOT_ARM_EXAMPLE)

BUILD_ROBOT_ARM_EXAMPLE(Calibrate_RobotArm)
BUILD_ROBOT_ARM_EXAMPLE(Example_01_Leds)
BUILD_ROBOT_ARM_EXAMPLE(Example_02_Uart_01)
BUILD_ROBOT_ARM_EXAMPLE(Example_03_Uart_02)
BUILD_ROBOT_ARM_EXAMPLE(Example_04_Stopwatches)
#BUILD_ROBOT_ARM_EXAMPLE(Example_04_Stopwatches)
BUILD_ROBOT_ARM_EXAMPLE(Example_05_Measuring_Current)
BUILD_ROBOT_ARM_EXAMPLE(Example_06_Move_01)
BUILD_ROBOT_ARM_EXAMPLE(Example_07_Move_02)
Expand All @@ -29,10 +29,5 @@ BUILD_ROBOT_ARM_EXAMPLE(Example_09_Key_Board)
BUILD_ROBOT_ARM_EXAMPLE(Example_10_I2C)
BUILD_ROBOT_ARM_EXAMPLE(Example_11_Selftest)
BUILD_ROBOT_ARM_EXAMPLE(Example_12_Music)
BUILD_ROBOT_ARM_EXAMPLE(Calibrate_RobotArm)
BUILD_ROBOT_ARM_EXAMPLE(Calibrate_RobotArm)
BUILD_ROBOT_ARM_EXAMPLE(Calibrate_RobotArm)
BUILD_ROBOT_ARM_EXAMPLE(Calibrate_RobotArm)
BUILD_ROBOT_ARM_EXAMPLE(Calibrate_RobotArm)


6 changes: 6 additions & 0 deletions examples/RobotArmLib/RobotArmBase/RobotArmBaseLib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,12 @@ int scan_keyboard(void){
/************************** Servo Control **********************************/
/*****************************************************************************/

int Current_1;
int Current_2;
int Current_3;
int Current_4;
int Current_5;
int Current_6;

//Measuring Current

Expand Down
2 changes: 2 additions & 0 deletions ppa_upload.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export DEBEMAIL="richi@paraeasy.ch"
export DEBFULLNAME="Richard Ulrich"


rm -rf build
rm -rf build-*
rm *-stamp
rm -rf racs/qt/build
Expand All @@ -18,6 +19,7 @@ rm racs/uc/*.o
rm racs/uc/*.cmake
rm -rf ros/arexx_robotarm/build
rm -rf ros/arexx_robotarm/bin
rm -rf ros/uc_arm/build
rm -rf debian/build*
rm -rf debian/tmp
rm -rf debian/arexx-robotarm-examples/
Expand Down

0 comments on commit 4e7b25f

Please sign in to comment.