Merge pull request #188 from gillham/master

Repair Mac builds & add 2MHz & 4MHz sample rates for Arduino Generic Logic Analyzer v0.11.
jawi · Aug 12, 2013 · 09869f4 · 09869f4
2 parents e9b5601 + 4d34764
commit 09869f4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/ols.distribution/src/main/assembly/assembly.xml b/ols.distribution/src/main/assembly/assembly.xml
@@ -5,6 +5,7 @@
 	<id>full</id>
 	<formats>
 		<format>dir</format>
+		<format>zip</format>
 		<format>tar.gz</format>
 	</formats>
 	<dependencySets>

diff --git a/ols.distribution/src/main/config/ols.profile-agla.cfg b/ols.distribution/src/main/config/ols.profile-agla.cfg
@@ -13,7 +13,7 @@ device.dividerClockspeed = 100000000
 # Whether or not double-data-rate is supported by the device (also known as the "demux"-mode).
 device.supports_ddr = false
 # Supported sample rates in Hertz, separated by comma's
-device.samplerates = 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000
+device.samplerates = 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000, 2000000, 4000000
 # What capture clocks are supported
 device.captureclock = INTERNAL
 # The supported capture sizes, in bytes

diff --git a/ols.distribution/src/main/config/ols.profile-aglam.cfg b/ols.distribution/src/main/config/ols.profile-aglam.cfg
@@ -13,7 +13,7 @@ device.dividerClockspeed = 100000000
 # Whether or not double-data-rate is supported by the device (also known as the "demux"-mode).
 device.supports_ddr = false
 # Supported sample rates in Hertz, separated by comma's
-device.samplerates = 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000
+device.samplerates = 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000, 2000000, 4000000
 # What capture clocks are supported
 device.captureclock = INTERNAL
 # The supported capture sizes, in bytes