aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Drivers
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-10-27 12:04:23 +0200
committerShlomo Hecht <shlomo@twine-s.com>2020-10-27 12:04:23 +0200
commit2d36ca07a6b43cf997aea3a987ed97cd3afcb655 (patch)
tree66967c02359b13965cbb5dda303d54566cbde65d /Software/Embedded_SW/Embedded/Drivers
parentc1dbc0def7c7401432195461df5eb4face4025ba (diff)
downloadTango-2d36ca07a6b43cf997aea3a987ed97cd3afcb655.tar.gz
Tango-2d36ca07a6b43cf997aea3a987ed97cd3afcb655.zip
fix flash writing (parameters. now causes reset!), improve logs saving on errfile.txt, prevent motor alarms after hw configuration
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers')
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c9
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h2
2 files changed, 6 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c
index 9d20d37a4..2ebaa4732 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_SPI_Comm.c
@@ -166,8 +166,7 @@ void Read_Motors_Driver_ADC(void)
}
else
{
- ReportWithPackageFilter(GeneralFilter,"the motor's combined driver adc",__FILE__,__LINE__,i,RpMessage,MotorDriverResponse[i].ADC,0);
-
+ //ReportWithPackageFilter(GeneralFilter,"the motor's combined driver adc",__FILE__,__LINE__,i,RpMessage,MotorDriverResponse[i].ADC,0);
}
}
@@ -192,9 +191,7 @@ void Read_Motors_Driver_ADC(void)
{
FPGA_Get_Res(i);
MotorDriverResponse[i].ADC = Fpga_Spi[i].RX_MISO;
- LOG_ERROR (i, "the motor's driver type");
- ReportWithPackageFilter(GeneralFilter,"the motor's driver adc",__FILE__,__LINE__,i,RpMessage,MotorDriverResponse[i].ADC,0);
-
+ //ReportWithPackageFilter(GeneralFilter,"the motor's driver adc",__FILE__,__LINE__,i,RpMessage,MotorDriverResponse[i].ADC,0);
}
}
}
@@ -491,6 +488,8 @@ void FPGA_SetMotorsInit()
{
uint8_t i=0;
+ MotorConfiguredTimeout = 100;
+
//since powerstep in stby on powerup)
F1_Moto_Driver_NSTBYRST1 = 0xFFFF;
F1_Moto_Driver_NSTBYRST2 = 0xFFFF;
diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h
index 655a980db..7da9f92a7 100644
--- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h
+++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h
@@ -26,6 +26,8 @@
#define FLASH_SIZE 0X8000
+extern int base_flashErased;
+
//*****************************************************************************
//
// Read application data from a buffer and program it into flash.