Diff: Defs_Sett.h

Revision:

1:f058cf4e422a

Parent:

0:0c5c2cbf330a

Child:

2:014cf2a98712

--- a/Defs_Sett.h	Mon Mar 08 18:09:21 2021 +0000
+++ b/Defs_Sett.h	Wed Mar 10 19:10:47 2021 +0000
@@ -3,14 +3,15 @@
 
 //HARDWARE SETTINGS
 #define DEBOUNCE_TIME           10000           //Debounce time for pushbutton (us)
-#define INPUT_LOGIC             0               //0 - Active Low, 1 - Active High
+#define INPUT_LOGIC             1               //0 - Active Low, 1 - Active High
+#define LOOP_DELAY              10000           //Delay for main loop (us)
 
 //BEHAVIORIAL SETTINGS
-#define TIME_NORMAL             900             //Time Between Adjustment in Normal Mode (seconds)
-#define TIME_WSETTING           3               //Time FN button need to be held for the system to go to WSETTING mode (seconds)
+#define TIME_NORMAL             10              //Time Between Adjustment in Normal Mode (seconds)
+#define TIME_WSETTING           1               //Time FN button need to be held for the system to go to WSETTING mode (seconds)
 #define TIME_MANUAL_TIMEOUT     3600            //Time for the system to resume NORMAL mode after idling in MANUAL mode (seconds)
 #define TIME_WSETTING_TIMEOUT   3               //Time for the system to resume NORMAL mode after idling in WSETTING mode (seconds)
-#define TICK_WIND               10000ms         //Interval for Checking Wind Speed
+#define TICK_WIND               1000ms          //Interval for Checking Wind Speed
 
 //PHYSICAL ATTRIBUTES
 #define PANEL_HEIGHT            0.6             //Heigh of Panels' Pivot
@@ -29,32 +30,39 @@
 #define LOOP_LIMIT              1000            //Max Loop Iterration
 #define ERR_LIMIT               0.01            //Secant Error Limit
 
-//ACCELERATOR SETTINGS
-#define ACC_FREQ                40000           //Accelerometer I2C frequency
+//ACCELEROMETER SETTINGS
 #define ANGLE_TOL               2               //Angle Tolerance (Degrees)
-#define MEAS_AXIS               0               //Measurement Axis (0 - X, 1 - Y, 2 - Z)
 #define N_AVG                   15              //Averaging
 #define N_CAL                   100             //Calibration sampling
+#define MEAS_AXIS               0               //Measurement Axis (0 - X, 1 - Y, 2 - Z)
+#define MUL_P                   1.0             //Multiplier of panel accelerometer
+#define MUL_R1                  1.0             //Multiplier of reflector 1 accelerometer
+#define MUL_R2                  1.0             //Multiplier of reflector 2 accelerometer
 
 //ANEMOMETER SETTINGS
-#define WIND_THRES_INIT         70              //Default safety windspeed (km/h)
-#define WIND_THRES_MIN          20              //Minimum safety windspeed setting (km/h)
+#define WIND_THRES_INIT         10              //Default safety windspeed (km/h)
+#define WIND_THRES_MIN          10              //Minimum safety windspeed setting (km/h)
 #define WIND_THRES_MAX          100             //Maximum safety windspeed setting (km/h)
+#define WIND_AVG                15              //Averaging
 #define VCC                     3.3             //VCC of K64F board
 
 //LCD SETTING
-#define LCD_FREQ                50000           //LCD I2C frequency
 #define LCD_INIT_DELAY          100000          //LCD initialization delay
-#define LCD_DELAY               1000             //Delay for printing characters (us)
+#define LCD_DELAY               1000            //Delay for printing characters (us)
+#define LCD_WRATE               1               //LCD refresh rate for windspeed (s)
+
+//I2C SETTING
+#define I2C_FREQ                50000           //I2C Frequency (Hz)
 
 //MODES AND SOURCES
 //Operations
-#define OP_CALLIBRATION         0
+#define OP_CALIBRATION          0
 #define OP_NORMAL               1
 #define OP_WIND                 2
 #define OP_MANUAL1              3
 #define OP_MANUAL2              4
 #define OP_WSETTING             5
+#define OP_PLACEMENT            6
 //Accelerometer Selection
 #define S_PANEL                 0
 #define S_R1                    1