[ion] Change model name: n0200 --> n0110

2026-03-19 05:40:38 +01:00 · 2019-06-05 11:03:26 +02:00
parent 74665c0569
commit 4dd2a5a47a
41 changed files with 75 additions and 75 deletions
--- a/ion/src/device/n0110/Makefile
+++ b/ion/src/device/n0110/Makefile
@@ -0,0 +1,9 @@
+ion_device_src += $(addprefix ion/src/device/n0110/drivers/, \
+  board.cpp \
+  cache.cpp \
+  power.cpp \
+)
+
+ion_device_src += ion/src/device/n0110/usb/stack/device.cpp
+
+LDSCRIPT ?= ion/src/device/n0110/flash.ld
--- a/ion/src/device/n0110/drivers/board.cpp
+++ b/ion/src/device/n0110/drivers/board.cpp
@@ -10,7 +10,7 @@ extern void * InitialisationVector;
 // Public Ion methods

 const char * Ion::fccId() {
-  return "2ALWP-N0200";
+  return "2ALWP-N0110";
 }

 // Private Ion::Device methods
--- a/ion/src/device/n0110/drivers/cache.cpp
+++ b/ion/src/device/n0110/drivers/cache.cpp
--- a/ion/src/device/n0110/drivers/cache.h
+++ b/ion/src/device/n0110/drivers/cache.h
@@ -1,5 +1,5 @@
-#ifndef ION_DEVICE_N0200_CACHE_H
-#define ION_DEVICE_N0200_CACHE_H
+#ifndef ION_DEVICE_N0110_CACHE_H
+#define ION_DEVICE_N0110_CACHE_H

 #include <regs/regs.h>

--- a/ion/src/device/n0110/drivers/config/backlight.h
+++ b/ion/src/device/n0110/drivers/config/backlight.h
@@ -1,5 +1,5 @@
-#ifndef ION_DEVICE_N0200_CONFIG_BACKLIGHT_H
-#define ION_DEVICE_N0200_CONFIG_BACKLIGHT_H
+#ifndef ION_DEVICE_N0110_CONFIG_BACKLIGHT_H
+#define ION_DEVICE_N0110_CONFIG_BACKLIGHT_H

 #include <regs/regs.h>

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

 #include <regs/regs.h>

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

 #include <regs/regs.h>

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

 #include <regs/regs.h>

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

 #include <regs/regs.h>

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

 #include <regs/regs.h>

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

 #include <regs/regs.h>

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

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

 #include <regs/regs.h>

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

 #include <regs/regs.h>

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

 #include <regs/regs.h>

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

 #include <regs/regs.h>

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

 #include <regs/regs.h>

--- a/ion/src/device/n0110/drivers/power.cpp
+++ b/ion/src/device/n0110/drivers/power.cpp
--- a/ion/src/device/n0110/flash.ld
+++ b/ion/src/device/n0110/flash.ld
--- a/ion/src/device/n0110/internal_flash.ld
+++ b/ion/src/device/n0110/internal_flash.ld
--- a/ion/src/device/n0110/ram.ld
+++ b/ion/src/device/n0110/ram.ld
--- a/ion/src/device/n0110/regs/config/cortex.h
+++ b/ion/src/device/n0110/regs/config/cortex.h
@@ -0,0 +1,6 @@
+#ifndef ION_DEVICE_N0110_REGS_CONFIG_CORTEX_H
+#define ION_DEVICE_N0110_REGS_CONFIG_CORTEX_H
+
+#define REGS_CORTEX_CONFIG_CACHE 1
+
+#endif
--- a/ion/src/device/n0110/regs/config/flash.h
+++ b/ion/src/device/n0110/regs/config/flash.h
@@ -0,0 +1,6 @@
+#ifndef ION_DEVICE_N0110_REGS_CONFIG_FLASH_H
+#define ION_DEVICE_N0110_REGS_CONFIG_FLASH_H
+
+#define REGS_FLASH_CONFIG_ART 1
+
+#endif
--- a/ion/src/device/n0110/regs/config/pwr.h
+++ b/ion/src/device/n0110/regs/config/pwr.h
@@ -0,0 +1,6 @@
+#ifndef ION_DEVICE_N0110_REGS_CONFIG_PWR_H
+#define ION_DEVICE_N0110_REGS_CONFIG_PWR_H
+
+#define REGS_PWR_CONFIG_ADDITIONAL_FIELDS 1
+
+#endif
--- a/ion/src/device/n0110/regs/config/rcc.h
+++ b/ion/src/device/n0110/regs/config/rcc.h
@@ -0,0 +1,7 @@
+#ifndef ION_DEVICE_N0110_REGS_CONFIG_RCC_H
+#define ION_DEVICE_N0110_REGS_CONFIG_RCC_H
+
+#define REGS_RCC_CONFIG_F730 1
+#define REGS_RCC_CONFIG_F412 0
+
+#endif
--- a/ion/src/device/n0110/regs/config/syscfg.h
+++ b/ion/src/device/n0110/regs/config/syscfg.h
@@ -0,0 +1,6 @@
+#ifndef ION_DEVICE_N0110_REGS_CONFIG_SYSCFG_H
+#define ION_DEVICE_N0110_REGS_CONFIG_SYSCFG_H
+
+#define REGS_SYSCFG_CONFIG_F412 0
+
+#endif
--- a/ion/src/device/n0110/regs/config/usart.h
+++ b/ion/src/device/n0110/regs/config/usart.h
@@ -1,5 +1,5 @@
-#ifndef ION_DEVICE_N0200_REGS_CONFIG_USART_H
-#define ION_DEVICE_N0200_REGS_CONFIG_USART_H
+#ifndef ION_DEVICE_N0110_REGS_CONFIG_USART_H
+#define ION_DEVICE_N0110_REGS_CONFIG_USART_H

 #define REGS_USART_SR_OFFSET 0x1C
 #define REGS_USART_RDR_OFFSET 0x24
--- a/ion/src/device/n0110/usb/dfu.ld
+++ b/ion/src/device/n0110/usb/dfu.ld
--- a/ion/src/device/n0110/usb/stack/device.cpp
+++ b/ion/src/device/n0110/usb/stack/device.cpp
--- a/ion/src/device/n0200/Makefile
+++ b/ion/src/device/n0200/Makefile
@@ -1,9 +0,0 @@
-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/regs/config/cortex.h
+++ b/ion/src/device/n0200/regs/config/cortex.h
@@ -1,6 +0,0 @@
-#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
@@ -1,6 +0,0 @@
-#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
@@ -1,6 +0,0 @@
-#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
@@ -1,7 +0,0 @@
-#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/syscfg.h
+++ b/ion/src/device/n0200/regs/config/syscfg.h
@@ -1,6 +0,0 @@
-#ifndef ION_DEVICE_N0200_REGS_CONFIG_SYSCFG_H
-#define ION_DEVICE_N0200_REGS_CONFIG_SYSCFG_H
-
-#define REGS_SYSCFG_CONFIG_F412 0
-
-#endif
--- 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 N0200
+ * (K_B2 and K_B3 are respectively specific to N0100 and N0110
 *
 *      |  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)
-   * - N0200: position 12-15 (charging pin = 3) with 0100 (ChargingGPIO = group E)
+   * - N0110: 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)
-   * - N0200: position 8-11 (column pin = 2) with 0010 (ColumnGPIO = group C). */
+   * - N0110: position 8-11 (column pin = 2) with 0010 (ColumnGPIO = group C). */

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

--- a/scripts/device/openocd.n0110.cfg
+++ b/scripts/device/openocd.n0110.cfg
--- a/scripts/platform.device.mak
+++ b/scripts/platform.device.mak
@@ -1,4 +1,4 @@
-MODEL ?= n0200
+MODEL ?= n0110
 USE_LIBA = 1
 EXE = elf
 EPSILON_BOOT_PROMPT = update
--- a/scripts/platform.device.n0110.mak
+++ b/scripts/platform.device.n0110.mak
--- a/scripts/targets.device.n0110.mak
+++ b/scripts/targets.device.n0110.mak