Skip to content

Commit 8ae8dd8

Browse files
MCUdudeMCUdude
committed
Update shell build script
There where an issue where the script wasn't able to obtain the DSP and EEPROM i2c address. An issue where the library didn't wrote to the correct hardware registers have also been fixed
1 parent 06dd53d commit 8ae8dd8

File tree

6 files changed

+27
-27
lines changed

6 files changed

+27
-27
lines changed

‎DSP_parameter_generator.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ BEGIN {
129129
{
130130
# Track down the DSP and EEPROM i2c addresses and convert them into 7-bit
131131
if ($1 ~ "#define" && $2 ~ "DEVICE_ADDR_IC_1")
132-
printf($1 " DSP_I2C_ADDRESS (%#01x >> 1) & 0xFE\n", $3)
132+
printf($1 " DSP_I2C_ADDRESS (%.4s >> 1) & 0xFE\n", $3)
133133
134134
if ($1 ~ "#define" && $2 ~ "DEVICE_ADDR_IC_2")
135-
printf($1 " EEPROM_I2C_ADDRESS (%#01x >> 1) & 0xFE\n\n", $3)
135+
printf($1 " EEPROM_I2C_ADDRESS (%.4s >> 1) & 0xFE\n\n", $3)
136136
} ' "$DSP_PROGRAM_FILE" "$EEPROM_PROGRAM_FILE" > temp1
137137

138138

@@ -286,11 +286,11 @@ END {
286286
printf("/* Run this function to load DSP firmware directly */\n")
287287
printf("void loadProgram(SigmaDSP &myDSP)\n")
288288
printf("{\n")
289-
printf(" myDSP.writeRegisterBlock(CORE_REGISTER_R0_ADDR, CORE_REGISTER_R0_SIZE, DSP_core_register_R0_data, CORE_REGISTER_R0_REGSIZE);\n")
289+
printf(" myDSP.writeRegister(CORE_REGISTER_R0_ADDR, CORE_REGISTER_R0_SIZE, DSP_core_register_R0_data);\n")
290290
printf(" myDSP.writeRegisterBlock(PROGRAM_ADDR, PROGRAM_SIZE, DSP_program_data, PROGRAM_REGSIZE);\n")
291291
printf(" myDSP.writeRegisterBlock(PARAMETER_ADDR, PARAMETER_SIZE, DSP_parameter_data, PARAMETER_REGSIZE);\n")
292-
printf(" myDSP.writeRegisterBlock(HARDWARE_CONF_ADDR, HARDWARE_CONF_SIZE, DSP_hardware_conf_data, HARDWARE_CONF_REGSIZE);\n")
293-
printf(" myDSP.writeRegisterBlock(CORE_REGISTER_R4_ADDR, CORE_REGISTER_R4_SIZE, DSP_core_register_R4_data, CORE_REGISTER_R4_REGSIZE);\n")
292+
printf(" myDSP.writeRegister(HARDWARE_CONF_ADDR, HARDWARE_CONF_SIZE, DSP_hardware_conf_data);\n")
293+
printf(" myDSP.writeRegister(CORE_REGISTER_R4_ADDR, CORE_REGISTER_R4_SIZE, DSP_core_register_R4_data);\n")
294294
printf("}\n\n")
295295
}' "$DSP_PROGRAM_FILE" > temp4
296296

‎examples/1_Volume/DSP_parameter_generator.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ BEGIN {
129129
{
130130
# Track down the DSP and EEPROM i2c addresses and convert them into 7-bit
131131
if ($1 ~ "#define" && $2 ~ "DEVICE_ADDR_IC_1")
132-
printf($1 " DSP_I2C_ADDRESS (%#01x >> 1) & 0xFE\n", $3)
132+
printf($1 " DSP_I2C_ADDRESS (%.4s >> 1) & 0xFE\n", $3)
133133
134134
if ($1 ~ "#define" && $2 ~ "DEVICE_ADDR_IC_2")
135-
printf($1 " EEPROM_I2C_ADDRESS (%#01x >> 1) & 0xFE\n\n", $3)
135+
printf($1 " EEPROM_I2C_ADDRESS (%.4s >> 1) & 0xFE\n\n", $3)
136136
} ' "$DSP_PROGRAM_FILE" "$EEPROM_PROGRAM_FILE" > temp1
137137

138138

@@ -286,11 +286,11 @@ END {
286286
printf("/* Run this function to load DSP firmware directly */\n")
287287
printf("void loadProgram(SigmaDSP &myDSP)\n")
288288
printf("{\n")
289-
printf(" myDSP.writeRegisterBlock(CORE_REGISTER_R0_ADDR, CORE_REGISTER_R0_SIZE, DSP_core_register_R0_data, CORE_REGISTER_R0_REGSIZE);\n")
289+
printf(" myDSP.writeRegister(CORE_REGISTER_R0_ADDR, CORE_REGISTER_R0_SIZE, DSP_core_register_R0_data);\n")
290290
printf(" myDSP.writeRegisterBlock(PROGRAM_ADDR, PROGRAM_SIZE, DSP_program_data, PROGRAM_REGSIZE);\n")
291291
printf(" myDSP.writeRegisterBlock(PARAMETER_ADDR, PARAMETER_SIZE, DSP_parameter_data, PARAMETER_REGSIZE);\n")
292-
printf(" myDSP.writeRegisterBlock(HARDWARE_CONF_ADDR, HARDWARE_CONF_SIZE, DSP_hardware_conf_data, HARDWARE_CONF_REGSIZE);\n")
293-
printf(" myDSP.writeRegisterBlock(CORE_REGISTER_R4_ADDR, CORE_REGISTER_R4_SIZE, DSP_core_register_R4_data, CORE_REGISTER_R4_REGSIZE);\n")
292+
printf(" myDSP.writeRegister(HARDWARE_CONF_ADDR, HARDWARE_CONF_SIZE, DSP_hardware_conf_data);\n")
293+
printf(" myDSP.writeRegister(CORE_REGISTER_R4_ADDR, CORE_REGISTER_R4_SIZE, DSP_core_register_R4_data);\n")
294294
printf("}\n\n")
295295
}' "$DSP_PROGRAM_FILE" > temp4
296296

‎examples/2_First_order_EQ/DSP_parameter_generator.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ BEGIN {
129129
{
130130
# Track down the DSP and EEPROM i2c addresses and convert them into 7-bit
131131
if ($1 ~ "#define" && $2 ~ "DEVICE_ADDR_IC_1")
132-
printf($1 " DSP_I2C_ADDRESS (%#01x >> 1) & 0xFE\n", $3)
132+
printf($1 " DSP_I2C_ADDRESS (%.4s >> 1) & 0xFE\n", $3)
133133
134134
if ($1 ~ "#define" && $2 ~ "DEVICE_ADDR_IC_2")
135-
printf($1 " EEPROM_I2C_ADDRESS (%#01x >> 1) & 0xFE\n\n", $3)
135+
printf($1 " EEPROM_I2C_ADDRESS (%.4s >> 1) & 0xFE\n\n", $3)
136136
} ' "$DSP_PROGRAM_FILE" "$EEPROM_PROGRAM_FILE" > temp1
137137

138138

‎examples/3_Second_order_EQ/DSP_parameter_generator.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ BEGIN {
129129
{
130130
# Track down the DSP and EEPROM i2c addresses and convert them into 7-bit
131131
if ($1 ~ "#define" && $2 ~ "DEVICE_ADDR_IC_1")
132-
printf($1 " DSP_I2C_ADDRESS (%#01x >> 1) & 0xFE\n", $3)
132+
printf($1 " DSP_I2C_ADDRESS (%.4s >> 1) & 0xFE\n", $3)
133133
134134
if ($1 ~ "#define" && $2 ~ "DEVICE_ADDR_IC_2")
135-
printf($1 " EEPROM_I2C_ADDRESS (%#01x >> 1) & 0xFE\n\n", $3)
135+
printf($1 " EEPROM_I2C_ADDRESS (%.4s >> 1) & 0xFE\n\n", $3)
136136
} ' "$DSP_PROGRAM_FILE" "$EEPROM_PROGRAM_FILE" > temp1
137137

138138

@@ -286,11 +286,11 @@ END {
286286
printf("/* Run this function to load DSP firmware directly */\n")
287287
printf("void loadProgram(SigmaDSP &myDSP)\n")
288288
printf("{\n")
289-
printf(" myDSP.writeRegisterBlock(CORE_REGISTER_R0_ADDR, CORE_REGISTER_R0_SIZE, DSP_core_register_R0_data, CORE_REGISTER_R0_REGSIZE);\n")
289+
printf(" myDSP.writeRegister(CORE_REGISTER_R0_ADDR, CORE_REGISTER_R0_SIZE, DSP_core_register_R0_data);\n")
290290
printf(" myDSP.writeRegisterBlock(PROGRAM_ADDR, PROGRAM_SIZE, DSP_program_data, PROGRAM_REGSIZE);\n")
291291
printf(" myDSP.writeRegisterBlock(PARAMETER_ADDR, PARAMETER_SIZE, DSP_parameter_data, PARAMETER_REGSIZE);\n")
292-
printf(" myDSP.writeRegisterBlock(HARDWARE_CONF_ADDR, HARDWARE_CONF_SIZE, DSP_hardware_conf_data, HARDWARE_CONF_REGSIZE);\n")
293-
printf(" myDSP.writeRegisterBlock(CORE_REGISTER_R4_ADDR, CORE_REGISTER_R4_SIZE, DSP_core_register_R4_data, CORE_REGISTER_R4_REGSIZE);\n")
292+
printf(" myDSP.writeRegister(HARDWARE_CONF_ADDR, HARDWARE_CONF_SIZE, DSP_hardware_conf_data);\n")
293+
printf(" myDSP.writeRegister(CORE_REGISTER_R4_ADDR, CORE_REGISTER_R4_SIZE, DSP_core_register_R4_data);\n")
294294
printf("}\n\n")
295295
}' "$DSP_PROGRAM_FILE" > temp4
296296

‎examples/4_State_variable_filter/DSP_parameter_generator.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ BEGIN {
129129
{
130130
# Track down the DSP and EEPROM i2c addresses and convert them into 7-bit
131131
if ($1 ~ "#define" && $2 ~ "DEVICE_ADDR_IC_1")
132-
printf($1 " DSP_I2C_ADDRESS (%#01x >> 1) & 0xFE\n", $3)
132+
printf($1 " DSP_I2C_ADDRESS (%.4s >> 1) & 0xFE\n", $3)
133133
134134
if ($1 ~ "#define" && $2 ~ "DEVICE_ADDR_IC_2")
135-
printf($1 " EEPROM_I2C_ADDRESS (%#01x >> 1) & 0xFE\n\n", $3)
135+
printf($1 " EEPROM_I2C_ADDRESS (%.4s >> 1) & 0xFE\n\n", $3)
136136
} ' "$DSP_PROGRAM_FILE" "$EEPROM_PROGRAM_FILE" > temp1
137137

138138

@@ -286,11 +286,11 @@ END {
286286
printf("/* Run this function to load DSP firmware directly */\n")
287287
printf("void loadProgram(SigmaDSP &myDSP)\n")
288288
printf("{\n")
289-
printf(" myDSP.writeRegisterBlock(CORE_REGISTER_R0_ADDR, CORE_REGISTER_R0_SIZE, DSP_core_register_R0_data, CORE_REGISTER_R0_REGSIZE);\n")
289+
printf(" myDSP.writeRegister(CORE_REGISTER_R0_ADDR, CORE_REGISTER_R0_SIZE, DSP_core_register_R0_data);\n")
290290
printf(" myDSP.writeRegisterBlock(PROGRAM_ADDR, PROGRAM_SIZE, DSP_program_data, PROGRAM_REGSIZE);\n")
291291
printf(" myDSP.writeRegisterBlock(PARAMETER_ADDR, PARAMETER_SIZE, DSP_parameter_data, PARAMETER_REGSIZE);\n")
292-
printf(" myDSP.writeRegisterBlock(HARDWARE_CONF_ADDR, HARDWARE_CONF_SIZE, DSP_hardware_conf_data, HARDWARE_CONF_REGSIZE);\n")
293-
printf(" myDSP.writeRegisterBlock(CORE_REGISTER_R4_ADDR, CORE_REGISTER_R4_SIZE, DSP_core_register_R4_data, CORE_REGISTER_R4_REGSIZE);\n")
292+
printf(" myDSP.writeRegister(HARDWARE_CONF_ADDR, HARDWARE_CONF_SIZE, DSP_hardware_conf_data);\n")
293+
printf(" myDSP.writeRegister(CORE_REGISTER_R4_ADDR, CORE_REGISTER_R4_SIZE, DSP_core_register_R4_data);\n")
294294
printf("}\n\n")
295295
}' "$DSP_PROGRAM_FILE" > temp4
296296

‎examples/5_Signal_generator/DSP_parameter_generator.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ BEGIN {
129129
{
130130
# Track down the DSP and EEPROM i2c addresses and convert them into 7-bit
131131
if ($1 ~ "#define" && $2 ~ "DEVICE_ADDR_IC_1")
132-
printf($1 " DSP_I2C_ADDRESS (%#01x >> 1) & 0xFE\n", $3)
132+
printf($1 " DSP_I2C_ADDRESS (%.4s >> 1) & 0xFE\n", $3)
133133
134134
if ($1 ~ "#define" && $2 ~ "DEVICE_ADDR_IC_2")
135-
printf($1 " EEPROM_I2C_ADDRESS (%#01x >> 1) & 0xFE\n\n", $3)
135+
printf($1 " EEPROM_I2C_ADDRESS (%.4s >> 1) & 0xFE\n\n", $3)
136136
} ' "$DSP_PROGRAM_FILE" "$EEPROM_PROGRAM_FILE" > temp1
137137

138138

@@ -286,11 +286,11 @@ END {
286286
printf("/* Run this function to load DSP firmware directly */\n")
287287
printf("void loadProgram(SigmaDSP &myDSP)\n")
288288
printf("{\n")
289-
printf(" myDSP.writeRegisterBlock(CORE_REGISTER_R0_ADDR, CORE_REGISTER_R0_SIZE, DSP_core_register_R0_data, CORE_REGISTER_R0_REGSIZE);\n")
289+
printf(" myDSP.writeRegister(CORE_REGISTER_R0_ADDR, CORE_REGISTER_R0_SIZE, DSP_core_register_R0_data);\n")
290290
printf(" myDSP.writeRegisterBlock(PROGRAM_ADDR, PROGRAM_SIZE, DSP_program_data, PROGRAM_REGSIZE);\n")
291291
printf(" myDSP.writeRegisterBlock(PARAMETER_ADDR, PARAMETER_SIZE, DSP_parameter_data, PARAMETER_REGSIZE);\n")
292-
printf(" myDSP.writeRegisterBlock(HARDWARE_CONF_ADDR, HARDWARE_CONF_SIZE, DSP_hardware_conf_data, HARDWARE_CONF_REGSIZE);\n")
293-
printf(" myDSP.writeRegisterBlock(CORE_REGISTER_R4_ADDR, CORE_REGISTER_R4_SIZE, DSP_core_register_R4_data, CORE_REGISTER_R4_REGSIZE);\n")
292+
printf(" myDSP.writeRegister(HARDWARE_CONF_ADDR, HARDWARE_CONF_SIZE, DSP_hardware_conf_data);\n")
293+
printf(" myDSP.writeRegister(CORE_REGISTER_R4_ADDR, CORE_REGISTER_R4_SIZE, DSP_core_register_R4_data);\n")
294294
printf("}\n\n")
295295
}' "$DSP_PROGRAM_FILE" > temp4
296296

0 commit comments

Comments
 (0)