Skip to content

Commit 34fdcc9

Browse files
committed
STM32: move analogin_read functions in a common file
1 parent 4dbe95d commit 34fdcc9

File tree

9 files changed

+0
-126
lines changed

9 files changed

+0
-126
lines changed

targets/TARGET_STM/TARGET_STM32F0/analogin_device.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -186,18 +186,4 @@ static inline uint16_t adc_read(analogin_t *obj)
186186
}
187187
}
188188

189-
uint16_t analogin_read_u16(analogin_t *obj)
190-
{
191-
uint16_t value = adc_read(obj);
192-
// 12-bit to 16-bit conversion
193-
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
194-
return value;
195-
}
196-
197-
float analogin_read(analogin_t *obj)
198-
{
199-
uint16_t value = adc_read(obj);
200-
return (float)value * (1.0f / (float)0xFFF); // 12 bits range
201-
}
202-
203189
#endif

targets/TARGET_STM/TARGET_STM32F1/analogin_device.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -180,18 +180,4 @@ static inline uint16_t adc_read(analogin_t *obj)
180180
}
181181
}
182182

183-
uint16_t analogin_read_u16(analogin_t *obj)
184-
{
185-
uint16_t value = adc_read(obj);
186-
// 12-bit to 16-bit conversion
187-
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
188-
return value;
189-
}
190-
191-
float analogin_read(analogin_t *obj)
192-
{
193-
uint16_t value = adc_read(obj);
194-
return (float)value * (1.0f / (float)0xFFF); // 12 bits range
195-
}
196-
197183
#endif

targets/TARGET_STM/TARGET_STM32F2/analogin_device.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -184,18 +184,4 @@ static inline uint16_t adc_read(analogin_t *obj)
184184
}
185185
}
186186

187-
uint16_t analogin_read_u16(analogin_t *obj)
188-
{
189-
uint16_t value = adc_read(obj);
190-
// 12-bit to 16-bit conversion
191-
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
192-
return value;
193-
}
194-
195-
float analogin_read(analogin_t *obj)
196-
{
197-
uint16_t value = adc_read(obj);
198-
return (float)value * (1.0f / (float)0xFFF); // 12 bits range
199-
}
200-
201187
#endif

targets/TARGET_STM/TARGET_STM32F3/analogin_device.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -197,18 +197,4 @@ static inline uint16_t adc_read(analogin_t *obj)
197197
}
198198
}
199199

200-
uint16_t analogin_read_u16(analogin_t *obj)
201-
{
202-
uint16_t value = adc_read(obj);
203-
// 12-bit to 16-bit conversion
204-
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
205-
return value;
206-
}
207-
208-
float analogin_read(analogin_t *obj)
209-
{
210-
uint16_t value = adc_read(obj);
211-
return (float)value * (1.0f / (float)0xFFF); // 12 bits range
212-
}
213-
214200
#endif

targets/TARGET_STM/TARGET_STM32F4/analogin_device.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -194,18 +194,4 @@ static inline uint16_t adc_read(analogin_t *obj)
194194
}
195195
}
196196

197-
uint16_t analogin_read_u16(analogin_t *obj)
198-
{
199-
uint16_t value = adc_read(obj);
200-
// 12-bit to 16-bit conversion
201-
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
202-
return value;
203-
}
204-
205-
float analogin_read(analogin_t *obj)
206-
{
207-
uint16_t value = adc_read(obj);
208-
return (float)value * (1.0f / (float)0xFFF); // 12 bits range
209-
}
210-
211197
#endif

targets/TARGET_STM/TARGET_STM32F7/analogin_device.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -184,18 +184,4 @@ static inline uint16_t adc_read(analogin_t *obj)
184184
}
185185
}
186186

187-
uint16_t analogin_read_u16(analogin_t *obj)
188-
{
189-
uint16_t value = adc_read(obj);
190-
// 12-bit to 16-bit conversion
191-
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
192-
return value;
193-
}
194-
195-
float analogin_read(analogin_t *obj)
196-
{
197-
uint16_t value = adc_read(obj);
198-
return (float)value * (1.0f / (float)0xFFF); // 12 bits range
199-
}
200-
201187
#endif

targets/TARGET_STM/TARGET_STM32L0/analogin_device.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -183,18 +183,4 @@ static inline uint16_t adc_read(analogin_t *obj)
183183
}
184184
}
185185

186-
uint16_t analogin_read_u16(analogin_t *obj)
187-
{
188-
uint16_t value = adc_read(obj);
189-
// 12-bit to 16-bit conversion
190-
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
191-
return value;
192-
}
193-
194-
float analogin_read(analogin_t *obj)
195-
{
196-
uint16_t value = adc_read(obj);
197-
return (float)value * (1.0f / (float)0xFFF); // 12 bits range
198-
}
199-
200186
#endif

targets/TARGET_STM/TARGET_STM32L1/analogin_device.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -234,18 +234,4 @@ static inline uint16_t adc_read(analogin_t *obj)
234234
}
235235
}
236236

237-
uint16_t analogin_read_u16(analogin_t *obj)
238-
{
239-
uint16_t value = adc_read(obj);
240-
// 12-bit to 16-bit conversion
241-
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
242-
return value;
243-
}
244-
245-
float analogin_read(analogin_t *obj)
246-
{
247-
uint16_t value = adc_read(obj);
248-
return (float)value * (1.0f / (float)0xFFF); // 12 bits range
249-
}
250-
251237
#endif

targets/TARGET_STM/TARGET_STM32L4/analogin_device.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -184,18 +184,4 @@ static inline uint16_t adc_read(analogin_t *obj)
184184
}
185185
}
186186

187-
uint16_t analogin_read_u16(analogin_t *obj)
188-
{
189-
uint16_t value = adc_read(obj);
190-
// 12-bit to 16-bit conversion
191-
value = ((value << 4) & (uint16_t)0xFFF0) | ((value >> 8) & (uint16_t)0x000F);
192-
return value;
193-
}
194-
195-
float analogin_read(analogin_t *obj)
196-
{
197-
uint16_t value = adc_read(obj);
198-
return (float)value * (1.0f / (float)0xFFF); // 12 bits range
199-
}
200-
201187
#endif

0 commit comments

Comments
 (0)