Skip to content

Commit b2a186c

Browse files
authored
Purge uGFX. (#14720)
* Purge uGFX. * Remove remnants of visualizer. * Remove remnants of uGFX.
1 parent bc1f5ef commit b2a186c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+2
-3898
lines changed

.gitmodules

-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
path = lib/chibios-contrib
77
url = https://github.com/qmk/ChibiOS-Contrib
88
branch = master
9-
[submodule "lib/ugfx"]
10-
path = lib/ugfx
11-
url = https://github.com/qmk/uGFX
12-
branch = master
139
[submodule "lib/googletest"]
1410
path = lib/googletest
1511
url = https://github.com/qmk/googletest

Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,6 @@ endef
490490
ifndef SKIP_GIT
491491
if [ ! -e lib/chibios ]; then git submodule sync lib/chibios && git submodule update --depth 50 --init lib/chibios; fi
492492
if [ ! -e lib/chibios-contrib ]; then git submodule sync lib/chibios-contrib && git submodule update --depth 50 --init lib/chibios-contrib; fi
493-
if [ ! -e lib/ugfx ]; then git submodule sync lib/ugfx && git submodule update --depth 50 --init lib/ugfx; fi
494493
if [ ! -e lib/lufa ]; then git submodule sync lib/lufa && git submodule update --depth 50 --init lib/lufa; fi
495494
if [ ! -e lib/vusb ]; then git submodule sync lib/vusb && git submodule update --depth 50 --init lib/vusb; fi
496495
if [ ! -e lib/printf ]; then git submodule sync lib/printf && git submodule update --depth 50 --init lib/printf; fi

build_keyboard.mk

-6
Original file line numberDiff line numberDiff line change
@@ -429,12 +429,6 @@ PROJECT_DEFS := $(OPT_DEFS)
429429
PROJECT_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS)
430430
PROJECT_CONFIG := $(CONFIG_H)
431431

432-
ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
433-
VISUALIZER_DIR = $(QUANTUM_DIR)/visualizer
434-
VISUALIZER_PATH = $(QUANTUM_PATH)/visualizer
435-
include $(VISUALIZER_PATH)/visualizer.mk
436-
endif
437-
438432
CONFIG_H += $(POST_CONFIG_H)
439433
ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H)
440434

common_features.mk

-4
Original file line numberDiff line numberDiff line change
@@ -450,10 +450,6 @@ ifeq ($(strip $(APA102_DRIVER_REQUIRED)), yes)
450450
SRC += apa102.c
451451
endif
452452

453-
ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
454-
CIE1931_CURVE := yes
455-
endif
456-
457453
ifeq ($(strip $(CIE1931_CURVE)), yes)
458454
OPT_DEFS += -DUSE_CIE1931_CURVE
459455
LED_TABLES := yes

disable_features.mk

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ FEATURE_NAMES += SLEEP_LED
2222
FEATURE_NAMES += SERIAL_LINK
2323
FEATURE_NAMES += STENO
2424
FEATURE_NAMES += SWAP_HANDS
25-
FEATURE_NAMES += VISUALIZER
2625
FEATURE_NAMES += WATCHDOG
2726
FEATURE_NAMES += XT
2827

docs/es/hardware_drivers.md

-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ Soporte para direccionar pines en el ProMicro por su nombre Arduino en lugar de
1818

1919
Soporte para pantallas OLED basadas en SSD1306. Para obtener más información consulta la página de [Característica de Controlador OLED](feature_oled_driver.md).
2020

21-
## uGFX
22-
23-
Puedes hacer uso de uGFX dentro de QMK para manejar LCDs de caracteres y gráficos, matrices de LED, OLED, TFT, y otras tecnologías de visualización. Esto necesita ser mejor documentado. Si estás tratando de hacer esto y leer el código no ayuda por favor [abre una issue](https://github.com/qmk/qmk_firmware/issues/new) y podemos ayudarte por el proceso.
24-
2521
## WS2812 (Solo AVR)
2622

2723
Soporte para LEDs WS2811/WS2812{a,b,c}. Para obtener más información consulta la página de [Luz RGB](feature_rgblight.md).

docs/es/hardware_keyboard_guidelines.md

-2
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@ El año debe ser el primer año en que se crea el archivo. Si el trabajo se hizo
142142

143143
El núcleo de QMC está licenciado bajo la [GNU General Public License](https://www.gnu.org/licenses/licenses.en.html). Si estás enviando binarios para los procesadores AVR puedes elegir cualquiera [GPLv2](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html) o [GPLv3](https://www.gnu.org/licenses/gpl.html). Si estás enviando binarios para ARM procesadores debes elegir [GPL Versión 3](https://www.gnu.org/licenses/gpl.html) para cumplir con los [ChibiOS](https://www.chibios.org) licencia GPLv3.
144144

145-
Si tu teclado hace uso de la [uGFX](https://gfx.io) características dentro de QMK debes cumplir con la [Licencia de uGFX](https://ugfx.io/license.html), que requiere una licencia comercial separada antes de vender un dispositivo que contiene uGFX.
146-
147145
## Detalles técnicos
148146

149147
Si estás buscando más información sobre cómo hacer que su teclado funcione con QMK, [echa un vistazo a la sección hardware](hardware.md)!

docs/fr-fr/getting_started_github.md

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ Submodule path 'lib/chibios': checked out '587968d6cbc2b0e1c7147540872f2a67e59ca
3232
Submodule path 'lib/chibios-contrib': checked out 'ede48346eee4b8d6847c19bc01420bee76a5e486'
3333
Submodule path 'lib/googletest': checked out 'ec44c6c1675c25b9827aacd08c02433cccde7780'
3434
Submodule path 'lib/lufa': checked out 'ce10f7642b0459e409839b23cc91498945119b4d'
35-
Submodule path 'lib/ugfx': checked out '3e97b74e03c93631cdd3ddb2ce43b963fdce19b2'
3635
```
3736

3837
Vous avez maintenant votre fork QMK sur votre machine locale, vous pouvez ajouter votre keymap, la compiler et la flasher sur votre board. Une fois heureux avec vos changements, vous pouvez les ajouter, commit, et pousser vers votre fork comme suit:

docs/getting_started_github.md

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ Submodule path 'lib/chibios': checked out '587968d6cbc2b0e1c7147540872f2a67e59ca
3232
Submodule path 'lib/chibios-contrib': checked out 'ede48346eee4b8d6847c19bc01420bee76a5e486'
3333
Submodule path 'lib/googletest': checked out 'ec44c6c1675c25b9827aacd08c02433cccde7780'
3434
Submodule path 'lib/lufa': checked out 'ce10f7642b0459e409839b23cc91498945119b4d'
35-
Submodule path 'lib/ugfx': checked out '3e97b74e03c93631cdd3ddb2ce43b963fdce19b2'
3635
```
3736

3837
You now have your QMK fork on your local machine, and you can add your keymap, compile it and flash it to your board. Once you're happy with your changes, you can add, commit, and push them to your fork like this:

docs/hardware_drivers.md

-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ Support for addressing pins on the ProMicro by their Arduino name rather than th
1818

1919
Support for SSD1306 based OLED displays. For more information see the [OLED Driver Feature](feature_oled_driver.md) page.
2020

21-
## uGFX
22-
23-
You can make use of uGFX within QMK to drive character and graphic LCDs, LED arrays, OLED, TFT, and other display technologies. This needs to be better documented, if you are trying to do this and reading the code doesn't help please [open an issue](https://github.com/qmk/qmk_firmware/issues/new) and we can help you through the process.
24-
2521
## WS2812
2622

2723
Support for WS2811/WS2812{a,b,c} LED's. For more information see the [RGB Light](feature_rgblight.md) page.

docs/hardware_keyboard_guidelines.md

-2
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,6 @@ The year should be the first year the file is created. If work was done to that
255255

256256
The core of QMK is licensed under the [GNU General Public License](https://www.gnu.org/licenses/licenses.en.html). If you are shipping binaries for AVR processors you may choose either [GPLv2](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html) or [GPLv3](https://www.gnu.org/licenses/gpl.html). If you are shipping binaries for ARM processors you must choose [GPL Version 3](https://www.gnu.org/licenses/gpl.html) to comply with the [ChibiOS](https://www.chibios.org) GPLv3 license.
257257

258-
If your keyboard makes use of the [uGFX](https://ugfx.io) features within QMK you must comply with the [uGFX License](https://ugfx.io/license.html), which requires a separate commercial license before selling a device containing uGFX.
259-
260258
## Technical Details
261259

262260
If you're looking for more information on making your keyboard work with QMK, [check out the hardware section](hardware.md)!

docs/he-il/getting_started_github.md

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ Submodule path 'lib/chibios': checked out '587968d6cbc2b0e1c7147540872f2a67e59ca
3535
Submodule path 'lib/chibios-contrib': checked out 'ede48346eee4b8d6847c19bc01420bee76a5e486'
3636
Submodule path 'lib/googletest': checked out 'ec44c6c1675c25b9827aacd08c02433cccde7780'
3737
Submodule path 'lib/lufa': checked out 'ce10f7642b0459e409839b23cc91498945119b4d'
38-
Submodule path 'lib/ugfx': checked out '3e97b74e03c93631cdd3ddb2ce43b963fdce19b2'
3938
```
4039

4140
</div>

docs/ja/getting_started_github.md

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ Submodule path 'lib/chibios': checked out '587968d6cbc2b0e1c7147540872f2a67e59ca
3737
Submodule path 'lib/chibios-contrib': checked out 'ede48346eee4b8d6847c19bc01420bee76a5e486'
3838
Submodule path 'lib/googletest': checked out 'ec44c6c1675c25b9827aacd08c02433cccde7780'
3939
Submodule path 'lib/lufa': checked out 'ce10f7642b0459e409839b23cc91498945119b4d'
40-
Submodule path 'lib/ugfx': checked out '3e97b74e03c93631cdd3ddb2ce43b963fdce19b2'
4140
```
4241

4342
ローカルマシンに QMK のフォークができるので、キーマップの追加、コンパイル、キーボードへの書き込みができます。変更に満足したら、以下のようにそれらをフォークへ追加、コミットおよびプッシュすることができます:

docs/ja/hardware_drivers.md

-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ ProMicro のピンを AVR の名前ではなく、Arduino の名前で指定で
2424

2525
SSD1306 ベースの OLED ディスプレイのサポート。詳しくは[OLED ドライバ](ja/feature_oled_driver.md)を参照して下さい。
2626

27-
## uGFX
28-
29-
QMK 内で uGFX を使用して、キャラクタ LCD やグラフィック LCD、LED アレイ、OLED ディスプレイ、TFT 液晶や他のディスプレイを制御できます。この部分はより詳しく文書化される必要があります。もしこれを使用したい場合にコードを読んでも分からない場合、[issue を開く](https://github.com/qmk/qmk_firmware/issues/new)を通して助けることができるかもしれません。
30-
3127
## WS2812
3228

3329
WS2811/WS2812{a,b,c} LED のサポート。 詳しくは [RGB ライト](ja/feature_rgblight.md)を参照して下さい。

docs/ja/hardware_keyboard_guidelines.md

-2
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,6 @@ QMK が提供する機能の量を考えれば、新しいユーザーが混乱
234234

235235
QMK のコア部分は [GNU General Public License](https://www.gnu.org/licenses/licenses.en.html) でライセンスされます。AVR マイコン用のバイナリを提供する場合は、[GPLv2](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html) か、[GPLv3](https://www.gnu.org/licenses/gpl.html) のどちらかから選択出来ます。ARM マイコン用のバイナリを提供する場合は、 [ChibiOS](https://www.chibios.org) の GPLv3 ライセンスに準拠するため、[GPL Version 3](https://www.gnu.org/licenses/gpl.html) を選択しなければいけません。
236236

237-
[uGFX](https://ugfx.io) を使用している場合は、[uGFX License](https://ugfx.io/license.html) に準拠する必要があります。uGFX を利用したデバイスを販売するには個別に商用ライセンスを取得しなければいけません。
238-
239237
## 技術的な詳細
240238

241239
キーボードを QMK で動作させるための詳細は[ハードウェア](ja/hardware.md)を参照して下さい!

docs/ja/understanding_qmk.md

-4
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,6 @@ FIXME: This needs to be written
183183
184184
FIXME: This needs to be written
185185
186-
#### Visualizer
187-
188-
FIXME: This needs to be written
189-
190186
#### Keyboard state LEDs (Caps Lock, Num Lock, Scroll Lock)
191187
192188
FIXME: This needs to be written

docs/ru-ru/getting_started_github.md

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ Submodule path 'lib/chibios': checked out '587968d6cbc2b0e1c7147540872f2a67e59ca
3131
Submodule path 'lib/chibios-contrib': checked out 'ede48346eee4b8d6847c19bc01420bee76a5e486'
3232
Submodule path 'lib/googletest': checked out 'ec44c6c1675c25b9827aacd08c02433cccde7780'
3333
Submodule path 'lib/lufa': checked out 'ce10f7642b0459e409839b23cc91498945119b4d'
34-
Submodule path 'lib/ugfx': checked out '3e97b74e03c93631cdd3ddb2ce43b963fdce19b2'
3534
```
3635

3736
Теперь у вас есть форк QMK на вашем локальном компьютере, и вы можете добавить свою раскладку, скомпилировать ее и прошить ей свою клавиатуру. Как только вы будете довольны своими изменениями, есть возможность добавить, зафиксировать их и сделать коммит в свой форк следующим образом:

docs/understanding_qmk.md

-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ Within `keyboard_task()` you'll find code to handle:
2929
* [Matrix Scanning](#matrix-scanning)
3030
* Mouse Handling
3131
* Serial Link(s)
32-
* Visualizer
3332
* Keyboard status LEDs (Caps Lock, Num Lock, Scroll Lock)
3433

3534
#### Matrix Scanning
@@ -180,10 +179,6 @@ FIXME: This needs to be written
180179
181180
FIXME: This needs to be written
182181
183-
#### Visualizer
184-
185-
FIXME: This needs to be written
186-
187182
#### Keyboard state LEDs (Caps Lock, Num Lock, Scroll Lock)
188183
189184
FIXME: This needs to be written

docs/zh-cn/getting_started_github.md

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ Submodule path 'lib/chibios': checked out '587968d6cbc2b0e1c7147540872f2a67e59ca
3232
Submodule path 'lib/chibios-contrib': checked out 'ede48346eee4b8d6847c19bc01420bee76a5e486'
3333
Submodule path 'lib/googletest': checked out 'ec44c6c1675c25b9827aacd08c02433cccde7780'
3434
Submodule path 'lib/lufa': checked out 'ce10f7642b0459e409839b23cc91498945119b4d'
35-
Submodule path 'lib/ugfx': checked out '3e97b74e03c93631cdd3ddb2ce43b963fdce19b2'
3635
```
3736

3837
现在你本地计算机有QMK的分叉了,你可以添加你的布局了, 为你的键盘编译并刷新固件吧。如果你觉得你的修改很不错, 你可以添加,提交,然后想你的分叉推出(pull)你的改变,像这样:

doxygen-todo

-6
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,4 @@ quantum/serial_link/protocol
1818
quantum/serial_link/system
1919
quantum/serial_link/tests
2020
quantum/tools
21-
quantum/visualizer
22-
quantum/visualizer/resources
2321
drivers
24-
drivers/ugfx
25-
drivers/ugfx/gdisp
26-
drivers/ugfx/gdisp/is31fl3731c
27-
drivers/ugfx/gdisp/st7565

drivers/ugfx/gdisp/is31fl3731c/board_is31fl3731c_template.h

-105
This file was deleted.

drivers/ugfx/gdisp/is31fl3731c/driver.mk

-3
This file was deleted.

0 commit comments

Comments
 (0)