坐标

fctom1215

2020-08-27 6203683433231a71fea7069d121ebd85c0b9529d

坐标

 lib/src/main/cpp/driver_test.cpp

@@ -400,7 +400,7 @@
            reportSeatbeltEject = false;

            if (type == TEST_TYPE_ROAD_DUMMY_LIGHT) {
                exam_dummy_light = 1;           //0
                exam_dummy_light = 0;           //0
            }
            if (type == TEST_TYPE_AREA) {
                InitAreaExam();
@@ -563,7 +563,7 @@

        for (int i = 0; i < 2; ++i) {
            if (cs_temp[i] != cs[i]) {
                DEBUG("车辆状态 %s = %d", NAME[i], cs_temp[i]);
//                DEBUG("车辆状态 %s = %d", NAME[i], cs_temp[i]);

                cs[i] = cs_temp[i];
            }
@@ -578,7 +578,7 @@
                char buff[128];

                sprintf(buff, "%s，%s", NAME[i], VALUE[ cs_temp[i] ]);
                PlayTTS(buff, NULL);
//                PlayTTS(buff, NULL);
            }
        }


 lib/src/main/cpp/rtk_platform/platform.cpp

@@ -336,7 +336,7 @@
            AppTimer_delete(TriggerHeartbeat);
            AppTimer_add(TriggerHeartbeat, D_SEC(30));

            PlayTTS("基准源建立", NULL);
//            PlayTTS("基准源建立", NULL);
        } else {
            platformStatus.login = 0;
        }

 lib/src/main/cpp/test_common/car_sensor.cpp

@@ -203,7 +203,9 @@
        SensorChanged(SENSOR_SURROUND_CAR_4, BX(s->surround4));
    }
    if (s->gear != Sensor.gear && s->gear != '#') {
        SensorChanged(GEAR, GEAR_N + s->gear);
//        SensorChanged(GEAR, GEAR_N + s->gear);
        DEBUG("状态改变 挡位 %d", s->gear);
        WriteCarStatus(GEAR, s->gear + GEAR_N);
    }

    Sensor = *s;
@@ -415,18 +417,18 @@
            }
            break;
        }
        case SENSOR_SHIFT_N:
        case SENSOR_SHIFT_1:
        case SENSOR_SHIFT_2:
        case SENSOR_SHIFT_3:
        case SENSOR_SHIFT_4:
        case SENSOR_SHIFT_5:
        case SENSOR_SHIFT_R: {
            if (value != 0) {
                WriteCarStatus(GEAR, id - SENSOR_SHIFT_N + GEAR_N);
            }
            break;
        }
//        case SENSOR_SHIFT_N:
//        case SENSOR_SHIFT_1:
//        case SENSOR_SHIFT_2:
//        case SENSOR_SHIFT_3:
//        case SENSOR_SHIFT_4:
//        case SENSOR_SHIFT_5:
//        case SENSOR_SHIFT_R: {
//            if (value != 0) {
//                WriteCarStatus(GEAR, id - SENSOR_SHIFT_N + GEAR_N);
//            }
//            break;
//        }
        default:
            break;
    }

 lib/src/main/cpp/test_items2/dummy_light.cpp

@@ -39,6 +39,7 @@
    contentNum = num;

    if (content != NULL && num > 0) {
        DEBUG("启动灯光");
        currRtkTime = *rtkTime;

        for (int i = 0; i < contentNum; ++i) {
@@ -172,7 +173,7 @@
        switch (content[i].itemStatus) {
            case TTS_NOT_START:
                content[i].itemStatus = TTS_DOING;
                examTtsSeq = PlayTTS(content[i].tts, NULL);
                examTtsSeq = PlayTTS(content[i].tts, DummyLightTTSDone);
                // 等待TTS播放完毕
                return;
            case TTS_DOING: