Skip to content

Commit

Permalink
Merge branch 'rgb'
Browse files Browse the repository at this point in the history
  • Loading branch information
@galenlynch
galenlynch committed Jan 27, 2020
2 parents 312954d + 4e4519c commit 72b75eb
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 13 deletions.
8 changes: 4 additions & 4 deletions .settings/language.settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1237471199257402008" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1152702129182687639" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
Expand All @@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1232112691835333630" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1147343621760619261" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
Expand All @@ -27,7 +27,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1237471199257402008" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1152702129182687639" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
Expand All @@ -38,7 +38,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1149307642742977246" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1064538572668262877" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
Expand Down
2 changes: 2 additions & 0 deletions auxiliary.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#define REG_ADC_CTRL 0x01
#define REG_ADC_PERIOD 0x02



/*
Get the current LED brightness.
*/
Expand Down
1 change: 1 addition & 0 deletions auxiliary.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#define AUX_ADDR_WR 0x98
#define AUX_ADDR_RD 0x99
#define AUX_ADC_MIN_PER 0x0034

/*
Get the current LED brightness.
*/
Expand Down
16 changes: 8 additions & 8 deletions cyfxuvcdscr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,10 +490,10 @@ const uint8_t CyFxUSBHSConfigDscr[] =
0x04, /* Subtype : uncompressed format I/F */
0x01, /* Format desciptor index (only one format is supported) */
0x01, /* number of frame descriptor followed */
0x59,0x55,0x59,0x32, /* GUID used to identify streaming-encoding format: YUY2 */
0x00,0x00,0x10,0x00,
0x80,0x00,0x00,0xAA,
0x00,0x38,0x9B,0x71,
0x7B,0xEB,0x36,0xE4, /*MEDIASUBTYPE_RGB565 GUID: E436EB7B-524F-11CE-9F53-0020AF0BA770 */
0x4F,0x52,0xCE,0x11,
0x9F,0x53,0x00,0x20,
0xAF,0x0B,0xA7,0x70,
0x10, /* Number of bits per pixel used to specify color in the decoded video frame.
0 if not applicable: 16 bit per pixel */
0x01, /* Optimum Frame Index for this stream: 1 */
Expand Down Expand Up @@ -837,10 +837,10 @@ const uint8_t CyFxUSBSSConfigDscr[] =
0x04, /* Subtype : uncompressed format I/F */
0x01, /* Format desciptor index */
0x01, /* Number of frame descriptor followed */
0x59,0x55,0x59,0x32, /* GUID used to identify streaming-encoding format: YUY2 */
0x00,0x00,0x10,0x00,
0x80,0x00,0x00,0xAA,
0x00,0x38,0x9B,0x71,
0x7B,0xEB,0x36,0xE4, /*MEDIASUBTYPE_RGB565 GUID: E436EB7B-524F-11CE-9F53-0020AF0BA770 */
0x4F,0x52,0xCE,0x11,
0x9F,0x53,0x00,0x20,
0xAF,0x0B,0xA7,0x70,
0x10, /* Number of bits per pixel */
0x01, /* Optimum Frame Index for this stream: 1 */
0x2F, /* X dimension of the picture aspect ratio; Non-interlaced; Changed by GL*/
Expand Down
2 changes: 1 addition & 1 deletion uvc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ CyFxUVCApplnInit (void)
SensorInit ();
SensorGetFeedback ();
LedSetBrightness (0x00);
/* ScopeAdcStart(CyTrue, AUX_ADC_MIN_PER); */
ScopeAdcStart(CyTrue, AUX_ADC_MIN_PER);

/* USB initialization. */
apiRetStatus = CyU3PUsbStart ();
Expand Down

0 comments on commit 72b75eb

Please sign in to comment.