Index: ADuCM360_demo_cn0359/.cproject
===================================================================
diff -u -re68895e85fe32aca137ce08ac5d6accd67fec591 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/.cproject (.../.cproject) (revision e68895e85fe32aca137ce08ac5d6accd67fec591)
+++ ADuCM360_demo_cn0359/.cproject (.../.cproject) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -38,6 +38,7 @@
+
-
-
+
+
+
+
+
+
+
@@ -205,7 +214,7 @@
-
+
@@ -220,6 +229,7 @@
+
-
-
+
+
+
+
+
+
+
@@ -368,6 +386,377 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -402,6 +791,7 @@
+
@@ -413,9 +803,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
Index: ADuCM360_demo_cn0359/.gitignore
===================================================================
diff -u -r93501a11686db33641c04a2678bf69dd8c67677a -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/.gitignore (.../.gitignore) (revision 93501a11686db33641c04a2678bf69dd8c67677a)
+++ ADuCM360_demo_cn0359/.gitignore (.../.gitignore) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -1,2 +1,4 @@
/Debug/
/Release/
+/Debug_Sensor_only/
+/Release_Sensor_only/
Index: ADuCM360_demo_cn0359/include/applications/dialog/BaudRateDialog.h
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/include/applications/dialog/BaudRateDialog.h (.../BaudRateDialog.h) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/include/applications/dialog/BaudRateDialog.h (.../BaudRateDialog.h) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#ifndef __BAUDRATEDIALOG_H__
#define __BAUDRATEDIALOG_H__
@@ -67,4 +67,6 @@
extern CBaudRateDialog BaudRateDialog;
-#endif
+#endif // __BAUDRATEDIALOG_H__
+#endif // EVAL_BUILD
+
Index: ADuCM360_demo_cn0359/include/applications/dialog/CellConstantDialog.h
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/include/applications/dialog/CellConstantDialog.h (.../CellConstantDialog.h) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/include/applications/dialog/CellConstantDialog.h (.../CellConstantDialog.h) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#ifndef __CELLCONSTANTDIALOG_H__
#define __CELLCONSTANTDIALOG_H__
@@ -67,4 +67,6 @@
extern CCellConstantDialog CellConstantDialog;
-#endif
+#endif // __CELLCONSTANTDIALOG_H__
+#endif // EVAL_BUILD
+
Index: ADuCM360_demo_cn0359/include/applications/dialog/CoefficientDialog.h
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/include/applications/dialog/CoefficientDialog.h (.../CoefficientDialog.h) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/include/applications/dialog/CoefficientDialog.h (.../CoefficientDialog.h) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#ifndef __COEFFICIENTDIALOG_H__
#define __COEFFICIENTDIALOG_H__
@@ -67,4 +67,6 @@
extern CCoefficientDialog CoefficientDialog;
-#endif
+#endif // __COEFFICIENTDIALOG_H__
+#endif // EVAL_BUILD
+
Index: ADuCM360_demo_cn0359/include/applications/dialog/ContrastDialog.h
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/include/applications/dialog/ContrastDialog.h (.../ContrastDialog.h) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/include/applications/dialog/ContrastDialog.h (.../ContrastDialog.h) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#ifndef __CONTRASTDIALOG_H__
#define __CONTRASTDIALOG_H__
@@ -61,4 +61,6 @@
extern CContrastDialog ContrastDialog;
-#endif
+#endif // __CONTRASTDIALOG_H__
+#endif // EVAL_BUILD
+
Index: ADuCM360_demo_cn0359/include/applications/dialog/Dialog.h
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/include/applications/dialog/Dialog.h (.../Dialog.h) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/include/applications/dialog/Dialog.h (.../Dialog.h) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#ifndef __DIALOG_H__
#define __DIALOG_H__
@@ -69,4 +69,6 @@
extern CDialog *p_dialog;
-#endif
+#endif // __DIALOG_H__
+#endif // EVAL_BUILD
+
Index: ADuCM360_demo_cn0359/include/applications/dialog/FirmwareDialog.h
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/include/applications/dialog/FirmwareDialog.h (.../FirmwareDialog.h) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/include/applications/dialog/FirmwareDialog.h (.../FirmwareDialog.h) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#ifndef __FIRMWAREDIALOG_H__
#define __FIRMWAREDIALOG_H__
@@ -61,4 +61,6 @@
extern CFirmwareDialog FirmwareDialog;
-#endif
+#endif // __FIRMWAREDIALOG_H__
+#endif // EVAL_BUILD
+
Index: ADuCM360_demo_cn0359/include/applications/dialog/FrequencyDialog.h
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/include/applications/dialog/FrequencyDialog.h (.../FrequencyDialog.h) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/include/applications/dialog/FrequencyDialog.h (.../FrequencyDialog.h) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#ifndef __FREQUENCYDIALOG_H__
#define __FREQUENCYDIALOG_H__
@@ -69,4 +69,6 @@
extern CFrequencyDialog FrequencyDialog;
-#endif
+#endif // __FREQUENCYDIALOG_H__
+#endif // EVAL_BUILD
+
Index: ADuCM360_demo_cn0359/include/applications/dialog/HoldTimeDialog.h
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/include/applications/dialog/HoldTimeDialog.h (.../HoldTimeDialog.h) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/include/applications/dialog/HoldTimeDialog.h (.../HoldTimeDialog.h) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#ifndef __HOLDTIMEDIALOG_H__
#define __HOLDTIMEDIALOG_H__
@@ -67,4 +67,5 @@
extern CHoldTimeDialog HoldTimeDialog;
-#endif
+#endif // __HOLDTIMEDIALOG_H__
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/include/applications/dialog/HomeDialog.h
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/include/applications/dialog/HomeDialog.h (.../HomeDialog.h) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/include/applications/dialog/HomeDialog.h (.../HomeDialog.h) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#ifndef __HOMEDIALOG_H__
#define __HOMEDIALOG_H__
@@ -66,4 +66,6 @@
extern CHomeDialog HomeDialog;
-#endif
+#endif // __HOMEDIALOG_H__
+#endif // EVAL_BUILD
+
Index: ADuCM360_demo_cn0359/include/applications/dialog/SettingDialog.h
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/include/applications/dialog/SettingDialog.h (.../SettingDialog.h) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/include/applications/dialog/SettingDialog.h (.../SettingDialog.h) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#ifndef __SETTINGDIALOG_H__
#define __SETTINGDIALOG_H__
@@ -62,4 +62,5 @@
extern CSettingDialog SettingDialog;
-#endif
+#endif // __SETTINGDIALOG_H__
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/include/applications/dialog/SetupTimeDialog.h
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/include/applications/dialog/SetupTimeDialog.h (.../SetupTimeDialog.h) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/include/applications/dialog/SetupTimeDialog.h (.../SetupTimeDialog.h) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#ifndef __SETUPTIMEDIALOG_H__
#define __SETUPTIMEDIALOG_H__
@@ -67,4 +67,5 @@
extern CSetupTimeDialog SetupTimeDialog;
-#endif
+#endif // __SETUPTIMEDIALOG_H__
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/include/applications/dialog/SplashDialog.h
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/include/applications/dialog/SplashDialog.h (.../SplashDialog.h) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/include/applications/dialog/SplashDialog.h (.../SplashDialog.h) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#ifndef __SPLASHDIALOG_H__
#define __SPLASHDIALOG_H__
@@ -52,4 +52,5 @@
extern CSplashDialog SplashDialog;
-#endif
+#endif // __SPLASHDIALOG_H__
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/include/applications/dialog/VoltageDialog.h
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/include/applications/dialog/VoltageDialog.h (.../VoltageDialog.h) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/include/applications/dialog/VoltageDialog.h (.../VoltageDialog.h) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#ifndef __VOLTAGEDIALOG_H__
#define __VOLTAGEDIALOG_H__
@@ -67,4 +67,5 @@
extern CVoltageDialog VoltageDialog;
-#endif
+#endif // __VOLTAGEDIALOG_H__
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/include/hal/devices.h
===================================================================
diff -u -re68895e85fe32aca137ce08ac5d6accd67fec591 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/include/hal/devices.h (.../devices.h) (revision e68895e85fe32aca137ce08ac5d6accd67fec591)
+++ ADuCM360_demo_cn0359/include/hal/devices.h (.../devices.h) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -42,8 +42,12 @@
#include
-extern FILE *p_lcd, *p_uart, *p_flash, *p_dac, *p_adc, *p_pwm, *p_ad8253, *p_cal, *p_ser;
+#ifdef EVAL_BUILD
+extern FILE *p_lcd;
+#endif // EVAL_BUILD
+extern FILE *p_uart, *p_flash, *p_dac, *p_adc, *p_pwm, *p_ad8253, *p_cal, *p_ser;
+
extern void initial_devices(void);
#endif
Index: ADuCM360_demo_cn0359/include/hal/drivers/buzzer.h
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/include/hal/drivers/buzzer.h (.../buzzer.h) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/include/hal/drivers/buzzer.h (.../buzzer.h) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -37,6 +37,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
+#ifdef EVAL_BUILD
#ifndef __BUZZER_H__
#define __BUZZER_H__
@@ -46,4 +47,6 @@
#define beep(args...) _beep(args, -1)
-#endif
+#endif // __BUZZER_H__
+#endif // EVAL_BUILD
+
Index: ADuCM360_demo_cn0359/include/hal/drivers/encoder.h
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/include/hal/drivers/encoder.h (.../encoder.h) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/include/hal/drivers/encoder.h (.../encoder.h) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -37,9 +37,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
+#ifdef EVAL_BUILD
#ifndef __ENCODER_H__
#define __ENCODER_H__
extern void encoder_open(void);
-#endif
+#endif // __ENCODER_H__
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/include/hal/drivers/lcd.h
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/include/hal/drivers/lcd.h (.../lcd.h) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/include/hal/drivers/lcd.h (.../lcd.h) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -37,6 +37,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
+#ifdef EVAL_BUILD
#ifndef __LCD_H__
#define __LCD_H__
@@ -51,4 +52,5 @@
extern uint8_t framebuffer_memory[4][128];
-#endif
+#endif // __LCD_H__
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/src/applications/DDdefs.cpp
===================================================================
diff -u -re68895e85fe32aca137ce08ac5d6accd67fec591 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/applications/DDdefs.cpp (.../DDdefs.cpp) (revision e68895e85fe32aca137ce08ac5d6accd67fec591)
+++ ADuCM360_demo_cn0359/src/applications/DDdefs.cpp (.../DDdefs.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -247,6 +247,8 @@
fwrite(&coeff1, sizeof(cal_file::coeff1), 1, p_cal);
fflush(p_cal);
+ rewind(p_cal);
+ fread(&cal_var, sizeof(cal_file), 1, p_cal);
// Coefficient set successfully
printf("%s: Coefficient 1 is set to: %fV\n\n", argv[0], cal_var.coeff1);
}
@@ -296,6 +298,8 @@
fwrite(&coeff2, sizeof(cal_file::coeff2), 1, p_cal);
fflush(p_cal);
+ rewind(p_cal);
+ fread(&cal_var, sizeof(cal_file), 1, p_cal);
// Coefficient set successfully
printf("%s: Coefficient 2 is set to: %fV\n\n", argv[0], cal_var.coeff2);
}
@@ -345,6 +349,8 @@
fwrite(&coeff3, sizeof(cal_file::coeff3), 1, p_cal);
fflush(p_cal);
+ rewind(p_cal);
+ fread(&cal_var, sizeof(cal_file), 1, p_cal);
// Coefficient set successfully
printf("%s: Coefficient 3 is set to: %fV\n\n", argv[0], cal_var.coeff3);
}
@@ -394,6 +400,8 @@
fwrite(&coeff4, sizeof(cal_file::coeff4), 1, p_cal);
fflush(p_cal);
+ rewind(p_cal);
+ fread(&cal_var, sizeof(cal_file), 1, p_cal);
// Coefficient set successfully
printf("%s: Coefficient 4 is set to: %fV\n\n", argv[0], cal_var.coeff4);
}
@@ -443,6 +451,8 @@
fwrite(&coeff5, sizeof(cal_file::coeff5), 1, p_cal);
fflush(p_cal);
+ rewind(p_cal);
+ fread(&cal_var, sizeof(cal_file), 1, p_cal);
// Coefficient set successfully
printf("%s: Coefficient 5 is set to: %fV\n\n", argv[0], cal_var.coeff5);
}
@@ -492,6 +502,8 @@
fwrite(&coeff6, sizeof(cal_file::coeff6), 1, p_cal);
fflush(p_cal);
+ rewind(p_cal);
+ fread(&cal_var, sizeof(cal_file), 1, p_cal);
// Coefficient set successfully
printf("%s: Coefficient 6 is set to: %fV\n\n", argv[0], cal_var.coeff6);
}
@@ -541,6 +553,8 @@
fwrite(&coeff7, sizeof(cal_file::coeff7), 1, p_cal);
fflush(p_cal);
+ rewind(p_cal);
+ fread(&cal_var, sizeof(cal_file), 1, p_cal);
// Coefficient set successfully
printf("%s: Coefficient 7 is set to: %fV\n\n", argv[0], cal_var.coeff7);
}
@@ -590,6 +604,8 @@
fwrite(&coeff8, sizeof(cal_file::coeff8), 1, p_cal);
fflush(p_cal);
+ rewind(p_cal);
+ fread(&cal_var, sizeof(cal_file), 1, p_cal);
// Coefficient set successfully
printf("%s: Coefficient 8 is set to: %fV\n\n", argv[0], cal_var.coeff8);
}
@@ -639,6 +655,8 @@
fwrite(&coeff9, sizeof(cal_file::coeff9), 1, p_cal);
fflush(p_cal);
+ rewind(p_cal);
+ fread(&cal_var, sizeof(cal_file), 1, p_cal);
// Coefficient set successfully
printf("%s: Coefficient 9 is set to: %fV\n\n", argv[0], cal_var.coeff9);
}
@@ -688,6 +706,8 @@
fwrite(&coeff10, sizeof(cal_file::coeff10), 1, p_cal);
fflush(p_cal);
+ rewind(p_cal);
+ fread(&cal_var, sizeof(cal_file), 1, p_cal);
// Coefficient set successfully
printf("%s: Coefficient 10 is set to: %fV\n\n", argv[0], cal_var.coeff10);
}
@@ -737,6 +757,8 @@
fwrite(&coeff11, sizeof(cal_file::coeff11), 1, p_cal);
fflush(p_cal);
+ rewind(p_cal);
+ fread(&cal_var, sizeof(cal_file), 1, p_cal);
// Coefficient set successfully
printf("%s: Coefficient 11 is set to: %fV\n\n", argv[0], cal_var.coeff11);
}
@@ -786,6 +808,8 @@
fwrite(&coeff12, sizeof(cal_file::coeff12), 1, p_cal);
fflush(p_cal);
+ rewind(p_cal);
+ fread(&cal_var, sizeof(cal_file), 1, p_cal);
// Coefficient set successfully
printf("%s: Coefficient 12 is set to: %fV\n\n", argv[0], cal_var.coeff12);
}
@@ -891,6 +915,8 @@
fwrite(&version_number, sizeof(ser_file::hw_ver), 1, p_ser);
fflush(p_ser);
+ rewind(p_ser);
+ fread(&ser_var, sizeof(ser_file), 1, p_ser);
// Hardware Version Number set successfully
printf("%s: Hardware Version Number is set to: %sV\n\n", argv[0], ser_var.hw_ver);
@@ -949,6 +975,8 @@
fwrite(&serial_number, sizeof(ser_file::ser_num), 1, p_ser);
fflush(p_ser);
+ rewind(p_ser);
+ fread(&ser_var, sizeof(ser_file), 1, p_ser);
// Serial Number set successfully
printf("%s: Serial Number is set to: %sV\n\n", argv[0], ser_var.ser_num);
@@ -1025,7 +1053,6 @@
return 0;
}
-
/**
* @brief Helper function to transmit calibration coefficients in binary format to STDOUT.
*
Index: ADuCM360_demo_cn0359/src/applications/dialog/BaudRateDialog.cpp
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/applications/dialog/BaudRateDialog.cpp (.../BaudRateDialog.cpp) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/src/applications/dialog/BaudRateDialog.cpp (.../BaudRateDialog.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#include
#include
#include
@@ -198,3 +198,5 @@
fflush(p_lcd);
}
+
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/src/applications/dialog/CellConstantDialog.cpp
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/applications/dialog/CellConstantDialog.cpp (.../CellConstantDialog.cpp) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/src/applications/dialog/CellConstantDialog.cpp (.../CellConstantDialog.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#include
#include
#include
@@ -276,3 +276,5 @@
fflush(p_lcd);
}
+
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/src/applications/dialog/CoefficientDialog.cpp
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/applications/dialog/CoefficientDialog.cpp (.../CoefficientDialog.cpp) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/src/applications/dialog/CoefficientDialog.cpp (.../CoefficientDialog.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#include
#include
#include
@@ -230,3 +230,5 @@
fflush(p_lcd);
}
+
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/src/applications/dialog/ContrastDialog.cpp
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/applications/dialog/ContrastDialog.cpp (.../ContrastDialog.cpp) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/src/applications/dialog/ContrastDialog.cpp (.../ContrastDialog.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#include
#include
#include
@@ -133,3 +133,5 @@
fflush(p_lcd);
}
+
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/src/applications/dialog/Dialog.cpp
===================================================================
diff -u -re68895e85fe32aca137ce08ac5d6accd67fec591 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/applications/dialog/Dialog.cpp (.../Dialog.cpp) (revision e68895e85fe32aca137ce08ac5d6accd67fec591)
+++ ADuCM360_demo_cn0359/src/applications/dialog/Dialog.cpp (.../Dialog.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#include
CDialog *p_dialog;
@@ -111,3 +111,5 @@
{
}
+
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/src/applications/dialog/FirmwareDialog.cpp
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/applications/dialog/FirmwareDialog.cpp (.../FirmwareDialog.cpp) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/src/applications/dialog/FirmwareDialog.cpp (.../FirmwareDialog.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#include
#include
#include
@@ -91,3 +91,5 @@
fflush(p_lcd);
}
+
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/src/applications/dialog/FrequencyDialog.cpp
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/applications/dialog/FrequencyDialog.cpp (.../FrequencyDialog.cpp) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/src/applications/dialog/FrequencyDialog.cpp (.../FrequencyDialog.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#include
#include
#include
@@ -275,3 +275,5 @@
fflush(p_lcd);
}
+
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/src/applications/dialog/HoldTimeDialog.cpp
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/applications/dialog/HoldTimeDialog.cpp (.../HoldTimeDialog.cpp) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/src/applications/dialog/HoldTimeDialog.cpp (.../HoldTimeDialog.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#include
#include
#include
@@ -272,3 +272,5 @@
fflush(p_lcd);
}
+
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/src/applications/dialog/HomeDialog.cpp
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/applications/dialog/HomeDialog.cpp (.../HomeDialog.cpp) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/src/applications/dialog/HomeDialog.cpp (.../HomeDialog.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#include
#include
#include
@@ -164,3 +164,5 @@
fflush(p_lcd);
}
+
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/src/applications/dialog/SettingDialog.cpp
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/applications/dialog/SettingDialog.cpp (.../SettingDialog.cpp) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/src/applications/dialog/SettingDialog.cpp (.../SettingDialog.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#include
#include
#include
@@ -136,3 +136,5 @@
fflush(p_lcd);
}
+
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/src/applications/dialog/SetupTimeDialog.cpp
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/applications/dialog/SetupTimeDialog.cpp (.../SetupTimeDialog.cpp) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/src/applications/dialog/SetupTimeDialog.cpp (.../SetupTimeDialog.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#include
#include
#include
@@ -272,3 +272,6 @@
fflush(p_lcd);
}
+
+#endif // EVAL_BUILD
+
Index: ADuCM360_demo_cn0359/src/applications/dialog/SplashDialog.cpp
===================================================================
diff -u -re68895e85fe32aca137ce08ac5d6accd67fec591 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/applications/dialog/SplashDialog.cpp (.../SplashDialog.cpp) (revision e68895e85fe32aca137ce08ac5d6accd67fec591)
+++ ADuCM360_demo_cn0359/src/applications/dialog/SplashDialog.cpp (.../SplashDialog.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#include
#include
#include
@@ -90,3 +90,5 @@
new_timer(t);
}
+#endif // EVAL_BUILD
+
Index: ADuCM360_demo_cn0359/src/applications/dialog/VoltageDialog.cpp
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/applications/dialog/VoltageDialog.cpp (.../VoltageDialog.cpp) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/src/applications/dialog/VoltageDialog.cpp (.../VoltageDialog.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#include
#include
#include
@@ -224,3 +224,6 @@
fflush(p_lcd);
}
+
+#endif // EVAL_BUILD
+
Index: ADuCM360_demo_cn0359/src/applications/main.cpp
===================================================================
diff -u -re68895e85fe32aca137ce08ac5d6accd67fec591 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/applications/main.cpp (.../main.cpp) (revision e68895e85fe32aca137ce08ac5d6accd67fec591)
+++ ADuCM360_demo_cn0359/src/applications/main.cpp (.../main.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -42,8 +42,12 @@
#include
#include
#include
+
+#ifdef EVAL_BUILD
#include
#include
+#endif // EVAL_BUILD
+
#include
int main(void)
@@ -58,8 +62,10 @@
SysTick_Config(SystemCoreClock /
CLK_TCK); //system tick 100Hz = 10ms, defined in time.h
+#ifdef EVAL_BUILD
p_dialog = &SplashDialog;
p_dialog->OnCreat();
+#endif // EVAL_BUILD
// Start automated polling / publishing
start_auto_publishing();
Index: ADuCM360_demo_cn0359/src/hal/devices.cpp
===================================================================
diff -u -re68895e85fe32aca137ce08ac5d6accd67fec591 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/hal/devices.cpp (.../devices.cpp) (revision e68895e85fe32aca137ce08ac5d6accd67fec591)
+++ ADuCM360_demo_cn0359/src/hal/devices.cpp (.../devices.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -44,8 +44,12 @@
#include
#include
#include
+
+#ifdef EVAL_BUILD
#include
#include
+#endif // EVAL_BUILD
+
#include
#include
#include
@@ -59,14 +63,22 @@
#define SIZE_OF_CAL_FILE sizeof(cal_file)
#define SIZE_OF_SER_FILE sizeof(ser_file)
-FILE *p_lcd, *p_uart, *p_flash, *p_dac, *p_adc, *p_pwm, *p_ad8253, *p_cal, *p_ser;
+#ifdef EVAL_BUILD
+FILE *p_lcd;
+#endif // EVAL_BUILD
+FILE *p_uart, *p_flash, *p_dac, *p_adc, *p_pwm, *p_ad8253, *p_cal, *p_ser;
+
static char stdout_buf[64];
static char stdin_buf[16];
static char stderr_buf[0];
static char p_flash_buf[SIZE_OF_FLASH_FILE];
+
static char p_uart_buf[0];
+#ifdef EVAL_BUILD
static char p_lcd_buf[16];
+#endif // EVAL_BUILD
+
static char p_dac_buf[SIZE_OF_DAC_FILE];
static char p_pwm_buf[SIZE_OF_PWM_FILE];
static char p_ad8253_buf[SIZE_OF_AD8253_FILE];
@@ -90,7 +102,9 @@
NVIC_SetPriorityGrouping(6); //2 groups, each group have 4 subpriorities
+#ifdef EVAL_BUILD
buzzer_open();
+#endif // EVAL_BUILD
p_flash = fopen("flash", "rb+");
// setvbuf(p_flash, nullptr, _IOFBF, sizeof(flash_file));
@@ -116,13 +130,19 @@
&& setting.hold >= configure_file.min_hold
&& setting.brightness <= configure_file.max_brightness
&& setting.brightness >= configure_file.min_brightness) { //check flash_disk
+
+#ifdef EVAL_BUILD
beep(50); // disk ok
+#endif // EVAL_BUILD
+
} else { // disk error
rewind(p_flash);
fwrite(&default_setting, sizeof(flash_file), 1, p_flash);
fflush(p_flash);
+#ifdef EVAL_BUILD
beep(50, 50, 50, 50, 50, 50, 50, 50, 50);
+#endif // EVAL_BUILD
}
p_cal = fopen("cal", "rb+");
@@ -137,9 +157,11 @@
// setvbuf(p_uart, nullptr, _IONBF, 0);
setvbuf(p_uart, p_uart_buf, _IONBF, 0);
+#ifdef EVAL_BUILD
p_lcd = fopen("lcd", "rb+");
// setvbuf(p_lcd, nullptr, _IOFBF, 16);
setvbuf(p_lcd, p_lcd_buf, _IOFBF, 16);
+#endif // EVAL_BUILD
p_dac = fopen("dac", "rb+");
// setvbuf(p_dac, nullptr, _IOFBF, sizeof(dac_file));
@@ -157,7 +179,9 @@
// setvbuf(p_adc, nullptr, _IOFBF, sizeof(adc_file));
setvbuf(p_adc, p_adc_buf, _IOFBF, SIZE_OF_ADC_FILE);
+#ifdef EVAL_BUILD
encoder_open();
+#endif // EVAL_BUILD
}
Index: ADuCM360_demo_cn0359/src/hal/drivers/adc.cpp
===================================================================
diff -u -re68895e85fe32aca137ce08ac5d6accd67fec591 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/hal/drivers/adc.cpp (.../adc.cpp) (revision e68895e85fe32aca137ce08ac5d6accd67fec591)
+++ ADuCM360_demo_cn0359/src/hal/drivers/adc.cpp (.../adc.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,8 +36,10 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#include
+#endif // EVAL_BUILD
+
#include
#include
#include
@@ -410,12 +412,14 @@
}
++result.adc0_hit;
-
+
+#ifdef EVAL_BUILD
app msg;
msg.argc = 0;
msg.fun = on_conductivity;
msg.argv = new char*;
post_message(msg);
+#endif // EVAL_BUILD
return 0;
}
Index: ADuCM360_demo_cn0359/src/hal/drivers/buzzer.cpp
===================================================================
diff -u -r509657069dd7ee800560a5c0b790077ce4cbd31a -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/hal/drivers/buzzer.cpp (.../buzzer.cpp) (revision 509657069dd7ee800560a5c0b790077ce4cbd31a)
+++ ADuCM360_demo_cn0359/src/hal/drivers/buzzer.cpp (.../buzzer.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -37,6 +37,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
+#ifdef EVAL_BUILD
#include
#include
#include
@@ -109,3 +110,5 @@
beep_loop(0, nullptr); //start
}
+
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/src/hal/drivers/encoder.cpp
===================================================================
diff -u -r509657069dd7ee800560a5c0b790077ce4cbd31a -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/hal/drivers/encoder.cpp (.../encoder.cpp) (revision 509657069dd7ee800560a5c0b790077ce4cbd31a)
+++ ADuCM360_demo_cn0359/src/hal/drivers/encoder.cpp (.../encoder.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -36,7 +36,7 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-
+#ifdef EVAL_BUILD
#include
#include
#include
@@ -189,3 +189,5 @@
#ifdef __cplusplus
}
#endif
+
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/src/hal/drivers/lcd.cpp
===================================================================
diff -u -r8d80f35bf88694bd50d769b9bab31db8364a9004 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/hal/drivers/lcd.cpp (.../lcd.cpp) (revision 8d80f35bf88694bd50d769b9bab31db8364a9004)
+++ ADuCM360_demo_cn0359/src/hal/drivers/lcd.cpp (.../lcd.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -37,6 +37,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
+#ifdef EVAL_BUILD
#include
#include
#include
@@ -582,3 +583,5 @@
lcd_blinking(0, nullptr);
}
+
+#endif // EVAL_BUILD
Index: ADuCM360_demo_cn0359/src/hal/syscalls.cpp
===================================================================
diff -u -re68895e85fe32aca137ce08ac5d6accd67fec591 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- ADuCM360_demo_cn0359/src/hal/syscalls.cpp (.../syscalls.cpp) (revision e68895e85fe32aca137ce08ac5d6accd67fec591)
+++ ADuCM360_demo_cn0359/src/hal/syscalls.cpp (.../syscalls.cpp) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -46,7 +46,11 @@
#include
#include
#include
+
+#ifdef EVAL_BUILD
#include
+#endif // EVAL_BUILD
+
#include
#include
#include
@@ -71,7 +75,11 @@
while (0)
#define UART_HANDLE (0x20)
+
+#ifdef EVAL_BUILD
#define LCD_HANDLE (0x21)
+#endif // EVAL_BUILD
+
#define FLASH_HANDLE (0x22)
#define DAC_HANDLE (0x23)
#define ADC_HANDLE (0x24)
@@ -107,7 +115,11 @@
break;
case AD8253_HANDLE:
return ad8253_read(buf, count);
+
+#ifdef EVAL_BUILD
case LCD_HANDLE:
+#endif // EVAL_BUILD
+
case STDOUT_FILENO:
case STDERR_FILENO:
default:
@@ -120,9 +132,13 @@
off_t _lseek(int fd, off_t offset, int whence)
{
switch (fd) {
+
+#ifdef EVAL_BUILD
case LCD_HANDLE:
return lcd_tty_lseek(offset, whence);
break;
+#endif // EVAL_BUILD
+
case FLASH_HANDLE:
return flash_lseek(offset, whence);
break;
@@ -161,9 +177,13 @@
ssize_t _write(int fd, const void *buf, size_t count)
{
switch (fd) {
+
+#ifdef EVAL_BUILD
case LCD_HANDLE:
return lcd_tty_write(buf, count);
break;
+#endif // EVAL_BUILD
+
case FLASH_HANDLE:
return flash_write(buf, count);
break;
@@ -202,10 +222,13 @@
int _open(const char *pathname, int flags)
{
+
+#ifdef EVAL_BUILD
if (strcmp(pathname, "lcd") == 0) {
lcd_open();
return LCD_HANDLE;
}
+#endif // EVAL_BUILD
if (strcmp(pathname, "uart") == 0) {
uart_open();
Index: CN0_Python_Scripts/EVAL_CN0359_REV_B.py
===================================================================
diff -u -r855524c483c89b2cabf1b0fdb91227d5614b1639 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- CN0_Python_Scripts/EVAL_CN0359_REV_B.py (.../EVAL_CN0359_REV_B.py) (revision 855524c483c89b2cabf1b0fdb91227d5614b1639)
+++ CN0_Python_Scripts/EVAL_CN0359_REV_B.py (.../EVAL_CN0359_REV_B.py) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -112,7 +112,7 @@
# time.sleep(sleep_time)
# commands.cmd_poll(cond1)
# time.sleep(sleep_time)
-
+#
# # Reading Auto polled data for different durations
# read_durations = [30, 60, 120, 240, 480]
# for read_duration in read_durations:
Index: CN0_Python_Scripts/__pycache__/commands_rev_b.cpython-313.pyc
===================================================================
diff -u -r855524c483c89b2cabf1b0fdb91227d5614b1639 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
Binary files differ
Index: CN0_Python_Scripts/autopoll_log.xlsx
===================================================================
diff -u -r855524c483c89b2cabf1b0fdb91227d5614b1639 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
Binary files differ
Index: CN0_Python_Scripts/commands_rev_b.py
===================================================================
diff -u -r855524c483c89b2cabf1b0fdb91227d5614b1639 -rb39d7f18a4f5f23a76b7fb484c13bffd225ef466
--- CN0_Python_Scripts/commands_rev_b.py (.../commands_rev_b.py) (revision 855524c483c89b2cabf1b0fdb91227d5614b1639)
+++ CN0_Python_Scripts/commands_rev_b.py (.../commands_rev_b.py) (revision b39d7f18a4f5f23a76b7fb484c13bffd225ef466)
@@ -3,10 +3,10 @@
import time
from datetime import datetime
-exp_coeff = [3.1, 0.006, 0.6, -1.0, 3.1, 0.03, 2.0, 999.0, 1.5, 7.1, 100.11, 100.12]
+exp_coeff = [13.1, 10.006, 10.6, -11.0, 13.1, 10.03, 12.0, 199.0, 11.5, 17.1, 110.11, 110.12]
exp_fw_ver = "v0.1.0"
-exp_hw_ver = "EFGH"
-exp_sn = "IJKL"
+exp_hw_ver = "v0.1.1"
+exp_sn = "v0.1.2"
########################################################################################################################
# This function reads the sensor data and settings
# {"poll", cmd_poll},
@@ -249,7 +249,7 @@
cond1.ser.reset_input_buffer()
cond1.ser.write(b' U\n')
print("Sent command cmd_get_cal_ver_bin")
- data = cond1.ser.read(80)
+ data = cond1.ser.read(86)
print(data)
# parser.parse_coeff_and_version(data)
status = parser.verify_coeffs_and_versions(data, exp_coeff, exp_fw_ver,exp_hw_ver,exp_sn,1e-5)