Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge

  • Loading branch information...
commit 0f28bc01d30acdd6086b5545aa0864f278cebb18 1 parent 6785e12
Antoine Fraboulet authored
Showing with 0 additions and 11 deletions.
  1. +0 −11 devices/ds2411/ds2411_dev.c
View
11 devices/ds2411/ds2411_dev.c
@@ -1103,20 +1103,9 @@ void ds2411_ui_get_pos (int UNUSED dev, int *x, int *y)
/***************************************************/
/***************************************************/
-<<<<<<< HEAD
void ds2411_statdump(int dev, wsimtime_t UNUSED user_nanotime)
{
OUTPUT(" + id: %s\n", ds2411_id_to_str( & DS2411_ID ));
-=======
-void ds2411_statdump(int UNUSED dev, wsimtime_t UNUSED user_nanotime)
-{
- /*
- if (.io.value)
- {
- OUTPUT(" + opt: %s\n", opt_array[DS2411_SERID].io.value);
- }
- */
->>>>>>> move statdump() to wsimtime_t type
}
/***************************************************/
Please sign in to comment.
Something went wrong with that request. Please try again.