Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CC1120 Temprature Sensor #286

Draft
wants to merge 25 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
60fb008
Made header and c files for the helper functions
kepler452b123 Nov 5, 2023
0a8f48e
Implemented function to get single channel reading
kepler452b123 Nov 13, 2023
019d96a
White space shenanigans?
kepler452b123 Nov 13, 2023
7c1369e
More whitespace shenanigans
kepler452b123 Nov 13, 2023
111c8db
Made header and c files for the helper functions
kepler452b123 Nov 5, 2023
142eb24
Implemented function to get single channel reading
kepler452b123 Nov 13, 2023
feac089
White space shenanigans?
kepler452b123 Nov 13, 2023
ed5887d
More whitespace shenanigans
kepler452b123 Nov 13, 2023
2c46465
Funcs w/o comments. Need final style check
kepler452b123 Nov 16, 2023
e63b066
Merge branch 'kashifb/adc-helper-functions' of github.com:UWOrbital/O…
kepler452b123 Nov 16, 2023
24a7288
Fixed merging errors
kepler452b123 Nov 16, 2023
72df6b8
Added function comments, fixed up any last style
kepler452b123 Nov 19, 2023
f55bf71
Merge branch 'main' into kashifb/adc-helper-functions
Navtajh04 Nov 22, 2023
b484e49
Used adcGetData as main logic, digital to analog
kepler452b123 Feb 11, 2024
9d415c9
Added table with group size values
kepler452b123 Feb 11, 2024
d59dc47
Typo
kepler452b123 Feb 11, 2024
c03aa58
Enabled ADC1 drivers, default settings on HAL
kepler452b123 Feb 13, 2024
fb152ae
Forgot to increment pointer in single data
kepler452b123 Mar 3, 2024
84c505f
Fixed style, added constants/enums, enabled CHID
kepler452b123 Mar 4, 2024
0c25090
Comment with instructions on how to update
kepler452b123 Mar 4, 2024
33f7a3b
Changed how digital is converted back to analog
kepler452b123 Mar 6, 2024
1e1ea8e
Added max attempts to polling, added ADC err code
kepler452b123 Mar 6, 2024
3495521
Add CC1120 temp sensor driver.
twilkhoo Mar 30, 2024
123dcd6
Change type in cc1120WriteSpi command.
twilkhoo Mar 30, 2024
88ac4d7
Add return if error code.
twilkhoo Mar 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions obc/drivers/cc1120/cc1120.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "cc1120_mcu.h"
#include "obc_logging.h"
#include "obc_board_config.h"
#include "obc_adc_helper.h"

#define READ_BIT 1 << 7
#define BURST_BIT 1 << 6
Expand Down Expand Up @@ -445,3 +446,35 @@ obc_error_code_t cc1120GetBytesInRxFifo(uint8_t *numBytes) {
RETURN_IF_ERROR_CODE(cc1120ReadExtAddrSpi(CC1120_REGS_EXT_NUM_RXBYTES, numBytes, 1));
return OBC_ERR_CODE_SUCCESS;
}

/**
* @brief Reads the temperature into `temp` using the CC1120 temperature sensor
*
* @param temp - The location to store the temperature reading
* @return obc_error_code_t - Whether or not the register read was successful
*/
obc_error_code_t cc1120ReadTemp(float *temp) {
obc_error_code_t errCode;
// Write 0x80 to reg IOCFG1 to enable analog mode.
// https://www.ti.com/lit/ug/swru295e/swru295e.pdf?ts=1709851860789, p71.
const uint8_t toggleOn = 0x80;
RETURN_IF_ERROR_CODE(cc1120WriteSpi(CC1120_REGS_IOCFG1, &toggleOn, 1));

// Read the analog value from the GPIO1 pin.
float reading;
TickType_t readTempTicks = CC1120_TEMP_BLOCK_TICKS;

// Using ADC module 1, channel 1, group 1 for now.
RETURN_IF_ERROR_CODE(adcGetSingleData(ADC1, 1, 1, &reading, readTempTicks));

// Typical temperature coefficient for Vdd=3V is 2.6733mV/C, with 728.55mv at 0C.
// https://www.ti.com/lit/an/swra415d/swra415d.pdf?ts=1709859129032, p2.
*temp = (reading - CC1120_TEMP_3V_0DEG) / CC1120_TEMP_3V_COEFF;

// Write 0x00 to reg IOCFG1 to reenable digital mode.
// https://www.ti.com/lit/ug/swru295e/swru295e.pdf?ts=1709851860789, p71.
const uint8_t toggleOff = 0x0;
RETURN_IF_ERROR_CODE(cc1120WriteSpi(CC1120_REGS_IOCFG1, &toggleOff, 1));

return OBC_ERR_CODE_SUCCESS;
}
8 changes: 8 additions & 0 deletions obc/drivers/cc1120/cc1120.h
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,14 @@ obc_error_code_t cc1120GetBytesInTxFifo(uint8_t *numBytes);
*/
obc_error_code_t cc1120GetBytesInRxFifo(uint8_t *numBytes);

/**
* @brief Reads the temperature into `temp` using the CC1120 temperature sensor
*
* @param temp - The location to store the temperature reading
* @return obc_error_code_t - Whether or not the register read was successful
*/
obc_error_code_t cc1120ReadTemp(float *temp);

/**
* @brief Gets the state of the CC1120 from the MARCSTATE register
*
Expand Down
4 changes: 4 additions & 0 deletions obc/drivers/cc1120/cc1120_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -405,3 +405,7 @@
#define CC1120_EXT_DEFAULTS_NUM_RXBYTES 0x00U
#define CC1120_EXT_DEFAULTS_FIFO_NUM_TXBYTES 0x0FU
#define CC1120_EXT_DEFAULTS_FIFO_NUM_RXBYTES 0x00U

#define CC1120_TEMP_3V_0DEG 728.55F
#define CC1120_TEMP_3V_COEFF 2.6733F
#define CC1120_TEMP_BLOCK_TICKS 100U
97 changes: 97 additions & 0 deletions obc/drivers/rm46/obc_adc_helper.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
#include "obc_adc_helper.h"

static SemaphoreHandle_t adcConversionMutex = NULL;
static StaticSemaphore_t adcConversionMutexBuffer;

void initADCMutex(void) {
if (adcConversionMutex == NULL) {
adcConversionMutex = xSemaphoreCreateMutexStatic(&adcConversionMutexBuffer);
}
ASSERT(adcConversionMutex != NULL);
return OBC_ERR_CODE_SUCCESS;
}

obc_error_code_t adcGetSingleData(ADC_module_t adc, uint32_t channel, ADC_group_t group, float *reading,
TickType_t blockTime) {
if (adc == NULL || reading == NULL) {
return OBC_ERR_CODE_INVALID_ARG;
}

if (adcConversionMutex == NULL) {
return OBC_ERR_CODE_INVALID_STATE;
}

adcData_t adcData[MAXGROUPSIZE];

obc_error_code_t errCode;
RETURN_IF_ERROR_CODE(adcGetGroupReadings(adc, group, adcData, blockTime));

uint32_t groupSize = adcGroupSize[(adc == ADC1) ? 0U : 1U, group];

for (int i = 0; i < groupSize; i++) {
if (adcData[i].id == channel) {
*reading =
(float)(adcData[i].value) * (REF_VOLTAGE_HIGH - REF_VOLTAGE_LOW) / (float)(1 << RESOLUTION) - REF_VOLTAGE_LOW;
return OBC_ERR_CODE_SUCCESS;
}
}

return OBC_ERR_CODE_ADC_INVALID_CHANNEL;
}

obc_error_code_t adcGetGroupData(ADC_module_t adc, ADC_group_t group, float *readings, TickType_t blockTime) {
if (adc == NULL || readings == NULL) {
return OBC_ERR_CODE_INVALID_ARG;
}

if (adcConversionMutex == NULL) {
return OBC_ERR_CODE_INVALID_STATE;
}

adcData_t adcData[MAXGROUPSIZE];

obc_error_code_t errCode;
RETURN_IF_ERROR_CODE(adcGetGroupReadings(adc, group, adcData, blockTime));

uint32_t groupSize = adcGroupSize[(adc == ADC1) ? 0U : 1U, group];

for (int i = 0; i < groupSize; i++) {
readings[i] =
(float)(adcData[i].value) * (REF_VOLTAGE_HIGH - REF_VOLTAGE_LOW) / (float)(1 << RESOLUTION) - REF_VOLTAGE_LOW;
}

return OBC_ERR_CODE_SUCCESS;
}

static obc_error_code_t adcGetGroupReadings(ADC_module_t adc, ADC_group_t group, adcData_t *data,
TickType_t blockTime) {
if (adc == NULL || data == NULL) {
return OBC_ERR_CODE_INVALID_ARG;
}

if (xStaticSemaphoreTake(adcConversionMutexBuffer, blockTime) != pdTRUE) {
return OBC_ERR_CODE_MUTEX_TIMEOUT;
}

adcBASE_t *adcReg = (adc == ADC1) ? adcREG1 : adcREG2;

adcStartConversion(adcReg, group);

uint8_t totalAttempts = 0;
while (!adcIsConverionComplete(adcReg, group)) {
if (totalAttempts == 1) {
adcStopConversion(adcReg, group);
xSemaphoreGive(adcConversionMutex);
return OBC_ERR_CODE_ADC_FAILURE;
}
totalAttempts++;
}

adcStopConversion(adcReg, group);

adcGetData(adcReg, group, data);

xSemaphoreGive(adcConversionMutex);

return OBC_ERR_CODE_SUCCESS;
}
88 changes: 88 additions & 0 deletions obc/drivers/rm46/obc_adc_helper.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
#pragma once

#include "obc_logging.h"
#include "obc_errors.h"
#include "adc.h"
#include "reg_adc.h"

#include <FreeRTOS.h>
#include <os_portmacro.h>
#include <os_semphr.h>
#include <os_task.h>

#include <stdint.h>

// Should be configured to max FIFO size for all groups, so that an adcData_t array of a proper size can be made
#define MAXGROUPSIZE 16U
// Assumes all groups have same resolution for simplicity. Could make this more flexible/an enum.
#define RESOLUTION 12U

#define ADC_CHANNEL_0 0U
#define ADC_CHANNEL_1 1U
#define ADC_CHANNEL_2 2U
#define ADC_CHANNEL_3 3U
#define ADC_CHANNEL_4 4U
#define ADC_CHANNEL_5 5U
#define ADC_CHANNEL_6 6U
#define ADC_CHANNEL_7 7U
#define ADC_CHANNEL_8 8U
#define ADC_CHANNEL_9 9U
#define ADC_CHANNEL_10 10U
#define ADC_CHANNEL_11 11U
#define ADC_CHANNEL_12 12U
#define ADC_CHANNEL_13 13U
#define ADC_CHANNEL_14 14U
#define ADC_CHANNEL_15 15U
#define ADC_CHANNEL_16 16U
#define ADC_CHANNEL_17 17U
#define ADC_CHANNEL_18 18U
#define ADC_CHANNEL_19 19U
#define ADC_CHANNEL_20 20U
#define ADC_CHANNEL_21 21U
#define ADC_CHANNEL_22 22U
#define ADC_CHANNEL_23 23U

#define REF_VOLTAGE_HIGH 5.0f
#define REF_VOLTAGE_LOW 0.0f

typedef enum { ADC1, ADC2 } ADC_module_t;

typedef enum { EVENT = 0U, GROUP1, GROUP2 } ADC_group_t;

/* Hardcoded table. # of channels in each Group 0-2 for ADC modules 1-2. All set to 1 for testing purposes.
**IMPORTANT** Should be updated to reflect the amount of channels assigned to each group of both ADC modules */
const uint32_t adcGroupSize[2U][3U] = {{1U, 1U, 1U}, {1U, 1U, 1U}};

/**
* @brief Initialize the ADC bus mutex
*/
void initADCMutex(void);

/**
* @note Get data from a single ADC channel. ADC conversion mode channel ID should be ENABLED for all groups this is
* called for.
* @param adc Pointer to adc module
* @param channel Channel number
* @param group Group number (0-2)
* @param reading The float to receive the analog reading
* @param blockTime The HAL ticks to wait for mutex
* @return OBC_ERR_CODE_INVALID_ARG if reading or adc parameters are null,
* OBC_ERR_CODE_INVALID_STATE if ADC mutex not init,
* OBC_ERR_CODE_MUTEX_TIMEOUT if unable to obtain ADC mutex,
* OBC_ERR_CODE_SUCCESS if conversion completed and analog data is obtained,
* OBC_ERR_CODE_ADC_INVALID_CHANNEL if conversion completed but channel number is not found
*/
obc_error_code_t adcGetSingleData(adcBASE_t *adc, uint8_t channel, uint8_t group, float *reading, TickType_t blockTime);

/**
* @note Get data from an entire group, must pass in an array of floats long enough to hold values for the whole group
* @param adc Pointer to adc module
* @param group Group number (0-2)
* @param readings Array of floats equal to number of channels in the group
* @param blockTime The HAL ticks to wait for mutex
* @return OBC_ERR_CODE_INVALID_ARG if data or adc parameters are null,
* OBC_ERR_CODE_INVALID_STATE if ADC mutex not init,
* OBC_ERR_CODE_MUTEX_TIMEOUT if unable to obtain ADC mutex,
* OBC_ERR_CODE_SUCCESS if conversions completed and analog data is obtained
*/
obc_error_code_t adcGetGroupData(adcBASE_t *adc, uint8_t group, float *readings, TickType_t blockTime);
25 changes: 25 additions & 0 deletions obc/hal/launchpad/include/adc.h
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,29 @@ typedef struct adc_config_reg
uint32 CONFIG_PARCR;
}adc_config_reg_t;

#define ADC1_OPMODECR_CONFIGVALUE 0x81140001U
#define ADC1_CLOCKCR_CONFIGVALUE (6U)

#define ADC1_G0MODECR_CONFIGVALUE ((uint32)ADC_12_BIT | (uint32)0x00000020U | (uint32)0x00000000U)
#define ADC1_G1MODECR_CONFIGVALUE ((uint32)ADC_12_BIT | (uint32)0x00000020U | (uint32)0x00000000U | (uint32)0x00000000U)
#define ADC1_G2MODECR_CONFIGVALUE ((uint32)ADC_12_BIT | (uint32)0x00000020U | (uint32)0x00000000U | (uint32)0x00000000U)

#define ADC1_G0SRC_CONFIGVALUE ((uint32)0x00000000U | (uint32)ADC1_EVENT)
#define ADC1_G1SRC_CONFIGVALUE ((uint32)0x00000000U | (uint32)ADC1_EVENT)
#define ADC1_G2SRC_CONFIGVALUE ((uint32)0x00000000U | (uint32)ADC1_EVENT)

#define ADC1_BNDCR_CONFIGVALUE ((uint32)((uint32)8U << 16U)|(8U + 8U))
#define ADC1_BNDEND_CONFIGVALUE (2U)

#define ADC1_G0SAMP_CONFIGVALUE (2U)
#define ADC1_G1SAMP_CONFIGVALUE (2U)
#define ADC1_G2SAMP_CONFIGVALUE (2U)

#define ADC1_G0SAMPDISEN_CONFIGVALUE ((uint32)((uint32)0U << 8U) | 0x00000000U)
#define ADC1_G1SAMPDISEN_CONFIGVALUE ((uint32)((uint32)0U << 8U) | 0x00000000U)
#define ADC1_G2SAMPDISEN_CONFIGVALUE ((uint32)((uint32)0U << 8U) | 0x00000000U)

#define ADC1_PARCR_CONFIGVALUE (0x00000005U)


/**
Expand Down Expand Up @@ -261,6 +284,8 @@ uint32 adcMidPointCalibration(adcBASE_t *adc);
void adcSetEVTPin(adcBASE_t *adc, uint32 value);
uint32 adcGetEVTPin(adcBASE_t *adc);

void adc1GetConfigValue(adc_config_reg_t *config_reg, config_value_type_t type);
void adc2GetConfigValue(adc_config_reg_t *config_reg, config_value_type_t type);

/** @fn void adcNotification(adcBASE_t *adc, uint32 group)
* @brief Group notification
Expand Down
24 changes: 12 additions & 12 deletions obc/hal/launchpad/rm46_launchpad_hal.dil
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# RM46L852PGE 11/10/23 17:16:34
# RM46L852PGE 03/03/24 23:47:48
#
ARCH=RM46L852PGE
#
Expand Down Expand Up @@ -180,7 +180,7 @@ DRIVER.SYSTEM.VAR.VIM_CHANNEL_119_INT_ENABLE.VALUE=0
DRIVER.SYSTEM.VAR.VIM_CHANNEL_114_INT_TYPE.VALUE=IRQ
DRIVER.SYSTEM.VAR.VIM_CHANNEL_106_INT_TYPE.VALUE=IRQ
DRIVER.SYSTEM.VAR.VIM_CHANNEL_9_INT_PRAGMA_ENABLE.VALUE=1
DRIVER.SYSTEM.VAR.ADC1_ENABLE.VALUE=0
DRIVER.SYSTEM.VAR.ADC1_ENABLE.VALUE=1
DRIVER.SYSTEM.VAR.MIBSPI_ENABLE.VALUE=0
DRIVER.SYSTEM.VAR.ECLK_VCLK1_FREQ.VALUE=73.333
DRIVER.SYSTEM.VAR.CLKT_EXTERNAL_FREQ.VALUE=00.0
Expand Down Expand Up @@ -862,7 +862,7 @@ DRIVER.SYSTEM.VAR.VIM_CHANNEL_21_INT_ENABLE.VALUE=1
DRIVER.SYSTEM.VAR.VIM_CHANNEL_13_INT_ENABLE.VALUE=1
DRIVER.SYSTEM.VAR.SAFETY_INIT_HTU1_DP_PBISTCHECK_ENA.VALUE=0x00002000
DRIVER.SYSTEM.VAR.ECAP5_ENABLE.VALUE=1
DRIVER.SYSTEM.VAR.ADC_ENABLE.VALUE=0
DRIVER.SYSTEM.VAR.ADC_ENABLE.VALUE=1
DRIVER.SYSTEM.VAR.CORE_MPU_REGION_3_TYPE_VALUE.VALUE=0x0008
DRIVER.SYSTEM.VAR.VIM_CHANNEL_70_NAME.VALUE=phantomInterrupt
DRIVER.SYSTEM.VAR.VIM_CHANNEL_62_NAME.VALUE=phantomInterrupt
Expand Down Expand Up @@ -5562,7 +5562,7 @@ DRIVER.ADC.VAR.ADC1_GROUP2_DISCHARGE_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC1_GROUP2_SAMPLE_PRESCALER.VALUE=2
DRIVER.ADC.VAR.ADC1_GROUP1_LENGTH.VALUE=16
DRIVER.ADC.VAR.ADC2_GROUP1_ID_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC1_GROUP2_CONVERSION_TIME.VALUE=1.300
DRIVER.ADC.VAR.ADC1_GROUP2_CONVERSION_TIME.VALUE=1.241
DRIVER.ADC.VAR.ADC2_PORT_BIT0_DIR.VALUE=0
DRIVER.ADC.VAR.ADC2_GROUP1_PIN4_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC2_GROUP0_PIN11_ENABLE.VALUE=0x00000000
Expand Down Expand Up @@ -5591,9 +5591,9 @@ DRIVER.ADC.VAR.ADC1_GROUP1_SAMPLE_PRESCALER.VALUE=2
DRIVER.ADC.VAR.ADC2_PORT_BIT0_PULDIS.VALUE=0
DRIVER.ADC.VAR.ADC2_GROUP2_PIN5_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC1_GROUP1_PIN8_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC1_GROUP1_ID_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC1_GROUP1_EXTENDED_SAMPLE_TIME.VALUE=300.00
DRIVER.ADC.VAR.ADC1_GROUP0_CONVERSION_TIME.VALUE=1.300
DRIVER.ADC.VAR.ADC1_GROUP1_ID_ENABLE.VALUE=0x00000020
DRIVER.ADC.VAR.ADC1_GROUP1_EXTENDED_SAMPLE_TIME.VALUE=381.80
DRIVER.ADC.VAR.ADC1_GROUP0_CONVERSION_TIME.VALUE=1.241
DRIVER.ADC.VAR.ADC2_GROUP0_RESOLUTION.VALUE=12_BIT
DRIVER.ADC.VAR.ADC1_GROUP1_PIN1_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC1_GROUP1_RESOLUTION.VALUE=12_BIT
Expand Down Expand Up @@ -5723,14 +5723,14 @@ DRIVER.ADC.VAR.ADC2_GROUP0_PIN2_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC2_GROUP0_RAM_PARITY_ENA.VALUE=0
DRIVER.ADC.VAR.ADC1_GROUP2_PIN24_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC1_GROUP2_PIN16_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC1_GROUP2_ID_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC1_GROUP2_ID_ENABLE.VALUE=0x00000020
DRIVER.ADC.VAR.ADC2_GROUP2_PIN6_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC1_GROUP1_PIN9_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC1_GROUP1_CONTINUOUS_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC1_PORT_BIT0_PDR.VALUE=0
DRIVER.ADC.VAR.ADC1_GROUP1_SAMPLE_TIME.VALUE=300.00
DRIVER.ADC.VAR.ADC1_GROUP1_PIN2_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC1_GROUP1_CONVERSION_TIME.VALUE=1.300
DRIVER.ADC.VAR.ADC1_GROUP1_CONVERSION_TIME.VALUE=1.241
DRIVER.ADC.VAR.ADC1_GROUP0_FIFO_SIZE.VALUE=16
DRIVER.ADC.VAR.ADC1_PORT_BIT0_PULL.VALUE=2
DRIVER.ADC.VAR.ADC1_GROUP0_LENGTH.VALUE=16
Expand All @@ -5744,11 +5744,11 @@ DRIVER.ADC.VAR.ADC1_GROUP0_PIN6_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC2_GROUP2_SCAN_TIME.VALUE=0.000
DRIVER.ADC.VAR.ADC2_GROUP1_HW_TRIGGER_SOURCE.VALUE=EVENT
DRIVER.ADC.VAR.ADC1_GROUP1_CHANNEL_TOTAL_TIME.VALUE=0.000000
DRIVER.ADC.VAR.ADC1_GROUP0_EXTENDED_SAMPLE_TIME.VALUE=300.00
DRIVER.ADC.VAR.ADC1_GROUP0_EXTENDED_SAMPLE_TIME.VALUE=381.80
DRIVER.ADC.VAR.ADC1_GROUP0_HW_TRIGGER_SOURCE_ALT.VALUE=EVENT
DRIVER.ADC.VAR.ADC2_GROUP1_PIN14_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC1_PORT_BIT0_PSL.VALUE=1
DRIVER.ADC.VAR.ADC1_GROUP2_EXTENDED_SAMPLE_TIME.VALUE=300.00
DRIVER.ADC.VAR.ADC1_GROUP2_EXTENDED_SAMPLE_TIME.VALUE=381.80
DRIVER.ADC.VAR.ADC2_GROUP1_LENGTH.VALUE=16
DRIVER.ADC.VAR.ADC1_GROUP1_HW_TRIGGER_SOURCE_ALT.VALUE=EVENT
DRIVER.ADC.VAR.ADC1_GROUP2_PIN3_ENABLE.VALUE=0x00000000
Expand All @@ -5773,7 +5773,7 @@ DRIVER.ADC.VAR.ADC1_GROUP1_PIN7_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC1_GROUP2_DISCHARGE_TIME.VALUE=0.00
DRIVER.ADC.VAR.ADC1_GROUP0_HW_TRIGGER_SOURCE.VALUE=EVENT
DRIVER.ADC.VAR.ADC1_GROUP1_PIN0_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC1_GROUP0_ID_ENABLE.VALUE=0x00000000
DRIVER.ADC.VAR.ADC1_GROUP0_ID_ENABLE.VALUE=0x00000020
DRIVER.ADC.VAR.ADC2_GROUP2_DISCHARGE_TIME.VALUE=0.00
DRIVER.ADC.VAR.ADC1_GROUP2_SCAN_TIME.VALUE=0.000
DRIVER.ADC.VAR.ADC1_GROUP1_PINS.VALUE=0
Expand Down
6 changes: 4 additions & 2 deletions obc/hal/launchpad/rm46_launchpad_hal.hcg
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,9 @@
<HDRADC>
<NAME>adc.h</NAME>
</HDRADC>
<SRCADC/>
<SRCADC>
<NAME>adc.c</NAME>
</SRCADC>
<HET1ASMHDR>
<NAME/>
</HET1ASMHDR>
Expand Down Expand Up @@ -720,7 +722,7 @@
<PATH>include\adc.h</PATH>
</HDRADC>
<SRCADC>
<PATH/>
<PATH>source\adc.c</PATH>
</SRCADC>
</FILENAMES>
</ADC>
Expand Down
Loading
Loading