From e427007393fe34e63136d0ffca1a149a7387f4b7 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Wed, 14 Jun 2023 08:50:51 -0400 Subject: [PATCH] CJ125 is dead --- firmware/hw_layer/backup_ram.h | 8 -------- firmware/hw_layer/ports/stm32/backup_ram.cpp | 14 ++++---------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/firmware/hw_layer/backup_ram.h b/firmware/hw_layer/backup_ram.h index 8bee89241e..a7b7d13d3c 100644 --- a/firmware/hw_layer/backup_ram.h +++ b/firmware/hw_layer/backup_ram.h @@ -25,14 +25,6 @@ typedef enum { * See startPrimeInjectionPulse() in controllers/trigger/main_trigger_callback.cpp */ BACKUP_IGNITION_SWITCH_COUNTER, - /** - * CJ125 Calibration data (16bit) - */ - BACKUP_CJ125_CALIBRATION_LAMBDA, - /** - * CJ125 Calibration data (16bit) - */ - BACKUP_CJ125_CALIBRATION_HEATER, DFU_JUMP_REQUESTED, diff --git a/firmware/hw_layer/ports/stm32/backup_ram.cpp b/firmware/hw_layer/ports/stm32/backup_ram.cpp index f126190652..0af34ea9ad 100644 --- a/firmware/hw_layer/ports/stm32/backup_ram.cpp +++ b/firmware/hw_layer/ports/stm32/backup_ram.cpp @@ -13,10 +13,8 @@ uint32_t backupRamLoad(backup_ram_e idx) { return RTCD1.rtc->BKP0R & 0xffff; case BACKUP_IGNITION_SWITCH_COUNTER: return (RTCD1.rtc->BKP0R >> 16) & 0xff; - case BACKUP_CJ125_CALIBRATION_LAMBDA: - return RTCD1.rtc->BKP1R & 0xffff; - case BACKUP_CJ125_CALIBRATION_HEATER: - return (RTCD1.rtc->BKP1R >> 16) & 0xffff; +// return RTCD1.rtc->BKP1R & 0xffff; +// return (RTCD1.rtc->BKP1R >> 16) & 0xffff; // it is assembly code which reads this value // case DFU_JUMP_REQUESTED: // return RTCD1.rtc->BKP4R; @@ -38,12 +36,8 @@ void backupRamSave(backup_ram_e idx, uint32_t value) { case BACKUP_IGNITION_SWITCH_COUNTER: RTCD1.rtc->BKP0R = (RTCD1.rtc->BKP0R & ~0x00ff0000) | ((value & 0xff) << 16); break; - case BACKUP_CJ125_CALIBRATION_LAMBDA: - RTCD1.rtc->BKP1R = (RTCD1.rtc->BKP1R & ~0x0000ffff) | (value & 0xffff); - break; - case BACKUP_CJ125_CALIBRATION_HEATER: - RTCD1.rtc->BKP1R = (RTCD1.rtc->BKP1R & ~0xffff0000) | ((value & 0xffff) << 16); - break; +// RTCD1.rtc->BKP1R = (RTCD1.rtc->BKP1R & ~0x0000ffff) | (value & 0xffff); +// RTCD1.rtc->BKP1R = (RTCD1.rtc->BKP1R & ~0xffff0000) | ((value & 0xffff) << 16); // todo: start using this code case DFU_JUMP_REQUESTED: RTCD1.rtc->BKP4R = value;