101
This commit is contained in:
@@ -97,7 +97,7 @@
|
||||
#define configTICK_RATE_HZ ( ( TickType_t ) 500 )
|
||||
#define configMAX_PRIORITIES ( 15 )
|
||||
#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 256 ) /* Can be as low as 60 but some of the demo tasks that use this constant require it to be higher. */
|
||||
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 16 * 1024 ) )
|
||||
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 12 * 1024 ) )
|
||||
#define configMAX_TASK_NAME_LEN ( 16 )
|
||||
#define configUSE_TRACE_FACILITY 0
|
||||
#define configUSE_16_BIT_TICKS 0
|
||||
|
||||
@@ -699,8 +699,8 @@ static void handle_2d_trigger(const RawImageBuffer_t *raw, const Config2D_t *t2,
|
||||
}
|
||||
|
||||
/* Phase 4: check for new trigger */
|
||||
if (t2->TriggerMode == 0) {
|
||||
/* --- External trigger --- */
|
||||
if (t2->TriggerMode == 1) {
|
||||
/* --- External trigger (TriggerMode=1) --- */
|
||||
if (g_ext_trigger_flag) {
|
||||
g_ext_trigger_flag = 0;
|
||||
DBG_TRIG("2D ext trigger\r\n");
|
||||
@@ -715,7 +715,7 @@ static void handle_2d_trigger(const RawImageBuffer_t *raw, const Config2D_t *t2,
|
||||
}
|
||||
}
|
||||
} else {
|
||||
/* --- Internal trigger: temperature threshold in TriggerRoi --- */
|
||||
/* --- Internal trigger (TriggerMode=0): temperature threshold in TriggerRoi --- */
|
||||
if (Preprocess_CheckInternalTrigger2D(raw) == 1) {
|
||||
DBG_TRIG("2D internal trigger\r\n");
|
||||
if (t2->TriggerDelayMs > 0) {
|
||||
@@ -747,8 +747,8 @@ static void handle_1d_trigger(const RawImageBuffer_t *raw, const Config1D_t *t1,
|
||||
|
||||
switch (s1d_state) {
|
||||
case S1D_IDLE:
|
||||
if (t1->TriggerType == 0) {
|
||||
/* --- External trigger --- */
|
||||
if (t1->TriggerType == 2) {
|
||||
/* --- External trigger (TriggerType=2) --- */
|
||||
if (g_ext_trigger_flag) {
|
||||
g_ext_trigger_flag = 0;
|
||||
s1d_debounce_until = sys_tick_ms + t1->HighTimerLimit;
|
||||
@@ -756,8 +756,8 @@ static void handle_1d_trigger(const RawImageBuffer_t *raw, const Config1D_t *t1,
|
||||
DBG_TRIG("1D: ext trigger -> debounce %d ms\r\n",
|
||||
(int)t1->HighTimerLimit);
|
||||
}
|
||||
} else {
|
||||
/* --- Internal trigger: scan with pre-ring buffer --- */
|
||||
} else if (t1->TriggerType == 1) {
|
||||
/* --- Internal trigger (TriggerType=1): scan with pre-ring buffer --- */
|
||||
s1d_pre_ring[s1d_pre_idx] = sample;
|
||||
s1d_pre_idx = (s1d_pre_idx + 1) % 3;
|
||||
if (s1d_pre_count < 3) s1d_pre_count++;
|
||||
@@ -996,8 +996,8 @@ int main(void)
|
||||
{
|
||||
Config2D_t test_cfg2d;
|
||||
memset(&test_cfg2d, 0, sizeof(test_cfg2d));
|
||||
test_cfg2d.Enabled = 1;
|
||||
test_cfg2d.TriggerMode = 1; /* Internal trigger */
|
||||
test_cfg2d.Enabled = 0;
|
||||
test_cfg2d.TriggerMode = 0; /* Internal trigger (0=内部, 1=外部) */
|
||||
test_cfg2d.TargetWidth = 64;
|
||||
test_cfg2d.TargetHeight = 64;
|
||||
test_cfg2d.TriggerRoiX = 0;
|
||||
|
||||
Reference in New Issue
Block a user