from  cereal  import  car ,  log 
 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								import  cereal . messaging  as  messaging 
 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								from  opendbc . car  import  DT_CTRL ,  structs 
 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								from  opendbc . car . interfaces  import  MAX_CTRL_SPEED 
 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								from  openpilot . selfdrive . selfdrived . events  import  Events 
 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
									
										
											 
										
											
												selfdrive/car: ban cereal and capnp (#33208)
* ban cereal and msgq
* common too
* do toyota/values.py
* do all fingerprints
* example without builder
* this still works, but no type checking anymore
* stash
* wtf, how does this work
* okay actually not bad
* safe
* epic!
* stash data_structures.py
* some clean up
* hell yeah
* clean up old file
* add to delete
* delete
This reverts commit 90239b7797ace31ee647a2fdbd67e0c3faa98dcf.
* switch more CarParams stuff over
remove unused
* fix car tests by removing cereal! mypy forgets about dataclass if we wrap it :(
* fix this too
* fix this too
* remove more cereal and add some good hyundai tests
* bunch more typing
* override default with 20hz radar
* temp capnp converter helper
* more lateralTuning
* small union replicator is better than what i was trying, and fixes mypy dynamic typing issues
* can keep all this the same now!
* type ret: CarParams, add more missing structs, revert lateralTuning changes (smaller diff!)
* revert more
* get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :(
would have been `CarParams.NetworkLocation()`
* Revert "get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :("
This reverts commit bb28b228becba932052d2fc5a4389784027435b1.
* remove cereal from car_helpers (TODO: caching)
* remove a bunch of temp lines
* use dataclass_transform!
* remove some car.CarParams from the interfaces
* remove rest of car.CarParams from the interfaces
* same which() API
* sort
* from cereal/cache from fingerprinting!
* more typing
* dataclass to capnp helper for CarParams, cached it since it's kinda slow
* (partial) fix process replay fingerprintig for new API
* latcontrollers take capnp
* forgot this
* fix test_models
* fix unit tests
* not here
* VehicleModel and controller still takes capnp CP since they get it from Params()
* fix modeld test
* more fix
* need to namespace to structs, since CarState is both class and struct
* this was never in the base class?!
* clean that up again
* fix import error
fix import error
* cmts and more structs
* remove some more cereal from toyota + convert CarState to capnp
* bruh this was wrong
* replace more cereal
* EventName is one of the last things...
* replace a bunch more cereal.car
* missing imports
* more
* can fix this typing now
* proper toyota+others CS typing!
* mypy can detect return type of CS.update() now
* fix redeclaration of cruise_buttons type
* mypy is only complaining about events now
* temp fix
* add carControl struct
* replace CarControl
i hope there's no circular imports in hyundai's CC
* fine now
* lol this was wrong too
* fix crash
* include my failed attempts at recursively converting to dataclass (doesn't implicitly convert types/recursively :( )
but attrs does, maybe will switch in the future
* clean up
* try out attr.s for its converter (doesn't work recursively yet, but interesting!)
* Revert "try out attr.s for its converter (doesn't work recursively yet, but interesting!)"
This reverts commit ff2434f7bbd45a4d4bfb21f7d6712d1f1c3bcde9.
* test processes doesn't fail anymore (on toyota)!
* fix honda crash
* stash
* Revert "stash"
This reverts commit c1762af4e776790e4ad1322ad4ce0610157346e0.
* remove a bunch more cereal!
* LET'S GOOO
* fix these tests
* and these
* and that
* stash, something is wrong with hyundai enable
* Revert "stash, something is wrong with hyundai enable"
This reverts commit 39cf327def258e2959fe23cd7a550a858f6d8f03.
* forgot these
* remove cereal from fw_versions
* Revert "remove cereal from fw_versions"
This reverts commit 232b37cd409b55d04b1afc90d4a80c49e710eb56.
* remove rest of the cereal exceptions!
* fix that
* add typing to radard since I didn't realize RI.update() switched from cereal to structs
* and here too!
* add TODO for slots
* needed CS to be capnp, fix comparisons, and type hint car_specific so it's easier to catch type issues (capnp isn't detected by mypy :( )
* remove the struct converter
* save ~4-5% CPU at 100hz, we don't modify after so no need to deepcopy
btw pickle.loads(pickle.dumps()) is faster by ~1% CPU
* deepcopy -> copy: we can technically make a reference, but copy is almost free and less error-prone
saves ~1% CPU
* add non-copying asdict function
* should save ~3% CPU (still 4% above baseline)
* fix that, no dict support
* ~27% decrease in time for 20k iterations on 3X (3.37857 -> 2.4821s)
* give a better name
* fix
* dont support none, capitalize
* sheesh, this called type() on every field
* remove CS.events, clean up
* bump card %
* this was a bug on master!
* add a which enum
* default to pid
* revert
* update refs
* not needed, but consistent
* just Ecu
* don't need to do this in this pr
* clean up
* no cast
* consistent typing
* rm
* fix
* can do this if we're desperate for the last few %
* Revert "can do this if we're desperate for the last few %"
This reverts commit 18e11ac7883a0a56583750b1cc5a2b13011e7299.
* type this
* don't need to convert carControl
* i guess don't support set either
* fix CP type hint
* simplify that
old-commit-hash: 6a15c42143a4764e79df851d797f950a6212f464
											 
										 
										
											1 year ago 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								ButtonType  =  structs . CarState . ButtonEvent . Type 
 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								GearShifter  =  structs . CarState . GearShifter 
 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								EventName  =  log . OnroadEvent . EventName 
 
						 
					
						
							
								
									
										
											 
										
											
												selfdrive/car: ban cereal and capnp (#33208)
* ban cereal and msgq
* common too
* do toyota/values.py
* do all fingerprints
* example without builder
* this still works, but no type checking anymore
* stash
* wtf, how does this work
* okay actually not bad
* safe
* epic!
* stash data_structures.py
* some clean up
* hell yeah
* clean up old file
* add to delete
* delete
This reverts commit 90239b7797ace31ee647a2fdbd67e0c3faa98dcf.
* switch more CarParams stuff over
remove unused
* fix car tests by removing cereal! mypy forgets about dataclass if we wrap it :(
* fix this too
* fix this too
* remove more cereal and add some good hyundai tests
* bunch more typing
* override default with 20hz radar
* temp capnp converter helper
* more lateralTuning
* small union replicator is better than what i was trying, and fixes mypy dynamic typing issues
* can keep all this the same now!
* type ret: CarParams, add more missing structs, revert lateralTuning changes (smaller diff!)
* revert more
* get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :(
would have been `CarParams.NetworkLocation()`
* Revert "get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :("
This reverts commit bb28b228becba932052d2fc5a4389784027435b1.
* remove cereal from car_helpers (TODO: caching)
* remove a bunch of temp lines
* use dataclass_transform!
* remove some car.CarParams from the interfaces
* remove rest of car.CarParams from the interfaces
* same which() API
* sort
* from cereal/cache from fingerprinting!
* more typing
* dataclass to capnp helper for CarParams, cached it since it's kinda slow
* (partial) fix process replay fingerprintig for new API
* latcontrollers take capnp
* forgot this
* fix test_models
* fix unit tests
* not here
* VehicleModel and controller still takes capnp CP since they get it from Params()
* fix modeld test
* more fix
* need to namespace to structs, since CarState is both class and struct
* this was never in the base class?!
* clean that up again
* fix import error
fix import error
* cmts and more structs
* remove some more cereal from toyota + convert CarState to capnp
* bruh this was wrong
* replace more cereal
* EventName is one of the last things...
* replace a bunch more cereal.car
* missing imports
* more
* can fix this typing now
* proper toyota+others CS typing!
* mypy can detect return type of CS.update() now
* fix redeclaration of cruise_buttons type
* mypy is only complaining about events now
* temp fix
* add carControl struct
* replace CarControl
i hope there's no circular imports in hyundai's CC
* fine now
* lol this was wrong too
* fix crash
* include my failed attempts at recursively converting to dataclass (doesn't implicitly convert types/recursively :( )
but attrs does, maybe will switch in the future
* clean up
* try out attr.s for its converter (doesn't work recursively yet, but interesting!)
* Revert "try out attr.s for its converter (doesn't work recursively yet, but interesting!)"
This reverts commit ff2434f7bbd45a4d4bfb21f7d6712d1f1c3bcde9.
* test processes doesn't fail anymore (on toyota)!
* fix honda crash
* stash
* Revert "stash"
This reverts commit c1762af4e776790e4ad1322ad4ce0610157346e0.
* remove a bunch more cereal!
* LET'S GOOO
* fix these tests
* and these
* and that
* stash, something is wrong with hyundai enable
* Revert "stash, something is wrong with hyundai enable"
This reverts commit 39cf327def258e2959fe23cd7a550a858f6d8f03.
* forgot these
* remove cereal from fw_versions
* Revert "remove cereal from fw_versions"
This reverts commit 232b37cd409b55d04b1afc90d4a80c49e710eb56.
* remove rest of the cereal exceptions!
* fix that
* add typing to radard since I didn't realize RI.update() switched from cereal to structs
* and here too!
* add TODO for slots
* needed CS to be capnp, fix comparisons, and type hint car_specific so it's easier to catch type issues (capnp isn't detected by mypy :( )
* remove the struct converter
* save ~4-5% CPU at 100hz, we don't modify after so no need to deepcopy
btw pickle.loads(pickle.dumps()) is faster by ~1% CPU
* deepcopy -> copy: we can technically make a reference, but copy is almost free and less error-prone
saves ~1% CPU
* add non-copying asdict function
* should save ~3% CPU (still 4% above baseline)
* fix that, no dict support
* ~27% decrease in time for 20k iterations on 3X (3.37857 -> 2.4821s)
* give a better name
* fix
* dont support none, capitalize
* sheesh, this called type() on every field
* remove CS.events, clean up
* bump card %
* this was a bug on master!
* add a which enum
* default to pid
* revert
* update refs
* not needed, but consistent
* just Ecu
* don't need to do this in this pr
* clean up
* no cast
* consistent typing
* rm
* fix
* can do this if we're desperate for the last few %
* Revert "can do this if we're desperate for the last few %"
This reverts commit 18e11ac7883a0a56583750b1cc5a2b13011e7299.
* type this
* don't need to convert carControl
* i guess don't support set either
* fix CP type hint
* simplify that
old-commit-hash: 6a15c42143a4764e79df851d797f950a6212f464
											 
										 
										
											1 year ago 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								NetworkLocation  =  structs . CarParams . NetworkLocation 
 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								# TODO: the goal is to abstract this file into the CarState struct and make events generic 
 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								class  MockCarState : 
 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								  def  __init__ ( self ) : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    self . sm  =  messaging . SubMaster ( [ ' gpsLocation ' ,  ' gpsLocationExternal ' ] ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								  def  update ( self ,  CS :  car . CarState ) : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    self . sm . update ( 0 ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    gps_sock  =  ' gpsLocationExternal '  if  self . sm . recv_frame [ ' gpsLocationExternal ' ]  >  1  else  ' gpsLocation ' 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    CS . vEgo  =  self . sm [ gps_sock ] . speed 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    CS . vEgoRaw  =  self . sm [ gps_sock ] . speed 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    return  CS 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								class  CarSpecificEvents : 
 
						 
					
						
							
								
									
										
											 
										
											
												selfdrive/car: ban cereal and capnp (#33208)
* ban cereal and msgq
* common too
* do toyota/values.py
* do all fingerprints
* example without builder
* this still works, but no type checking anymore
* stash
* wtf, how does this work
* okay actually not bad
* safe
* epic!
* stash data_structures.py
* some clean up
* hell yeah
* clean up old file
* add to delete
* delete
This reverts commit 90239b7797ace31ee647a2fdbd67e0c3faa98dcf.
* switch more CarParams stuff over
remove unused
* fix car tests by removing cereal! mypy forgets about dataclass if we wrap it :(
* fix this too
* fix this too
* remove more cereal and add some good hyundai tests
* bunch more typing
* override default with 20hz radar
* temp capnp converter helper
* more lateralTuning
* small union replicator is better than what i was trying, and fixes mypy dynamic typing issues
* can keep all this the same now!
* type ret: CarParams, add more missing structs, revert lateralTuning changes (smaller diff!)
* revert more
* get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :(
would have been `CarParams.NetworkLocation()`
* Revert "get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :("
This reverts commit bb28b228becba932052d2fc5a4389784027435b1.
* remove cereal from car_helpers (TODO: caching)
* remove a bunch of temp lines
* use dataclass_transform!
* remove some car.CarParams from the interfaces
* remove rest of car.CarParams from the interfaces
* same which() API
* sort
* from cereal/cache from fingerprinting!
* more typing
* dataclass to capnp helper for CarParams, cached it since it's kinda slow
* (partial) fix process replay fingerprintig for new API
* latcontrollers take capnp
* forgot this
* fix test_models
* fix unit tests
* not here
* VehicleModel and controller still takes capnp CP since they get it from Params()
* fix modeld test
* more fix
* need to namespace to structs, since CarState is both class and struct
* this was never in the base class?!
* clean that up again
* fix import error
fix import error
* cmts and more structs
* remove some more cereal from toyota + convert CarState to capnp
* bruh this was wrong
* replace more cereal
* EventName is one of the last things...
* replace a bunch more cereal.car
* missing imports
* more
* can fix this typing now
* proper toyota+others CS typing!
* mypy can detect return type of CS.update() now
* fix redeclaration of cruise_buttons type
* mypy is only complaining about events now
* temp fix
* add carControl struct
* replace CarControl
i hope there's no circular imports in hyundai's CC
* fine now
* lol this was wrong too
* fix crash
* include my failed attempts at recursively converting to dataclass (doesn't implicitly convert types/recursively :( )
but attrs does, maybe will switch in the future
* clean up
* try out attr.s for its converter (doesn't work recursively yet, but interesting!)
* Revert "try out attr.s for its converter (doesn't work recursively yet, but interesting!)"
This reverts commit ff2434f7bbd45a4d4bfb21f7d6712d1f1c3bcde9.
* test processes doesn't fail anymore (on toyota)!
* fix honda crash
* stash
* Revert "stash"
This reverts commit c1762af4e776790e4ad1322ad4ce0610157346e0.
* remove a bunch more cereal!
* LET'S GOOO
* fix these tests
* and these
* and that
* stash, something is wrong with hyundai enable
* Revert "stash, something is wrong with hyundai enable"
This reverts commit 39cf327def258e2959fe23cd7a550a858f6d8f03.
* forgot these
* remove cereal from fw_versions
* Revert "remove cereal from fw_versions"
This reverts commit 232b37cd409b55d04b1afc90d4a80c49e710eb56.
* remove rest of the cereal exceptions!
* fix that
* add typing to radard since I didn't realize RI.update() switched from cereal to structs
* and here too!
* add TODO for slots
* needed CS to be capnp, fix comparisons, and type hint car_specific so it's easier to catch type issues (capnp isn't detected by mypy :( )
* remove the struct converter
* save ~4-5% CPU at 100hz, we don't modify after so no need to deepcopy
btw pickle.loads(pickle.dumps()) is faster by ~1% CPU
* deepcopy -> copy: we can technically make a reference, but copy is almost free and less error-prone
saves ~1% CPU
* add non-copying asdict function
* should save ~3% CPU (still 4% above baseline)
* fix that, no dict support
* ~27% decrease in time for 20k iterations on 3X (3.37857 -> 2.4821s)
* give a better name
* fix
* dont support none, capitalize
* sheesh, this called type() on every field
* remove CS.events, clean up
* bump card %
* this was a bug on master!
* add a which enum
* default to pid
* revert
* update refs
* not needed, but consistent
* just Ecu
* don't need to do this in this pr
* clean up
* no cast
* consistent typing
* rm
* fix
* can do this if we're desperate for the last few %
* Revert "can do this if we're desperate for the last few %"
This reverts commit 18e11ac7883a0a56583750b1cc5a2b13011e7299.
* type this
* don't need to convert carControl
* i guess don't support set either
* fix CP type hint
* simplify that
old-commit-hash: 6a15c42143a4764e79df851d797f950a6212f464
											 
										 
										
											1 year ago 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								  def  __init__ ( self ,  CP :  structs . CarParams ) : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    self . CP  =  CP 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    self . steering_unpressed  =  0 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    self . low_speed_alert  =  False 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    self . no_steer_warning  =  False 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    self . silent_steer_warning  =  True 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								  def  update ( self ,  CS :  car . CarState ,  CS_prev :  car . CarState ,  CC :  car . CarControl ) : 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								    if  self . CP . brand  in  ( ' body ' ,  ' mock ' ) : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events  =  Events ( ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								    elif  self . CP . brand  ==  ' ford ' : 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      events  =  self . create_common_events ( CS ,  CS_prev ,  extra_gears = [ GearShifter . low ,  GearShifter . manumatic ] ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								    elif  self . CP . brand  ==  ' nissan ' : 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      events  =  self . create_common_events ( CS ,  CS_prev ,  extra_gears = [ GearShifter . brake ] ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								    elif  self . CP . brand  ==  ' chrysler ' : 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      events  =  self . create_common_events ( CS ,  CS_prev ,  extra_gears = [ GearShifter . low ] ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      # Low speed steer alert hysteresis logic 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      if  self . CP . minSteerSpeed  >  0.  and  CS . vEgo  <  ( self . CP . minSteerSpeed  +  0.5 ) : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								        self . low_speed_alert  =  True 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      elif  CS . vEgo  >  ( self . CP . minSteerSpeed  +  1. ) : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								        self . low_speed_alert  =  False 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      if  self . low_speed_alert : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								        events . add ( EventName . belowSteerSpeed ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								    elif  self . CP . brand  ==  ' honda ' : 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      events  =  self . create_common_events ( CS ,  CS_prev ,  pcm_enable = False ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      if  self . CP . pcmCruise  and  CS . vEgo  <  self . CP . minEnableSpeed : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								        events . add ( EventName . belowEngageSpeed ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      if  self . CP . pcmCruise : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								        # we engage when pcm is active (rising edge) 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								        if  CS . cruiseState . enabled  and  not  CS_prev . cruiseState . enabled : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								          events . add ( EventName . pcmEnable ) 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								        elif  not  CS . cruiseState . enabled  and  ( CC . actuators . accel  > =  0.  or  not  self . CP . openpilotLongitudinalControl ) : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								          # it can happen that car cruise disables while comma system is enabled: need to 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								          # keep braking if needed or if the speed is very low 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								          if  CS . vEgo  <  self . CP . minEnableSpeed  +  2. : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								            # non loud alert if cruise disables below 25mph as expected (+ a little margin) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								            events . add ( EventName . speedTooLow ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								          else : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								            events . add ( EventName . cruiseDisabled ) 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      if  self . CP . minEnableSpeed  >  0  and  CS . vEgo  <  0.001 : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								        events . add ( EventName . manualRestart ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								    elif  self . CP . brand  ==  ' toyota ' : 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      # TODO: when we check for unexpected disengagement, check gear not S1, S2, S3 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events  =  self . create_common_events ( CS ,  CS_prev ,  extra_gears = [ GearShifter . sport ] ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      if  self . CP . openpilotLongitudinalControl : 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								        if  CS . cruiseState . standstill  and  not  CS . brakePressed : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								          events . add ( EventName . resumeRequired ) 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								        if  CS . vEgo  <  self . CP . minEnableSpeed : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								          events . add ( EventName . belowEngageSpeed ) 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								          if  CC . actuators . accel  >  0.3 : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								            # some margin on the actuator to not false trigger cancellation while stopping 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								            events . add ( EventName . speedTooLow ) 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								          if  CS . vEgo  <  0.001 : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								            # while in standstill, send a user alert 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								            events . add ( EventName . manualRestart ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								    elif  self . CP . brand  ==  ' gm ' : 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      events  =  self . create_common_events ( CS ,  CS_prev ,  extra_gears = [ GearShifter . sport ,  GearShifter . low , 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								                                                                   GearShifter . eco ,  GearShifter . manumatic ] , 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								                                         pcm_enable = self . CP . pcmCruise ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      # Enabling at a standstill with brake is allowed 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      # TODO: verify 17 Volt can enable for the first time at a stop and allow for all GMs 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      if  CS . vEgo  <  self . CP . minEnableSpeed  and  not  ( CS . standstill  and  CS . brake  > =  20  and 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								                                                   self . CP . networkLocation  ==  NetworkLocation . fwdCamera ) : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								        events . add ( EventName . belowEngageSpeed ) 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      if  CS . cruiseState . standstill : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								        events . add ( EventName . resumeRequired ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								    elif  self . CP . brand  ==  ' volkswagen ' : 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      events  =  self . create_common_events ( CS ,  CS_prev ,  extra_gears = [ GearShifter . eco ,  GearShifter . sport ,  GearShifter . manumatic ] , 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								                                         pcm_enable = self . CP . pcmCruise ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      if  self . CP . openpilotLongitudinalControl : 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								        if  CS . vEgo  <  self . CP . minEnableSpeed  +  0.5 : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								          events . add ( EventName . belowEngageSpeed ) 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								        if  CC . enabled  and  CS . vEgo  <  self . CP . minEnableSpeed : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								          events . add ( EventName . speedTooLow ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      # TODO: this needs to be implemented generically in carState struct 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      # if CC.eps_timer_soft_disable_alert:  # type: ignore[attr-defined] 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      #   events.add(EventName.steerTimeLimit) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								    elif  self . CP . brand  ==  ' hyundai ' : 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      events  =  self . create_common_events ( CS ,  CS_prev ,  extra_gears = ( GearShifter . sport ,  GearShifter . manumatic ) , 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								                                         pcm_enable = self . CP . pcmCruise ,  allow_button_cancel = False ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    else : 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      events  =  self . create_common_events ( CS ,  CS_prev ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    return  events 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
									
										
											 
										
											
												selfdrive/car: ban cereal and capnp (#33208)
* ban cereal and msgq
* common too
* do toyota/values.py
* do all fingerprints
* example without builder
* this still works, but no type checking anymore
* stash
* wtf, how does this work
* okay actually not bad
* safe
* epic!
* stash data_structures.py
* some clean up
* hell yeah
* clean up old file
* add to delete
* delete
This reverts commit 90239b7797ace31ee647a2fdbd67e0c3faa98dcf.
* switch more CarParams stuff over
remove unused
* fix car tests by removing cereal! mypy forgets about dataclass if we wrap it :(
* fix this too
* fix this too
* remove more cereal and add some good hyundai tests
* bunch more typing
* override default with 20hz radar
* temp capnp converter helper
* more lateralTuning
* small union replicator is better than what i was trying, and fixes mypy dynamic typing issues
* can keep all this the same now!
* type ret: CarParams, add more missing structs, revert lateralTuning changes (smaller diff!)
* revert more
* get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :(
would have been `CarParams.NetworkLocation()`
* Revert "get first enum automatically, but ofc mypy doesn't pick up the new metaclass so can't use :("
This reverts commit bb28b228becba932052d2fc5a4389784027435b1.
* remove cereal from car_helpers (TODO: caching)
* remove a bunch of temp lines
* use dataclass_transform!
* remove some car.CarParams from the interfaces
* remove rest of car.CarParams from the interfaces
* same which() API
* sort
* from cereal/cache from fingerprinting!
* more typing
* dataclass to capnp helper for CarParams, cached it since it's kinda slow
* (partial) fix process replay fingerprintig for new API
* latcontrollers take capnp
* forgot this
* fix test_models
* fix unit tests
* not here
* VehicleModel and controller still takes capnp CP since they get it from Params()
* fix modeld test
* more fix
* need to namespace to structs, since CarState is both class and struct
* this was never in the base class?!
* clean that up again
* fix import error
fix import error
* cmts and more structs
* remove some more cereal from toyota + convert CarState to capnp
* bruh this was wrong
* replace more cereal
* EventName is one of the last things...
* replace a bunch more cereal.car
* missing imports
* more
* can fix this typing now
* proper toyota+others CS typing!
* mypy can detect return type of CS.update() now
* fix redeclaration of cruise_buttons type
* mypy is only complaining about events now
* temp fix
* add carControl struct
* replace CarControl
i hope there's no circular imports in hyundai's CC
* fine now
* lol this was wrong too
* fix crash
* include my failed attempts at recursively converting to dataclass (doesn't implicitly convert types/recursively :( )
but attrs does, maybe will switch in the future
* clean up
* try out attr.s for its converter (doesn't work recursively yet, but interesting!)
* Revert "try out attr.s for its converter (doesn't work recursively yet, but interesting!)"
This reverts commit ff2434f7bbd45a4d4bfb21f7d6712d1f1c3bcde9.
* test processes doesn't fail anymore (on toyota)!
* fix honda crash
* stash
* Revert "stash"
This reverts commit c1762af4e776790e4ad1322ad4ce0610157346e0.
* remove a bunch more cereal!
* LET'S GOOO
* fix these tests
* and these
* and that
* stash, something is wrong with hyundai enable
* Revert "stash, something is wrong with hyundai enable"
This reverts commit 39cf327def258e2959fe23cd7a550a858f6d8f03.
* forgot these
* remove cereal from fw_versions
* Revert "remove cereal from fw_versions"
This reverts commit 232b37cd409b55d04b1afc90d4a80c49e710eb56.
* remove rest of the cereal exceptions!
* fix that
* add typing to radard since I didn't realize RI.update() switched from cereal to structs
* and here too!
* add TODO for slots
* needed CS to be capnp, fix comparisons, and type hint car_specific so it's easier to catch type issues (capnp isn't detected by mypy :( )
* remove the struct converter
* save ~4-5% CPU at 100hz, we don't modify after so no need to deepcopy
btw pickle.loads(pickle.dumps()) is faster by ~1% CPU
* deepcopy -> copy: we can technically make a reference, but copy is almost free and less error-prone
saves ~1% CPU
* add non-copying asdict function
* should save ~3% CPU (still 4% above baseline)
* fix that, no dict support
* ~27% decrease in time for 20k iterations on 3X (3.37857 -> 2.4821s)
* give a better name
* fix
* dont support none, capitalize
* sheesh, this called type() on every field
* remove CS.events, clean up
* bump card %
* this was a bug on master!
* add a which enum
* default to pid
* revert
* update refs
* not needed, but consistent
* just Ecu
* don't need to do this in this pr
* clean up
* no cast
* consistent typing
* rm
* fix
* can do this if we're desperate for the last few %
* Revert "can do this if we're desperate for the last few %"
This reverts commit 18e11ac7883a0a56583750b1cc5a2b13011e7299.
* type this
* don't need to convert carControl
* i guess don't support set either
* fix CP type hint
* simplify that
old-commit-hash: 6a15c42143a4764e79df851d797f950a6212f464
											 
										 
										
											1 year ago 
										
									 
								 
							 
							
								
									
										 
								
							 
							
								 
							
							
								  def  create_common_events ( self ,  CS :  structs . CarState ,  CS_prev :  car . CarState ,  extra_gears = None ,  pcm_enable = True , 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								                           allow_button_cancel = True ) : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    events  =  Events ( ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . doorOpen : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . doorOpen ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . seatbeltUnlatched : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . seatbeltNotLatched ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . gearShifter  !=  GearShifter . drive  and  ( extra_gears  is  None  or 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								       CS . gearShifter  not  in  extra_gears ) : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . wrongGear ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . gearShifter  ==  GearShifter . reverse : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . reverseGear ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  not  CS . cruiseState . available : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . wrongCarMode ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . espDisabled : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . espDisabled ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . espActive : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . espActive ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . stockFcw : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . stockFcw ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . stockAeb : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . stockAeb ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . vEgo  >  MAX_CTRL_SPEED : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . speedTooHigh ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . cruiseState . nonAdaptive : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . wrongCruiseMode ) 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								    if  CS . brakeHoldActive  and  self . CP . openpilotLongitudinalControl : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . brakeHold ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . parkingBrake : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . parkBrake ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . accFaulted : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . accFaulted ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . steeringPressed : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . steerOverride ) 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								    if  CS . steeringDisengage  and  not  CS_prev . steeringDisengage : 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      events . add ( EventName . steerDisengage ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . brakePressed  and  CS . standstill : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . preEnableStandstill ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . gasPressed : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . gasPressedOverride ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . vehicleSensorsInvalid : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . vehicleSensorsInvalid ) 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								    if  CS . invalidLkasSetting : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . invalidLkasSetting ) 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								    if  CS . lowSpeedAlert : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . belowSteerSpeed ) 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								    if  CS . buttonEnable : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . buttonEnable ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								    # Handle cancel button presses 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    for  b  in  CS . buttonEvents : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      # Disable on rising and falling edge of cancel for both stock and OP long 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      # TODO: only check the cancel button with openpilot longitudinal on all brands to match panda safety 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      if  b . type  ==  ButtonType . cancel  and  ( allow_button_cancel  or  not  self . CP . pcmCruise ) : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								        events . add ( EventName . buttonCancel ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    # Handle permanent and temporary steering faults 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    self . steering_unpressed  =  0  if  CS . steeringPressed  else  self . steering_unpressed  +  1 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . steerFaultTemporary : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      if  CS . steeringPressed  and  ( not  CS_prev . steerFaultTemporary  or  self . no_steer_warning ) : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								        self . no_steer_warning  =  True 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      else : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								        self . no_steer_warning  =  False 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								        # if the user overrode recently, show a less harsh alert 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								        if  self . silent_steer_warning  or  CS . standstill  or  self . steering_unpressed  <  int ( 1.5  /  DT_CTRL ) : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								          self . silent_steer_warning  =  True 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								          events . add ( EventName . steerTempUnavailableSilent ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								        else : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								          events . add ( EventName . steerTempUnavailable ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    else : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      self . no_steer_warning  =  False 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      self . silent_steer_warning  =  False 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  CS . steerFaultPermanent : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      events . add ( EventName . steerUnavailable ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    # we engage when pcm is active (rising edge) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    # enabling can optionally be blocked by the car interface 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    if  pcm_enable : 
  
						 
					
						
							
								
							 
							
								
									
										 
								
							 
							
								 
							
							
								      if  CS . cruiseState . enabled  and  not  CS_prev . cruiseState . enabled  and  not  CS . blockPcmEnable : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								        events . add ( EventName . pcmEnable ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								      elif  not  CS . cruiseState . enabled : 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								        events . add ( EventName . pcmDisable ) 
  
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								
							 
						 
					
						
							
								
							 
							
								
							 
							
								 
							
							
								    return  events