Mercurial > public > ostc4
annotate Small_CPU/Src/i2c.c @ 239:e4207f0aaa4b div-fixes-5
cleanup: factor out dataSendToSlaveStopEval
The global dataSendToSlaveStopEval was set all over the place, but never
tested, so useless to set it. And remove an unused piece of code. Trivial
cleanup.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
| author | Jan Mulder <jlmulder@xs4all.nl> |
|---|---|
| date | Mon, 08 Apr 2019 10:35:29 +0200 |
| parents | a9d798e8c11f |
| children | 2b9775f71e30 |
| rev | line source |
|---|---|
| 38 | 1 #include "baseCPU2.h" |
| 2 #include "i2c.h" | |
| 3 #include "scheduler.h" | |
| 4 | |
| 5 /* Private typedef -----------------------------------------------------------*/ | |
| 6 /* Private define ------------------------------------------------------------*/ | |
| 7 /* Private macro -------------------------------------------------------------*/ | |
| 8 | |
| 9 | |
| 10 // =============================================================================== | |
| 11 // I2C addresses - see i2c.h | |
|
165
e9cce686fe41
Minor: Some documentation for new hardware
heinrichsweikamp
parents:
104
diff
changeset
|
12 // =============================================================================== |
| 38 | 13 |
| 14 I2C_HandleTypeDef I2cHandle; | |
| 15 | |
| 16 | |
| 17 /* | |
| 18 static void I2C_Error_Handler(void) | |
| 19 { | |
| 20 while(1) | |
| 21 { | |
| 22 } | |
| 23 } | |
| 24 */ | |
| 25 | |
|
238
a9d798e8c11f
cleanup, bugfix: do not mask I2C_SystemStatus with local variable
Jan Mulder <jlmulder@xs4all.nl>
parents:
182
diff
changeset
|
26 //TODO: remove this function. Why return a global variable? |
| 38 | 27 HAL_StatusTypeDef I2C1_Status(void) |
| 28 { | |
| 29 return (HAL_StatusTypeDef)global.I2C_SystemStatus; | |
| 30 } | |
| 31 | |
| 32 | |
| 33 GPIO_PinState HAL_I2C_Read_Data_PIN(void) | |
| 34 { | |
| 35 return HAL_GPIO_ReadPin(I2Cx_SDA_GPIO_PORT,I2Cx_SDA_PIN); | |
| 36 } | |
| 37 | |
| 38 void HAL_I2C_Send_One_CLOCK(void) | |
| 39 { | |
| 40 HAL_GPIO_WritePin(I2Cx_SCL_GPIO_PORT, I2Cx_SCL_PIN, GPIO_PIN_RESET); | |
| 41 HAL_Delay(10); | |
| 42 HAL_GPIO_WritePin(I2Cx_SCL_GPIO_PORT, I2Cx_SCL_PIN, GPIO_PIN_SET); | |
| 43 HAL_Delay(10); | |
| 44 } | |
| 45 | |
| 46 GPIO_PinState MX_I2C1_TestAndClear(void) | |
| 47 { | |
| 48 I2C_DeInit(); | |
| 49 HAL_I2C_ManualControl_MspInit(); | |
| 50 for(int i=0; i<9;i++) | |
| 51 { | |
| 52 if(HAL_I2C_Read_Data_PIN() == GPIO_PIN_RESET) | |
| 53 HAL_I2C_Send_One_CLOCK(); | |
| 54 else | |
| 55 break; | |
| 56 } | |
| 57 return HAL_I2C_Read_Data_PIN(); | |
| 58 } | |
| 59 | |
|
238
a9d798e8c11f
cleanup, bugfix: do not mask I2C_SystemStatus with local variable
Jan Mulder <jlmulder@xs4all.nl>
parents:
182
diff
changeset
|
60 //TODO: make this void. return is never used |
| 38 | 61 HAL_StatusTypeDef MX_I2C1_Init(void) |
| 62 { | |
| 63 I2cHandle.Instance = I2Cx; | |
| 64 I2cHandle.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT; | |
| 104 | 65 I2cHandle.Init.ClockSpeed = 100000;//400000; REDUCED for compatibility with HMC5583L + MMA8452Q |
| 38 | 66 I2cHandle.Init.DualAddressMode = I2C_DUALADDRESS_DISABLED; |
| 104 | 67 I2cHandle.Init.DutyCycle = I2C_DUTYCYCLE_2; |
| 38 | 68 I2cHandle.Init.GeneralCallMode = I2C_GENERALCALL_DISABLED; |
| 69 I2cHandle.Init.NoStretchMode = I2C_NOSTRETCH_DISABLED; | |
| 70 I2cHandle.Init.OwnAddress1 = 0x01; | |
| 71 | |
| 72 global.I2C_SystemStatus = HAL_I2C_Init(&I2cHandle); | |
| 82 | 73 HAL_I2CEx_AnalogFilter_Config(&I2cHandle, I2C_ANALOGFILTER_ENABLED); |
| 100 | 74 HAL_I2CEx_ConfigDigitalFilter(&I2cHandle,0x0F); |
| 75 | |
| 76 if(global.dataSendToSlavePending) | |
| 77 { | |
| 78 scheduleSpecial_Evaluate_DataSendToSlave(); | |
| 79 } | |
| 38 | 80 return (HAL_StatusTypeDef)global.I2C_SystemStatus; |
| 81 } | |
| 82 | |
| 83 | |
| 84 void I2C_DeInit(void) | |
| 85 { | |
| 86 HAL_I2C_DeInit(&I2cHandle); | |
| 87 } | |
| 88 | |
|
239
e4207f0aaa4b
cleanup: factor out dataSendToSlaveStopEval
Jan Mulder <jlmulder@xs4all.nl>
parents:
238
diff
changeset
|
89 static uint8_t i2c_errors = 0; |
| 38 | 90 |
| 91 void I2C_Error_count(void) | |
| 92 { | |
| 93 i2c_errors++; | |
| 94 } | |
| 95 | |
| 96 HAL_StatusTypeDef I2C_Master_Transmit( uint16_t DevAddress, uint8_t *pData, uint16_t Size) | |
| 97 { | |
| 98 if(global.I2C_SystemStatus != HAL_OK) | |
|
238
a9d798e8c11f
cleanup, bugfix: do not mask I2C_SystemStatus with local variable
Jan Mulder <jlmulder@xs4all.nl>
parents:
182
diff
changeset
|
99 return global.I2C_SystemStatus; |
| 38 | 100 |
| 182 | 101 global.I2C_SystemStatus = HAL_I2C_Master_Transmit(&I2cHandle, DevAddress, pData, Size, 2); |
| 38 | 102 if(global.I2C_SystemStatus != HAL_OK) |
| 103 { | |
| 104 I2C_Error_count(); | |
| 105 } | |
| 88 | 106 |
| 38 | 107 return (HAL_StatusTypeDef)global.I2C_SystemStatus; |
| 108 } | |
| 109 | |
|
238
a9d798e8c11f
cleanup, bugfix: do not mask I2C_SystemStatus with local variable
Jan Mulder <jlmulder@xs4all.nl>
parents:
182
diff
changeset
|
110 // TODO: return value never used |
| 38 | 111 HAL_StatusTypeDef I2C_Master_Receive( uint16_t DevAddress, uint8_t *pData, uint16_t Size) |
| 112 { | |
| 113 if(global.I2C_SystemStatus != HAL_OK) | |
|
238
a9d798e8c11f
cleanup, bugfix: do not mask I2C_SystemStatus with local variable
Jan Mulder <jlmulder@xs4all.nl>
parents:
182
diff
changeset
|
114 return global.I2C_SystemStatus; |
| 38 | 115 |
|
238
a9d798e8c11f
cleanup, bugfix: do not mask I2C_SystemStatus with local variable
Jan Mulder <jlmulder@xs4all.nl>
parents:
182
diff
changeset
|
116 global.I2C_SystemStatus = HAL_I2C_Master_Receive(&I2cHandle, DevAddress, pData, Size, 10); |
|
a9d798e8c11f
cleanup, bugfix: do not mask I2C_SystemStatus with local variable
Jan Mulder <jlmulder@xs4all.nl>
parents:
182
diff
changeset
|
117 if(global.I2C_SystemStatus != HAL_OK) |
| 38 | 118 { |
| 119 I2C_Error_count(); | |
| 120 } | |
| 121 | |
|
238
a9d798e8c11f
cleanup, bugfix: do not mask I2C_SystemStatus with local variable
Jan Mulder <jlmulder@xs4all.nl>
parents:
182
diff
changeset
|
122 return global.I2C_SystemStatus; |
| 38 | 123 } |