diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 06a69c35..294f6405 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -27,8 +27,6 @@ jobs: run: ${{ env.RUN }} "scons -j4" - name: Build with UBSan run: ${{ env.RUN }} "scons -j4 --ubsan" - - name: Build jungle firmware with FINAL_PROVISIONING support - run: ${{ env.RUN }} "FINAL_PROVISIONING=1 scons -j4 board/jungle" - name: Build panda in release mode run: ${{ env.RUN }} "CERT=certs/debug RELEASE=1 scons -j4" diff --git a/SConscript b/SConscript index 957982ca..69b44fc2 100644 --- a/SConscript +++ b/SConscript @@ -157,8 +157,6 @@ build_project("panda_h7", base_project_h7, "./board/main.c", []) flags = [ "-DPANDA_JUNGLE", ] -if os.getenv("FINAL_PROVISIONING"): - flags += ["-DFINAL_PROVISIONING"] build_project("panda_jungle_h7", base_project_h7, "./board/jungle/main.c", flags) # body fw diff --git a/board/jungle/main.c b/board/jungle/main.c index 7bac6d75..4ef99506 100644 --- a/board/jungle/main.c +++ b/board/jungle/main.c @@ -75,11 +75,6 @@ void tick_handler(void) { // turn off the blue LED, turned on by CAN led_set(LED_BLUE, false); - // Blink and OBD CAN -#ifdef FINAL_PROVISIONING - current_board->set_can_mode(can_mode == CAN_MODE_NORMAL ? CAN_MODE_OBD_CAN2 : CAN_MODE_NORMAL); -#endif - // on to the next one uptime_cnt += 1U; } @@ -91,33 +86,12 @@ void tick_handler(void) { current_board->set_panda_power(!panda_power); } -#ifdef FINAL_PROVISIONING - // Ignition blinking - uint8_t ignition_bitmask = 0U; - for (uint8_t i = 0U; i < 6U; i++) { - ignition_bitmask |= ((loop_counter % 12U) < ((uint32_t) i + 2U)) << i; - } - current_board->set_individual_ignition(ignition_bitmask); - - // SBU voltage reporting - for (uint8_t i = 0U; i < 6U; i++) { - CANPacket_t pkt = { 0 }; - pkt.data_len_code = 8U; - pkt.addr = 0x100U + i; - *(uint16_t *) &pkt.data[0] = current_board->get_sbu_mV(i + 1U, SBU1); - *(uint16_t *) &pkt.data[2] = current_board->get_sbu_mV(i + 1U, SBU2); - pkt.data[4] = (ignition_bitmask >> i) & 1U; - can_set_checksum(&pkt); - can_send(&pkt, 0U, false); - } -#else // toggle ignition on button press static bool prev_button_status = false; if (!current_button_status && prev_button_status && button_press_cnt < 10){ current_board->set_ignition(!ignition); } prev_button_status = current_button_status; -#endif button_press_cnt = current_button_status ? button_press_cnt + 1 : 0; @@ -181,12 +155,6 @@ int main(void) { can_init_all(); current_board->set_harness_orientation(HARNESS_ORIENTATION_1); -#ifdef FINAL_PROVISIONING - print("---- FINAL PROVISIONING BUILD ---- \n"); - can_set_forwarding(0, 2); - can_set_forwarding(1, 2); -#endif - // LED should keep on blinking all the time uint32_t cnt = 0; for (cnt=0;;cnt++) {