Support Nitrokey Start
authorNIIBE Yutaka <gniibe@fsij.org>
Tue, 8 Sep 2015 13:02:13 +0000 (22:02 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Tue, 8 Sep 2015 13:02:13 +0000 (22:02 +0900)
ChangeLog
chopstx
src/adc_stm32f103.c
src/configure
src/sys.h

index ba34efd..8c3602c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-09-08  Niibe Yutaka  <gniibe@fsij.org>
+
+       * src/adc_stm32f103.c (get_adc_config): Add
+       BOARD_ID_NITROKEY_START.
+
+       * src/sys.h: Update from Chopstx.
+
 2015-09-04  Niibe Yutaka  <gniibe@fsij.org>
 
        * src/main.c (usb_cb_device_reset): Fix bDeviceState on reset.
diff --git a/chopstx b/chopstx
index 85ef4a5..baef99b 160000 (submodule)
--- a/chopstx
+++ b/chopstx
@@ -1 +1 @@
-Subproject commit 85ef4a5391cc6f82ba4b18a65c189b585ac125f4
+Subproject commit baef99bf11db42df18e2155e14fe774260747c91
index ca766a7..2577a1e 100644 (file)
@@ -171,6 +171,7 @@ get_adc_config (uint32_t config[4])
     case BOARD_ID_STM8S_DISCOVERY:
     case BOARD_ID_ST_DONGLE:
     case BOARD_ID_ST_NUCLEO_F103:
+    case BOARD_ID_NITROKEY_START:
     default:
       config[0] = 0;
       config[1] = ADC_SMPR2_SMP_AN0(ADC_SAMPLE_1P5)
index cac7291..278585b 100755 (executable)
@@ -102,9 +102,10 @@ Configuration:
                           STBEE
                           STBEE_MINI
                           MAPLE_MINI
-                          CQ_STARM
                           ST_DONGLE
                           ST_NUCLEO_F103
+                          NITROKEY_START
+                          CQ_STARM
                           FST_01_00 (unreleased version with 8MHz XTAL)
   --enable-sys1-compat enable SYS 1.0 compatibility    [yes]
                           executable is target dependent
index 370aa1c..aa7825d 100644 (file)
--- a/src/sys.h
+++ b/src/sys.h
@@ -9,6 +9,7 @@
 #define BOARD_ID_STM8S_DISCOVERY   0x2f0976bb
 #define BOARD_ID_ST_DONGLE         0x2cd4e471
 #define BOARD_ID_ST_NUCLEO_F103    0x9b87c16d
+#define BOARD_ID_NITROKEY_START    0xad1e7ebd
 
 extern const uint8_t sys_version[8];
 extern const uint32_t sys_board_id;