summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2014-04-19 02:33:30 +0700
committerhathach <[email protected]>2014-04-19 02:33:30 +0700
commit9a48a4aa0318cc499369758b6cbafe9088fb85bb (patch)
treee51dc5333c59a14797cb3ccd68b947e111b89819
parentd1ecec49d1ae5d6e943f8544002699e3e13a0e1d (diff)
disable device mouse by default
fix hal_debugger_is_attached with lpc11u
-rw-r--r--demos/device/device_os_none/device_os_none.uvopt10
-rw-r--r--demos/device/src/tusb_config.h2
-rw-r--r--tinyusb/hal/hal.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/demos/device/device_os_none/device_os_none.uvopt b/demos/device/device_os_none/device_os_none.uvopt
index c86d08cfd..7a1697e94 100644
--- a/demos/device/device_os_none/device_os_none.uvopt
+++ b/demos/device/device_os_none/device_os_none.uvopt
@@ -956,7 +956,7 @@
<Focus>0</Focus>
<ColumnNumber>3</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>72</TopLine>
+ <TopLine>73</TopLine>
<CurrentLine>76</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\src\main.c</PathWithFileName>
@@ -1004,7 +1004,7 @@
<Focus>0</Focus>
<ColumnNumber>1</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>108</TopLine>
+ <TopLine>106</TopLine>
<CurrentLine>112</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\src\keyboard_device_app.c</PathWithFileName>
@@ -1092,7 +1092,7 @@
<Focus>0</Focus>
<ColumnNumber>6</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>58</TopLine>
+ <TopLine>56</TopLine>
<CurrentLine>61</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\tinyusb\tusb.c</PathWithFileName>
@@ -1396,7 +1396,7 @@
<Focus>0</Focus>
<ColumnNumber>47</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>422</TopLine>
+ <TopLine>417</TopLine>
<CurrentLine>427</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\tinyusb\device\usbd.c</PathWithFileName>
@@ -2012,7 +2012,7 @@
<Focus>0</Focus>
<ColumnNumber>54</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>155</TopLine>
+ <TopLine>156</TopLine>
<CurrentLine>160</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</PathWithFileName>
diff --git a/demos/device/src/tusb_config.h b/demos/device/src/tusb_config.h
index 1cb8aef2a..f653b85fd 100644
--- a/demos/device/src/tusb_config.h
+++ b/demos/device/src/tusb_config.h
@@ -57,7 +57,7 @@
//------------- CLASS -------------//
#define TUSB_CFG_DEVICE_HID_KEYBOARD 1
-#define TUSB_CFG_DEVICE_HID_MOUSE 1
+#define TUSB_CFG_DEVICE_HID_MOUSE 0
#define TUSB_CFG_DEVICE_HID_GENERIC 0 // not supported yet
#define TUSB_CFG_DEVICE_MSC 1
#define TUSB_CFG_DEVICE_CDC 1
diff --git a/tinyusb/hal/hal.h b/tinyusb/hal/hal.h
index 650c16eca..da7ef63c7 100644
--- a/tinyusb/hal/hal.h
+++ b/tinyusb/hal/hal.h
@@ -110,7 +110,7 @@ static inline bool hal_debugger_is_attached(void)
#elif TUSB_CFG_DEBUG == 3
return true; // force to break into breakpoint with debug = 3
#else
- return false
+ return false;
#endif
}