Change model name: n0101 --> n0200

2026-01-18 16:27:34 +01:00 · 2019-04-16 10:49:41 +02:00
parent 8ee80c5755
commit e1b2bb09f0
36 changed files with 67 additions and 67 deletions
--- a/ion/src/device/n0101/Makefile
+++ b/ion/src/device/n0101/Makefile
@@ -1,9 +0,0 @@
-ion_device_src += $(addprefix ion/src/device/n0101/drivers/, \
-  board.cpp \
-  cache.cpp \
-  power.cpp \
-)
-
-ion_device_src += ion/src/device/n0101/usb/stack/device.cpp
-
-LDSCRIPT ?= ion/src/device/n0101/flash.ld
--- a/ion/src/device/n0101/regs/config/cortex.h
+++ b/ion/src/device/n0101/regs/config/cortex.h
@@ -1,6 +0,0 @@
-#ifndef ION_DEVICE_N0101_REGS_CONFIG_CORTEX_H
-#define ION_DEVICE_N0101_REGS_CONFIG_CORTEX_H
-
-#define REGS_CORTEX_CONFIG_CACHE 1
-
-#endif
--- a/ion/src/device/n0101/regs/config/flash.h
+++ b/ion/src/device/n0101/regs/config/flash.h
@@ -1,6 +0,0 @@
-#ifndef ION_DEVICE_N0101_REGS_CONFIG_FLASH_H
-#define ION_DEVICE_N0101_REGS_CONFIG_FLASH_H
-
-#define REGS_FLASH_CONFIG_ART 1
-
-#endif
--- a/ion/src/device/n0101/regs/config/pwr.h
+++ b/ion/src/device/n0101/regs/config/pwr.h
@@ -1,6 +0,0 @@
-#ifndef ION_DEVICE_N0101_REGS_CONFIG_PWR_H
-#define ION_DEVICE_N0101_REGS_CONFIG_PWR_H
-
-#define REGS_PWR_CONFIG_ADDITIONAL_FIELDS 1
-
-#endif
--- a/ion/src/device/n0101/regs/config/rcc.h
+++ b/ion/src/device/n0101/regs/config/rcc.h
@@ -1,7 +0,0 @@
-#ifndef ION_DEVICE_N0101_REGS_CONFIG_RCC_H
-#define ION_DEVICE_N0101_REGS_CONFIG_RCC_H
-
-#define REGS_RCC_CONFIG_F730 1
-#define REGS_RCC_CONFIG_F412 0
-
-#endif
--- a/ion/src/device/n0200/Makefile
+++ b/ion/src/device/n0200/Makefile
@@ -0,0 +1,9 @@
+ion_device_src += $(addprefix ion/src/device/n0200/drivers/, \
+  board.cpp \
+  cache.cpp \
+  power.cpp \
+)
+
+ion_device_src += ion/src/device/n0200/usb/stack/device.cpp
+
+LDSCRIPT ?= ion/src/device/n0200/flash.ld
--- a/ion/src/device/n0200/drivers/board.cpp
+++ b/ion/src/device/n0200/drivers/board.cpp
--- a/ion/src/device/n0200/drivers/cache.cpp
+++ b/ion/src/device/n0200/drivers/cache.cpp
--- a/ion/src/device/n0200/drivers/cache.h
+++ b/ion/src/device/n0200/drivers/cache.h
--- a/ion/src/device/n0200/drivers/config/backlight.h
+++ b/ion/src/device/n0200/drivers/config/backlight.h
@@ -1,5 +1,5 @@
-#ifndef ION_DEVICE_N0101_CONFIG_BACKLIGHT_H
-#define ION_DEVICE_N0101_CONFIG_BACKLIGHT_H
+#ifndef ION_DEVICE_N0200_CONFIG_BACKLIGHT_H
+#define ION_DEVICE_N0200_CONFIG_BACKLIGHT_H

 #include <regs/regs.h>

--- a/ion/src/device/n0200/drivers/config/battery.h
+++ b/ion/src/device/n0200/drivers/config/battery.h
@@ -1,5 +1,5 @@
-#ifndef ION_DEVICE_N0101_CONFIG_BATTERY_H
-#define ION_DEVICE_N0101_CONFIG_BATTERY_H
+#ifndef ION_DEVICE_N0200_CONFIG_BATTERY_H
+#define ION_DEVICE_N0200_CONFIG_BATTERY_H

 #include <regs/regs.h>

--- a/ion/src/device/n0200/drivers/config/clocks.h
+++ b/ion/src/device/n0200/drivers/config/clocks.h
@@ -1,5 +1,5 @@
-#ifndef ION_DEVICE_N0101_CONFIG_CLOCKS_H
-#define ION_DEVICE_N0101_CONFIG_CLOCKS_H
+#ifndef ION_DEVICE_N0200_CONFIG_CLOCKS_H
+#define ION_DEVICE_N0200_CONFIG_CLOCKS_H

 #include <regs/regs.h>

--- a/ion/src/device/n0200/drivers/config/console.h
+++ b/ion/src/device/n0200/drivers/config/console.h
@@ -1,5 +1,5 @@
-#ifndef ION_DEVICE_N0101_CONFIG_CONSOLE_H
-#define ION_DEVICE_N0101_CONFIG_CONSOLE_H
+#ifndef ION_DEVICE_N0200_CONFIG_CONSOLE_H
+#define ION_DEVICE_N0200_CONFIG_CONSOLE_H

 #include <regs/regs.h>

--- a/ion/src/device/n0200/drivers/config/display.h
+++ b/ion/src/device/n0200/drivers/config/display.h
@@ -1,5 +1,5 @@
-#ifndef ION_DEVICE_N0101_CONFIG_DISPLAY_H
-#define ION_DEVICE_N0101_CONFIG_DISPLAY_H
+#ifndef ION_DEVICE_N0200_CONFIG_DISPLAY_H
+#define ION_DEVICE_N0200_CONFIG_DISPLAY_H

 #include <regs/regs.h>

--- a/ion/src/device/n0200/drivers/config/external_flash.h
+++ b/ion/src/device/n0200/drivers/config/external_flash.h
@@ -1,5 +1,5 @@
-#ifndef ION_DEVICE_N0101_CONFIG_EXTERNAL_FLASH_H
-#define ION_DEVICE_N0101_CONFIG_EXTERNAL_FLASH_H
+#ifndef ION_DEVICE_N0200_CONFIG_EXTERNAL_FLASH_H
+#define ION_DEVICE_N0200_CONFIG_EXTERNAL_FLASH_H

 #include <regs/regs.h>

--- a/ion/src/device/n0200/drivers/config/flash.h
+++ b/ion/src/device/n0200/drivers/config/flash.h
@@ -1,5 +1,5 @@
-#ifndef ION_DEVICE_N0101_CONFIG_FLASH_H
-#define ION_DEVICE_N0101_CONFIG_FLASH_H
+#ifndef ION_DEVICE_N0200_CONFIG_FLASH_H
+#define ION_DEVICE_N0200_CONFIG_FLASH_H

 #include <regs/regs.h>

--- a/ion/src/device/n0200/drivers/config/keyboard.h
+++ b/ion/src/device/n0200/drivers/config/keyboard.h
@@ -1,5 +1,5 @@
-#ifndef ION_DEVICE_N0101_CONFIG_KEYBOARD_H
-#define ION_DEVICE_N0101_CONFIG_KEYBOARD_H
+#ifndef ION_DEVICE_N0200_CONFIG_KEYBOARD_H
+#define ION_DEVICE_N0200_CONFIG_KEYBOARD_H

 #include <regs/regs.h>
 #include <ion/keyboard.h>
--- a/ion/src/device/n0200/drivers/config/led.h
+++ b/ion/src/device/n0200/drivers/config/led.h
@@ -1,5 +1,5 @@
-#ifndef ION_DEVICE_N0101_CONFIG_LED_H
-#define ION_DEVICE_N0101_CONFIG_LED_H
+#ifndef ION_DEVICE_N0200_CONFIG_LED_H
+#define ION_DEVICE_N0200_CONFIG_LED_H

 #include <regs/regs.h>

--- a/ion/src/device/n0200/drivers/config/serial_number.h
+++ b/ion/src/device/n0200/drivers/config/serial_number.h
@@ -1,5 +1,5 @@
-#ifndef ION_DEVICE_N0101_CONFIG_SERIAL_NUMBER_H
-#define ION_DEVICE_N0101_CONFIG_SERIAL_NUMBER_H
+#ifndef ION_DEVICE_N0200_CONFIG_SERIAL_NUMBER_H
+#define ION_DEVICE_N0200_CONFIG_SERIAL_NUMBER_H

 #include <regs/regs.h>

--- a/ion/src/device/n0200/drivers/config/swd.h
+++ b/ion/src/device/n0200/drivers/config/swd.h
@@ -1,5 +1,5 @@
-#ifndef ION_DEVICE_N0101_CONFIG_SWD_H
-#define ION_DEVICE_N0101_CONFIG_SWD_H
+#ifndef ION_DEVICE_N0200_CONFIG_SWD_H
+#define ION_DEVICE_N0200_CONFIG_SWD_H

 #include <regs/regs.h>

--- a/ion/src/device/n0200/drivers/config/timing.h
+++ b/ion/src/device/n0200/drivers/config/timing.h
@@ -1,5 +1,5 @@
-#ifndef ION_DEVICE_N0101_CONFIG_TIMING_H
-#define ION_DEVICE_N0101_CONFIG_TIMING_H
+#ifndef ION_DEVICE_N0200_CONFIG_TIMING_H
+#define ION_DEVICE_N0200_CONFIG_TIMING_H

 #include <regs/regs.h>

--- a/ion/src/device/n0200/drivers/config/usb.h
+++ b/ion/src/device/n0200/drivers/config/usb.h
@@ -1,5 +1,5 @@
-#ifndef ION_DEVICE_N0101_CONFIG_USB_H
-#define ION_DEVICE_N0101_CONFIG_USB_H
+#ifndef ION_DEVICE_N0200_CONFIG_USB_H
+#define ION_DEVICE_N0200_CONFIG_USB_H

 #include <regs/regs.h>

--- a/ion/src/device/n0200/drivers/power.cpp
+++ b/ion/src/device/n0200/drivers/power.cpp
--- a/ion/src/device/n0200/flash.ld
+++ b/ion/src/device/n0200/flash.ld
--- a/ion/src/device/n0200/regs/config/cortex.h
+++ b/ion/src/device/n0200/regs/config/cortex.h
@@ -0,0 +1,6 @@
+#ifndef ION_DEVICE_N0200_REGS_CONFIG_CORTEX_H
+#define ION_DEVICE_N0200_REGS_CONFIG_CORTEX_H
+
+#define REGS_CORTEX_CONFIG_CACHE 1
+
+#endif
--- a/ion/src/device/n0200/regs/config/flash.h
+++ b/ion/src/device/n0200/regs/config/flash.h
@@ -0,0 +1,6 @@
+#ifndef ION_DEVICE_N0200_REGS_CONFIG_FLASH_H
+#define ION_DEVICE_N0200_REGS_CONFIG_FLASH_H
+
+#define REGS_FLASH_CONFIG_ART 1
+
+#endif
--- a/ion/src/device/n0200/regs/config/pwr.h
+++ b/ion/src/device/n0200/regs/config/pwr.h
@@ -0,0 +1,6 @@
+#ifndef ION_DEVICE_N0200_REGS_CONFIG_PWR_H
+#define ION_DEVICE_N0200_REGS_CONFIG_PWR_H
+
+#define REGS_PWR_CONFIG_ADDITIONAL_FIELDS 1
+
+#endif
--- a/ion/src/device/n0200/regs/config/rcc.h
+++ b/ion/src/device/n0200/regs/config/rcc.h
@@ -0,0 +1,7 @@
+#ifndef ION_DEVICE_N0200_REGS_CONFIG_RCC_H
+#define ION_DEVICE_N0200_REGS_CONFIG_RCC_H
+
+#define REGS_RCC_CONFIG_F730 1
+#define REGS_RCC_CONFIG_F412 0
+
+#endif
--- a/ion/src/device/n0200/regs/config/usart.h
+++ b/ion/src/device/n0200/regs/config/usart.h
@@ -1,5 +1,5 @@
-#ifndef ION_DEVICE_N0101_REGS_CONFIG_USART_H
-#define ION_DEVICE_N0101_REGS_CONFIG_USART_H
+#ifndef ION_DEVICE_N0200_REGS_CONFIG_USART_H
+#define ION_DEVICE_N0200_REGS_CONFIG_USART_H

 #define REGS_USART_SR_OFFSET 0x1C
 #define REGS_USART_RDR_OFFSET 0x24
--- a/ion/src/device/n0200/usb/stack/device.cpp
+++ b/ion/src/device/n0200/usb/stack/device.cpp
--- a/ion/src/device/shared/drivers/keyboard.cpp
+++ b/ion/src/device/shared/drivers/keyboard.cpp
@@ -3,7 +3,7 @@
 * The job of this code is to implement the "ion_key_state" function.
 *
 * The keyboard is a matrix that is laid out as follow:
- * (K_B2 and K_B3 are respectively specific to N0100 and N0101
+ * (K_B2 and K_B3 are respectively specific to N0100 and N0200
 *
 *      |  PC0 |  PC1 | PC2  | PC3  | PC4  | PC5  |
 * -----+------+------+------+------+------+------+
--- a/ion/src/device/shared/drivers/wakeup.cpp
+++ b/ion/src/device/shared/drivers/wakeup.cpp
@@ -20,7 +20,7 @@ void onChargingEvent() {
   * source input for EXTI at the same time. Here, EXTICR1 register is filled
   * between:
   * - N0100: position 0-3 (charging pin = 0) with  0000 (ChargingGPIO = group A)
-   * - N0101: position 12-15 (charging pin = 3) with 0100 (ChargingGPIO = group E)
+   * - N0200: position 12-15 (charging pin = 3) with 0100 (ChargingGPIO = group E)
   */
  SYSCFG.EXTICR1()->setEXTI(Battery::Config::ChargingPin.pin(), Battery::Config::ChargingPin.group());

@@ -58,7 +58,7 @@ void onOnOffKeyDown() {

  /* Here, EXTICR1 register is filled between:
   * - N0100: position 4-7 (column pin = 1) with 0010 (ColumnGPIO = group C)
-   * - N0101: position 8-11 (column pin = 2) with 0010 (ColumnGPIO = group C). */
+   * - N0200: position 8-11 (column pin = 2) with 0010 (ColumnGPIO = group C). */

  SYSCFG.EXTICR1()->setEXTI(columnPin, Keyboard::Config::ColumnGPIO);

--- a/quiz/Makefile
+++ b/quiz/Makefile
@@ -27,7 +27,7 @@ $(BUILD_DIR)/quiz/src/%_symbols.o: SFLAGS += -Iquiz/src

 $(BUILD_DIR)/test.$(EXE): $(BUILD_DIR)/quiz/src/tests_symbols.o $(runner_objs) $(call object_for,$(tests))

-ifeq ($(MODEL),n0101)
+ifeq ($(MODEL),n0200)
 $(BUILD_DIR)/test_external_flash.$(EXE): LDSCRIPT = ion/test/external_flash_tests.ld
 $(BUILD_DIR)/test_external_flash.$(EXE): $(BUILD_DIR)/quiz/src/external_flash_tests_symbols.o $(runner_objs) $(call object_for,$(tests_external_flash))
 endif
--- a/scripts/device/openocd.n0200.cfg
+++ b/scripts/device/openocd.n0200.cfg
--- a/scripts/platform.device.mak
+++ b/scripts/platform.device.mak
@@ -1,4 +1,4 @@
-MODEL ?= n0101
+MODEL ?= n0200
 USE_LIBA = 1
 EXE = elf
 EPSILON_BOOT_PROMPT = update
--- a/scripts/platform.device.n0200.mak
+++ b/scripts/platform.device.n0200.mak