Skip to content

Fix change address #7

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.

Sign up for GitHub

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

Open
baender wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix change address #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86cd8e0
Fix serial port support
BaenderGFZ Nov 12, 2019
ccbe0fb
Fixed changeAddress() function
BaenderGFZ Nov 13, 2019
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
34 changes: 15 additions & 19 deletions SDI12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ void SDI12::init( void ) {
TX_PIN = &PORTB_PCR17;
SET = &GPIOB_PSOR;
CLEAR = &GPIOB_PCOR;
STATUS_REG = &UART0_S1;
BITMASK = CORE_PIN1_BITMASK;
//PIN_NUM_RX = 0;
PIN_NUM_TX = 1;
Expand All @@ -120,6 +121,7 @@ void SDI12::init( void ) {
TX_PIN = &PORTC_PCR4;
SET = &GPIOC_PSOR;
CLEAR = &GPIOC_PCOR;
STATUS_REG = &UART1_S1;
BITMASK = CORE_PIN10_BITMASK;
//PIN_NUM_RX = 9;
PIN_NUM_TX = 10;
Expand All @@ -130,14 +132,15 @@ void SDI12::init( void ) {
attachInterruptVector( IRQ_UART2_STATUS, uart2_isr );
NVIC_ENABLE_IRQ( IRQ_UART2_STATUS );
RUN_ONCE_END;
REG = &KINETISK_UART2;
RX_PIN = &PORTD_PCR2;
TX_PIN = &PORTD_PCR3;
SET = &GPIOD_PSOR;
CLEAR = &GPIOD_PCOR;
BITMASK = CORE_PIN8_BITMASK;
//PIN_NUM_RX = 7;
PIN_NUM_TX = 8;
REG = &KINETISK_UART2;
RX_PIN = &PORTD_PCR2;
TX_PIN = &PORTD_PCR3;
SET = &GPIOD_PSOR;
CLEAR = &GPIOD_PCOR;
STATUS_REG = &UART2_S1;
BITMASK = CORE_PIN8_BITMASK;
//PIN_NUM_RX = 7;
PIN_NUM_TX = 8;
}
}

Expand Down Expand Up @@ -322,13 +325,6 @@ int SDI12::changeAddress( const uint8_t new_address ) {
ioActive = false;
return -3;
}

error = isActive( );

if ( error ) {
ioActive = false;
return -4;
}

uint8_t command[4];
command[0] = sensor.address;
Expand Down Expand Up @@ -423,7 +419,7 @@ int SDI12::verification( volatile void *src ) {

do {
yield( );
} while ( !( UART2_S1 & UART_S1_IDLE ) );
} while ( !( *STATUS_REG & UART_S1_IDLE ) );

char service_request[10];
i = 0;
Expand Down Expand Up @@ -501,7 +497,7 @@ int SDI12::measurement( volatile void *src, int num ) {
if ( time >= timeout ) { ioActive = false; return -4; }
yield( );
}
do { yield( ); } while ( !( UART2_S1 & UART_S1_IDLE ) );
do { yield( ); } while ( !( *STATUS_REG & UART_S1_IDLE ) );
while ( available( ) ) *s++ = read( );
*s = 0;
uint8_t * service_request = ( uint8_t * )src;
Expand Down Expand Up @@ -638,7 +634,7 @@ int SDI12::transparent( const void *command, volatile void *src ) {
if ( time >= timeout ) { serviceRequest = true; ioActive = false; return -4; }
yield( );
}
do { yield( ); } while ( !(UART2_S1 & UART_S1_IDLE) ); // wait for line to go idle
do { yield( ); } while ( !(*STATUS_REG & UART_S1_IDLE) ); // wait for line to go idle
while ( available( ) ) *s++ = read( ); // read sensor data
}
*s = 0; // null terminate return string
Expand Down Expand Up @@ -727,7 +723,7 @@ int SDI12::send_command( const void *cmd, uint8_t count, uint8_t type ) {
}
response_timer = 0; // reset timeout
while ( !commandResponse && ( response_timer < 1000 ) ) yield( ); // wait for response from sensor
do { yield( ); } while ( !( UART2_S1 & UART_S1_IDLE ) ); // wait for i/o to become idle
do { yield( ); } while ( !( *STATUS_REG & UART_S1_IDLE ) ); // wait for i/o to become idle
if ( response_timer >= 1000 ) { return -3; } // signal any errors
break;
case NON_BLOCKING:
Expand Down
2 changes: 2 additions & 0 deletions SDI12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class UART {
RX_PIN( nullptr ),
SET( nullptr ),
CLEAR( nullptr ),
STATUS_REG( nullptr ),
PIN_NUM_RX( 0 ),
PIN_NUM_TX( 0 )
{
Expand All @@ -66,6 +67,7 @@ class UART {
volatile uint8_t SCGC4;
volatile uint32_t *SET;
volatile uint32_t *CLEAR;
volatile uint8_t *STATUS_REG;
volatile uint32_t BITMASK;
uint8_t PIN_NUM_RX;
uint8_t PIN_NUM_TX;
Expand Down