8000 Exclude SoCs without basic timers · gregdavill/circuitpython@eb71bfe · GitHub
[go: up one dir, main page]
Skip to content

Commit eb71bfe

Browse files
hierophecthierophect
committed
Exclude SoCs without basic timers
1 parent 6bb1649 commit eb71bfe

File tree

15 files changed

+79
-14
lines changed

15 files changed

+79
-14
lines changed

‎locale/ID.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-02-29 14:52-0500\n"
11+
"POT-Creation-Date: 2020-03-02 11:20-0500\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1179,6 +1179,10 @@ msgstr ""
11791179
msgid "PulseIn not yet supported"
11801180
msgstr ""
11811181

1182+
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
1183+
msgid "PulseOut not supported on this chip"
1184+
msgstr ""
1185+
11821186
#: ports/stm32f4/common-hal/os/__init__.c
11831187
msgid "RNG DeInit Error"
11841188
msgstr ""

‎locale/circuitpython.pot

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-02-29 14:52-0500\n"
11+
"POT-Creation-Date: 2020-03-02 11:20-0500\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1165,6 +1165,10 @@ msgstr ""
11651165
msgid "PulseIn not yet supported"
11661166
msgstr ""
11671167

1168+
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
1169+
msgid "PulseOut not supported on this chip"
1170+
msgstr ""
1171+
11681172
#: ports/stm32f4/common-hal/os/__init__.c
11691173
msgid "RNG DeInit Error"
11701174
msgstr ""

‎locale/de_DE.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-02-29 14:52-0500\n"
10+
"POT-Creation-Date: 2020-03-02 11:20-0500\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Pascal Deneaux\n"
1313
"Language-Team: Sebastian Plamauer, Pascal Deneaux\n"
@@ -1182,6 +1182,10 @@ msgstr "Pull wird nicht verwendet, wenn die Richtung output ist."
11821182
msgid "PulseIn not yet supported"
11831183
msgstr ""
11841184

1185+
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
1186+
msgid "PulseOut not supported on this chip"
1187+
msgstr ""
1188+
11851189
#: ports/stm32f4/common-hal/os/__init__.c
11861190
msgid "RNG DeInit Error"
11871191
msgstr ""

‎locale/en_US.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-02-29 14:52-0500\n"
10+
"POT-Creation-Date: 2020-03-02 11:20-0500\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -1165,6 +1165,10 @@ msgstr ""
11651165
msgid "PulseIn not yet supported"
11661166
msgstr ""
11671167

1168+
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
1169+
msgid "PulseOut not supported on this chip"
1170+
msgstr ""
1171+
11681172
#: ports/stm32f4/common-hal/os/__init__.c
11691173
msgid "RNG DeInit Error"
11701174
msgstr ""

‎locale/en_x_pirate.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-02-29 14:52-0500\n"
10+
"POT-Creation-Date: 2020-03-02 11:20-0500\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: @sommersoft, @MrCertainly\n"
@@ -1169,6 +1169,10 @@ msgstr ""
11691169
msgid "PulseIn not yet supported"
11701170
msgstr ""
11711171

1172+
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
1173+
msgid "PulseOut not supported on this chip"
1174+
msgstr ""
1175+
11721176
#: ports/stm32f4/common-hal/os/__init__.c
11731177
msgid "RNG DeInit Error"
11741178
msgstr ""

‎locale/es.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-02-29 14:52-0500\n"
10+
"POT-Creation-Date: 2020-03-02 11:20-0500\n"
1111
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -1181,6 +1181,10 @@ msgstr "Pull no se usa cuando la dirección es output."
11811181
msgid "PulseIn not yet supported"
11821182
msgstr ""
11831183

1184+
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
1185+
msgid "PulseOut not supported on this chip"
1186+
msgstr ""
1187+
11841188
#: ports/stm32f4/common-hal/os/__init__.c
11851189
msgid "RNG DeInit Error"
11861190
msgstr ""

‎locale/fil.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-02-29 14:52-0500\n"
10+
"POT-Creation-Date: 2020-03-02 11:20-0500\n"
1111
"PO-Revision-Date: 2018-12-20 22:15-0800\n"
1212
"Last-Translator: Timothy <me@timothygarcia.ca>\n"
1313
"Language-Team: fil\n"
@@ -1187,6 +1187,10 @@ msgstr "Pull hindi ginagamit kapag ang direksyon ay output."
11871187
msgid "PulseIn not yet supported"
11881188
msgstr ""
11891189

1190+
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
1191+
msgid "PulseOut not supported on this chip"
1192+
msgstr ""
1193+
11901194
#: ports/stm32f4/common-hal/os/__init__.c
11911195
msgid "RNG DeInit Error"
11921196
msgstr ""

‎locale/fr.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: 0.1\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-02-29 14:52-0500\n"
11+
"POT-Creation-Date: 2020-03-02 11:20-0500\n"
1212
"PO-Revision-Date: 2019-04-14 20:05+0100\n"
1313
"Last-Translator: Pierrick Couturier <arofarn@arofarn.info>\n"
1414
"Language-Team: fr\n"
@@ -1200,6 +1200,10 @@ msgstr "Le tirage 'pull' n'est pas utilisé quand la direction est 'output'."
12001200
msgid "PulseIn not yet supported"
12011201
msgstr ""
12021202

1203+
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
1204+
msgid "PulseOut not supported on this chip"
1205+
msgstr ""
1206+
12031207
#: ports/stm32f4/common-hal/os/__init__.c
12041208
msgid "RNG DeInit Error"
12051209
msgstr ""

‎locale/it_IT.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-02-29 14:52-0500\n"
11+
"POT-Creation-Date: 2020-03-02 11:20-0500\n"
1212
"PO-Revision-Date: 2018-10-02 16:27+0200\n"
1313
"Last-Translator: Enrico Paganin <enrico.paganin@mail.com>\n"
1414
"Language-Team: \n"
@@ -1196,6 +1196,10 @@ msgstr ""
11961196
msgid "PulseIn not yet supported"
11971197
msgstr ""
11981198

1199+
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
1200+
msgid "PulseOut not supported on this chip"
1201+
msgstr ""
1202+
11991203
#: ports/stm32f4/common-hal/os/__init__.c
12001204
msgid "RNG DeInit Error"
12011205
msgstr ""

‎locale/ko.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-02-29 14:52-0500\n"
11+
"POT-Creation-Date: 2020-03-02 11:20-0500\n"
1212
"PO-Revision-Date: 2019-05-06 14:22-0700\n"
1313
"Last-Translator: \n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1169,6 +1169,10 @@ msgstr ""
11691169
msgid "PulseIn not yet supported"
11701170
msgstr ""
11711171

1172+
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
1173+
msgid "PulseOut not supported on this chip"
1174+
msgstr ""
1175+
11721176
#: ports/stm32f4/common-hal/os/__init__.c
11731177
msgid "RNG DeInit Error"
11741178
msgstr ""

‎locale/pl.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-02-29 14:52-0500\n"
10+
"POT-Creation-Date: 2020-03-02 11:20-0500\n"
1111
"PO-Revision-Date: 2019-03-19 18:37-0700\n"
1212
"Last-Translator: Radomir Dopieralski <circuitpython@sheep.art.pl>\n"
1313
"Language-Team: pl\n"
@@ -1170,6 +1170,10 @@ msgstr "Podciągnięcie nieużywane w trybie wyjścia."
11701170
msgid "PulseIn not yet supported"
11711171
msgstr ""
11721172

1173+
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
1174+
msgid "PulseOut not supported on this chip"
1175+
msgstr ""
1176+
11731177
#: ports/stm32f4/common-hal/os/__init__.c
11741178
msgid "RNG DeInit Error"
11751179
msgstr ""

‎locale/pt_BR.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-02-29 14:52-0500\n"
11+
"POT-Creation-Date: 2020-03-02 11:20-0500\n"
1212
"PO-Revision-Date: 2018-10-02 21:14-0000\n"
1313
"Last-Translator: \n"
1414
"Language-Team: \n"
@@ -1181,6 +1181,10 @@ msgstr ""
11811181
msgid "PulseIn not yet supported"
11821182
msgstr ""
11831183

1184+
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
1185+
msgid "PulseOut not supported on this chip"
1186+
msgstr ""
1187+
11841188
#: ports/stm32f4/common-hal/os/__init__.c
11851189
msgid "RNG DeInit Error"
11861190
msgstr ""

‎locale/zh_Latn_pinyin.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: circuitpython-cn\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-02-29 14:52-0500\n"
10+
"POT-Creation-Date: 2020-03-02 11:20-0500\n"
1111
"PO-Revision-Date: 2019-04-13 10:10-0700\n"
1212
"Last-Translator: hexthat\n"
1313
"Language-Team: Chinese Hanyu Pinyin\n"
@@ -1184,6 +1184,10 @@ msgstr "Fāngxiàng shūchū shí Pull méiyǒu shǐyòng."
11841184
msgid "PulseIn not yet supported"
11851185
msgstr "Shàng bù zhīchí PulseIn"
11861186

1187+
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
1188+
msgid "PulseOut not supported on this chip"
1189+
msgstr ""
1190+
11871191
#: ports/stm32f4/common-hal/os/__init__.c
11881192
msgid "RNG DeInit Error"
11891193
msgstr "RNG qǔxiāo chūshǐhuà cuòwù"

‎ports/stm32f4/common-hal/pulseio/PulseOut.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,17 @@ STATIC void pulseout_event_handler(void) {
105105
}
106106

107107
void pulseout_reset() {
108+
#if HAS_BASIC_TIM
108109
__HAL_RCC_TIM7_CLK_DISABLE();
109110
refcount = 0;
111+
#endif
110112
}
111113

112114
void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
113115
const pulseio_pwmout_obj_t* carrier) {
116+
#if !(HAS_BASIC_TIM)
117+
mp_raise_NotImplementedError(translate("PulseOut not supported on this chip"));
118+
#else
114119
// Add to active PulseOuts
115120
refcount++;
116121

@@ -145,6 +150,7 @@ void common_hal_pulseio_pulseout_construct(pulseio_pulseout_obj_t* self,
145150
self->pwmout = (pulseio_pwmout_obj_t*)carrier;
146151

147152
turn_off(self);
153+
#endif
148154
}
149155

150156
bool common_hal_pulseio_pulseout_deinited(pulseio_pulseout_obj_t* self) {
@@ -160,7 +166,9 @@ void common_hal_pulseio_pulseout_deinit(pulseio_pulseout_obj_t* self) {
160166

161167
refcount--;
162168
if (refcount == 0) {
169+
#if HAS_BASIC_TIM
163170
__HAL_RCC_TIM7_CLK_DISABLE();
171+
#endif
164172
}
165173
}
166174

‎ports/stm32f4/peripherals/stm32f4/periph.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,23 +138,26 @@ typedef struct {
138138
.pin = tim_pin, \
139139
}
140140

141-
//Starter Lines
141+
//Access Lines
142142

143143
#ifdef STM32F401xE
144144
#define HAS_DAC 0
145145
#define HAS_TRNG 0
146+
#define HAS_BASIC_TIM 0
146147
#include "stm32f401xe/periph.h"
147148
#endif
148149

149150
#ifdef STM32F411xE
150151
#define HAS_DAC 0
151152
#define HAS_TRNG 0
153+
#define HAS_BASIC_TIM 0
152154
#include "stm32f411xe/periph.h"
153155
#endif
154156

155157
#ifdef STM32F412Zx
156158
#define HAS_DAC 0
157159
#define HAS_TRNG 1
160+
#define HAS_BASIC_TIM 1
158161
#include "stm32f412zx/periph.h"
159162
#endif
160163

@@ -163,12 +166,14 @@ typedef struct {
163166
#ifdef STM32F405xx
164167
#define HAS_DAC 1
165168
#define HAS_TRNG 1
169+
#define HAS_BASIC_TIM 1
166170
#include "stm32f405xx/periph.h"
167171
#endif
168172

169173
#ifdef STM32F407xx
170174
#define HAS_DAC 1
171175
#define HAS_TRNG 1
176+
#define HAS_BASIC_TIM 1
172177
#include "stm32f407xx/periph.h"
173178
#endif
174179

0 commit comments

Comments
 (0)
0