Skip to content

Commit

Permalink
Update no-OS submodule
Browse files Browse the repository at this point in the history 
Update AD5686, AD5696 examples to accommodate slight changes in no-OS drivers - channel renaming, mask function.
Add delay after DE assertion in serial passthrough
  • Loading branch information
@thorenscientific
thorenscientific committed Nov 26, 2018
1 parent 3908ec9 commit 3e8f12f
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion ADIDrivers/no-OS
Submodule no-OS updated 275 files
4 changes: 2 additions & 2 deletions LTSketchbook/Example Designs/CN0416_SerialPassthrough/CN0416_SerialPassthrough.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ void setup() {
void loop() {
if (Serial.available()) { // If anything comes in Serial (USB),
digitalWrite(2, HIGH);
delay(1);
Serial1.write(Serial.read()); // read it and send it out Serial1 (pins 0 & 1)
delay(2);
digitalWrite(2, LOW);
digitalWrite(2, LOW);
}

if (Serial1.available()) { // If anything comes in Serial1 (pins 0 & 1)
Expand Down
18 changes: 9 additions & 9 deletions LTSketchbook/Part Number/ADI-Parts/EVAL-AD5686R/EVAL-AD5686R.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,22 +397,22 @@ uint8_t menu_5_power_down_mode(int16_t selected_dac)
if (dac1)
{
Serial.println(F(" Applying power mode to DAC A..."));
ad5686_power_mode(device, AD5686_CH_A, selected_mode);
ad5686_power_mode(device, AD5686_CH_0, selected_mode);
}
if (dac2)
{
Serial.println(F(" Applying power mode to DAC B..."));
ad5686_power_mode(device, AD5686_CH_B, selected_mode);
ad5686_power_mode(device, AD5686_CH_1, selected_mode);
}
if (dac3)
{
Serial.println(F(" Applying power mode to DAC C..."));
ad5686_power_mode(device, AD5686_CH_C, selected_mode);
ad5686_power_mode(device, AD5686_CH_2, selected_mode);
}
if (dac4)
{
Serial.println(F(" Applying power mode to DAC D..."));
ad5686_power_mode(device, AD5686_CH_D, selected_mode);
ad5686_power_mode(device, AD5686_CH_3, selected_mode);
}

Serial.println(F(" Done!"));
Expand Down Expand Up @@ -459,10 +459,10 @@ uint8_t menu_6_select_ref_voltage(float *vref)
// Reads back all DAC registers
uint8_t menu_7_read_back_registers()
{
uint32_t reg1 = ad5686_read_back_register(device, AD5686_CH_A);
uint32_t reg2 = ad5686_read_back_register(device, AD5686_CH_B);
uint32_t reg3 = ad5686_read_back_register(device, AD5686_CH_C);
uint32_t reg4 = ad5686_read_back_register(device, AD5686_CH_D);
uint32_t reg1 = ad5686_read_back_register(device, AD5686_CH_0);
uint32_t reg2 = ad5686_read_back_register(device, AD5686_CH_1);
uint32_t reg3 = ad5686_read_back_register(device, AD5686_CH_2);
uint32_t reg4 = ad5686_read_back_register(device, AD5686_CH_3);

Serial.println(F("\n All DAC register values:"));
Serial.print(F(" DAC A - "));
Expand All @@ -488,7 +488,7 @@ uint8_t menu_8_set_ldac_mask()
if (mask > 15) mask = 15; // Clamp at 1111
Serial.println(mask, BIN);

ad5686_ldac_mask(device, mask);
ad5686_ldac_mask(device, mask, 0x01);

Serial.println(F(" Updated LDAC mask"));

Expand Down
20 changes: 10 additions & 10 deletions LTSketchbook/Part Number/ADI-Parts/EVAL-AD5696R/EVAL-AD5696R.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,22 +403,22 @@ uint8_t menu_5_set_DAC_power_mode(int16_t selected_dac)
if (dac1)
{
Serial.println(F(" Applying power mode to DAC A..."));
ad5686_power_mode(device, AD5686_CH_A, selected_mode);
ad5686_power_mode(device, AD5686_CH_0, selected_mode);
}
if (dac2)
{
Serial.println(F(" Applying power mode to DAC B..."));
ad5686_power_mode(device, AD5686_CH_B, selected_mode);
ad5686_power_mode(device, AD5686_CH_1, selected_mode);
}
if (dac3)
{
Serial.println(F(" Applying power mode to DAC C..."));
ad5686_power_mode(device, AD5686_CH_C, selected_mode);
ad5686_power_mode(device, AD5686_CH_2, selected_mode);
}
if (dac4)
{
Serial.println(F(" Applying power mode to DAC D..."));
ad5686_power_mode(device, AD5686_CH_D, selected_mode);
ad5686_power_mode(device, AD5686_CH_3, selected_mode);
}

Serial.println(F(" Done!"));
Expand Down Expand Up @@ -465,10 +465,10 @@ uint8_t menu_6_select_ref_voltage(float *vref)
// Reads back all DAC registers
uint8_t menu_7_read_back_dac_input_registers()
{
uint32_t reg1 = ad5686_read_back_register(device, AD5686_CH_A);
uint32_t reg2 = ad5686_read_back_register(device, AD5686_CH_B);
uint32_t reg3 = ad5686_read_back_register(device, AD5686_CH_C);
uint32_t reg4 = ad5686_read_back_register(device, AD5686_CH_D);
uint32_t reg1 = ad5686_read_back_register(device, AD5686_CH_0);
uint32_t reg2 = ad5686_read_back_register(device, AD5686_CH_1);
uint32_t reg3 = ad5686_read_back_register(device, AD5686_CH_2);
uint32_t reg4 = ad5686_read_back_register(device, AD5686_CH_3);

Serial.println(F("\n All DAC-input register values:"));
Serial.print(F(" DAC A - "));
Expand All @@ -490,7 +490,7 @@ uint8_t menu_old_read_back_dac_input_registers()
//#define AD5686_CH_ALL 0xF
//uint32_t read_data = ad5696_read_back_register(device, AD5686_CH_ALL);
uint32_t reg1 = ad5686_read_back_register(device, AD5686_CH_A);
uint32_t reg2 = ad5686_read_back_register(device, AD5686_CH_B);
uint32_t reg2 = ad5686_read_back_register(device, AD5686_CH_1);
uint32_t reg3 = ad5686_read_back_register(device, AD5686_CH_C);
uint32_t reg4 = ad5686_read_back_register(device, AD5686_CH_D);
//https://www.tutorialspoint.com/cprogramming/c_return_arrays_from_function.htm
Expand Down Expand Up @@ -525,7 +525,7 @@ uint8_t menu_8_set_ldac_mask()
if (mask > 15) mask = 15; // Clamp at 1111
Serial.println(mask, BIN);

ad5686_ldac_mask(device, mask);
ad5686_ldac_mask(device, mask, 0x01);

Serial.println(F(" Updated LDAC mask"));

Expand Down

0 comments on commit 3e8f12f

Please sign in to comment.