Skip to content

Commit 53b770b

Browse files
authored
Merge pull request #16 from Avnet/updatePublicFromPrivate
Update public from private
2 parents af97f35 + 8598aa6 commit 53b770b

File tree

10 files changed

+56
-7
lines changed

10 files changed

+56
-7
lines changed
Binary file not shown.
Binary file not shown.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
DA16600 module has two types of flash.
2+
To check the type of the flash on board, please follow below sequences using console command through uart0.
3+
1. Enter "reset' for entering MROM state.
4+
2. Enter "sflash info" in MROM prompt.
5+
3. In case of W25Q32JW, below would be shown.
6+
[MROM] sflash info
7+
SFLASH:ef601615
8+
Density:01ffffff
9+
[MROM]
10+
4. In case of AT25SL321, below would be shown.
11+
[MROM] sflash info
12+
SFLASH:1f421615
13+
Density:01ffffff
14+
[MROM]
15+
5. the flash type of the target device can be selected once the macro is running.
16+
343 KB
Binary file not shown.
373 KB
Binary file not shown.

ndp120/synpkg_files/config.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Event_Watch_Mode=3 # 1==Audio, 2==IMU, 3==Audio&IMU
8383
Description="RASynPuck Demo"
8484
MCU=mcu_fw_120.synpkg
8585
DSP=dsp_firmware.synpkg
86-
DNN=RASynPuckDemoV1.synpkg
86+
DNN=RASynPuckDemoV3.synpkg
8787
Button_shift=imu # redefine the short press user button to capture the IMU data
8888
Event_Watch_Mode=2 # 1==Audio, 2==IMU, 3==Audio&IMU
8989

@@ -131,12 +131,13 @@ Print_to_terminal=0 # output data to the serial debug terminal
131131

132132
# Configures how IMU data will be captured to the microSD card,
133133
# and/or output to debug.
134-
# Convert_Data=0 captures RAW ADC data from the IMU
134+
# Convert_Data=0 captures RAW ADC data from the IMU
135+
# Note use RAW ADC values for training RASynBoard models as the NDP120 ingests RAW ADC data
135136
# Convert_Data=1 Captures converted data from the IMU
136137
# Acceleration units are m/s^2
137138
# Gyro units are degrees per second (dps)
138139
[IMU Recording Format]
139-
Convert_Data=1
140+
Convert_Data=0
140141

141142
[BLE Mode]
142143
# Defines if BLE is enabled and the BLE Advertisement name
File renamed without changes.

src/fat_load.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ static uint32_t read_config_file( void )
590590
config_items.imu_print_to_terminal = ini_getl("IMU data stream", "Print_to_terminal", \
591591
IMU_FUNC_DISABLE, inifile);
592592

593-
config_items.imu_conversion_enabled = ini_getl("IMU Recording Format", "Convert_Data", 1, inifile);
593+
config_items.imu_conversion_enabled = ini_getl("IMU Recording Format", "Convert_Data", 0, inifile);
594594

595595
// BLE Configuration
596596
config_items.ble_mode = ini_getl("BLE Mode", "BLE_Enabled", BLE_DISABLE, inifile);

src/iotc_thread_entry.c

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,38 @@ __attribute__ ((optimize(0))) void setup_mqtt(void)
881881
return;
882882
}
883883

884+
#undef NEW_AWS_CERT_CMDS
885+
886+
// These commands are not implemented in a DA16600 release as of 9/26/2024. If required please
887+
// contact Brian Willess @ brian.willess@avnet.com for a custom DA16600 image that supports the commands
888+
#ifdef NEW_AWS_CERT_CMDS
889+
890+
891+
892+
// Set the input buffer to 8k. This is required to pass the large certificate AWS certification test
893+
memset(buf, '\0', ATBUF_SIZE);
894+
if(FSP_SUCCESS != rm_atcmd_send("AT+NWMQTLSBUFIN=8192", 1000,buf, ATBUF_SIZE)){
895+
failCnt++;
896+
return;
897+
}
898+
899+
// Set the output buffer to 8k. This is required to pass the large certificate AWS certification test
900+
memset(buf, '\0', ATBUF_SIZE);
901+
if(FSP_SUCCESS != rm_atcmd_send("AT+NWMQTLSBUFOUT=8192", 1000,buf, ATBUF_SIZE)){
902+
failCnt++;
903+
return;
904+
}
905+
906+
// Set the MQTT TLS authorization to REQUIRED
907+
memset(buf, '\0', ATBUF_SIZE);
908+
if(FSP_SUCCESS != rm_atcmd_send("AT+NWMQTLSAUTH=2", 1000,buf, ATBUF_SIZE)){
909+
failCnt++;
910+
return;
911+
}
912+
913+
914+
#endif
915+
884916
// Set the TLS authorization to MBEDTLS_SSL_VERIFY_REQUIRED
885917
memset(buf, '\0', ATBUF_SIZE);
886918
if(FSP_SUCCESS != rm_atcmd_send("AT+NWOTATLSAUTH=2", 1000,buf, ATBUF_SIZE)){
@@ -1082,7 +1114,7 @@ __attribute__ ((optimize(0))) void wait_for_telemetry(void)
10821114
// Verify we have a valid MQTT connection before sending telemetry
10831115
memset(buf, '\0', ATBUF_SIZE);
10841116
rm_atcmd_check_value("AT+NWMQCL",5000,buf,ATBUF_SIZE);
1085-
if(buf[0] != '1'){
1117+
if(buf[0] == '0'){
10861118
if(!reestablish_mqtt_conn()){
10871119
return;
10881120
}

src/version_string.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
#define MAJOR_VERSION "1"
1717

1818
// Increment Minor Version when new features are added
19-
#define MINOR_VERSION "6"
19+
#define MINOR_VERSION "7"
2020

2121
#if RELEASE_BUILD
2222

2323
// Increment Build Version when Major and Minor versions do not change
2424
// If Major or Minor versions change, reset BUILD_VERSION to 0
25-
#define BUILD_VERSION "2"
25+
#define BUILD_VERSION "0"
2626

2727
#else
2828
#define BUILD_VERSION "Engineering Build"

0 commit comments

Comments
 (0)