Skip to content

Commit

Permalink
Enable system clock before enabling ADC0 (#26)
Browse files Browse the repository at this point in the history 
* NOT FOR RELEASE: Disable ADC

* NOT FOR RELEASE: Check if ADC0 is available on testing boards

* NOT FOR RELEASE: System clock before ADC0 enable

* NOT FOR RELEASE: Confirm clock needed to be enabled

* NOT FOR RELEASE: Check if ADC0 is available on testing boards (again)

* NOT FOR RELEASE: System clock before ADC0 enable (again)

* NOT FOR RELEASE: Confirm bug

* Final sanity check
  • Loading branch information
@WhiteHoodHacker
WhiteHoodHacker authored Mar 12, 2023
1 parent 4f5e3e4 commit a502fbc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
9 changes: 0 additions & 9 deletions docker_env/src/bin/fob.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,15 +238,6 @@ fn paired_fob_pairing() {
return
}

// Took too long...
if get_remaining_us_delay_timer() < 100_000 {
wait_delay_timer();
sleep_us(4_000_000);
uart_writeb_board(MAGIC_PAIR_RST);
log!("Paired fob: Sent PAIR_RST to unpaired fob");
return
}

// 5. Compute hash equality
let mut eeprom_pin_hash_w: [u32; LENW_PIN_HASH] = [0; LENW_PIN_HASH];
eeprom_read(&mut eeprom_pin_hash_w, FOBMEM_PIN_HASH);
Expand Down
3 changes: 3 additions & 0 deletions docker_env/tivaware/driverlib/wrapper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ static void tick_timer_init(void) {
* This function initializes the system peripherals and sets up the board link.
*/
void init_system(void) {
// Set the clocking to run directly from the crystal.
SysCtlClockSet(SYSCTL_SYSDIV_2_5 | SYSCTL_USE_PLL | SYSCTL_OSC_INT);

// Initialize the ADC temperature sensor
adc_init();

Expand Down
Binary file modified docker_env/tivaware/lib/libdriverwrapper.so
View file
Binary file not shown.

1 comment on commit a502fbc

@WhiteHoodHacker
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

[16:24:54] SUCCESS  [Logger] PASS Substep: Remove Existing Design              
[16:24:55] SUCCESS  [Logger] PASS Substep: Clone New Design                    
                    ([email protected]:sigpwny/2023-ectf-sigpwny.git, v1.2)       
[16:24:55] SUCCESS  [Logger] PASS Substep: Fetch LFS Files                     
[16:24:55] SUCCESS  [Logger] PASS Step: CloneDesign                            
[16:24:56] SUCCESS  [Logger] PASS Substep: Kill Docker Containers              
[16:24:56] SUCCESS  [Logger] PASS Substep: Remove Docker Containers            
[16:24:58] SUCCESS  [Logger] PASS Substep: Remove Docker Image                 
[16:30:42] SUCCESS  [Logger] PASS Substep: Build Environment                   
[16:30:43] SUCCESS  [Logger] PASS Substep: Build Tools                         
[16:30:44] SUCCESS  [Logger] PASS Substep: Build Deployment                    
[16:30:47] SUCCESS  [Logger] PASS Substep: Build Unpaired Fob                  
[16:30:52] SUCCESS  [Logger] PASS Substep: Build Car Fob Pair 1                
[16:30:57] SUCCESS  [Logger] PASS Substep: Build Car Fob Pair 2                
[16:30:58] SUCCESS  [Logger] PASS Substep: Package Feature 1 for Car 1         
[16:30:59] SUCCESS  [Logger] PASS Substep: Package Feature 2 for Car 1         
[16:31:00] SUCCESS  [Logger] PASS Substep: Package Feature 1 for Car 2         
[16:31:01] SUCCESS  [Logger] PASS Substep: Package Feature 2 for Car 2         
[16:31:02] SUCCESS  [Logger] PASS Substep: Protect car1 Image                  
[16:31:02] SUCCESS  [Logger] PASS Substep: Protect car2 Image                  
[16:31:02] SUCCESS  [Logger] PASS Substep: Protect fob1 Image                  
[16:31:02] SUCCESS  [Logger] PASS Substep: Protect fob2 Image                  
[16:31:02] SUCCESS  [Logger] PASS Substep: Protect fob0 Image                  
[16:31:02] SUCCESS  [Logger] PASS Substep: Kill Docker Containers              
[16:31:03] SUCCESS  [Logger] PASS Substep: Remove Docker Containers            
[16:31:03] SUCCESS  [Logger] PASS Step: BuildSystem                            
[16:31:04] SUCCESS  [Logger] PASS Substep: Reset Devices                       
[16:31:05] SUCCESS  [Logger] PASS Substep: Initiate car1_protected Device      
                    Firmware Update                                            
[16:31:36] SUCCESS  [Logger] PASS Substep: Load car1_protected Device          
[16:31:37] SUCCESS  [Logger] PASS Substep: Reset car1_protected Device         
[16:31:39] SUCCESS  [Logger] PASS Substep: Initiate fob1_protected Device      
                    Firmware Update                                            
[16:32:10] SUCCESS  [Logger] PASS Substep: Load fob1_protected Device          
[16:32:12] SUCCESS  [Logger] PASS Substep: Reset fob1_protected Device         
[16:32:12] SUCCESS  [Logger] PASS Substep: Start Car Bridge                    
[16:32:12] SUCCESS  [Logger] PASS Substep: Start Fob Bridge                    
[16:32:19] SUCCESS  [Logger] PASS Substep: Enable Feature 1                    
[16:32:21] SUCCESS  [Logger] PASS Substep: Enable Feature 2                    
[16:32:29] SUCCESS  [Logger] PASS Substep: Unlock Car                          
[16:32:29] SUCCESS  [Logger] PASS Substep: Verify Unlock                       
[16:32:29] SUCCESS  [Logger] PASS Substep: Verify Feature 1 Enabled            
[16:32:29] SUCCESS  [Logger] PASS Substep: Verify Feature 2 Enabled            
[16:32:29] SUCCESS  [Logger] PASS Substep: Kill Docker Containers              
[16:32:29] SUCCESS  [Logger] PASS Substep: Remove Docker Containers            
[16:32:29] SUCCESS  [Logger] PASS Step: UnlockCar                              
[16:32:29] SUCCESS  [Logger] PASS Substep: Reset Devices                       
[16:32:31] SUCCESS  [Logger] PASS Substep: Initiate fob1_protected Device
[3:39](https://mitre-ectf.slack.com/archives/C04K9J8MHA5/p1678653572147389)
Firmware Update                                            
[16:33:02] SUCCESS  [Logger] PASS Substep: Load fob1_protected Device          
[16:33:03] SUCCESS  [Logger] PASS Substep: Reset fob1_protected Device         
[16:33:04] SUCCESS  [Logger] PASS Substep: Initiate fob0_protected Device      
                    Firmware Update                                            
[16:33:36] SUCCESS  [Logger] PASS Substep: Load fob0_protected Device          
[16:33:37] SUCCESS  [Logger] PASS Substep: Reset fob0_protected Device         
[16:33:37] SUCCESS  [Logger] PASS Substep: Start Paired Fob Bridge             
[16:33:37] SUCCESS  [Logger] PASS Substep: Start Unpaired Fob Bridge           
[16:33:45] SUCCESS  [Logger] PASS Substep: Pair Fob                            
[16:33:45] SUCCESS  [Logger] PASS Substep: Reset Devices                       
[16:33:46] SUCCESS  [Logger] PASS Substep: Initiate car1_protected Device      
                    Firmware Update                                            
[16:34:18] SUCCESS  [Logger] PASS Substep: Load car1_protected Device          
[16:34:19] SUCCESS  [Logger] PASS Substep: Reset car1_protected Device         
[16:34:19] SUCCESS  [Logger] PASS Substep: Start Car Bridge                    
[16:34:19] SUCCESS  [Logger] PASS Substep: Start Fob Bridge                    
[16:34:27] SUCCESS  [Logger] PASS Substep: Enable Feature 1                    
[16:34:28] SUCCESS  [Logger] PASS Substep: Enable Feature 2                    
[16:34:36] SUCCESS  [Logger] PASS Substep: Unlock Car                          
[16:34:36] SUCCESS  [Logger] PASS Substep: Verify Unlock                       
[16:34:36] SUCCESS  [Logger] PASS Substep: Verify Feature 1 Enabled            
[16:34:36] SUCCESS  [Logger] PASS Substep: Verify Feature 2 Enabled            
[16:34:36] SUCCESS  [Logger] PASS Substep: Kill Docker Containers              
[16:34:36] SUCCESS  [Logger] PASS Substep: Remove Docker Containers            
[16:34:36] SUCCESS  [Logger] PASS Step: PairAndUnlockCar1                      
[16:34:37] SUCCESS  [Logger] PASS Substep: Reset Devices                       
[16:34:38] SUCCESS  [Logger] PASS Substep: Initiate fob2_protected Device      
                    Firmware Update                                            
[16:35:09] SUCCESS  [Logger] PASS Substep: Load fob2_protected Device          
[16:35:10] SUCCESS  [Logger] PASS Substep: Reset fob2_protected Device         
[16:35:12] SUCCESS  [Logger] PASS Substep: Initiate fob0_protected Device      
                    Firmware Update                                            
[16:35:43] SUCCESS  [Logger] PASS Substep: Load fob0_protected Device          
[16:35:45] SUCCESS  [Logger] PASS Substep: Reset fob0_protected Device         
[16:35:45] SUCCESS  [Logger] PASS Substep: Start Paired Fob Bridge             
[16:35:45] SUCCESS  [Logger] PASS Substep: Start Unpaired Fob Bridge           
[16:35:52] SUCCESS  [Logger] PASS Substep: Pair Fob                            
[16:35:53] SUCCESS  [Logger] PASS Substep: Reset Devices                       
[16:35:54] SUCCESS  [Logger] PASS Substep: Initiate car2_protected Device      
                    Firmware Update                                            
[16:36:25] SUCCESS  [Logger] PASS Substep: Load car2_protected Device          
[16:36:27] SUCCESS  [Logger] PASS Substep: Reset car2_protected Device         
[16:36:27] SUCCESS  [Logger] PASS Substep: Start Car Bridge                    
[16:36:27] SUCCESS  [Logger] PASS Substep: Start Fob Bridge                    
[16:36:34] SUCCESS  [Logger] PASS Substep: Enable Feature 1                    
[16:36:36] SUCCESS  [Logger] PASS Substep: Enable Feature 2                    
[16:36:44] SUCCESS  [Logger] PASS Substep: Unlock Car                          
[16:36:44] SUCCESS  [Logger] PASS Substep: Verify Unlock
[3:39](https://mitre-ectf.slack.com/archives/C04K9J8MHA5/p1678653572167899)
[16:36:44] SUCCESS  [Logger] PASS Substep: Verify Feature 1 Enabled            
[16:36:44] SUCCESS  [Logger] PASS Substep: Verify Feature 2 Enabled            
[16:36:44] SUCCESS  [Logger] PASS Substep: Kill Docker Containers              
[16:36:44] SUCCESS  [Logger] PASS Substep: Remove Docker Containers            
[16:36:44] SUCCESS  [Logger] PASS Step: PairAndUnlockCar2                      
[16:36:44] SUCCESS  [Logger] PASS Substep: Reset Devices                       
[16:36:45] SUCCESS  [Logger] PASS Substep: Initiate fob1_protected Device      
                    Firmware Update                                            
[16:37:17] SUCCESS  [Logger] PASS Substep: Load fob1_protected Device          
[16:37:18] SUCCESS  [Logger] PASS Substep: Reset fob1_protected Device         
[16:37:19] SUCCESS  [Logger] PASS Substep: Initiate fob0_protected Device      
                    Firmware Update                                            
[16:37:51] SUCCESS  [Logger] PASS Substep: Load fob0_protected Device          
[16:37:52] SUCCESS  [Logger] PASS Substep: Reset fob0_protected Device         
[16:37:52] SUCCESS  [Logger] PASS Substep: Start Paired Fob Bridge             
[16:37:52] SUCCESS  [Logger] PASS Substep: Start Unpaired Fob Bridge           
[16:38:00] SUCCESS  [Logger] PASS Substep: Pair Fob                            
[16:38:01] SUCCESS  [Logger] PASS Substep: Initiate fob0_protected Device      
                    Firmware Update                                            
[16:38:33] SUCCESS  [Logger] PASS Substep: Load fob0_protected Device          
[16:38:34] SUCCESS  [Logger] PASS Substep: Reset fob0_protected Device         
[16:38:34] SUCCESS  [Logger] PASS Substep: Start Paired Fob Bridge             
[16:38:34] SUCCESS  [Logger] PASS Substep: Start Unpaired Fob Bridge           
[16:38:43] SUCCESS  [Logger] PASS Substep: Pair Fob                            
[16:38:45] SUCCESS  [Logger] PASS Substep: Initiate car1_protected Device      
                    Firmware Update                                            
[16:39:16] SUCCESS  [Logger] PASS Substep: Load car1_protected Device          
[16:39:17] SUCCESS  [Logger] PASS Substep: Reset car1_protected Device         
[16:39:17] SUCCESS  [Logger] PASS Substep: Start Car Bridge                    
[16:39:31] SUCCESS  [Logger] PASS Substep: Unlock Car                          
[16:39:31] SUCCESS  [Logger] PASS Substep: Verify Unlock                       
[16:39:31] SUCCESS  [Logger] PASS Substep: Kill Docker Containers              
[16:39:31] SUCCESS  [Logger] PASS Substep: Remove Docker Containers            
[16:39:31] SUCCESS  [Logger] PASS Step: PairTwice                              
[16:39:31] SUCCESS  [Logger] Verification Flow Passed

Please sign in to comment.