Skip to content

Commit f714f72

Browse files
GissioGissio
committed
2.0rc6
1 parent 6b34194 commit f714f72

File tree

10 files changed

+10
-226
lines changed

10 files changed

+10
-226
lines changed

‎CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ add_definitions(-D SIMULATE_PULSES)
2525
add_definitions(-D TUBE_HV_PWM)
2626
add_definitions(-D BATTERY_REMOVABLE)
2727
add_definitions(-D KEYBOARD_5KEYS)
28-
# add_definitions(-D DISPLAY_PANEL)
2928
add_definitions(-D PULSE_LED)
3029
# add_definitions(-D ALERT_LED)
3130
add_definitions(-D VIBRATOR)

‎docs/devices/FNIRSI GC-01/install.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ The HV profile settings are:
7878

7979
On the FNIRSI GC-01 with an APM32F103R8 (Geehy) processor, the USB data connection is always available.
8080

81-
Data logging can store up to 61793 data points. At normal radiation levels (20 cpm), this allows for 1287 days of data at 60-minute intervals, 214 days at 10-minute intervals, 42 days at 1-minute intervals, 7 days at 10-second intervals and 17 hours at 1-second intervals.
81+
Data logging can store up to 63819 data points. At normal radiation levels (20 cpm), this allows for 1329 days of data at 60-minute intervals, 221 days at 10-minute intervals, 44 days at 1-minute intervals, 7 days at 10-second intervals and 17 hours at 1-second intervals.
8282

8383
The HV profile settings are:
8484

‎platform.io/platformio.ini

-3
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ build_flags =
137137
-D KEYBOARD_5KEYS
138138
-D DISPLAY_320X240
139139
-D DISPLAY_COLOR
140-
-D DISPLAY_PANEL
141140
-D FONT_2BPP
142141
-D FONT_SYMBOLS_LIM
143142
-D PULSE_LED
@@ -161,7 +160,6 @@ build_flags =
161160
-D KEYBOARD_5KEYS
162161
-D DISPLAY_320X240
163162
-D DISPLAY_COLOR
164-
-D DISPLAY_PANEL
165163
-D FONT_2BPP
166164
-D FONT_SYMBOLS_LIM
167165
-D PULSE_LED
@@ -186,7 +184,6 @@ build_flags =
186184
-D KEYBOARD_5KEYS
187185
-D DISPLAY_320X240
188186
-D DISPLAY_COLOR
189-
-D DISPLAY_PANEL
190187
-D FONT_SYMBOLS_LIM
191188
-D PULSE_LED
192189
-D VIBRATOR

‎platform.io/src/display.c

-54
Original file line numberDiff line numberDiff line change
@@ -2220,7 +2220,6 @@ const View displayThemeMenuView;
22202220
const View displayContrastMenuView;
22212221
const View displayBrightnessMenuView;
22222222
const View displaySleepMenuView;
2223-
const View displayPanelMenuView;
22242223

22252224
static const OptionView displayMenuOptions[] = {
22262225
#if defined(DISPLAY_COLOR)
@@ -2231,9 +2230,6 @@ static const OptionView displayMenuOptions[] = {
22312230
{"Contrast", &displayContrastMenuView},
22322231
#endif
22332232
{"Sleep", &displaySleepMenuView},
2234-
#if defined(DISPLAY_PANEL)
2235-
{"Panel", &displayPanelMenuView},
2236-
#endif
22372233
{NULL},
22382234
};
22392235

@@ -2445,56 +2441,6 @@ const View displaySleepMenuView = {
24452441
&displaySleepMenu,
24462442
};
24472443

2448-
// Display panel menu
2449-
2450-
#if defined(DISPLAY_PANEL)
2451-
2452-
static const char *const displayPanelMenuOptions[] = {
2453-
#if defined(DISPLAY_PANEL_1)
2454-
DISPLAY_PANEL_1,
2455-
#endif
2456-
#if defined(DISPLAY_PANEL_2)
2457-
DISPLAY_PANEL_2,
2458-
#endif
2459-
#if defined(DISPLAY_PANEL_3)
2460-
DISPLAY_PANEL_3,
2461-
#endif
2462-
NULL,
2463-
};
2464-
2465-
static const char *onDisplayPanelMenuGetOption(const Menu *menu,
2466-
uint32_t index,
2467-
MenuStyle *menuStyle)
2468-
{
2469-
*menuStyle = (index == settings.displayPanel);
2470-
2471-
return displayPanelMenuOptions[index];
2472-
}
2473-
2474-
static void onDisplayPanelMenuSelect(const Menu *menu)
2475-
{
2476-
settings.displayPanel = menu->state->selectedIndex;
2477-
2478-
updateDisplayPanel();
2479-
}
2480-
2481-
static MenuState displayPanelMenuState;
2482-
2483-
static const Menu displayPanelMenu = {
2484-
"Panel",
2485-
&displayPanelMenuState,
2486-
onDisplayPanelMenuGetOption,
2487-
onDisplayPanelMenuSelect,
2488-
onDisplaySubMenuBack,
2489-
};
2490-
2491-
const View displayPanelMenuView = {
2492-
onMenuEvent,
2493-
&displayPanelMenu,
2494-
};
2495-
2496-
#endif
2497-
24982444
// Display flashes menu
24992445

25002446
static const char *const displayFlashesMenuOptions[] = {

‎platform.io/src/display.h

-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ void initDisplay(void);
5959
void initDisplayController(void);
6060
void initDisplayBacklight(void);
6161

62-
void updateDisplayPanel(void);
63-
6462
void setDisplayOn(bool value);
6563
bool isDisplayOn(void);
6664

‎platform.io/src/sdl/sdlsim_display.c

-4
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ void initDisplayController(void)
5353
#endif
5454
}
5555

56-
void updateDisplayPanel(void)
57-
{
58-
}
59-
6056
void setDisplayOn(bool value)
6157
{
6258
displayOn = value;

‎platform.io/src/settings.h

-9
Original file line numberDiff line numberDiff line change
@@ -272,12 +272,6 @@ enum
272272
DISPLAY_BRIGHTNESS_NUM,
273273
};
274274

275-
#if defined(GC01) || defined(SIMULATOR)
276-
#define DISPLAY_PANEL_1 "CL24CG1045-40B"
277-
#define DISPLAY_PANEL_2 "ENH-TV0240B026"
278-
#define DISPLAY_PANEL_3 "GMT024-05 V2.0"
279-
#endif
280-
281275
enum
282276
{
283277
RTC_TIMEZONE_M1200,
@@ -391,9 +385,6 @@ typedef struct
391385
#endif
392386
unsigned int displayBrightness : 2;
393387
unsigned int displaySleep : 3;
394-
#if defined(DISPLAY_PANEL)
395-
unsigned int displayPanel : 2;
396-
#endif
397388

398389
unsigned int rtcTimeZone : 5;
399390
unsigned int rtcTimeFormat : 1;

‎platform.io/src/stm32/gc01.c

+7-150
Original file line numberDiff line numberDiff line change
@@ -139,66 +139,6 @@ bool displayOn;
139139

140140
static uint8_t displayTextbuffer[86 * 86];
141141

142-
static const uint8_t displayCL24CG104540BInitSequence[] = {
143-
MR_SEND_COMMAND(MR_ST7789_RAMCTRL),
144-
MR_SEND_DATA(0x00),
145-
MR_SEND_DATA(0xe0),
146-
MR_SEND_COMMAND(MR_ST7789_PORCTRL),
147-
MR_SEND_DATA(0x0c),
148-
MR_SEND_DATA(0x0c),
149-
MR_SEND_DATA(0x00),
150-
MR_SEND_DATA(0x33),
151-
MR_SEND_DATA(0x33),
152-
MR_SEND_COMMAND(MR_ST7789_GCTRL),
153-
MR_SEND_DATA(0x35), // VGLS=-10.43 V, VGHS=13.26 V
154-
MR_SEND_COMMAND(MR_ST7789_VCOMS),
155-
MR_SEND_DATA(0x28), // VCOM=1.1 V
156-
MR_SEND_COMMAND(MR_ST7789_VRHS),
157-
MR_SEND_DATA(0x0b), // VRH=4.1 V
158-
MR_SEND_COMMAND(MR_ST7789_FRCTRL2),
159-
MR_SEND_DATA(0x0f), // 60 Hz
160-
MR_SEND_COMMAND(MR_ST7789_PWCTRL1),
161-
MR_SEND_DATA(0xa4), // AVDD=6.8 V, AVCL=-4.8 V, VDDS=2.3 V
162-
MR_SEND_DATA(0xa1),
163-
MR_SEND_COMMAND(MR_ST7789_PVGAMCTRL),
164-
MR_SEND_DATA(0xd0),
165-
MR_SEND_DATA(0x01),
166-
MR_SEND_DATA(0x08),
167-
MR_SEND_DATA(0x0f),
168-
MR_SEND_DATA(0x11),
169-
MR_SEND_DATA(0x2a),
170-
MR_SEND_DATA(0x36),
171-
MR_SEND_DATA(0x55),
172-
MR_SEND_DATA(0x44),
173-
MR_SEND_DATA(0x3a),
174-
MR_SEND_DATA(0x0b),
175-
MR_SEND_DATA(0x06),
176-
MR_SEND_DATA(0x11),
177-
MR_SEND_DATA(0x20),
178-
MR_SEND_COMMAND(MR_ST7789_NVGAMCTRL),
179-
MR_SEND_DATA(0xd0),
180-
MR_SEND_DATA(0x02),
181-
MR_SEND_DATA(0x07),
182-
MR_SEND_DATA(0x0a),
183-
MR_SEND_DATA(0x0b),
184-
MR_SEND_DATA(0x18),
185-
MR_SEND_DATA(0x34),
186-
MR_SEND_DATA(0x43),
187-
MR_SEND_DATA(0x4a),
188-
MR_SEND_DATA(0x2b),
189-
MR_SEND_DATA(0x1b),
190-
MR_SEND_DATA(0x1c),
191-
MR_SEND_DATA(0x22),
192-
MR_SEND_DATA(0x1f),
193-
MR_SEND_COMMAND(MR_ST7789_PWCTRL2),
194-
MR_SEND_DATA(0x93), // SBCLK DIV 3, BCLK DIV 6
195-
MR_SEND_COMMAND(MR_ST7789_EQCTRL),
196-
MR_SEND_DATA(0x11), // SEQ=6.8 µs
197-
MR_SEND_DATA(0x11), // SPRET=6.8 µs
198-
MR_SEND_DATA(0x08), // GEQ=3.2 µs
199-
MR_END(),
200-
};
201-
202142
static const uint8_t displayENHTV0240B026InitSequence[] = {
203143
MR_SEND_COMMAND(MR_ST7789_RAMCTRL),
204144
MR_SEND_DATA(0x00),
@@ -259,66 +199,6 @@ static const uint8_t displayENHTV0240B026InitSequence[] = {
259199
MR_END(),
260200
};
261201

262-
static const uint8_t displayGMT02405V20InitSequence[] = {
263-
MR_SEND_COMMAND(MR_ST7789_RAMCTRL),
264-
MR_SEND_DATA(0x00),
265-
MR_SEND_DATA(0xe0),
266-
MR_SEND_COMMAND(MR_ST7789_PORCTRL),
267-
MR_SEND_DATA(0x05),
268-
MR_SEND_DATA(0x05),
269-
MR_SEND_DATA(0x00),
270-
MR_SEND_DATA(0x33),
271-
MR_SEND_DATA(0x33),
272-
MR_SEND_COMMAND(MR_ST7789_GCTRL),
273-
MR_SEND_DATA(0x05), // VGLS=-10.43 V, VGHS=12.2 V
274-
MR_SEND_COMMAND(MR_ST7789_VCOMS),
275-
MR_SEND_DATA(0x39), // VCOM=1.525 V
276-
MR_SEND_COMMAND(MR_ST7789_VRHS),
277-
MR_SEND_DATA(0x0f), // VRH=4.3 V
278-
MR_SEND_COMMAND(MR_ST7789_FRCTRL2),
279-
MR_SEND_DATA(0x01), // 111 Hz
280-
MR_SEND_COMMAND(MR_ST7789_PWCTRL1),
281-
MR_SEND_DATA(0xa4), // AVDD=6.8 V, AVCL=-4.8 V, VDDS=2.3 V
282-
MR_SEND_DATA(0xa1),
283-
MR_SEND_COMMAND(MR_ST7789_PVGAMCTRL),
284-
MR_SEND_DATA(0xd0),
285-
MR_SEND_DATA(0x05),
286-
MR_SEND_DATA(0x09),
287-
MR_SEND_DATA(0x09),
288-
MR_SEND_DATA(0x08),
289-
MR_SEND_DATA(0x14),
290-
MR_SEND_DATA(0x28),
291-
MR_SEND_DATA(0x33),
292-
MR_SEND_DATA(0x3f),
293-
MR_SEND_DATA(0x07),
294-
MR_SEND_DATA(0x13),
295-
MR_SEND_DATA(0x14),
296-
MR_SEND_DATA(0x28),
297-
MR_SEND_DATA(0x30),
298-
MR_SEND_COMMAND(MR_ST7789_NVGAMCTRL),
299-
MR_SEND_DATA(0xd0),
300-
MR_SEND_DATA(0x05),
301-
MR_SEND_DATA(0x09),
302-
MR_SEND_DATA(0x09),
303-
MR_SEND_DATA(0x08),
304-
MR_SEND_DATA(0x03),
305-
MR_SEND_DATA(0x24),
306-
MR_SEND_DATA(0x32),
307-
MR_SEND_DATA(0x32),
308-
MR_SEND_DATA(0x3B),
309-
MR_SEND_DATA(0x14),
310-
MR_SEND_DATA(0x13),
311-
MR_SEND_DATA(0x28),
312-
MR_SEND_DATA(0x2f),
313-
MR_SEND_COMMAND(MR_ST7789_PWCTRL2),
314-
MR_SEND_DATA(0x03), // SBCLK DIV 2, BCLK DIV 6
315-
MR_SEND_COMMAND(MR_ST7789_EQCTRL),
316-
MR_SEND_DATA(0x09), // SEQ=3.6 µs
317-
MR_SEND_DATA(0x09), // SPRET=3.6 µs
318-
MR_SEND_DATA(0x08), // GEQ=3.2 µs
319-
MR_END(),
320-
};
321-
322202
#if defined(GC01_DISPLAY_SPI)
323203
static const uint8_t displayIPSInitSequence[] = {
324204
MR_SEND_COMMAND(MR_ST7789_INVON), // Inverse for IPS displays
@@ -327,35 +207,6 @@ static const uint8_t displayIPSInitSequence[] = {
327207
};
328208
#endif
329209

330-
void updateDisplayPanel(void)
331-
{
332-
switch (settings.displayPanel)
333-
{
334-
case 0:
335-
mr_send_sequence(&mr,
336-
displayCL24CG104540BInitSequence);
337-
338-
break;
339-
340-
case 1:
341-
mr_send_sequence(&mr,
342-
displayENHTV0240B026InitSequence);
343-
344-
break;
345-
346-
case 2:
347-
mr_send_sequence(&mr,
348-
displayGMT02405V20InitSequence);
349-
350-
break;
351-
}
352-
353-
#if defined(GC01_DISPLAY_SPI)
354-
mr_send_sequence(&mr,
355-
displayIPSInitSequence);
356-
#endif
357-
}
358-
359210
static void onDisplaySleep(uint32_t value)
360211
{
361212
sleep(value);
@@ -520,7 +371,13 @@ void initDisplayController(void)
520371
onDisplaySend);
521372
#endif
522373

523-
updateDisplayPanel();
374+
mr_send_sequence(&mr,
375+
displayENHTV0240B026InitSequence);
376+
377+
#if defined(GC01_DISPLAY_SPI)
378+
mr_send_sequence(&mr,
379+
displayIPSInitSequence);
380+
#endif
524381
}
525382

526383
void setDisplayOn(bool value)

‎platform.io/src/stm32/gc01.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#define FIRMWARE_SIZE 0xa000
2424
#elif defined(APM32)
2525
#define FLASH_SIZE 0x20000
26-
#define FIRMWARE_SIZE 0xc800
26+
#define FIRMWARE_SIZE 0xc000
2727
#endif
2828

2929
#define PWR_EN_PORT GPIOA

‎tools/radpro-sign.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,4 @@ def sign_firmware(env_name, container_offset, container_size, flash_size):
113113
sign_firmware('bosean-fs1000', 0x0, 0x9000, 0x20000)
114114
sign_firmware('bosean-fs5000', 0x0, 0xc000, 0x40000)
115115
sign_firmware('fnirsi-gc01-ch32f103r8', 0x4000, 0xa000, 0x10000)
116-
sign_firmware('fnirsi-gc01-apm32f103rb', 0x4000, 0xc800, 0x20000)
116+
sign_firmware('fnirsi-gc01-apm32f103rb', 0x4000, 0xc000, 0x20000)

0 commit comments

Comments
 (0)