Jake Greaves
Test, please delete
Revision 34:9d5afa33df5d, committed 2019-02-15
- Comitter:
- ADIJake
- Date:
- Fri Feb 15 10:47:08 2019 +0000
- Parent:
- 33:ea9e60457591
- Commit message:
- test
Changed in this revision
| ADISense1000_MBED.c | Show annotated file Show diff for this revision Revisions of this file |
| main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/ADISense1000_MBED.c Mon Oct 15 07:57:54 2018 +0000
+++ b/ADISense1000_MBED.c Fri Feb 15 10:47:08 2019 +0000
@@ -62,18 +62,19 @@
.enableChannel = true,
.disablePublishing = false,
.compensationChannel = ADI_SENSE_1000_CHANNEL_ID_NONE,
- .measurementUnit = ADI_SENSE_1000_MEASUREMENT_UNIT_CELSIUS,
+ .measurementUnit = ADI_SENSE_1000_MEASUREMENT_UNIT_CELSIUS,
.measurementsPerCycle = 1,
.extraSettlingTime = 7500,
.adcChannelConfig = {
- .sensor = ADI_SENSE_1000_ADC_SENSOR_RTD_3WIRE_PT100_DEF_L1,
- .gain = ADI_SENSE_1000_ADC_GAIN_16X,
+ .sensor = ADI_SENSE_1000_ADC_SENSOR_RTD_4WIRE_PT100_DEF_L1,
+ .gain = ADI_SENSE_1000_ADC_GAIN_8X,
.current = {
- .outputLevel = ADI_SENSE_1000_ADC_EXC_CURRENT_250uA,
+ .outputLevel = ADI_SENSE_1000_ADC_EXC_CURRENT_500uA,
},
.filter = {
- .type = ADI_SENSE_1000_ADC_FILTER_FIR_20SPS,
- },
+ .type = ADI_SENSE_1000_ADC_FILTER_SINC4,
+ .fs = 1920,
+ },
.reference = {
.type = ADI_SENSE_1000_ADC_REFERENCE_RESISTOR_INTERNAL_1,
.disableBuffer = false,
--- a/main.cpp Mon Oct 15 07:57:54 2018 +0000
+++ b/main.cpp Fri Feb 15 10:47:08 2019 +0000
@@ -70,21 +70,21 @@
static ADI_SENSE_CONNECTION connectionInfo = {
.type = ADI_SENSE_CONNECTION_TYPE_SPI,
.spi = {
- .mosiPin = P1_13,
- .misoPin = P1_14,
- .sckPin = P1_15,
- .csPin = P1_12,
+ .mosiPin = SPI_MOSI,
+ .misoPin = SPI_MISO,
+ .sckPin = SPI_SCK,
+ .csPin = D10,
.maxSpeedHz = 2000000,
},
.gpio = {
- .resetPin = P1_7,
- .errorPin = P1_4,
- .alertPin = P1_5,
- .datareadyPin = P1_6,
+ .resetPin = D6,
+ .errorPin = D3,
+ .alertPin = D4,
+ .datareadyPin = D5,
},
.log = {
- .txPin = P0_6,
- .rxPin = P0_8,
+ .txPin = PA_2,
+ .rxPin = PA_3,
.baudRate = 115200,
.disableLogs = false,
},