Browse Source

gitignore; fixed for newer avr-gcc

master
Robin THONI 3 years ago
parent
commit
6bee61e62d
10 changed files with 14 additions and 249 deletions
  1. 1
    0
      .gitignore
  2. 0
    1
      .idea/.name
  3. 0
    8
      .idea/UsbKeyboard.iml
  4. 0
    15
      .idea/misc.xml
  5. 0
    8
      .idea/modules.xml
  6. 0
    6
      .idea/vcs.xml
  7. 0
    198
      .idea/workspace.xml
  8. 1
    1
      UsbKeyboard.h
  9. 5
    5
      usbdrv.c
  10. 7
    7
      usbdrv.h

+ 1
- 0
.gitignore View File

@@ -0,0 +1 @@
1
+/.idea

+ 0
- 1
.idea/.name View File

@@ -1 +0,0 @@
1
-UsbKeyboard

+ 0
- 8
.idea/UsbKeyboard.iml View File

@@ -1,8 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<module type="CPP_MODULE" version="4">
3
-  <component name="NewModuleRootManager">
4
-    <content url="file://$MODULE_DIR$" />
5
-    <orderEntry type="inheritedJdk" />
6
-    <orderEntry type="sourceFolder" forTests="false" />
7
-  </component>
8
-</module>

+ 0
- 15
.idea/misc.xml View File

@@ -1,15 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project version="4">
3
-  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
4
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
5
-    <OptionsSetting value="true" id="Add" />
6
-    <OptionsSetting value="true" id="Remove" />
7
-    <OptionsSetting value="true" id="Checkout" />
8
-    <OptionsSetting value="true" id="Update" />
9
-    <OptionsSetting value="true" id="Status" />
10
-    <OptionsSetting value="true" id="Edit" />
11
-    <ConfirmationsSetting value="0" id="Add" />
12
-    <ConfirmationsSetting value="0" id="Remove" />
13
-  </component>
14
-  <component name="ProjectRootManager" version="2" />
15
-</project>

+ 0
- 8
.idea/modules.xml View File

@@ -1,8 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project version="4">
3
-  <component name="ProjectModuleManager">
4
-    <modules>
5
-      <module fileurl="file://$PROJECT_DIR$/.idea/UsbKeyboard.iml" filepath="$PROJECT_DIR$/.idea/UsbKeyboard.iml" />
6
-    </modules>
7
-  </component>
8
-</project>

+ 0
- 6
.idea/vcs.xml View File

@@ -1,6 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project version="4">
3
-  <component name="VcsDirectoryMappings">
4
-    <mapping directory="" vcs="" />
5
-  </component>
6
-</project>

+ 0
- 198
.idea/workspace.xml View File

@@ -1,198 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project version="4">
3
-  <component name="CMakeRunConfigurationManager" shouldGenerate="true" assignedExecutableTargets="true" buildAllGenerated="false">
4
-    <generated />
5
-  </component>
6
-  <component name="CMakeSettings" AUTO_RELOAD="false" GENERATION_PASS_SYSTEM_ENVIRONMENT="true">
7
-    <ADDITIONAL_GENERATION_ENVIRONMENT>
8
-      <envs />
9
-    </ADDITIONAL_GENERATION_ENVIRONMENT>
10
-  </component>
11
-  <component name="ChangeListManager">
12
-    <list default="true" id="ccee955d-0be2-4bc1-8c38-c4bb22e37e1e" name="Default" comment="" />
13
-    <ignored path="UsbKeyboard.iws" />
14
-    <ignored path=".idea/workspace.xml" />
15
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
16
-    <option name="TRACKING_ENABLED" value="true" />
17
-    <option name="SHOW_DIALOG" value="false" />
18
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
19
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
20
-    <option name="LAST_RESOLUTION" value="IGNORE" />
21
-  </component>
22
-  <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
23
-  <component name="CreatePatchCommitExecutor">
24
-    <option name="PATCH_PATH" value="" />
25
-  </component>
26
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
27
-  <component name="FavoritesManager">
28
-    <favorites_list name="UsbKeyboard" />
29
-  </component>
30
-  <component name="FileEditorManager">
31
-    <leaf>
32
-      <file leaf-file-name="UsbKeyboard.h" pinned="false" current-in-tab="true">
33
-        <entry file="file://$PROJECT_DIR$/UsbKeyboard.h">
34
-          <provider selected="true" editor-type-id="text-editor">
35
-            <state vertical-scroll-proportion="0.33216783">
36
-              <caret line="118" column="15" selection-start-line="118" selection-start-column="12" selection-end-line="118" selection-end-column="15" />
37
-              <folding />
38
-            </state>
39
-          </provider>
40
-        </entry>
41
-      </file>
42
-    </leaf>
43
-  </component>
44
-  <component name="IdeDocumentHistory">
45
-    <option name="CHANGED_PATHS">
46
-      <list>
47
-        <option value="$PROJECT_DIR$/UsbKeyboard.h" />
48
-      </list>
49
-    </option>
50
-  </component>
51
-  <component name="JsBuildToolGruntFileManager" detection-done="true" />
52
-  <component name="JsGulpfileManager">
53
-    <detection-done>true</detection-done>
54
-  </component>
55
-  <component name="NamedScopeManager">
56
-    <order />
57
-  </component>
58
-  <component name="ProjectFrameBounds">
59
-    <option name="x" value="960" />
60
-    <option name="width" value="960" />
61
-    <option name="height" value="1061" />
62
-  </component>
63
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
64
-    <OptionsSetting value="true" id="Add" />
65
-    <OptionsSetting value="true" id="Remove" />
66
-    <OptionsSetting value="true" id="Checkout" />
67
-    <OptionsSetting value="true" id="Update" />
68
-    <OptionsSetting value="true" id="Status" />
69
-    <OptionsSetting value="true" id="Edit" />
70
-    <ConfirmationsSetting value="0" id="Add" />
71
-    <ConfirmationsSetting value="0" id="Remove" />
72
-  </component>
73
-  <component name="ProjectView">
74
-    <navigator currentView="ProjectPane" proportions="" version="1">
75
-      <flattenPackages />
76
-      <showMembers />
77
-      <showModules />
78
-      <showLibraryContents />
79
-      <hideEmptyPackages />
80
-      <abbreviatePackageNames />
81
-      <autoscrollToSource />
82
-      <autoscrollFromSource />
83
-      <sortByType />
84
-    </navigator>
85
-    <panes>
86
-      <pane id="ProjectPane">
87
-        <subPane>
88
-          <PATH>
89
-            <PATH_ELEMENT>
90
-              <option name="myItemId" value="UsbKeyboard" />
91
-              <option name="myItemType" value="com.jetbrains.cidr.projectView.CidrFilesViewHelper$1$1" />
92
-            </PATH_ELEMENT>
93
-          </PATH>
94
-          <PATH>
95
-            <PATH_ELEMENT>
96
-              <option name="myItemId" value="UsbKeyboard" />
97
-              <option name="myItemType" value="com.jetbrains.cidr.projectView.CidrFilesViewHelper$1$1" />
98
-            </PATH_ELEMENT>
99
-            <PATH_ELEMENT>
100
-              <option name="myItemId" value="UsbKeyboard" />
101
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
102
-            </PATH_ELEMENT>
103
-          </PATH>
104
-        </subPane>
105
-      </pane>
106
-    </panes>
107
-  </component>
108
-  <component name="PropertiesComponent">
109
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
110
-  </component>
111
-  <component name="RunManager">
112
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
113
-      <method />
114
-    </configuration>
115
-  </component>
116
-  <component name="ShelveChangesManager" show_recycled="false" />
117
-  <component name="TaskManager">
118
-    <task active="true" id="Default" summary="Default task">
119
-      <changelist id="ccee955d-0be2-4bc1-8c38-c4bb22e37e1e" name="Default" comment="" />
120
-      <created>1452172947648</created>
121
-      <option name="number" value="Default" />
122
-      <updated>1452172947648</updated>
123
-    </task>
124
-    <servers />
125
-  </component>
126
-  <component name="ToolWindowManager">
127
-    <frame x="960" y="0" width="960" height="1061" extended-state="0" />
128
-    <editor active="true" />
129
-    <layout>
130
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23012552" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
131
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
132
-      <window_info id="CMake" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3299075" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
133
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
134
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3299075" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
135
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
136
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
137
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
138
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
139
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
140
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
141
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
142
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
143
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
144
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
145
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
146
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
147
-    </layout>
148
-  </component>
149
-  <component name="VcsContentAnnotationSettings">
150
-    <option name="myLimit" value="2678400000" />
151
-  </component>
152
-  <component name="XDebuggerManager">
153
-    <breakpoint-manager />
154
-    <watches-manager />
155
-  </component>
156
-  <component name="editorHistoryManager">
157
-    <entry file="file://$PROJECT_DIR$/usbconfig-prototype.h">
158
-      <provider selected="true" editor-type-id="text-editor">
159
-        <state vertical-scroll-proportion="0.0">
160
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
161
-          <folding />
162
-        </state>
163
-      </provider>
164
-    </entry>
165
-    <entry file="file://$PROJECT_DIR$/usbdrv.h">
166
-      <provider selected="true" editor-type-id="text-editor">
167
-        <state vertical-scroll-proportion="0.2768">
168
-          <caret line="259" column="28" selection-start-line="259" selection-start-column="28" selection-end-line="259" selection-end-column="28" />
169
-          <folding />
170
-        </state>
171
-      </provider>
172
-    </entry>
173
-    <entry file="file://$PROJECT_DIR$/usbconfig.h">
174
-      <provider selected="true" editor-type-id="text-editor">
175
-        <state vertical-scroll-proportion="0.3328">
176
-          <caret line="247" column="32" selection-start-line="247" selection-start-column="32" selection-end-line="247" selection-end-column="32" />
177
-          <folding />
178
-        </state>
179
-      </provider>
180
-    </entry>
181
-    <entry file="file://$PROJECT_DIR$/usbconfig-prototype.h">
182
-      <provider selected="true" editor-type-id="text-editor">
183
-        <state vertical-scroll-proportion="0.0">
184
-          <caret line="237" column="34" selection-start-line="237" selection-start-column="34" selection-end-line="237" selection-end-column="34" />
185
-          <folding />
186
-        </state>
187
-      </provider>
188
-    </entry>
189
-    <entry file="file://$PROJECT_DIR$/UsbKeyboard.h">
190
-      <provider selected="true" editor-type-id="text-editor">
191
-        <state vertical-scroll-proportion="0.33216783">
192
-          <caret line="118" column="15" selection-start-line="118" selection-start-column="12" selection-end-line="118" selection-end-column="15" />
193
-          <folding />
194
-        </state>
195
-      </provider>
196
-    </entry>
197
-  </component>
198
-</project>

+ 1
- 1
UsbKeyboard.h View File

@@ -33,7 +33,7 @@ static uchar    idleRate;           // in 4 ms units
33 33
  * Redundant entries (such as LOGICAL_MINIMUM and USAGE_PAGE) have been omitted
34 34
  * for the second INPUT item.
35 35
  */
36
-PROGMEM char usbHidReportDescriptor[35] = { /* USB report descriptor */
36
+PROGMEM const char usbHidReportDescriptor[35] = { /* USB report descriptor */
37 37
   0x05, 0x01,                    // USAGE_PAGE (Generic Desktop) 
38 38
   0x09, 0x06,                    // USAGE (Keyboard) 
39 39
   0xa1, 0x01,                    // COLLECTION (Application) 

+ 5
- 5
usbdrv.c View File

@@ -67,7 +67,7 @@ optimizing hints:
67 67
 #if USB_CFG_DESCR_PROPS_STRING_0 == 0
68 68
 #undef USB_CFG_DESCR_PROPS_STRING_0
69 69
 #define USB_CFG_DESCR_PROPS_STRING_0    sizeof(usbDescriptorString0)
70
-PROGMEM char usbDescriptorString0[] = { /* language descriptor */
70
+PROGMEM const char usbDescriptorString0[] = { /* language descriptor */
71 71
     4,          /* sizeof(usbDescriptorString0): length of descriptor in bytes */
72 72
     3,          /* descriptor type */
73 73
     0x09, 0x04, /* language index (0x0409 = US-English) */
@@ -77,7 +77,7 @@ PROGMEM char usbDescriptorString0[] = { /* language descriptor */
77 77
 #if USB_CFG_DESCR_PROPS_STRING_VENDOR == 0 && USB_CFG_VENDOR_NAME_LEN
78 78
 #undef USB_CFG_DESCR_PROPS_STRING_VENDOR
79 79
 #define USB_CFG_DESCR_PROPS_STRING_VENDOR   sizeof(usbDescriptorStringVendor)
80
-PROGMEM int  usbDescriptorStringVendor[] = {
80
+PROGMEM const int  usbDescriptorStringVendor[] = {
81 81
     USB_STRING_DESCRIPTOR_HEADER(USB_CFG_VENDOR_NAME_LEN),
82 82
     USB_CFG_VENDOR_NAME
83 83
 };
@@ -86,7 +86,7 @@ PROGMEM int  usbDescriptorStringVendor[] = {
86 86
 #if USB_CFG_DESCR_PROPS_STRING_PRODUCT == 0 && USB_CFG_DEVICE_NAME_LEN
87 87
 #undef USB_CFG_DESCR_PROPS_STRING_PRODUCT
88 88
 #define USB_CFG_DESCR_PROPS_STRING_PRODUCT   sizeof(usbDescriptorStringDevice)
89
-PROGMEM int  usbDescriptorStringDevice[] = {
89
+PROGMEM const int  usbDescriptorStringDevice[] = {
90 90
     USB_STRING_DESCRIPTOR_HEADER(USB_CFG_DEVICE_NAME_LEN),
91 91
     USB_CFG_DEVICE_NAME
92 92
 };
@@ -108,7 +108,7 @@ PROGMEM int usbDescriptorStringSerialNumber[] = {
108 108
 #if USB_CFG_DESCR_PROPS_DEVICE == 0
109 109
 #undef USB_CFG_DESCR_PROPS_DEVICE
110 110
 #define USB_CFG_DESCR_PROPS_DEVICE  sizeof(usbDescriptorDevice)
111
-PROGMEM char usbDescriptorDevice[] = {    /* USB device descriptor */
111
+PROGMEM const char usbDescriptorDevice[] = {    /* USB device descriptor */
112 112
     18,         /* sizeof(usbDescriptorDevice): length of descriptor in bytes */
113 113
     USBDESCR_DEVICE,        /* descriptor type */
114 114
     0x10, 0x01,             /* USB version supported */
@@ -139,7 +139,7 @@ PROGMEM char usbDescriptorDevice[] = {    /* USB device descriptor */
139 139
 #if USB_CFG_DESCR_PROPS_CONFIGURATION == 0
140 140
 #undef USB_CFG_DESCR_PROPS_CONFIGURATION
141 141
 #define USB_CFG_DESCR_PROPS_CONFIGURATION   sizeof(usbDescriptorConfiguration)
142
-PROGMEM char usbDescriptorConfiguration[] = {    /* USB configuration descriptor */
142
+PROGMEM const char usbDescriptorConfiguration[] = {    /* USB configuration descriptor */
143 143
     9,          /* sizeof(usbDescriptorConfiguration): length of descriptor in bytes */
144 144
     USBDESCR_CONFIG,    /* descriptor type */
145 145
     18 + 7 * USB_CFG_HAVE_INTRIN_ENDPOINT + 7 * USB_CFG_HAVE_INTRIN_ENDPOINT3 +

+ 7
- 7
usbdrv.h View File

@@ -476,43 +476,43 @@ extern
476 476
 #if !(USB_CFG_DESCR_PROPS_DEVICE & USB_PROP_IS_RAM)
477 477
 PROGMEM
478 478
 #endif
479
-char usbDescriptorDevice[];
479
+const char usbDescriptorDevice[];
480 480
 
481 481
 extern
482 482
 #if !(USB_CFG_DESCR_PROPS_CONFIGURATION & USB_PROP_IS_RAM)
483 483
 PROGMEM
484 484
 #endif
485
-char usbDescriptorConfiguration[];
485
+const char usbDescriptorConfiguration[];
486 486
 
487 487
 extern
488 488
 #if !(USB_CFG_DESCR_PROPS_HID_REPORT & USB_PROP_IS_RAM)
489 489
 PROGMEM
490 490
 #endif
491
-char usbDescriptorHidReport[];
491
+const char usbDescriptorHidReport[];
492 492
 
493 493
 extern
494 494
 #if !(USB_CFG_DESCR_PROPS_STRING_0 & USB_PROP_IS_RAM)
495 495
 PROGMEM
496 496
 #endif
497
-char usbDescriptorString0[];
497
+const char usbDescriptorString0[];
498 498
 
499 499
 extern
500 500
 #if !(USB_CFG_DESCR_PROPS_STRING_VENDOR & USB_PROP_IS_RAM)
501 501
 PROGMEM
502 502
 #endif
503
-int usbDescriptorStringVendor[];
503
+const int usbDescriptorStringVendor[];
504 504
 
505 505
 extern
506 506
 #if !(USB_CFG_DESCR_PROPS_STRING_PRODUCT & USB_PROP_IS_RAM)
507 507
 PROGMEM
508 508
 #endif
509
-int usbDescriptorStringDevice[];
509
+const int usbDescriptorStringDevice[];
510 510
 
511 511
 extern
512 512
 #if !(USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER & USB_PROP_IS_RAM)
513 513
 PROGMEM
514 514
 #endif
515
-int usbDescriptorStringSerialNumber[];
515
+const int usbDescriptorStringSerialNumber[];
516 516
 
517 517
 #endif /* __ASSEMBLER__ */
518 518
 

Loading…
Cancel
Save